make use of actual integration tests! state: compiles + executable; f…

…ixed dependencies; tests fail
secure-software-engineering · Oct 15, 2024 · 5aec810 · 5aec810
1 parent 5bca69d
commit 5aec810
Show file tree

Hide file tree

Showing 47 changed files with 1,222 additions and 1,226 deletions.
diff --git a/boomerangPDS/pom.xml b/boomerangPDS/pom.xml
@@ -29,6 +29,12 @@
             <groupId>de.fraunhofer.iem</groupId>
             <artifactId>boomerangScope</artifactId>
         </dependency>
+        <dependency>
+            <groupId>de.fraunhofer.iem</groupId>
+            <artifactId>boomerangScope-Soot</artifactId>
+            <version>3.1.2-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>de.fraunhofer.iem</groupId>
             <artifactId>synchronizedPDS</artifactId>
@@ -68,6 +74,11 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>3.4.0</version>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                            </execution>
+                        </executions>
                         <configuration>
                             <excludes>
                                 <exclude>**/*LongTest.java</exclude>

diff --git a/boomerangPDS/src/main/java/boomerang/Boomerang.java b/boomerangPDS/src/main/java/boomerang/Boomerang.java
@@ -22,12 +22,15 @@ public class Boomerang extends WeightedBoomerang<Weight.NoWeight> {
   private OneWeightFunctions<Edge, Val, Field, Weight.NoWeight> fieldWeights;
   private OneWeightFunctions<Edge, Val, Edge, Weight.NoWeight> callWeights;
 
-  public Boomerang(CallGraph callGraph, DataFlowScope scope, ScopeFactory scopeFactory) {
+  public Boomerang(CallGraph callGraph, DataFlowScope scope, FrameworkScopeFactory scopeFactory) {
     super(callGraph, scope, scopeFactory);
   }
 
   public Boomerang(
-      CallGraph callGraph, DataFlowScope scope, BoomerangOptions opt, ScopeFactory scopeFactory) {
+      CallGraph callGraph,
+      DataFlowScope scope,
+      BoomerangOptions opt,
+      FrameworkScopeFactory scopeFactory) {
     super(callGraph, scope, opt, scopeFactory);
   }
 

diff --git a/boomerangPDS/src/main/java/boomerang/BoomerangOptions.java b/boomerangPDS/src/main/java/boomerang/BoomerangOptions.java
@@ -19,9 +19,9 @@
 import boomerang.scene.Method;
 import boomerang.scene.Statement;
 import boomerang.scene.Val;
-import boomerang.sparse.SparsificationStrategy;
 import boomerang.stats.IBoomerangStats;
 import java.util.Optional;
+import sparse.SparsificationStrategy;
 
 public interface BoomerangOptions {
 

diff --git a/boomerangPDS/src/main/java/boomerang/DefaultBoomerangOptions.java b/boomerangPDS/src/main/java/boomerang/DefaultBoomerangOptions.java
@@ -19,14 +19,14 @@
 import boomerang.scene.Method;
 import boomerang.scene.Statement;
 import boomerang.scene.Val;
-import boomerang.sparse.SparsificationStrategy;
 import boomerang.stats.IBoomerangStats;
 import boomerang.stats.SimpleBoomerangStats;
 import com.google.common.base.Joiner;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import sparse.SparsificationStrategy;
 
 public class DefaultBoomerangOptions implements BoomerangOptions {
 
@@ -221,7 +221,6 @@ public boolean allowMultipleQueries() {
   public SparsificationStrategy getSparsificationStrategy() {
     return new SparsificationStrategy.NoSparsification();
   }
-  ;
 
   @Override
   public boolean handleSpecialInvokeAsNormalPropagation() {

diff --git a/boomerangPDS/src/main/java/boomerang/WeightedBoomerang.java b/boomerangPDS/src/main/java/boomerang/WeightedBoomerang.java
@@ -73,7 +73,7 @@
 import wpds.interfaces.WPAStateListener;
 
 public abstract class WeightedBoomerang<W extends Weight> {
-  protected final ScopeFactory scopeFactory;
+  protected final FrameworkScopeFactory scopeFactory;
   protected ObservableICFG<Statement, Method> icfg;
   protected ObservableControlFlowGraph cfg;
   private static final Logger LOGGER = LoggerFactory.getLogger(WeightedBoomerang.class);
@@ -396,7 +396,10 @@ protected FieldWritePOI createItem(FieldWritePOI key) {
   private INode<Val> rootQuery;
 
   public WeightedBoomerang(
-      CallGraph cg, DataFlowScope scope, BoomerangOptions options, ScopeFactory scopeFactory) {
+      CallGraph cg,
+      DataFlowScope scope,
+      BoomerangOptions options,
+      FrameworkScopeFactory scopeFactory) {
     this.scopeFactory = scopeFactory;
     this.options = options;
     this.options.checkValid();
@@ -419,7 +422,7 @@ public WeightedBoomerang(
     this.queryGraph = new QueryGraph<>(this);
   }
 
-  public WeightedBoomerang(CallGraph cg, DataFlowScope scope, ScopeFactory scopeFactory) {
+  public WeightedBoomerang(CallGraph cg, DataFlowScope scope, FrameworkScopeFactory scopeFactory) {
     this(cg, scope, new DefaultBoomerangOptions(), scopeFactory);
   }
 

diff --git a/boomerangPDS/src/main/java/boomerang/WholeProgramBoomerang.java b/boomerangPDS/src/main/java/boomerang/WholeProgramBoomerang.java
@@ -23,12 +23,16 @@ public abstract class WholeProgramBoomerang<W extends Weight> extends WeightedBo
   private CallGraph callGraph;
 
   public WholeProgramBoomerang(
-      CallGraph cg, DataFlowScope scope, BoomerangOptions opts, ScopeFactory scopeFactory) {
+      CallGraph cg,
+      DataFlowScope scope,
+      BoomerangOptions opts,
+      FrameworkScopeFactory scopeFactory) {
     super(cg, scope, opts, scopeFactory);
     this.callGraph = cg;
   }
 
-  public WholeProgramBoomerang(CallGraph cg, DataFlowScope scope, ScopeFactory scopeFactory) {
+  public WholeProgramBoomerang(
+      CallGraph cg, DataFlowScope scope, FrameworkScopeFactory scopeFactory) {
     this(cg, scope, new DefaultBoomerangOptions(), scopeFactory);
   }
 

diff --git a/boomerangPDS/src/main/java/boomerang/callgraph/BoomerangResolver.java b/boomerangPDS/src/main/java/boomerang/callgraph/BoomerangResolver.java
@@ -48,7 +48,7 @@ public enum NoCalleeFoundFallbackOptions {
   private Set<Statement> queriedInvokeExpr = Sets.newHashSet();
   ;
 
-  public BoomerangResolver(CallGraph cg, DataFlowScope scope, ScopeFactory scopeFactory) {
+  public BoomerangResolver(CallGraph cg, DataFlowScope scope, FrameworkScopeFactory scopeFactory) {
     this.solver = new Boomerang(cg, scope, scopeFactory);
     this.precomputedCallGraph = cg;
   }

diff --git a/boomerangPDS/src/main/java/boomerang/controlflowgraph/StaticCFG.java b/boomerangPDS/src/main/java/boomerang/controlflowgraph/StaticCFG.java
@@ -4,9 +4,7 @@
 import boomerang.scene.Method;
 import boomerang.scene.Statement;
 import boomerang.scene.Val;
-import boomerang.sparse.SparsificationStrategy;
-import boomerang.sparse.eval.PropagationCounter;
-import java.util.*;
+import sparse.SparsificationStrategy;
 
 public class StaticCFG implements ObservableControlFlowGraph {
 
@@ -59,15 +57,15 @@ private void propagateSparse(
       SuccessorListener l, Method method, Statement curr, SparseAliasingCFG sparseCFG) {
     Set<Unit> successors = sparseCFG.getGraph().successors(SootAdapter.asStmt(curr));
     for (Unit succ : successors) {
-      PropagationCounter.getInstance(sparsificationStrategy).countForward();
+      sparsificationStrategy.getCounter().countForward();
       l.getSuccessor(SootAdapter.asStatement(succ, method));
     }
   }
   */
 
   private void propagateDefault(SuccessorListener l) {
     for (Statement s : l.getCurr().getMethod().getControlFlowGraph().getSuccsOf(l.getCurr())) {
-      PropagationCounter.getInstance(sparsificationStrategy).countForward();
+      sparsificationStrategy.getCounter().countForward();
       l.getSuccessor(s);
     }
   }

diff --git a/boomerangPDS/src/main/java/boomerang/guided/DemandDrivenGuidedAnalysis.java b/boomerangPDS/src/main/java/boomerang/guided/DemandDrivenGuidedAnalysis.java
@@ -13,7 +13,7 @@
 import boomerang.scene.CallGraph;
 import boomerang.scene.ControlFlowGraph.Edge;
 import boomerang.scene.DataFlowScope;
-import boomerang.scene.ScopeFactory;
+import boomerang.scene.FrameworkScopeFactory;
 import boomerang.scene.Val;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
@@ -43,7 +43,7 @@ public DemandDrivenGuidedAnalysis(
       BoomerangOptions options,
       DataFlowScope dataFlowScope,
       CallGraph callGraph,
-      ScopeFactory scopeFactory) {
+      FrameworkScopeFactory scopeFactory) {
     spec = specification;
     scope = dataFlowScope;
     this.callGraph = callGraph;

diff --git a/boomerangPDS/src/main/java/boomerang/results/ForwardBoomerangResults.java b/boomerangPDS/src/main/java/boomerang/results/ForwardBoomerangResults.java
@@ -36,7 +36,7 @@
 
 public class ForwardBoomerangResults<W extends Weight> extends AbstractBoomerangResults<W> {
 
-  private final ScopeFactory scopeFactory;
+  private final FrameworkScopeFactory scopeFactory;
   private final ForwardQuery query;
   private final boolean timedout;
   private final IBoomerangStats<W> stats;
@@ -50,7 +50,7 @@ public class ForwardBoomerangResults<W extends Weight> extends AbstractBoomerang
   private boolean pruneImplictFlows;
 
   public ForwardBoomerangResults(
-      ScopeFactory scopeFactory,
+      FrameworkScopeFactory scopeFactory,
       ForwardQuery query,
       ObservableICFG<Statement, Method> icfg,
       ObservableControlFlowGraph cfg,

diff --git a/boomerangPDS/src/main/java/boomerang/solver/BackwardBoomerangSolver.java b/boomerangPDS/src/main/java/boomerang/solver/BackwardBoomerangSolver.java
@@ -189,8 +189,7 @@ protected void normalFlow(Method method, Node<ControlFlowGraph.Edge, Val> currNo
           curr.getStart().getMethod().getControlFlowGraph().getPredsOf(curr.getStart())) {
         Collection<State> flow = computeNormalFlow(method, new Edge(pred, curr.getStart()), value);
         for (State s : flow) {
-          // TODO: [ms] re-enable sparse
-          // PropagationCounter.getInstance(options.getSparsificationStrategy()).countBackward();
+          options.getSparsificationStrategy().getCounter().countBackward();
           propagate(currNode, s);
         }
       }
@@ -199,7 +198,6 @@ protected void normalFlow(Method method, Node<ControlFlowGraph.Edge, Val> currNo
 
   /*
   // TODO: [ms] re-enable sparse
-
     private void propagateSparse(Method method, Node<Edge, Val> currNode, Edge curr, Val value) {
       Statement propStmt = curr.getStart();
       SparseAliasingCFG sparseCFG = getSparseCFG(query, method, value, propStmt);
@@ -211,7 +209,7 @@ private void propagateSparse(Method method, Node<Edge, Val> currNode, Edge curr,
               computeNormalFlow(
                   method, new Edge(SootAdapter.asStatement(pred, method), propStmt), value);
           for (State s : flow) {
-            PropagationCounter.getInstance(options.getSparsificationStrategy()).countBackward();
+            options.getSparsificationStrategy().getCounter().countBackward();
             propagate(currNode, s);
           }
         }

diff --git a/boomerangPDS/src/main/java/boomerang/sparse/eval/PropagationCounter.java b/boomerangPDS/src/main/java/boomerang/sparse/eval/PropagationCounter.java
diff --git a/boomerangPDS/src/main/java/boomerang/weights/PathTrackingBoomerang.java b/boomerangPDS/src/main/java/boomerang/weights/PathTrackingBoomerang.java
@@ -24,13 +24,17 @@ public abstract class PathTrackingBoomerang extends WeightedBoomerang<DataFlowPa
   private OneWeightFunctions<Edge, Val, Field, DataFlowPathWeight> fieldWeights;
   private PathTrackingWeightFunctions callWeights;
 
-  public PathTrackingBoomerang(CallGraph cg, DataFlowScope scope, ScopeFactory scopeFactory) {
-    super(cg, scope, scopeFactory);
+  public PathTrackingBoomerang(
+      CallGraph cg, DataFlowScope scope, FrameworkScopeFactory frameworkScopeFactory) {
+    super(cg, scope, frameworkScopeFactory);
   }
 
   public PathTrackingBoomerang(
-      CallGraph cg, DataFlowScope scope, BoomerangOptions opt, ScopeFactory scopeFactory) {
-    super(cg, scope, opt, scopeFactory);
+      CallGraph cg,
+      DataFlowScope scope,
+      BoomerangOptions opt,
+      FrameworkScopeFactory frameworkScopeFactory) {
+    super(cg, scope, opt, frameworkScopeFactory);
   }
 
   @Override

diff --git a/boomerangPDS/src/test/java/boomerang/guided/CustomFlowFunctionTest.java b/boomerangPDS/src/test/java/boomerang/guided/CustomFlowFunctionTest.java
@@ -14,14 +14,15 @@
 import boomerang.scene.AllocVal;
 import boomerang.scene.ControlFlowGraph.Edge;
 import boomerang.scene.Method;
-import boomerang.scene.SootDataFlowScope;
 import boomerang.scene.Statement;
 import boomerang.scene.Val;
-import boomerang.scene.jimple.BoomerangPretransformer;
 import boomerang.scene.jimple.IntAndStringBoomerangOptions;
-import boomerang.scene.jimple.JimpleMethod;
-import boomerang.scene.jimple.SootCallGraph;
 import boomerang.solver.BackwardBoomerangSolver;
+import boomerang.soot.SootDataFlowScope;
+import boomerang.soot.SootFrameworkFactoryFramework;
+import boomerang.soot.jimple.BoomerangPretransformer;
+import boomerang.soot.jimple.JimpleMethod;
+import boomerang.soot.jimple.SootCallGraph;
 import com.google.common.collect.Lists;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -54,7 +55,8 @@ public void killOnSystemExitBackwardTestInteger() {
         new Boomerang(
             sootCallGraph,
             SootDataFlowScope.make(Scene.v()),
-            new CustomIntAndStringBoomerangOptions());
+            new CustomIntAndStringBoomerangOptions(),
+            new SootFrameworkFactoryFramework());
 
     System.out.println("Solving query: " + query);
     BackwardBoomerangResults<NoWeight> backwardQueryResults = solver.solve(query);
@@ -80,7 +82,10 @@ public void killOnSystemExitBackwardTest() {
     SootCallGraph sootCallGraph = new SootCallGraph();
     Boomerang solver =
         new Boomerang(
-            sootCallGraph, SootDataFlowScope.make(Scene.v()), new CustomBoomerangOptions());
+            sootCallGraph,
+            SootDataFlowScope.make(Scene.v()),
+            new CustomBoomerangOptions(),
+            new SootFrameworkFactoryFramework());
 
     System.out.println("Solving query: " + query);
     BackwardBoomerangResults<NoWeight> backwardQueryResults = solver.solve(query);
@@ -103,7 +108,10 @@ public void killOnSystemExitForwardTest() {
     SootCallGraph sootCallGraph = new SootCallGraph();
     Boomerang solver =
         new Boomerang(
-            sootCallGraph, SootDataFlowScope.make(Scene.v()), new CustomBoomerangOptions());
+            sootCallGraph,
+            SootDataFlowScope.make(Scene.v()),
+            new CustomBoomerangOptions(),
+            new SootFrameworkFactoryFramework());
 
     System.out.println("Solving query: " + query);
     ForwardBoomerangResults<NoWeight> res = solver.solve(query);

diff --git a/boomerangPDS/src/test/java/boomerang/guided/DemandDrivenGuidedAnalysisTest.java b/boomerangPDS/src/test/java/boomerang/guided/DemandDrivenGuidedAnalysisTest.java
@@ -26,9 +26,12 @@
 import boomerang.guided.targets.WrappedInStringTwiceTest;
 import boomerang.scene.*;
 import boomerang.scene.ControlFlowGraph.Edge;
-import boomerang.scene.jimple.BoomerangPretransformer;
 import boomerang.scene.jimple.IntAndStringBoomerangOptions;
-import boomerang.scene.jimple.JimpleMethod;
+import boomerang.soot.SootDataFlowScope;
+import boomerang.soot.SootFrameworkFactoryFramework;
+import boomerang.soot.jimple.BoomerangPretransformer;
+import boomerang.soot.jimple.JimpleMethod;
+import boomerang.soot.jimple.SootCallGraph;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import java.nio.file.Path;
@@ -409,7 +412,10 @@ public int analysisTimeoutMS() {
               public boolean allowMultipleQueries() {
                 return true;
               }
-            });
+            },
+            SootDataFlowScope.make(Scene.v()),
+            new SootCallGraph(),
+            new SootFrameworkFactoryFramework());
 
     QueryGraph<NoWeight> queryGraph = demandDrivenGuidedAnalysis.run(query);
     demandDrivenGuidedAnalysis.cleanUp();