Improved conflict resolution and some minor fixes

Author: FoelliX

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.upb.mike.amt</groupId>
 	<artifactId>AMT</artifactId>
-	<version>0.0.3</version>
+	<version>0.0.4</version>
 	<packaging>jar</packaging>
 
 	<name>AMT</name>

src/de/upb/mike/amt/AMT.java

@@ -20,6 +20,8 @@
 import de.upb.mike.amt.soot.SootObject;
 
 public class AMT {
+	public static int steps;
+
 	private static boolean OPTION_CHECK = false;
 	private static boolean OPTION_COMPARISON = false;
 
@@ -115,11 +117,11 @@ public static void main(String[] args) {
 	}
 
 	private void start() {
-		int steps = 5;
+		steps = 5;
 		if (OPTION_COMPARISON) {
-			steps = 7;
+			steps += 2;
 		} else if (OPTION_CHECK) {
-			steps = 6;
+			steps += 1;
 		}
 
 		final Timer amtTimer = new Timer().start();
@@ -142,7 +144,7 @@ private void start() {
 			if (SootObject.getInstance().getLauncherActivity() == null && parseManifest.containsLauncherActivity()) {
 				SootObject.getInstance().setLauncherActivity(parseManifest.getLauncherActivity());
 				this.launcherAppPath = file.getAbsolutePath();
-				Log.log("Launcher-Activity found: " + SootObject.getInstance().getLauncherActivity() + " ("
+				Log.log("Launcher-Activity selected: " + SootObject.getInstance().getLauncherActivity() + " ("
 						+ this.launcherAppPath + ")", Log.LOG_LEVEL_DEBUG);
 			}
 		}
@@ -155,22 +157,19 @@ private void start() {
 				SootObject.getInstance().parseApp(apkFile.getAbsolutePath(), SootObject.FLAG_READ_NON_LAUNCHER_APPS);
 			}
 		}
-		// Data.getInstance().rebuildSootClass();
 		Log.log("successful!\n\n", Log.LOG_LEVEL_NORMAL);
 
 		Log.log("*** Step 3/" + steps + ": Instrumenting Classes ***", Log.LOG_LEVEL_NORMAL);
 		for (final File apkFile : Config.getInstance().getAppPathList()) {
 			if (apkFile.getAbsolutePath().equals(this.launcherAppPath)) {
-				SootObject.getInstance().parseApp(apkFile.getAbsolutePath(), SootObject.FLAG_MERGE1);
+				SootObject.getInstance().parseApp(apkFile.getAbsolutePath(), SootObject.FLAG_MERGE);
 			}
 		}
 		Log.log("successful!\n\n", Log.LOG_LEVEL_NORMAL);
 
-		Log.log("*** Step 4/" + steps + ": Build Merged App ***", Log.LOG_LEVEL_NORMAL);
-		SootObject.getInstance().parseApp(null, SootObject.FLAG_MERGE2);
-		Log.log("successful!\n\n", Log.LOG_LEVEL_NORMAL);
+		// Step 4 is triggered in InstrumentationTransformer
 
-		Log.log("*** Step 5/" + steps + ": Run Apktool (Merge Manifests, Copy Dex) ***", Log.LOG_LEVEL_NORMAL);
+		Log.log("*** Step 5/" + steps + ": Run Apktool (Merge Manifests) ***", Log.LOG_LEVEL_NORMAL);
 		final MergeManifest mergeManifest = new MergeManifest();
 		mergeManifest.mergeManifest();
 		Log.log("successful!\n\n", Log.LOG_LEVEL_NORMAL);

src/de/upb/mike/amt/Data.java

@@ -3,6 +3,7 @@
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.w3c.dom.Document;
 
@@ -14,11 +15,11 @@
 public class Data {
 	private static Data instance = new Data();
 
-	private Map<SootClass, Hash> sootClassMap = new HashMap<>();
+	private Map<SootClass, SootObjHashed> sootClassMap = new ConcurrentHashMap<>();
 	private Map<Document, File> docMap = new HashMap<>();
-	private Map<String, String> lifecycleMethodSignaturesChanged = new HashMap<>();
-	private Map<SootObjHashed, String> classesChanged = new HashMap<>();
-	private Map<File, Hash> hashMap = new HashMap<>();
+	private Map<String, String> lifecycleMethodSignaturesChanged = new ConcurrentHashMap<>();
+	private Map<SootObjHashed, String> classesChanged = new ConcurrentHashMap<>();
+	private Map<File, Hash> hashMap = new ConcurrentHashMap<>();
 	private Map<String, String> packageMap = new HashMap<>();
 
 	private Data() {
@@ -29,45 +30,45 @@ public static Data getInstance() {
 	}
 
 	public void receiveClass(SootClass sc, File appFile) {
-		if (!sootClassMap.containsKey(sc) && !sc.isPhantom()) {
-			sootClassMap.put(sc, putOrGetMapEntry(appFile));
+		if (!this.sootClassMap.containsKey(sc) && !sc.isPhantom()) {
+			this.sootClassMap.put(sc, new SootObjHashed(sc.getName(), putOrGetMapEntry(appFile)));
 		}
 	}
 
 	public Hash putOrGetMapEntry(File appFile) {
 		Hash appHash;
-		if (hashMap.containsKey(appFile)) {
-			appHash = hashMap.get(appFile);
+		if (this.hashMap.containsKey(appFile)) {
+			appHash = this.hashMap.get(appFile);
 		} else {
 			appHash = new Hash();
 			appHash.setType(KeywordsAndConstants.HASH_TYPE_SHA1);
 			appHash.setValue(HashHelper.sha1Hash(appFile));
-			hashMap.put(appFile, appHash);
+			this.hashMap.put(appFile, appHash);
 		}
 		return appHash;
 	}
 
-	public Map<SootClass, Hash> getSootClassMap() {
-		return sootClassMap;
+	public Map<SootClass, SootObjHashed> getSootClassMap() {
+		return this.sootClassMap;
 	}
 
 	public Map<Document, File> getDocMap() {
-		return docMap;
+		return this.docMap;
 	}
 
 	public Map<String, String> getLifecycleMethodSignaturesChanged() {
-		return lifecycleMethodSignaturesChanged;
+		return this.lifecycleMethodSignaturesChanged;
 	}
 
 	public Map<SootObjHashed, String> getClassesChanged() {
-		return classesChanged;
+		return this.classesChanged;
 	}
 
 	public Map<String, String> getPackageMap() {
-		return packageMap;
+		return this.packageMap;
 	}
 
 	public Map<File, Hash> getHashMap() {
-		return hashMap;
+		return this.hashMap;
 	}
 }

src/de/upb/mike/amt/aql/AQLRunner.java

@@ -8,6 +8,7 @@
 import de.foellix.aql.config.ConfigHandler;
 import de.foellix.aql.datastructure.Answer;
 import de.foellix.aql.datastructure.Flow;
+import de.foellix.aql.datastructure.Flows;
 import de.foellix.aql.datastructure.KeywordsAndConstants;
 import de.foellix.aql.datastructure.Reference;
 import de.foellix.aql.datastructure.handler.AnswerHandler;
@@ -29,9 +30,9 @@ public AQLRunner(String query) {
 	}
 
 	public Answer parseApp() {
-		Log.log("Issuing AQL-Query: \"" + query + "\"", Log.LOG_LEVEL_DEBUG);
+		Log.log("Issuing AQL-Query: \"" + this.query + "\"", Log.LOG_LEVEL_DEBUG);
 		Log.silence(true);
-		Collection<Answer> answerList = aqlSystem.queryAndWait(query);
+		final Collection<Answer> answerList = this.aqlSystem.queryAndWait(this.query);
 		Log.silence(false);
 
 		if (answerList != null && answerList.iterator().hasNext()) {
@@ -44,20 +45,23 @@ public Answer parseApp() {
 	public static Answer mergeFlows(List<Answer> resultList, File outputFile, boolean overapproximate) {
 		// Apply unify operator
 		Answer mergedAnswer = new Answer();
-		for (Answer answer : resultList) {
+		for (final Answer answer : resultList) {
 			mergedAnswer = DefaultOperator.unify(mergedAnswer, answer);
 		}
+		if (mergedAnswer.getFlows() == null) {
+			mergedAnswer.setFlows(new Flows());
+		}
 
 		// Over-approximate
 		if (overapproximate) {
-			Collection<Flow> flowsToAdd = new ArrayList<Flow>();
-			for (Flow flow : mergedAnswer.getFlows().getFlow()) {
-				Reference from = Helper.getFrom(flow.getReference());
-				Reference toExists = Helper.getTo(flow.getReference());
-				for (Reference to : Helper.getAllReferences(mergedAnswer)) {
+			final Collection<Flow> flowsToAdd = new ArrayList<Flow>();
+			for (final Flow flow : mergedAnswer.getFlows().getFlow()) {
+				final Reference from = Helper.getFrom(flow.getReference());
+				final Reference toExists = Helper.getTo(flow.getReference());
+				for (final Reference to : Helper.getAllReferences(mergedAnswer)) {
 					if (to.getType().equals(KeywordsAndConstants.REFERENCE_TYPE_TO)
 							&& !EqualsHelper.equals(toExists, to)) {
-						Flow flowToAdd = new Flow();
+						final Flow flowToAdd = new Flow();
 						flowToAdd.getReference().add(from);
 						flowToAdd.getReference().add(to);
 						flowsToAdd.add(flowToAdd);

src/de/upb/mike/amt/conflicresolution/ConflictResolution.java

@@ -1,13 +1,9 @@
 package de.upb.mike.amt.conflicresolution;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Set;
 
-import de.foellix.aql.datastructure.Hash;
-import de.upb.mike.amt.SootObjHashed;
 import de.upb.mike.amt.Data;
 import de.upb.mike.amt.Log;
-import soot.RefType;
 import soot.SootClass;
 import soot.util.Chain;
 
@@ -16,45 +12,40 @@ public class ConflictResolution {
 
 	private Chain<SootClass> sootClasses;
 
-	private Map<SootObjHashed, String> outerClassMap;
-
 	public ConflictResolution(Chain<SootClass> initSootClasses) {
 		this.sootClasses = initSootClasses;
-		this.outerClassMap = new HashMap<>();
 	}
 
-	public void resolveConflict(SootClass sootClass, Hash currentAppHash) {
-		String originalName = sootClass.getName();
+	public void resolveConflictOuter(SootClass sootClass, Set<SootClass> innerClasses) {
+		// Resolve conflicts
+		if (isConflicted(sootClass.getName())) {
+			final String oldName = sootClass.getName();
+			final String newName = makeUnique(sootClass.getName());
+			resolveConflictInner(innerClasses, oldName, newName);
+			rename(sootClass, oldName, newName, false);
+		}
 
-		// Probably rename outer class
-		String rename = null;
-		if (sootClass.hasOuterClass()) {
-			String outerClassOriginalName = outerClassMap
-					.get(new SootObjHashed(sootClass.getOuterClass().getName(), currentAppHash));
-			rename = Data.getInstance().getClassesChanged()
-					.get(new SootObjHashed(outerClassOriginalName, currentAppHash));
-			if (rename != null) {
-				sootClass.setName(sootClass.getName().replace(outerClassOriginalName, rename));
-				sootClass.setRefType(RefType.v(sootClass.getName()));
-			}
+		// Add classes
+		this.sootClasses.add(sootClass);
+		for (final SootClass innerClass : innerClasses) {
+			this.sootClasses.add(innerClass);
 		}
+	}
 
-		// Resolve conflict (if existent)
-		if (isConflicted(sootClass.getName())) {
-			sootClass.setName(makeUnique(sootClass.getName()));
-			sootClass.setRefType(RefType.v(sootClass.getName()));
-			Data.getInstance().getClassesChanged().put(new SootObjHashed(originalName, currentAppHash),
-					sootClass.getName());
-			outerClassMap.put(new SootObjHashed(sootClass.getName(), currentAppHash), originalName);
-			Log.log("Class " + originalName + " renamed to " + sootClass.getName() + " (Innerclass mode)",
-					Log.LOG_LEVEL_DETAILED);
-		} else if (rename != null) {
-			Data.getInstance().getClassesChanged().put(new SootObjHashed(originalName, currentAppHash),
-					sootClass.getName());
-			Log.log("Class " + originalName + " renamed to " + sootClass.getName() + " (Outerclass mode)",
-					Log.LOG_LEVEL_DETAILED);
+	private void resolveConflictInner(Set<SootClass> innerClasses, String outestClassOldName,
+			String outestClassNewName) {
+		for (final SootClass sootClass : innerClasses) {
+			final String oldName = new String(sootClass.getName());
+			final String newName = sootClass.getName().replace(outestClassOldName, outestClassNewName);
+			rename(sootClass, oldName, newName, true);
 		}
-		sootClasses.add(sootClass);
+	}
+
+	private void rename(SootClass sootClass, String oldName, String newName, boolean innerClass) {
+		sootClass.rename(newName);
+		Data.getInstance().getClassesChanged().put(Data.getInstance().getSootClassMap().get(sootClass), newName);
+		Log.log("Class \"" + oldName + "\" renamed to \"" + newName + "\" (" + (innerClass ? "inner" : "outer")
+				+ " class)", Log.LOG_LEVEL_DETAILED);
 	}
 
 	private String makeUnique(String name) {
@@ -67,8 +58,8 @@ private String makeUnique(String name) {
 	}
 
 	private boolean isConflicted(String sootClassName) {
-		for (SootClass conflictClass : sootClasses) {
-			String conflictClassName = conflictClass.getName();
+		for (final SootClass conflictClass : this.sootClasses) {
+			final String conflictClassName = conflictClass.getName();
 			if (sootClassName.equals(conflictClassName)) {
 				return true;
 			}