Merge pull request #712 from MarcMil/extensibility

Do not propagate old abstraction if new abstraction is equal & Extensibility

Author: StevenArzt

soot-infoflow-summaries/src/soot/jimple/infoflow/methodSummary/taintWrappers/SummaryTaintWrapper.java

@@ -539,13 +539,17 @@ public Set<Abstraction> getTaintsForMethod(Stmt stmt, Abstraction d1, Abstractio
 			callee = m;
 		}
 		res = computeTaintsForMethod(stmt, d1, taintedAbs, callee, killIncomingTaint, classSupported);
+		boolean wasEqualToIncoming = false;
 
 		// Create abstractions from the access paths
 		if (res != null && !res.isEmpty()) {
 			if (resAbs == null)
 				resAbs = new HashSet<>();
-			for (AccessPath ap : res)
+			for (AccessPath ap : res) {
 				resAbs.add(taintedAbs.deriveNewAbstraction(ap, stmt));
+				if (ap.equals(taintedAbs.getAccessPath()))
+					wasEqualToIncoming = true;
+			}
 		}
 
 		// If we have no data flows, we can abort early
@@ -568,7 +572,8 @@ public Set<Abstraction> getTaintsForMethod(Stmt stmt, Abstraction d1, Abstractio
 		if (!killIncomingTaint.value) {
 			if (resAbs == null)
 				return Collections.singleton(taintedAbs);
-			resAbs.add(taintedAbs);
+			if (!wasEqualToIncoming)
+				resAbs.add(taintedAbs);
 		}
 		return resAbs;
 	}

soot-infoflow-summaries/summariesManual/javax.servlet.http.Cookie.xml

@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <summary fileFormatVersion="101">
 	<methods>
+		<method id="void &lt;init&gt;(java.lang.String,java.lang.String)">
+			<flows>
+				<flow isAlias="false" typeChecking="false">
+					<from sourceSinkType="Parameter" ParameterIndex="0" />
+					<to sourceSinkType="Field" />
+				</flow>
+				<flow isAlias="false" typeChecking="false">
+					<from sourceSinkType="Parameter" ParameterIndex="1" />
+					<to sourceSinkType="Field" />
+				</flow>
+			</flows>
+		</method>
 		<method id="java.lang.String getValue()">
 			<flows>
 				<flow isAlias="false" typeChecking="false">

soot-infoflow/src/soot/jimple/infoflow/data/SourceContextAndPath.java

@@ -1,6 +1,11 @@
 package soot.jimple.infoflow.data;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Stack;
 
 import heros.solver.Pair;
 import soot.jimple.Stmt;
@@ -24,13 +29,13 @@ public class SourceContextAndPath extends SourceContext implements Cloneable {
 
 	private int hashCode = 0;
 
-	public SourceContextAndPath(InfoflowConfiguration config, Collection<ISourceSinkDefinition> definitions, AccessPath value,
-			Stmt stmt) {
+	public SourceContextAndPath(InfoflowConfiguration config, Collection<ISourceSinkDefinition> definitions,
+			AccessPath value, Stmt stmt) {
 		this(config, definitions, value, stmt, null);
 	}
 
-	public SourceContextAndPath(InfoflowConfiguration config, Collection<ISourceSinkDefinition> definitions, AccessPath value,
-			Stmt stmt, Object userData) {
+	public SourceContextAndPath(InfoflowConfiguration config, Collection<ISourceSinkDefinition> definitions,
+			AccessPath value, Stmt stmt, Object userData) {
 		super(definitions, value, stmt, userData);
 		this.config = config;
 	}
@@ -49,6 +54,10 @@ public List<Stmt> getPath() {
 		return stmtPath;
 	}
 
+	public Abstraction getFirstAbstractionSlow() {
+		return path.getFirstSlow();
+	}
+
 	public List<Abstraction> getAbstractionPath() {
 		if (path == null)
 			return null;

soot-infoflow/src/soot/jimple/infoflow/data/pathBuilders/ContextSensitivePathBuilder.java

@@ -64,7 +64,7 @@ public Thread newThread(Runnable r) {
 		return executor;
 	}
 
-	private enum PathProcessingResult {
+	protected enum PathProcessingResult {
 		// Describes that the predecessor should be queued
 		NEW,
 		// Describes that the predecessor was already queued, but we might need to merge paths
@@ -111,7 +111,7 @@ private void processAndQueue(Abstraction pred, SourceContextAndPath scap) {
 			case NEW:
 				// Schedule the predecessor
 				assert pathCache.containsKey(pred);
-				scheduleDependentTask(new SourceFindingTask(pred));
+				scheduleDependentTask(createSourceFindingTask(pred));
 				break;
 			case CACHED:
 				// In case we already know the subpath, we do append the path after the path
@@ -128,7 +128,7 @@ private void processAndQueue(Abstraction pred, SourceContextAndPath scap) {
 			}
 		}
 
-		private PathProcessingResult processPredecessor(SourceContextAndPath scap, Abstraction pred) {
+		protected PathProcessingResult processPredecessor(SourceContextAndPath scap, Abstraction pred) {
 			// Shortcut: If this a call-to-return node, we should not enter and
 			// immediately leave again for performance reasons.
 			if (pred.getCurrentStmt() != null && pred.getCurrentStmt() == pred.getCorrespondingCallSite()) {
@@ -172,6 +172,7 @@ private PathProcessingResult processPredecessor(SourceContextAndPath scap, Abstr
 				if (existingPaths != null && existingPaths.size() > maxPaths)
 					return PathProcessingResult.INFEASIBLE_OR_MAX_PATHS_REACHED;
 			}
+
 			return pathCache.put(pred, extendedScap) ? PathProcessingResult.NEW : PathProcessingResult.CACHED;
 		}
 
@@ -327,11 +328,15 @@ protected Runnable getTaintPathTask(final AbstractionAtSink abs) {
 
 		if (pathCache.put(abs.getAbstraction(), scap)) {
 			if (!checkForSource(abs.getAbstraction(), scap))
-				return new SourceFindingTask(abs.getAbstraction());
+				return createSourceFindingTask(abs.getAbstraction());
 		}
 		return null;
 	}
 
+	protected Runnable createSourceFindingTask(Abstraction abstraction) {
+		return new SourceFindingTask(abstraction);
+	}
+
 	@Override
 	public InfoflowResults getResults() {
 		return this.results;