Merge pull request #806 from MarcMil/improve-tests

Improve tests for regression

Author: StevenArzt

soot-infoflow-android/src/soot/jimple/infoflow/android/SetupApplication.java

@@ -1317,7 +1317,7 @@ protected void configureCallgraph() {
 	 * @author Steven Arzt
 	 *
 	 */
-	protected static interface IInPlaceInfoflow extends IInfoflow {
+	public static interface IInPlaceInfoflow extends IInfoflow {
 
 		public void runAnalysis(final ISourceSinkManager sourcesSinks, SootMethod entryPoint);
 

soot-infoflow-integration/SourcesAndSinks_GeoLocationNetworkOnly.txt

@@ -0,0 +1,3 @@
+<java.net.URL: void <init>(java.lang.String)> -> _SINK_
+<android.location.Location: double getLatitude()> -> _SOURCE_
+<android.location.Location: double getLongitude()> -> _SOURCE_

soot-infoflow-integration/test/soot/jimple/infoflow/collections/test/junit/AndroidTests.java

@@ -21,6 +21,28 @@ protected void setConfiguration(InfoflowConfiguration config) {
 
 	}
 
+	@Test
+	public void testGeoLocation() throws IOException {
+		File rootDir = getIntegrationRoot();
+		SetupApplication app = initApplication(new File(rootDir, "testAPKs/CoordinatesToURLParameter.apk"));
+		app.getConfig().getPathConfiguration()
+				.setPathReconstructionMode(InfoflowConfiguration.PathReconstructionMode.Fast);
+		InfoflowResults results = app.runInfoflow(new File(rootDir, "SourcesAndSinks_GeoLocationNetworkOnly.txt"));
+		Assert.assertEquals(1, results.size());
+
+		DataFlowResult res = results.getResultSet().stream().findFirst().get();
+		boolean found = false;
+		for (Stmt stmt : res.getSource().getPath()) {
+			if (stmt.containsInvokeExpr()) {
+				String sig = stmt.getInvokeExpr().getMethod().getSignature();
+				if (sig.contains("android.location.Location: double")) {
+					found = true;
+				}
+			}
+		}
+		Assert.assertTrue(found);
+	}
+
 	@Test
 	public void testResourceResolving() throws IOException {
 		File rootDir = getIntegrationRoot();

soot-infoflow-integration/testAPKs/CoordinatesToURLParameter.apk

@@ -1670,7 +1670,7 @@ protected static class SourceOrSink {
 		private final SinkInfo sinkInfo;
 		private final SourceSinkState state;
 
-		protected SourceOrSink(SourceInfo sourceInfo, SinkInfo sinkInfo) {
+		public SourceOrSink(SourceInfo sourceInfo, SinkInfo sinkInfo) {
 			this.sourceInfo = sourceInfo;
 			this.sinkInfo = sinkInfo;
 			if (sourceInfo != null && sinkInfo == null)
@@ -1683,15 +1683,15 @@ else if (sourceInfo != null && sinkInfo != null)
 				this.state = SourceSinkState.NEITHER;
 		}
 
-		protected SourceSinkState getState() {
+		public SourceSinkState getState() {
 			return state;
 		}
 
-		protected SourceInfo getSourceInfo() {
+		public SourceInfo getSourceInfo() {
 			return sourceInfo;
 		}
 
-		protected SinkInfo getSinkInfo() {
+		public SinkInfo getSinkInfo() {
 			return sinkInfo;
 		}
 

soot-infoflow/src/soot/jimple/infoflow/AbstractInfoflow.java

@@ -13,7 +13,12 @@
 import java.util.Arrays;
 
 import com.google.common.base.Joiner;
-import soot.*;
+
+import soot.Local;
+import soot.NullType;
+import soot.SootField;
+import soot.Type;
+import soot.Value;
 import soot.jimple.ArrayRef;
 import soot.jimple.InstanceFieldRef;
 import soot.jimple.Jimple;
@@ -66,18 +71,18 @@ private AccessPath() {
 
 	AccessPath(Local val, SootField[] appendingFields, Type valType, Type[] appendingFieldTypes, boolean taintSubFields,
 			boolean isCutOffApproximation, ArrayTaintType arrayTaintType, boolean canHaveImmutableAliases) {
-		this(val, valType, null,
-			 AccessPathFragment.createFragmentArray(appendingFields, appendingFieldTypes, null),
-			 taintSubFields, isCutOffApproximation, arrayTaintType, canHaveImmutableAliases);
+		this(val, valType, null, AccessPathFragment.createFragmentArray(appendingFields, appendingFieldTypes, null),
+				taintSubFields, isCutOffApproximation, arrayTaintType, canHaveImmutableAliases);
 	}
 
 	AccessPath(Local val, Type valType, AccessPathFragment[] fragments, boolean taintSubFields,
 			boolean isCutOffApproximation, ArrayTaintType arrayTaintType, boolean canHaveImmutableAliases) {
-		this(val, valType, null, fragments, taintSubFields, isCutOffApproximation, arrayTaintType, canHaveImmutableAliases);
+		this(val, valType, null, fragments, taintSubFields, isCutOffApproximation, arrayTaintType,
+				canHaveImmutableAliases);
 	}
 
 	AccessPath(Local val, Type valType, ContainerContext[] ctxt, AccessPathFragment[] fragments, boolean taintSubFields,
-               boolean isCutOffApproximation, ArrayTaintType arrayTaintType, boolean canHaveImmutableAliases) {
+			boolean isCutOffApproximation, ArrayTaintType arrayTaintType, boolean canHaveImmutableAliases) {
 		this.value = val;
 		this.baseType = valType;
 		this.baseContext = ctxt;
@@ -238,6 +243,7 @@ public int hashCode() {
 	}
 
 	private int hashCodeWOContext = 0;
+
 	public int hashCodeWithoutContext() {
 		if (hashCodeWOContext != 0)
 			return hashCodeWOContext;
@@ -311,7 +317,8 @@ public boolean equalsWithoutContext(Object obj) {
 
 		AccessPath other = (AccessPath) obj;
 
-		if (this.hashCodeWOContext != 0 && other.hashCodeWOContext != 0 && this.hashCodeWOContext != other.hashCodeWOContext)
+		if (this.hashCodeWOContext != 0 && other.hashCodeWOContext != 0
+				&& this.hashCodeWOContext != other.hashCodeWOContext)
 			return false;
 
 		if (value == null) {
@@ -500,7 +507,6 @@ public ContainerContext[] getBaseContext() {
 		return this.baseContext;
 	}
 
-
 	/**
 	 * Gets whether sub-fields shall be tainted. If this access path is e.g. a.b.*,
 	 * the result is true, whereas it is false for a.b.
@@ -573,7 +579,7 @@ public boolean getCanHaveImmutableAliases() {
 	 * 
 	 * @return The access path that is used in the zero abstraction
 	 */
-	static AccessPath getZeroAccessPath() {
+	public static AccessPath getZeroAccessPath() {
 		if (zeroAccessPath == null)
 			zeroAccessPath = new AccessPath(Jimple.v().newLocal("zero", NullType.v()), null, NullType.v(), null, false,
 					false, ArrayTaintType.ContentsAndLength, false);