removed an optimization that didn't work, added support for unbounded access paths, reduced memory consumption of ExtensibleList, and refactored a few things

Author: StevenArzt

soot-infoflow-android/pom.xml

@@ -98,7 +98,7 @@
 		<dependency>
 			<groupId>heros</groupId>
 			<artifactId>heros</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>ca.mcgill.sable</groupId>

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

@@ -1509,6 +1509,7 @@ public IMemoryManager<Abstraction, Unit> getMemoryManager(boolean tracingEnabled
 			}
 
 		});
+		info.setMemoryManagerFactory(null);
 
 		// Inject additional post-processors
 		info.setPostProcessors(Collections.singleton(new PostAnalysisHandler() {

soot-infoflow-cmd/pom.xml

@@ -113,7 +113,7 @@
 		<dependency>
 			<groupId>heros</groupId>
 			<artifactId>heros</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>ca.mcgill.sable</groupId>

soot-infoflow-cmd/src/soot/jimple/infoflow/cmd/MainClass.java

@@ -249,8 +249,7 @@ private void run(String[] args) throws Exception {
 	/**
 	 * Initializes the taint wrapper based on the command-line parameters
 	 * 
-	 * @param cmd
-	 *            The command-line parameters
+	 * @param cmd The command-line parameters
 	 * @return The taint wrapper to use for the data flow analysis, or null in case
 	 *         no taint wrapper shall be used
 	 */
@@ -497,10 +496,8 @@ else if (implicitFlowMode.equalsIgnoreCase("ALL"))
 	 * Parses the given command-line options and fills the given configuration
 	 * object accordingly
 	 * 
-	 * @param cmd
-	 *            The command line to parse
-	 * @param config
-	 *            The configuration object to fill
+	 * @param cmd    The command line to parse
+	 * @param config The configuration object to fill
 	 */
 	private void parseCommandLineOptions(CommandLine cmd, InfoflowAndroidConfiguration config) {
 		// Files
@@ -558,7 +555,7 @@ private void parseCommandLineOptions(CommandLine cmd, InfoflowAndroidConfigurati
 		{
 			Integer aplength = getIntOption(cmd, OPTION_ACCESS_PATH_LENGTH);
 			if (aplength != null)
-				config.setAccessPathLength(aplength);
+				config.getAccessPathConfiguration().setAccessPathLength(aplength);
 		}
 		if (cmd.hasOption(OPTION_FLOW_INSENSITIVE_ALIASING))
 			config.setFlowSensitiveAliasing(false);
@@ -662,9 +659,8 @@ private Integer getIntOption(CommandLine cmd, String option) {
 	/**
 	 * Loads the data flow configuration from the given file
 	 * 
-	 * @param configFile
-	 *            The configuration file from which to load the data flow
-	 *            configuration
+	 * @param configFile The configuration file from which to load the data flow
+	 *                   configuration
 	 * @return The loaded data flow configuration
 	 */
 	private InfoflowAndroidConfiguration loadConfigurationFile(String configFile) {

soot-infoflow-summaries/pom.xml

@@ -99,7 +99,7 @@
 		<dependency>
 			<groupId>heros</groupId>
 			<artifactId>heros</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<!-- Uploaded to http://soot-build.cs.uni-paderborn.de/nexus/repository/soot-snapshot/ 
 			from the nightly build server -->

soot-infoflow-summaries/src/soot/jimple/infoflow/methodSummary/generator/SummaryGenerator.java

@@ -70,10 +70,8 @@ public SummaryGenerator() {
 	/**
 	 * Generates the summaries for the given set of classes
 	 * 
-	 * @param classpath
-	 *            The classpath from which to load the given classes
-	 * @param classNames
-	 *            The classes for which to create summaries
+	 * @param classpath  The classpath from which to load the given classes
+	 * @param classNames The classes for which to create summaries
 	 * @return The generated method summaries
 	 */
 	public ClassSummaries createMethodSummaries(String classpath, Collection<String> classNames) {
@@ -83,13 +81,10 @@ public ClassSummaries createMethodSummaries(String classpath, Collection<String>
 	/**
 	 * Generates the summaries for the given set of classes
 	 * 
-	 * @param classpath
-	 *            The classpath from which to load the given classes
-	 * @param classNames
-	 *            The classes for which to create summaries
-	 * @param handler
-	 *            The handler that shall be invoked when all methods inside one
-	 *            class have been summarized
+	 * @param classpath  The classpath from which to load the given classes
+	 * @param classNames The classes for which to create summaries
+	 * @param handler    The handler that shall be invoked when all methods inside
+	 *                   one class have been summarized
 	 * @return The generated method summaries
 	 */
 	public ClassSummaries createMethodSummaries(String classpath, Collection<String> classNames,
@@ -201,12 +196,8 @@ public ClassSummaries createMethodSummaries(String classpath, Collection<String>
 					curSummaries.merge(newSums);
 				}
 
-				System.out.println("Class summaries for "
-						+ entry.getKey()
-						+ " done in "
-						+ (System.nanoTime() - nanosBeforeClass) / 1E9
-						+ " seconds for "
-						+ curSummaries.getFlowCount()
+				System.out.println("Class summaries for " + entry.getKey() + " done in "
+						+ (System.nanoTime() - nanosBeforeClass) / 1E9 + " seconds for " + curSummaries.getFlowCount()
 						+ " summaries");
 			}
 
@@ -227,13 +218,11 @@ public ClassSummaries createMethodSummaries(String classpath, Collection<String>
 	}
 
 	/**
-	 * Checks whether the given method is to be included in the summary
-	 * generation. If so, it is added to the set of classes to be analyzed
+	 * Checks whether the given method is to be included in the summary generation.
+	 * If so, it is added to the set of classes to be analyzed
 	 * 
-	 * @param classes
-	 *            The set of classes to be analyzed
-	 * @param className
-	 *            The class to check
+	 * @param classes   The set of classes to be analyzed
+	 * @param className The class to check
 	 */
 	private void checkAndAdd(Set<String> classes, String className) {
 		if (config.getExcludes() != null)
@@ -250,13 +239,12 @@ private void checkAndAdd(Set<String> classes, String className) {
 	}
 
 	/**
-	 * Gets all classes that are sub-classes of the given class / implementors
-	 * of the given interface
+	 * Gets all classes that are sub-classes of the given class / implementors of
+	 * the given interface
 	 * 
-	 * @param sc
-	 *            The class or interface of which to get the implementors
-	 * @return The concrete implementors of the given interface / subclasses of
-	 *         the given parent class
+	 * @param sc The class or interface of which to get the implementors
+	 * @return The concrete implementors of the given interface / subclasses of the
+	 *         given parent class
 	 */
 	private Collection<? extends String> getImplementorsOf(SootClass sc) {
 		Set<String> classes = new HashSet<>();
@@ -284,8 +272,7 @@ private Collection<? extends String> getImplementorsOf(SootClass sc) {
 	/**
 	 * Calculates the external dependencies of the given summary set
 	 * 
-	 * @param summaries
-	 *            The summary set for which to calculate the dependencies
+	 * @param summaries The summary set for which to calculate the dependencies
 	 */
 	private void calculateDependencies(ClassSummaries summaries) {
 		for (MethodFlow flow : summaries.getAllFlows()) {
@@ -307,8 +294,7 @@ private void calculateDependencies(ClassSummaries summaries) {
 	/**
 	 * Gets the name of the field type from a field definition
 	 * 
-	 * @param apElement
-	 *            The field definition to parse
+	 * @param apElement The field definition to parse
 	 * @return The type name in the field definition
 	 */
 	private String getTypeFromFieldDef(String apElement) {
@@ -324,17 +310,15 @@ private String getTypeFromFieldDef(String apElement) {
 	/**
 	 * Creates a method summary for the method m
 	 * 
-	 * It is assumed that only the default constructor of c is executed before m
-	 * is called.
+	 * It is assumed that only the default constructor of c is executed before m is
+	 * called.
 	 * 
-	 * The result of that assumption is that some fields of c may be null. A
-	 * null field is not identified as a source and there for will not create a
-	 * Field -> X flow.
+	 * The result of that assumption is that some fields of c may be null. A null
+	 * field is not identified as a source and there for will not create a Field ->
+	 * X flow.
 	 * 
-	 * @param classpath
-	 *            The classpath containing the classes to summarize
-	 * @param methodSig
-	 *            method for which a summary will be created
+	 * @param classpath The classpath containing the classes to summarize
+	 * @param methodSig method for which a summary will be created
 	 * @return summary of method m
 	 */
 	public MethodSummaries createMethodSummary(String classpath, String methodSig) {
@@ -344,29 +328,26 @@ public MethodSummaries createMethodSummary(String classpath, String methodSig) {
 	/**
 	 * Creates a method summary for the method m.
 	 * 
-	 * It is assumed that all method in mDependencies and the default
-	 * constructor of c is executed before m is executed.
+	 * It is assumed that all method in mDependencies and the default constructor of
+	 * c is executed before m is executed.
 	 * 
 	 * That allows e.g. to call a setter before a getter method is analyzed and
 	 * there for the getter field is not null.
 	 * 
-	 * @param classpath
-	 *            The classpath containing the classes to summarize
-	 * @param methodSig
-	 *            method for which a summary will be created
-	 * @param parentClass
-	 *            The parent class on which the method to be analyzed shall be
-	 *            invoked
-	 * @param gapManager
-	 *            The gap manager to be used for creating new gaps
+	 * @param classpath   The classpath containing the classes to summarize
+	 * @param methodSig   method for which a summary will be created
+	 * @param parentClass The parent class on which the method to be analyzed shall
+	 *                    be invoked
+	 * @param gapManager  The gap manager to be used for creating new gaps
 	 * @return summary of method m
 	 */
 	private MethodSummaries createMethodSummary(String classpath, final String methodSig, final String parentClass,
 			final GapManager gapManager) {
 		System.out.println("Computing method summary for " + methodSig);
 		long nanosBeforeMethod = System.nanoTime();
 
-		final SourceSinkFactory sourceSinkFactory = new SourceSinkFactory(config.getAccessPathLength());
+		final SourceSinkFactory sourceSinkFactory = new SourceSinkFactory(
+				config.getAccessPathConfiguration().getAccessPathLength());
 		final SummarySourceSinkManager sourceSinkManager = new SummarySourceSinkManager(methodSig, parentClass,
 				sourceSinkFactory);
 		final MethodSummaries summaries = new MethodSummaries();
@@ -407,11 +388,8 @@ public void onResultsAvailable(IInfoflowCFG cfg, InfoflowResults results) {
 			throw e;
 		}
 
-		System.out.println("Method summary for "
-				+ methodSig
-				+ " done in "
-				+ (System.nanoTime() - nanosBeforeMethod) / 1E9
-				+ " seconds");
+		System.out.println("Method summary for " + methodSig + " done in "
+				+ (System.nanoTime() - nanosBeforeMethod) / 1E9 + " seconds");
 		return summaries;
 	}
 
@@ -447,13 +425,11 @@ public boolean supportsPathReconstruction() {
 	}
 
 	/**
-	 * Initializes the taint wrapper to be used for constructing gaps during
-	 * summary generation
+	 * Initializes the taint wrapper to be used for constructing gaps during summary
+	 * generation
 	 * 
-	 * @param summaries
-	 *            The summary data object to receive the flows
-	 * @param gapManager
-	 *            The gap manager to be used when handling callbacks
+	 * @param summaries  The summary data object to receive the flows
+	 * @param gapManager The gap manager to be used when handling callbacks
 	 * @return The taint wrapper to be used during summary generation
 	 */
 	protected SummaryGenerationTaintWrapper createTaintWrapper(MethodSummaries summaries, GapManager gapManager) {
@@ -463,10 +439,8 @@ protected SummaryGenerationTaintWrapper createTaintWrapper(MethodSummaries summa
 	/**
 	 * Initializes the data flow tracker
 	 * 
-	 * @param summaries
-	 *            The summary data object to receive the flows
-	 * @param gapManager
-	 *            The gap manager to be used when handling callbacks
+	 * @param summaries  The summary data object to receive the flows
+	 * @param gapManager The gap manager to be used when handling callbacks
 	 * @return The initialized data flow engine
 	 */
 	protected Infoflow initInfoflow(MethodSummaries summaries, GapManager gapManager) {
@@ -582,8 +556,7 @@ public SummaryGeneratorConfiguration getConfig() {
 	/**
 	 * Sets the configuration object to be used when generating summaries
 	 * 
-	 * @param config
-	 *            The configuration object to be used when generating summaries
+	 * @param config The configuration object to be used when generating summaries
 	 */
 	public void setConfig(SummaryGeneratorConfiguration config) {
 		this.config = config;

soot-infoflow-summaries/src/soot/jimple/infoflow/methodSummary/generator/SummaryGeneratorFactory.java

@@ -25,8 +25,8 @@ public class SummaryGeneratorFactory {
 	 */
 	public SummaryGenerator initSummaryGenerator() {
 		SummaryGenerator s = new SummaryGenerator();
-		s.getConfig().setAccessPathLength(accessPathLength);
-		s.getConfig().setUseRecursiveAccessPaths(useRecursiveAccessPaths);
+		s.getConfig().getAccessPathConfiguration().setAccessPathLength(accessPathLength);
+		s.getConfig().getAccessPathConfiguration().setUseRecursiveAccessPaths(useRecursiveAccessPaths);
 		s.getConfig().setEnableExceptionTracking(enableExceptionTracking);
 		s.getConfig().setImplicitFlowMode(
 				enableImplicitFlows ? ImplicitFlowMode.AllImplicitFlows : ImplicitFlowMode.NoImplicitFlows);

soot-infoflow-summaries/test/soot/jimple/infoflow/test/methodSummary/junit/ApiTests.java

@@ -583,8 +583,8 @@ protected SummaryGenerator getSummary() {
 		List<String> sub = new LinkedList<String>();
 		sub.add("java.util.ArrayList");
 		sg.setSubstitutedWith(sub);
-		sg.getConfig().setAccessPathLength(5);
-		sg.getConfig().setUseRecursiveAccessPaths(true);
+		sg.getConfig().getAccessPathConfiguration().setAccessPathLength(5);
+		sg.getConfig().getAccessPathConfiguration().setUseRecursiveAccessPaths(true);
 		return sg;
 	}
 

soot-infoflow-summaries/test/soot/jimple/infoflow/test/methodSummary/junit/ArbitraryAccessPathTests.java

@@ -214,8 +214,8 @@ protected SummaryGenerator getSummary() {
 		List<String> sub = new LinkedList<String>();
 		sub.add("java.util.ArrayList");
 		sg.setSubstitutedWith(sub);
-		sg.getConfig().setUseRecursiveAccessPaths(false);
-		sg.getConfig().setAccessPathLength(6);
+		sg.getConfig().getAccessPathConfiguration().setUseRecursiveAccessPaths(false);
+		sg.getConfig().getAccessPathConfiguration().setAccessPathLength(6);
 		return sg;
 	}
 }

soot-infoflow-summaries/test/soot/jimple/infoflow/test/methodSummary/junit/CallbackTests.java

@@ -213,8 +213,8 @@ protected SummaryGenerator getSummary() {
 		List<String> sub = new LinkedList<String>();
 		sub.add("java.util.ArrayList");
 		sg.setSubstitutedWith(sub);
-		sg.getConfig().setAccessPathLength(5);
-		sg.getConfig().setUseRecursiveAccessPaths(true);
+		sg.getConfig().getAccessPathConfiguration().setAccessPathLength(5);
+		sg.getConfig().getAccessPathConfiguration().setUseRecursiveAccessPaths(true);
 		sg.setSootConfig(new DefaultSummaryConfig() {
 
 			@Override