Some JSP support cleanup.

Author: baffles

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

@@ -227,7 +227,7 @@ class AkkaTracingTarget(traceId: TraceId, traceData: TraceData, transientTraceDa
 		for (reason <- t.completion) self ! TraceEnded(reason)
 
 		// set up data management for the trace
-		val dataManager = new StreamingTraceDataManager(traceData, transientTraceData)
+		val dataManager = new StreamingTraceDataManager(traceData, transientTraceData, jspMapper)
 
 		// remember this trace
 		trace = Some(t)

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

@@ -24,6 +24,7 @@ import com.secdec.bytefrog.hq.trace.DefaultSegmentAccess
 import com.secdec.bytefrog.hq.trace.TraceDataManager
 import com.secdec.bytefrog.hq.trace.TraceEndReason
 import com.secdec.bytefrog.hq.trace.TraceSegmentManager
+import com.secdec.codepulse.data.jsp.JspMapper
 import com.secdec.codepulse.data.trace.TraceData
 
 /** A TraceDataManager that records events through the `TraceRecorderServer`,
@@ -34,7 +35,7 @@ import com.secdec.codepulse.data.trace.TraceData
   * done at constructor time by creating a "PrecalculatedMethodCorrelator" for the
   * given analysis.
   */
-class StreamingTraceDataManager(traceData: TraceData, transientData: TransientTraceData) extends TraceDataManager {
+class StreamingTraceDataManager(traceData: TraceData, transientData: TransientTraceData, jspMapper: Option[JspMapper]) extends TraceDataManager {
 
 	/** Set up listeners for the various trace segment builder events,
 	  * adapt them to LiveSegmentData instances,
@@ -48,7 +49,7 @@ class StreamingTraceDataManager(traceData: TraceData, transientData: TransientTr
 	  * fires it back through the `liveTraceData` event stream.
 	  */
 	def setupDataProcessors(router: DataRouter): Unit = {
-		router += new TraceRecorderDataProcessor(traceData, transientData)
+		router += new TraceRecorderDataProcessor(traceData, transientData, jspMapper)
 	}
 
 	def finish(reason: TraceEndReason, traceWasStarted: Boolean): Unit = {

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

@@ -93,7 +93,6 @@ class TraceAPIServer(manager: TraceManager) extends RestHelper with Loggable {
 
 				case Some(_) =>
 					target.transientData.getAndClearRecentlyEncounteredNodes { data =>
-						println(data)
 						controller.enterData(data)
 					}
 			}

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

@@ -24,14 +24,12 @@ import com.secdec.bytefrog.hq.protocol.DataMessageContent
 import com.secdec.codepulse.data.MethodSignature
 import com.secdec.codepulse.data.MethodSignatureParser
 import com.secdec.codepulse.data.trace.TraceData
-import com.secdec.codepulse.data.jsp.JasperJspMapper
+import com.secdec.codepulse.data.jsp.JspMapper
 
-class TraceRecorderDataProcessor(traceData: TraceData, transientData: TransientTraceData) extends DataProcessor {
+class TraceRecorderDataProcessor(traceData: TraceData, transientData: TransientTraceData, jspMapper: Option[JspMapper]) extends DataProcessor {
 
 	val methodCor = collection.mutable.Map[Int, Int]()
 
-	val jspMapper = JasperJspMapper(traceData.treeNodeData)
-
 	/** Process a single data message */
 	def processMessage(message: DataMessageContent): Unit = message match {
 
@@ -46,11 +44,7 @@ class TraceRecorderDataProcessor(traceData: TraceData, transientData: TransientT
 
 		// make method correlations
 		case DataMessageContent.MapMethodSignature(sig, id) =>
-			if (sig.startsWith("org/apache"))
-				println(s"looking at $sig")
-			val node = traceData.treeNodeData.getNodeIdForSignature(sig).orElse(jspMapper map sig)
-			if (sig.startsWith("org/apache"))
-				println(node)
+			val node = traceData.treeNodeData.getNodeIdForSignature(sig).orElse(jspMapper.flatMap(_ map sig))
 			for (treemapNodeId <- node) methodCor.put(id, treemapNodeId)
 
 		// ignore everything else

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

@@ -36,19 +36,11 @@ object TraceSettingsCreator {
 				"^" + slashedName + "/[^/]+$"
 			}).toList
 		} ++ jspMapper.map { mapper =>
-			println(mapper)
-			try {
-				traceData.treeNodeData.iterateJspMappings { it =>
-					(for ((jspClass, _) <- it) yield mapper getInclusion jspClass).toList
-					//"^org/apache/jsp/.*$" :: Nil
-				}
-			} catch {
-				case e: Exception => e.printStackTrace; Nil
-			} finally { println("out") }
+			traceData.treeNodeData.iterateJspMappings { it =>
+				(for ((jspClass, _) <- it) yield mapper getInclusion jspClass).toList
+			}
 		}.getOrElse(Nil)
 
-		println(inclusions)
-
 		TraceSettings(exclusions = List(".*"), inclusions)
 	}
 }