More Fixes

Author: alexet

java/ql/lib/semmle/code/java/dataflow/DataFlow.qll

@@ -10,6 +10,6 @@ import java
 module DataFlow {
   private import semmle.code.java.dataflow.internal.DataFlowImplSpecific
   private import codeql.dataflow.DataFlow
-  import DataFlowMake<Location, JavaDataFlow>
+  import DataFlowMakeOverlay<Location, JavaDataFlow>
   import Public
 }

java/ql/lib/semmle/code/java/dataflow/TaintTracking.qll

@@ -13,5 +13,5 @@ module TaintTracking {
   private import semmle.code.java.dataflow.internal.DataFlowImplSpecific
   private import semmle.code.java.dataflow.internal.TaintTrackingImplSpecific
   private import codeql.dataflow.TaintTracking
-  import TaintFlowMake<Location, JavaDataFlow, JavaTaintTracking>
+  import TaintFlowMakeOverlay<Location, JavaDataFlow, JavaTaintTracking>
 }

shared/dataflow/codeql/dataflow/DataFlow.qll

@@ -1102,7 +1102,7 @@ module DataFlowMakeCore<LocationSig Location, InputSig<Location> Lang> {
   }
 }
 
-private module DataFlowMakeNonOverlayInformed<LocationSig Location, InputSig<Location> Lang> {
+module DataFlowMake<LocationSig Location, InputSig<Location> Lang> {
   import DataFlowMakeCore<Location, Lang>
   private import Lang
   private import internal.DataFlowImpl::MakeImpl<Location, Lang>
@@ -1162,17 +1162,9 @@ private module DataFlowMakeNonOverlayInformed<LocationSig Location, InputSig<Loc
 
     import Flow
   }
-
 }
 
-private module DataFlowMakeOverlayInformed<LocationSig Location, InputSig<Location> Lang> {
-  import DataFlowMakeCore<Location, Lang>
-  private import Lang
-  private import internal.DataFlowImpl::MakeImpl<Location, Lang>
-  private import internal.DataFlowImplStage1::MakeImplStage1<Location, Lang>
-
-
-
+module DataFlowMakeOverlay<LocationSig Location, InputSig<Location> Lang> {
   import DataFlowMakeCore<Location, Lang>
   private import Lang
   private import internal.DataFlowImpl::MakeImpl<Location, Lang>
@@ -1190,6 +1182,8 @@ private module DataFlowMakeOverlayInformed<LocationSig Location, InputSig<Locati
       predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
         Config::isAdditionalFlowStep(node1, node2) and model = "Config"
       }
+
+      predicate observeOverlayInformedIncrementalMode() { not Config::observeDiffInformedIncrementalMode() }
     }
 
     private module Stage1 = ImplStage1<C>;
@@ -1219,6 +1213,8 @@ private module DataFlowMakeOverlayInformed<LocationSig Location, InputSig<Locati
       ) {
         Config::isAdditionalFlowStep(node1, state1, node2, state2) and model = "Config"
       }
+
+      predicate observeOverlayInformedIncrementalMode() { not Config::observeDiffInformedIncrementalMode() }
     }
 
     private module Stage1 = ImplStage1<C>;

shared/dataflow/codeql/dataflow/TaintTracking.qll

@@ -155,7 +155,7 @@ private module TaintFlowMakeCore<
   }
 }
 
-private module TaintFlowMakeNonOverlay<
+module TaintFlowMake<
   LocationSig Location, DF::InputSig<Location> DataFlowLang,
   InputSig<Location, DataFlowLang> TaintTrackingLang>
 {
@@ -174,6 +174,10 @@ private module TaintFlowMakeNonOverlay<
       ) {
         Config::isAdditionalFlowStep(node1, node2) and model = "Config"
       }
+
+      predicate observeOverlayInformedIncrementalMode() {
+        not Config::observeDiffInformedIncrementalMode()
+      }
     }
 
     private module C implements DataFlowInternal::FullStateConfigSig {
@@ -208,6 +212,8 @@ private module TaintFlowMakeNonOverlay<
       ) {
         Config::isAdditionalFlowStep(node1, state1, node2, state2) and model = "Config"
       }
+
+      predicate observeOverlayInformedIncrementalMode() { none() }
     }
 
     private module C implements DataFlowInternal::FullStateConfigSig {
@@ -279,6 +285,8 @@ private module TaintFlowMakeNonOverlay<
       ) {
         Config::isAdditionalFlowStep(node1, state1, node2, state2) and model = "Config"
       }
+
+      predicate observeOverlayInformedIncrementalMode() { none() }
     }
 
     private module C implements DataFlowInternal::FullStateConfigSig {
@@ -295,8 +303,7 @@ private module TaintFlowMakeNonOverlay<
   }
 }
 
-
-private module TaintFlowMakeOverlay<
+module TaintFlowMakeOverlay<
   LocationSig Location, DF::InputSig<Location> DataFlowLang,
   InputSig<Location, DataFlowLang> TaintTrackingLang>
 {
@@ -316,6 +323,9 @@ private module TaintFlowMakeOverlay<
         Config::isAdditionalFlowStep(node1, node2) and model = "Config"
       }
 
+      predicate observeOverlayInformedIncrementalMode() {
+        not Config::observeDiffInformedIncrementalMode()
+      }
     }
 
     private module C implements DataFlowInternal::FullStateConfigSig {
@@ -350,6 +360,10 @@ private module TaintFlowMakeOverlay<
       ) {
         Config::isAdditionalFlowStep(node1, state1, node2, state2) and model = "Config"
       }
+
+      predicate observeOverlayInformedIncrementalMode() {
+        not Config::observeDiffInformedIncrementalMode()
+      }
     }
 
     private module C implements DataFlowInternal::FullStateConfigSig {
@@ -381,6 +395,10 @@ private module TaintFlowMakeOverlay<
       ) {
         Config::isAdditionalFlowStep(node1, node2) and model = "Config"
       }
+
+      predicate observeOverlayInformedIncrementalMode() {
+        not Config::observeDiffInformedIncrementalMode()
+      }
     }
 
     private module C implements DataFlowInternal::FullStateConfigSig {
@@ -419,6 +437,10 @@ private module TaintFlowMakeOverlay<
       ) {
         Config::isAdditionalFlowStep(node1, state1, node2, state2) and model = "Config"
       }
+
+      predicate observeOverlayInformedIncrementalMode() {
+        not Config::observeDiffInformedIncrementalMode()
+      }
     }
 
     private module C implements DataFlowInternal::FullStateConfigSig {

shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll

@@ -143,6 +143,13 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
      */
     predicate observeDiffInformedIncrementalMode();
 
+    /**
+     * Holds if sources and sinks should be filtered to only include those that
+     * are in the overlay database. This only has an effect when running
+     * in overlay-informed incremental mode.
+     */
+    predicate observeOverlayInformedIncrementalMode();
+
     Location getASelectedSourceLocation(Node source);
 
     Location getASelectedSinkLocation(Node sink);
@@ -195,7 +202,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       or
       // If we are overlay informed (i.e. we are not diff-informed), we
       // merge in the local results which includes the base database results.
-      flowLocal(source, sink) and not Config::observeDiffInformedIncrementalMode()
+      flowLocal(source, sink) and Config::observeOverlayInformedIncrementalMode()
     }
 
     /**
@@ -212,13 +219,36 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       or
       // If we are overlay informed (i.e. we are not diff-informed), we
       // merge in the local results which includes the base database results.
-      flowToLocal(sink) and not Config::observeDiffInformedIncrementalMode()
+      flowToLocal(sink) and not Config::observeOverlayInformedIncrementalMode()
     }
 
     /**
      * Holds if data can flow from some source to `sink`.
      */
     predicate flowToExpr(Lang::DataFlowExpr sink) { flowTo(exprNode(sink)) }
+
+    /**
+     * Holds if data can flow to some sink from `source`.
+     *
+     * This is a local predicate that only has results local to the overlay/base database.
+     */
+    predicate flowFromLocal(Node source) = forceLocal(Base::flowFrom/1)(source)
+
+    /**
+     * Holds if data can flow to some sink from `source`.
+     */
+    predicate flowFrom(Node source) {
+      Base::flowFrom(source)
+      or
+      // If we are overlay informed (i.e. we are not diff-informed), we
+      // merge in the local results which includes the base database results.
+      flowFromLocal(source) and not Config::observeOverlayInformedIncrementalMode()
+    }
+
+    /**
+     * Holds if data can flow from some source to `sink`.
+     */
+    predicate flowFromExpr(Lang::DataFlowExpr sink) { flowFrom(exprNode(sink)) }
   }
 
   /**
@@ -3447,9 +3477,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
     /**
      * Holds if data can flow from `source` to some sink.
      */
-    private predicate flowFrom(Node source) {
-      exists(PathNode n | n.isSource() and n.getNode() = source)
-    }
+    predicate flowFrom(Node source) { exists(PathNode n | n.isSource() and n.getNode() = source) }
 
     /**
      * Holds if data can flow from `source` to some sink.