fixing exceptions thrown, about #11

resess · Apr 15, 2024 · cf84708 · cf84708
1 parent 4fdb8cf
commit cf84708
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 21 deletions.
diff --git a/FlowDroid/soot-infoflow/pom.xml b/FlowDroid/soot-infoflow/pom.xml
@@ -142,13 +142,13 @@
 	</build>
 
 	<repositories>
-        <repository>
+        <!--repository>
             <id>Soot-Snapshots</id>
             <url>https://ssebuild.sit.fraunhofer.de/nexus/repository/Soot/</url>
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>
-        </repository>
+        </repository-->
 		<repository>
 			<id>sonatype-snapshots</id>
 			<url>https://oss.sonatype.org/content/repositories/snapshots</url>

diff --git a/GoalExplorer/pom.xml b/GoalExplorer/pom.xml
@@ -28,6 +28,11 @@
             <id>mavenCentral</id>
             <url>https://repo1.maven.org/maven2/</url>
         </repository>
+        <!--repository>
+            <id>in-project</id>
+            <name>In Project Repo</name>
+            <url>file://${project.basedir}/
+        </repository-->
     </repositories>
 
     <build>
@@ -216,7 +221,7 @@
         <dependency>
             <groupId>de.upb.cs.swt</groupId>
             <artifactId>heros</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.tinylog</groupId>

diff --git a/...xplorer/src/main/java/android/goal/explorer/analysis/dependency/BranchedFlowAnalysis.java b/...xplorer/src/main/java/android/goal/explorer/analysis/dependency/BranchedFlowAnalysis.java
@@ -85,8 +85,13 @@ public Map<Integer, List<Unit>> performBranchedAnalysis(){
                 if(stmt.containsInvokeExpr()){
                     if (invokesMethodOfInterest(stmt.getInvokeExpr())){
                         Logger.debug("Found invocation of method of interest {} in {}", methodToSwitchOver, stmt);
-                        DefinitionStmt definitionStmt = (DefinitionStmt)stmt; //double check
-                        registerToSwitchOver = definitionStmt.getLeftOp();
+                        if(stmt instanceof DefinitionStmt){
+                            DefinitionStmt definitionStmt = (DefinitionStmt)stmt; //double check
+                            registerToSwitchOver = definitionStmt.getLeftOp();
+                        }
+                        else{
+                            Logger.debug("Issue: found method of interest but no assignment");
+                        }
                     }
                 }
             }

diff --git a/...c/main/java/android/goal/explorer/analysis/value/analysis/problem/PropagationProblem.java b/...c/main/java/android/goal/explorer/analysis/value/analysis/problem/PropagationProblem.java
@@ -63,7 +63,7 @@ public Set<Unit> getInitialSeeds() {
     }
 
     @Override
-    protected MeetLattice<BasePropagationValue> createJoinLattice() {
+    protected MeetLattice<BasePropagationValue> createMeetLattice() {
         return new PropagationLattice();
     }
 

diff --git a/GoalExplorer/src/main/java/android/goal/explorer/model/component/AbstractComponent.java b/GoalExplorer/src/main/java/android/goal/explorer/model/component/AbstractComponent.java
@@ -50,7 +50,7 @@ public AbstractComponent(String name, String packageName){
     }
 
     public AbstractComponent(AXmlNode node, String packageName) {
-        this.name = processNodeName(node, packageName);
+        this.name = processNodeName(node, packageName); //TODO deal with disabled components, currently included
         if(this.name.length() < packageName.length()){
             Logger.error("Issue with app name {} and package name {}", name, packageName);
             setShortName(name);

diff --git a/GoalExplorer/src/main/java/android/goal/explorer/utils/AxmlUtils.java b/GoalExplorer/src/main/java/android/goal/explorer/utils/AxmlUtils.java
@@ -21,22 +21,22 @@ public class AxmlUtils {
     public static String processNodeName(AXmlNode node, String packageName){
         String className = null;
         AXmlAttribute<?> attrEnabled = node.getAttribute("enabled");
-        if (attrEnabled == null || !attrEnabled.getValue().equals(Boolean.FALSE)) {
+        //if (attrEnabled == null || !attrEnabled.getValue().equals(Boolean.FALSE)) {
             // process name
-            AXmlAttribute<?> attrName = node.getAttribute("name");
-            if (attrName != null){
-                className = expandClassName((String) attrName.getValue(), packageName);
-            } else {
-                // This component does not have a name, so this might be
-                // obfuscated malware. We apply a heuristic.
-                for (Map.Entry<String, AXmlAttribute<?>> a : node.getAttributes().entrySet())
-                    if (a.getValue().getName().isEmpty() && a.getValue().getType() == AxmlVisitor.TYPE_STRING) {
-                        String name = (String) a.getValue().getValue();
-                        if (isValidComponentName(name))
-                            className = expandClassName(name, packageName);
-                    }
-            }
+        AXmlAttribute<?> attrName = node.getAttribute("name");
+        if (attrName != null){
+            className = expandClassName((String) attrName.getValue(), packageName);
+        } else {
+            // This component does not have a name, so this might be
+            // obfuscated malware. We apply a heuristic.
+            for (Map.Entry<String, AXmlAttribute<?>> a : node.getAttributes().entrySet())
+                if (a.getValue().getName().isEmpty() && a.getValue().getType() == AxmlVisitor.TYPE_STRING) {
+                    String name = (String) a.getValue().getValue();
+                    if (isValidComponentName(name))
+                        className = expandClassName(name, packageName);
+                }
         }
+        //}
         return className;
     }