Added backend storage for traced state. Wired this to the agent configuration.

Author: baffles

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

@@ -28,14 +28,11 @@ import com.secdec.codepulse.data.MethodSignatureParser
 import com.secdec.codepulse.data.trace.TreeNode
 
 object CodeForestBuilder {
-
-	def main(arts: Array[String]): Unit = {
-		val rawSig = "com/avi/codepulse/Cool$Beans.stuff;9;([Ljava/lang/String;)V"
-		println(CodePath.parse(rawSig))
-	}
+	val JSPGroupName = "JSPs"
 }
 
-class CodeForestBuilder {
+class CodeForestBuilder(defaultTracedGroups: List[String]) {
+	import CodeForestBuilder._
 
 	private val roots = SortedSet.empty[CodeTreeNode]
 	private var nodeFactory = CodeTreeNodeFactory.mkDefaultFactory
@@ -48,13 +45,18 @@ class CodeForestBuilder {
 
 	def result = {
 		val lb = List.newBuilder[TreeNode]
+		val tracedGroups = defaultTracedGroups.toSet
 		for (root <- roots) root.visitTree { node =>
 			val id = node.id
 			val name = node.name
 			val parentId = node.parentId
 			val kind = node.kind
 			val size = node.size
-			lb += TreeNode(id, parentId, name, kind, size)
+			val traced = kind match {
+				case CodeTreeNodeKind.Grp | CodeTreeNodeKind.Pkg => Some(tracedGroups contains root.name)
+				case _ => None
+			}
+			lb += TreeNode(id, parentId, name, kind, size, traced)
 		}
 		lb.result()
 	}
@@ -95,7 +97,7 @@ class CodeForestBuilder {
 			case packageNode :: rest => recurse(addChildPackage(parent, packageNode), rest)
 		}
 
-		recurse(addGroup("JSPs"), path)
+		recurse(addGroup(JSPGroupName), path)
 	}
 
 	protected def addGroup(name: String) = roots.find { node =>

codepulse/src/main/scala/com/secdec/codepulse/data/trace/TreeNodeData.scala

@@ -29,8 +29,9 @@ import com.secdec.codepulse.data.bytecode.CodeTreeNodeKind
   * @param kind The `CodeTreeNodeKind` of this node
   * @param size A number indicating the size of the node (e.g. lines of code). If unspecified,
   * the size of a node is assumed to be the sum of its childrens' sizes.
+  * @param traced whether or not this treenode is being traced; this value may be unspecified (None)
   */
-case class TreeNode(id: Int, parentId: Option[Int], label: String, kind: CodeTreeNodeKind, size: Option[Int])
+case class TreeNode(id: Int, parentId: Option[Int], label: String, kind: CodeTreeNodeKind, size: Option[Int], traced: Option[Boolean])
 
 /** Access trait for tree node data.
   *
@@ -62,4 +63,10 @@ trait TreeNodeDataAccess {
 
 	def storeNode(node: TreeNode): Unit
 	def storeNodes(nodes: Iterable[TreeNode]) = nodes foreach storeNode
+
+	def updateTraced(id: Int, traced: Option[Boolean]): Unit
+	def updateTraced(id: Int, traced: Boolean): Unit = updateTraced(id, Some(traced))
+	def updateTraced(node: TreeNode, traced: Option[Boolean]): Unit = updateTraced(node.id, traced)
+	def updateTraced(node: TreeNode, traced: Boolean): Unit = updateTraced(node.id, Some(traced))
+	def updateTraced(values: Iterable[(Int, Boolean)]): Unit = values foreach { case (id, traced) => updateTraced(id, Some(traced)) }
 }

codepulse/src/main/scala/com/secdec/codepulse/data/trace/slick/SlickTreeNodeDataAccess.scala

@@ -100,4 +100,8 @@ private[slick] class SlickTreeNodeDataAccess(dao: TreeNodeDataDao, db: Database)
 	override def storeNodes(nodes: Iterable[TreeNode]) = db withTransaction { implicit transaction =>
 		dao storeNodes nodes
 	}
+
+	def updateTraced(id: Int, traced: Option[Boolean]) = db withTransaction { implicit transaction =>
+		dao.updateTraced(id, traced)
+	}
 }

codepulse/src/main/scala/com/secdec/codepulse/data/trace/slick/TreeNodeDataDao.scala

@@ -48,7 +48,8 @@ private[slick] class TreeNodeDataDao(val driver: JdbcProfile) {
 		def label = column[String]("label", O.NotNull)
 		def kind = column[CodeTreeNodeKind]("kind", O.NotNull)
 		def size = column[Option[Int]]("size", O.Nullable)
-		def * = (id, parentId, label, kind, size) <> (TreeNode.tupled, TreeNode.unapply)
+		def traced = column[Option[Boolean]]("traced", O.Nullable)
+		def * = (id, parentId, label, kind, size, traced) <> (TreeNode.tupled, TreeNode.unapply)
 	}
 	val treeNodeData = TableQuery[TreeNodeData]
 
@@ -132,4 +133,9 @@ private[slick] class TreeNodeDataDao(val driver: JdbcProfile) {
 	def storeNodes(nodes: Iterable[TreeNode])(implicit session: Session) {
 		treeNodeData ++= nodes
 	}
+
+	def updateTraced(id: Int, traced: Option[Boolean])(implicit session: Session) {
+		val q = for (n <- treeNodeData if n.id === id) yield n.traced
+		q.update(traced)
+	}
 }

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

@@ -31,6 +31,8 @@ object TraceSettingsCreator {
 			(for {
 				treeNode <- it
 				if treeNode.kind == CodeTreeNodeKind.Pkg
+				traced = treeNode.traced getOrElse ???
+				if traced
 			} yield {
 				val slashedName = treeNode.label.replace('.', '/')
 				"^" + slashedName + "/[^/]+$"

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

@@ -104,14 +104,15 @@ object TraceUploadData {
 	}
 
 	def handleBinaryZip(file: File): TraceId = createAndLoadTraceData { traceData =>
-		val builder = new CodeForestBuilder
+		val RootGroupName = "Classes"
+		val builder = new CodeForestBuilder(defaultTracedGroups = RootGroupName :: CodeForestBuilder.JSPGroupName :: Nil)
 		val methodCorrelationsBuilder = collection.mutable.Map.empty[String, Int]
 
 		//TODO: make this configurable somehow
 		val jspAdapter = new JasperJspAdapter
 
 		ZipEntryChecker.forEachEntry(file) { (filename, entry, contents) =>
-			val groupName = if (filename == file.getName) "\"classes\"" else new File(filename).getName
+			val groupName = if (filename == file.getName) RootGroupName else new File(filename).getName
 			if (!entry.isDirectory) {
 				FilenameUtils.getExtension(entry.getName) match {
 					case "class" =>

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

@@ -42,6 +42,7 @@ object TreemapDataStreamer {
 		jg.writeStringField("name", node.label)
 		jg.writeStringField("kind", node.kind.label)
 		for (size <- node.size) jg.writeNumberField("lineCount", size)
+		for (traced <- node.traced) jg.writeBooleanField("traced", traced)
 
 		jg.writeEndObject
 	}

codepulse/src/main/scala/com/secdec/codepulse/tracer/export/TraceExporter.scala

@@ -107,6 +107,7 @@ object TraceExporter extends JsonHelpers {
 				jg.writeStringField("label", node.label)
 				jg.writeStringField("kind", node.kind.label)
 				for (size <- node.size) jg.writeNumberField("size", size)
+				for (traced <- node.traced) jg.writeBooleanField("traced", traced)
 
 				jg.writeEndObject
 			}

codepulse/src/main/scala/com/secdec/codepulse/tracer/export/TraceImportReaderV1.scala

@@ -83,6 +83,7 @@ object TraceImportReaderV1 extends TraceImportReader with TraceImportHelpers wit
 				var label = None: Option[String]
 				var kind = None: Option[CodeTreeNodeKind]
 				var size = None: Option[Int]
+				var traced = None: Option[Boolean]
 
 				while (jp.nextValue != END_OBJECT) {
 					jp.getCurrentName match {
@@ -102,6 +103,12 @@ object TraceImportReaderV1 extends TraceImportReader with TraceImportHelpers wit
 								case VALUE_NULL => None
 								case _ => Some(jp.getIntValue)
 							}
+
+						case "traced" =>
+							traced = jp.getCurrentToken match {
+								case VALUE_NULL => None
+								case _ => Some(jp.getBooleanValue)
+							}
 					}
 				}
 
@@ -110,7 +117,8 @@ object TraceImportReaderV1 extends TraceImportReader with TraceImportHelpers wit
 					parentId,
 					label getOrElse { throw new TraceImportException("Missing label for tree node.") },
 					kind.getOrElse { throw new TraceImportException("Missing or invalid kind for tree node.") },
-					size)
+					size,
+					traced)
 
 				checkAndFlush
 			}