Make some tweaks to how JSPs and groups are handled

- Build up JSP hierarchy using nested groups
- Build JSP paths up using / rather than ., to make them look more like
  file paths
- Show group nodes in the treemap

Author: baffles

codepulse/src/main/resources/toserve/pages/traces/PackageController.js

@@ -74,7 +74,7 @@
 					} else {
 						var abbrevName
 
-						if (packageParentNode && packageParentNode.kind == 'group')
+						if (node.kind != 'group' && packageParentNode && packageParentNode.kind == 'group')
 							abbrevName = node.name
 						else {
 							var parentName = packageParentNode ? packageParentNode.name : '',

codepulse/src/main/resources/toserve/pages/traces/TreeProjector.js

@@ -86,18 +86,18 @@
 			// add `id` to the node in case the filter wants to use it
 			node.id = id
 
-			if(node.kind == 'package' && packageFilter(node)){
+			if((node.kind == 'group' || node.kind == 'package') && packageFilter(node)){
 				markFiltered(id)
 				partialAcceptAncestors(node)
 			}
 		}
 
-		function nearestPackageId(nodeId){
+		function nearestPackageOrGroupId(nodeId){
 			var node = rawNodes[nodeId]
 			if(!node) return undefined
 
-			if(node.kind == 'package') return nodeId
-			return nearestPackageId(node.parentId)
+			if(node.kind == 'package' || node.kind == 'group') return nodeId
+			return nearestPackageOrGroupId(node.parentId)
 		}
 
 		// Second Pass through rawNodes - make a copy of rawNodes with only accepted nodes
@@ -110,8 +110,8 @@
 			// - Other nodes are accepted if their nearest package
 			//   ancestor was 'fully' accepted (marked with a 2)
 			if(
-				(node.kind == 'package' && acceptedNodes[id]) ||
-				(acceptedNodes[nearestPackageId(id)] == 2)
+				((node.kind == 'group' || node.kind == 'package') && acceptedNodes[id]) ||
+				(acceptedNodes[nearestPackageOrGroupId(id)] == 2)
 			){
 				nodesCopy[id] = $.extend(true, {}, rawNodes[id])
 			}

codepulse/src/main/resources/toserve/pages/traces/traces.js

@@ -293,7 +293,7 @@ $(document).ready(function(){
 		'calculateContent': (function(){
 
 			return function(node){
-				if(node.kind == 'package'){
+				if(node.kind == 'package' || node.kind == 'group'){
 					return $('<div>')
 				} else {
 
@@ -333,7 +333,7 @@ $(document).ready(function(){
 					var path = [], i = node
 					while(i){
 						path.unshift(i)
-						if(i.kind == 'package') i = null
+						if(i.kind == 'package' || i.kind == 'group') i = null
 						else i = i.parent
 					}
 

codepulse/src/main/resources/toserve/widgets/codetreemap/treemap.js

@@ -343,7 +343,7 @@
 			.value(innerNodeSizing(widgetState))
 			.sticky(false)
 			.padding(function(d){
-				if(d.kind == 'package' || d.kind == 'root') return [12, 1, 1, 1]
+				if(d.kind == 'package' || d.kind == 'group' || d.kind == 'root') return [12, 1, 1, 1]
 				else return 0
 			})
 
@@ -655,7 +655,7 @@
 			// ignores root and package nodes
 			function setHighlight(node){
 				if(!node) return
-				if(node.kind == 'package' || node.kind == 'root') return
+				if(node.kind == 'package' || node.kind == 'group' || node.kind == 'root') return
 
 				var hd = node.highlightData
 				if(hd) hd.isNew = true
@@ -682,7 +682,7 @@
 		var kids = node.children || []
 		kids.forEach(computeLineCounts)
 
-		if(node.kind == 'package' || node.kind == 'root'){
+		if(node.kind == 'package' || node.kind == 'group' || node.kind == 'root'){
 			node.widgetLineCount = d3.sum(kids, select('widgetLineCount'))
 		} else {
 			node.widgetLineCount = node.lineCount || 1
@@ -733,10 +733,10 @@
 	 * an array of progressively-shorter strings that can
 	 * be used to represent the name.
 	 */
-	function packageNameClippings(name){
+	function nameClippings(name, sep){
 		var clips = [name]
-		var parts = name.split('.')
-		for(var i=0; i<parts.length; i++) clips.push( parts.slice(i).join('.') )
+		var parts = name.split(sep)
+		for(var i=0; i<parts.length; i++) clips.push( parts.slice(i).join(sep) )
 		clips.push("*")
 		return clips
 	}
@@ -788,9 +788,9 @@
 			.attr('class', 'treemap-labels')
 			.attr('transform', translate(widgetState.margin.left, widgetState.margin.top))
 
-		var packageNodes = treemapNodes.filter(function(d){ return d.kind == 'package' })
+		var labeledNodes = treemapNodes.filter(function(d){ return d.kind == 'package' || d.kind == 'group' })
 
-		var labelSvg = labelsLayer.selectAll('text.treemap-label').data(packageNodes, select('id'))
+		var labelSvg = labelsLayer.selectAll('text.treemap-label').data(labeledNodes, select('id'))
 		labelSvg.exit().remove()
 		labelSvg.enter().append('svg:text')
 			.attr('class', 'treemap-label')
@@ -801,9 +801,12 @@
 			.attr('y', function(d){ return d.y + 10 })
 			.text(function(d){
 				if(d.dy < 10) return ''
-				var names = packageNameClippings(d.name).sort(function(a,b){
-					return measure(b) - measure(a)
-				})
+				var nameSep
+				if (d.kind == 'package') nameSep = '.'
+				else nameSep = ' / '
+				var names = nameClippings(d.name, nameSep).sort(function(a,b){
+						return measure(b) - measure(a)
+					})
 				for(var i=0; i<names.length; i++){
 					var n = names[i]
 					if(measure(n) < d.dx - 4) return n

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

@@ -80,7 +80,7 @@ class CodeForestBuilder(defaultTracedGroups: List[String]) {
 
 	def getOrAddMethod(group: String, sig: MethodSignature, size: Int): CodeTreeNode = {
 		val treePath = CodePath.parse(sig)
-		val startNode = addGroup(group)
+		val startNode = addRootGroup(group)
 
 		def recurse(parent: CodeTreeNode, path: CodePath): CodeTreeNode = path match {
 			case CodePath.Package(name, childPath) => recurse(addChildPackage(parent, name), childPath)
@@ -94,20 +94,31 @@ class CodeForestBuilder(defaultTracedGroups: List[String]) {
 	def getOrAddJsp(path: List[String], size: Int): CodeTreeNode = {
 		def recurse(parent: CodeTreeNode, path: List[String]): CodeTreeNode = path match {
 			case className :: Nil => addChildMethod(parent, className, size)
-			case packageNode :: rest => recurse(addChildPackage(parent, packageNode), rest)
+			case packageNode :: rest => recurse(addFolder(parent, packageNode), rest)
 		}
 
-		recurse(addGroup(JSPGroupName), path)
+		recurse(addRootGroup(JSPGroupName), path)
 	}
 
-	protected def addGroup(name: String) = roots.find { node =>
+	protected def addRootGroup(name: String) = roots.find { node =>
 		node.name == name && node.kind == CodeTreeNodeKind.Grp
 	} getOrElse {
 		val node = nodeFactory.createGroupNode(name)
 		roots.add(node)
 		node
 	}
 
+	protected def addFolder(parent: CodeTreeNode, name: String) = {
+		val grpName = parent.name + " / " + name
+		parent.findChild { node =>
+			node.name == grpName && node.kind == CodeTreeNodeKind.Grp
+		} getOrElse {
+			val node = nodeFactory.createGroupNode(grpName)
+			parent addChild node
+			node
+		}
+	}
+
 	protected def addChildPackage(parent: CodeTreeNode, name: String) = {
 		val pkgName = parent.kind match {
 			case CodeTreeNodeKind.Grp => name

codepulse/src/main/scala/com/secdec/codepulse/data/jsp/JasperJspAdapter.scala

@@ -53,7 +53,7 @@ class JasperJspAdapter extends JspAdapter {
 		jspClasses.result.toList map { clazz =>
 			val jspClassName = JasperUtils.makeJavaClass(clazz)
 			val displayName = clazz.split('/').filter(!_.isEmpty).toList
-			val node = codeForestBuilder.getOrAddJsp(displayName, 10)
+			val node = codeForestBuilder.getOrAddJsp(displayName, 100)
 			jspClassName -> node.id
 		}
 	}