Merge pull request #6 from CodeShield-Security/develop

Adding Data-Flow Path & Refactoring Statement to ControlFlowEdge

Author: johspaeth

SynchronizedPDS/pom.xml

@@ -2,7 +2,7 @@
     <parent>
         <groupId>de.fraunhofer.iem</groupId>
         <artifactId>SPDS</artifactId>
-        <version>3.0.10-SNAPSHOT</version>
+        <version>3.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

SynchronizedPDS/src/main/java/sync/pds/solver/nodes/INode.java

@@ -14,5 +14,5 @@
 import wpds.interfaces.State;
 
 public interface INode<Fact> extends State {
-  public Fact fact();
+  Fact fact();
 }

SynchronizedPDS/src/main/java/sync/pds/solver/nodes/NodeWithLocation.java

@@ -17,7 +17,7 @@ public class NodeWithLocation<Stmt, Fact, Location> implements INode<Node<Stmt,
   private Node<Stmt, Fact> fact;
 
   public NodeWithLocation(Stmt stmt, Fact variable, Location loc) {
-    this.fact = new Node<Stmt, Fact>(stmt, variable);
+    this.fact = new Node<>(stmt, variable);
     this.loc = loc;
   }
 

WPDS/pom.xml

@@ -2,7 +2,7 @@
     <parent>
         <groupId>de.fraunhofer.iem</groupId>
         <artifactId>SPDS</artifactId>
-        <version>3.0.10-SNAPSHOT</version>
+        <version>3.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

boomerangPDS/pom.xml

@@ -2,7 +2,7 @@
     <parent>
         <groupId>de.fraunhofer.iem</groupId>
         <artifactId>SPDS</artifactId>
-        <version>3.0.10-SNAPSHOT</version>
+        <version>3.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

boomerangPDS/src/main/java/boomerang/BackwardQuery.java

@@ -11,25 +11,21 @@
  */
 package boomerang;
 
-import boomerang.scene.CallSiteStatement;
-import boomerang.scene.Statement;
+import boomerang.scene.ControlFlowGraph;
+import boomerang.scene.ControlFlowGraph.Edge;
 import boomerang.scene.Val;
 
 public class BackwardQuery extends Query {
-  protected BackwardQuery(Statement stmt, Val variable) {
-    super(stmt, variable);
+  protected BackwardQuery(ControlFlowGraph.Edge edge, Val variable) {
+    super(edge, variable);
   }
 
   @Override
   public String toString() {
     return "BackwardQuery: " + super.toString();
   }
 
-  public static BackwardQuery make(Statement stmt, Val variable) {
-    return new BackwardQuery(
-        (stmt instanceof CallSiteStatement)
-            ? ((CallSiteStatement) stmt).getReturnSiteStatement()
-            : stmt,
-        variable);
+  public static BackwardQuery make(Edge edge, Val variable) {
+    return new BackwardQuery(edge, variable);
   }
 }

boomerangPDS/src/main/java/boomerang/Boomerang.java

@@ -12,18 +12,18 @@
 package boomerang;
 
 import boomerang.scene.CallGraph;
+import boomerang.scene.ControlFlowGraph.Edge;
 import boomerang.scene.DataFlowScope;
 import boomerang.scene.Field;
-import boomerang.scene.Statement;
 import boomerang.scene.Val;
 import sync.pds.solver.OneWeightFunctions;
 import sync.pds.solver.WeightFunctions;
 import wpds.impl.Weight;
 
 public class Boomerang extends WeightedBoomerang<Weight.NoWeight> {
 
-  private OneWeightFunctions<Statement, Val, Field, Weight.NoWeight> fieldWeights;
-  private OneWeightFunctions<Statement, Val, Statement, Weight.NoWeight> callWeights;
+  private OneWeightFunctions<Edge, Val, Field, Weight.NoWeight> fieldWeights;
+  private OneWeightFunctions<Edge, Val, Edge, Weight.NoWeight> callWeights;
 
   public Boomerang(CallGraph callGraph, DataFlowScope scope) {
     super(callGraph, scope);
@@ -34,34 +34,34 @@ public Boomerang(CallGraph callGraph, DataFlowScope scope, BoomerangOptions opt)
   }
 
   @Override
-  protected WeightFunctions<Statement, Val, Field, Weight.NoWeight> getForwardFieldWeights() {
+  protected WeightFunctions<Edge, Val, Field, Weight.NoWeight> getForwardFieldWeights() {
     return getOrCreateFieldWeights();
   }
 
   @Override
-  protected WeightFunctions<Statement, Val, Field, Weight.NoWeight> getBackwardFieldWeights() {
+  protected WeightFunctions<Edge, Val, Field, Weight.NoWeight> getBackwardFieldWeights() {
     return getOrCreateFieldWeights();
   }
 
   @Override
-  protected WeightFunctions<Statement, Val, Statement, Weight.NoWeight> getBackwardCallWeights() {
+  protected WeightFunctions<Edge, Val, Edge, Weight.NoWeight> getBackwardCallWeights() {
     return getOrCreateCallWeights();
   }
 
   @Override
-  protected WeightFunctions<Statement, Val, Statement, Weight.NoWeight> getForwardCallWeights(
+  protected WeightFunctions<Edge, Val, Edge, Weight.NoWeight> getForwardCallWeights(
       ForwardQuery sourceQuery) {
     return getOrCreateCallWeights();
   }
 
-  private WeightFunctions<Statement, Val, Field, Weight.NoWeight> getOrCreateFieldWeights() {
+  private WeightFunctions<Edge, Val, Field, Weight.NoWeight> getOrCreateFieldWeights() {
     if (fieldWeights == null) {
       fieldWeights = new OneWeightFunctions<>(Weight.NO_WEIGHT_ONE);
     }
     return fieldWeights;
   }
 
-  private WeightFunctions<Statement, Val, Statement, Weight.NoWeight> getOrCreateCallWeights() {
+  private WeightFunctions<Edge, Val, Edge, Weight.NoWeight> getOrCreateCallWeights() {
     if (callWeights == null) {
       callWeights = new OneWeightFunctions<>(Weight.NO_WEIGHT_ONE);
     }

boomerangPDS/src/main/java/boomerang/ForwardQuery.java

@@ -11,13 +11,13 @@
  */
 package boomerang;
 
-import boomerang.scene.Statement;
+import boomerang.scene.ControlFlowGraph;
 import boomerang.scene.Val;
 
 public class ForwardQuery extends Query {
 
-  public ForwardQuery(Statement stmt, Val variable) {
-    super(stmt, variable);
+  public ForwardQuery(ControlFlowGraph.Edge edge, Val variable) {
+    super(edge, variable);
   }
 
   @Override

boomerangPDS/src/main/java/boomerang/ForwardQueryArray.java

@@ -11,15 +11,15 @@
  */
 package boomerang;
 
-import boomerang.scene.Statement;
+import boomerang.scene.ControlFlowGraph.Edge;
 import boomerang.scene.Val;
 import com.google.common.base.Objects;
 
 public class ForwardQueryArray extends ForwardQuery {
 
   private final Integer index;
 
-  public ForwardQueryArray(Statement stmt, Val variable, Integer index) {
+  public ForwardQueryArray(Edge stmt, Val variable, Integer index) {
     super(stmt, variable);
     this.index = index;
   }

boomerangPDS/src/main/java/boomerang/ForwardQueryMultiDimensionalArray.java

@@ -11,7 +11,7 @@
  */
 package boomerang;
 
-import boomerang.scene.Statement;
+import boomerang.scene.ControlFlowGraph.Edge;
 import boomerang.scene.Val;
 import com.google.common.base.Objects;
 
@@ -20,7 +20,7 @@ public class ForwardQueryMultiDimensionalArray extends ForwardQueryArray {
   private final Integer index2;
 
   public ForwardQueryMultiDimensionalArray(
-      Statement stmt, Val variable, Integer index1, Integer index2) {
+      Edge stmt, Val variable, Integer index1, Integer index2) {
     super(stmt, variable, index1);
     this.index2 = index2;
   }