Merge pull request #19 from codedx/dev/java-8

dev/java-8 pull request

Author: stevesalas

.travis.yml

@@ -2,9 +2,9 @@ language: scala
 scala:
   - 2.10.4
 jdk:
-  - oraclejdk7
-  - openjdk7
   - oraclejdk8
+  - openjdk8
+dist: trusty
 sudo: false
 cache:
   directories:

bytefrog

@@ -39,7 +39,7 @@ object AsmVisitors {
 	}
 }
 
-class MethodContentVisitor(counterCallback: AsmVisitors.CounterCallback) extends MethodVisitor(Opcodes.ASM4) {
+class MethodContentVisitor(counterCallback: AsmVisitors.CounterCallback) extends MethodVisitor(Opcodes.ASM5) {
 	private var instructionCounter = 0
 
 	def inc() = instructionCounter += 1
@@ -61,7 +61,7 @@ class MethodContentVisitor(counterCallback: AsmVisitors.CounterCallback) extends
 	override def visitVarInsn(opcode: Int, v: Int): Unit = inc()
 }
 
-class ClassStructureVisitor2(methodCallback: AsmVisitors.MethodCallback) extends ClassVisitor(Opcodes.ASM4) {
+class ClassStructureVisitor2(methodCallback: AsmVisitors.MethodCallback) extends ClassVisitor(Opcodes.ASM5) {
 	private var classSignature = ""
 
 	override def visit(version: Int, access: Int, name: String, signature: String, superName: String, interfaces: Array[String]) = {
@@ -75,4 +75,4 @@ class ClassStructureVisitor2(methodCallback: AsmVisitors.MethodCallback) extends
 		}
 		new MethodContentVisitor(counterCallback)
 	}
-}
+}

codepulse/src/main/scala/com/secdec/codepulse/data/bytecode/MethodContentVisitor.scala

@@ -41,11 +41,25 @@ class SlickH2ProjectDataProvider(folder: File, actorSystem: ActorSystem) extends
 
 	private val cache = collection.mutable.Map.empty[ProjectId, SlickProjectData]
 
+	val MasterDbName = "master"
+	val PageStoreFileSuffix = ".h2.db"
+	val MultiVersionStoreFileSuffix = ".mv.db"
+
 	private object ProjectFilename {
-		def apply(projectId: ProjectId) = s"${getDbName(projectId)}.h2.db"
+		def apply(folder: File, projectId: ProjectId) = {
+			val dbName = getDbName(projectId)
+
+			// The current H2 database driver reads existing PageStore db files
+			// but will create new db files using MVStore.
+			val dbPageStoreFilename = s"$dbName$PageStoreFileSuffix"
+			if ((folder / dbPageStoreFilename).exists)
+				dbPageStoreFilename
+			else
+				s"$dbName$MultiVersionStoreFileSuffix"
+		}
 		def getDbName(projectId: ProjectId) = s"project-${projectId.num}"
 
-		val NameRegex = raw"project-(\d+)\.h2\.db".r
+		val NameRegex = raw"project-(\d+)\.(?:h2|mv)\.db".r
 
 		def unapply(filename: String): Option[ProjectId] = filename match {
 			case NameRegex(ProjectId(id)) => Some(id)
@@ -54,9 +68,9 @@ class SlickH2ProjectDataProvider(folder: File, actorSystem: ActorSystem) extends
 	}
 
 	private val masterData = {
-		val needsInit = !(folder / "master.h2.db").exists
+		val needsInit = !((folder / s"$MasterDbName$MultiVersionStoreFileSuffix").exists || (folder / s"$MasterDbName$PageStoreFileSuffix").exists)
 
-		val db = Database.forURL(s"jdbc:h2:file:${(folder / "master").getCanonicalPath};DB_CLOSE_DELAY=10", driver = "org.h2.Driver")
+		val db = Database.forURL(s"jdbc:h2:file:${(folder / MasterDbName).getCanonicalPath};DB_CLOSE_DELAY=10", driver = "org.h2.Driver")
 		val data = new SlickMasterData(db, H2Driver)
 
 		if (needsInit) data.init
@@ -67,7 +81,7 @@ class SlickH2ProjectDataProvider(folder: File, actorSystem: ActorSystem) extends
 	def getProject(id: ProjectId): ProjectData = getProjectInternal(id)
 
 	private def getProjectInternal(id: ProjectId, suppressInit: Boolean = false) = cache.getOrElseUpdate(id, {
-		val needsInit = !(folder / ProjectFilename(id)).exists
+		val needsInit = !(folder / ProjectFilename(folder, id)).exists
 
 		val db = Database.forURL(s"jdbc:h2:file:${(folder / ProjectFilename.getDbName(id)).getCanonicalPath};DB_CLOSE_DELAY=10", driver = "org.h2.Driver")
 		val data = new SlickProjectData(id, db, H2Driver, masterData.metadataMaster get id.num, EncountersBufferSize, EncountersFlushInterval, actorSystem)

codepulse/src/main/scala/com/secdec/codepulse/data/model/slick/SlickH2ProjectDataProvider.scala

@@ -68,7 +68,13 @@ class ProjectFileUploadHandler(projectManager: ProjectManager) extends RestHelpe
 					_.projectData.metadata.name = name
 				}
 
-				hrefResponse(projectId)
+				projectManager.getProject(projectId) match {
+					case None =>
+						// failed processing for some reason
+						NotFoundResponse("There was an unknown error processing your data.")
+					case Some(_) =>
+						hrefResponse(projectId)
+				}
 			}
 		}
 

codepulse/src/main/scala/com/secdec/codepulse/tracer/ProjectFileUploadHandler.scala

@@ -0,0 +1,71 @@
+/*
+ * Code Pulse: A real-time code coverage testing tool. For more information
+ * see http://code-pulse.com
+ *
+ * Copyright (C) 2017 Applied Visions - http://securedecisions.avi.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.secdec.codepulse.data.bytecode.test
+
+import java.io.File
+import java.util.zip.{ ZipEntry, ZipFile }
+import org.scalatest._
+import org.scalatest.Matchers._
+import com.secdec.codepulse.util.ZipEntryChecker
+import com.secdec.codepulse.data.bytecode._
+
+
+class JavaSuite extends FunSpec with Matchers {
+	describe("Uploaded Java project data") {
+		it("should be accepted if the archive contains Java classes compiled in Java version < 8") {
+			val file = new ZipFile(getClass.getResource("java7-compiled.jar").getPath)
+			val entry = file.getEntry("Main.class")
+			val stream = file.getInputStream(entry)
+
+			try {
+				AsmVisitors.parseMethodsFromClass(stream)
+			}
+			finally {
+				stream.close
+			}
+		}
+
+		it("should be accepted if the archive contains Java classes compiled in Java version 8") {
+			val file = new ZipFile(getClass.getResource("java8-compiled.jar").getPath)
+			val entry = file.getEntry("Main.class")
+			val stream = file.getInputStream(entry)
+
+			try {
+				AsmVisitors.parseMethodsFromClass(stream)
+			}
+			finally {
+				stream.close
+			}
+		}
+
+		it("should not be accepted if the archive contains Java classes compiled in Java version 9") {
+			val file = new ZipFile(getClass.getResource("java9-compiled.jar").getPath)
+			val entry = file.getEntry("Main.class")
+			val stream = file.getInputStream(entry)
+
+			try {
+				an [IllegalArgumentException] should be thrownBy AsmVisitors.parseMethodsFromClass(stream)
+			}
+			finally {
+				stream.close
+			}
+		}
+	}
+}

codepulse/src/test/resources/com/secdec/codepulse/data/bytecode/test/java7-compiled.jar

@@ -31,15 +31,15 @@ object Dependencies {
 	// testing
 	lazy val junit = "junit" % "junit" % "4.5" % "test->default"
 	lazy val specs = "org.scala-tools.testing" % "specs_2.9.0" % "1.6.8" % "test"
-	lazy val scalatest = "org.scalatest" %% "scalatest" % "1.9.1" % "test"
+	lazy val scalatest = "org.scalatest" %% "scalatest" % "3.0.4" % "test"
 
 	// extra libraries
 	lazy val akka = "com.typesafe.akka" %% "akka-actor" % "2.2.3"
 	lazy val reactive = "cc.co.scala-reactive" %% "reactive-core"	% "0.3.2.1"
 	lazy val concLinkedHashMap = "com.googlecode.concurrentlinkedhashmap" % "concurrentlinkedhashmap-lru" % "1.2_jdk5"
 	lazy val asm = Seq(
-		"org.ow2.asm" % "asm" % "4.1",
-		"org.ow2.asm" % "asm-commons" % "4.1"
+		"org.ow2.asm" % "asm" % "5.1",
+		"org.ow2.asm" % "asm-commons" % "5.1"
 	)
 	lazy val jna = Seq(
 		"net.java.dev.jna" % "jna" % "4.1.0",
@@ -53,7 +53,7 @@ object Dependencies {
 
 	// database related
 	lazy val slick = "com.typesafe.slick" %% "slick" % "2.0.1"
-	lazy val h2 = "com.h2database" % "h2" % "1.3.172"
+	lazy val h2 = "com.h2database" % "h2" % "1.4.196"
 
 	// apache commons dependencies
 	object commons {