Dataflow: Simplify diff-informed implementation and tweak flag name.

github · Sep 19, 2024 · a6c49fd · a6c49fd
1 parent 2e6f34d
commit a6c49fd
Show file tree

Hide file tree

Showing 68 changed files with 175 additions and 401 deletions.
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll
@@ -284,13 +284,7 @@ deprecated private module Config implements FullStateConfigSig {
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 
-  predicate filterForSourceOrSinkAlerts() { none() }
-
-  predicate isFilteredSource(Node source, FlowState state) { isSource(source, state) }
-
-  predicate isFilteredSink(Node sink, FlowState state) { isSink(sink, state) }
-
-  predicate isFilteredSink(Node sink) { isSink(sink) }
+  predicate diffInformedIncrementalMode() { none() }
 }
 
 deprecated private import Impl<Config> as I

diff --git a/java/ql/lib/semmle/code/java/security/AndroidIntentRedirectionQuery.qll b/java/ql/lib/semmle/code/java/security/AndroidIntentRedirectionQuery.qll
@@ -19,7 +19,7 @@ module IntentRedirectionConfig implements DataFlow::ConfigSig {
     any(IntentRedirectionAdditionalTaintStep c).step(node1, node2)
   }
 
-  predicate filterForSourceOrSinkAlerts() { any() }
+  predicate diffInformedIncrementalMode() { any() }
 }
 
 /** Tracks the flow of tainted Intents being used to start Android components. */

diff --git a/java/ql/lib/semmle/code/java/security/ExternallyControlledFormatStringQuery.qll b/java/ql/lib/semmle/code/java/security/ExternallyControlledFormatStringQuery.qll
@@ -24,7 +24,7 @@ module ExternallyControlledFormatStringConfig implements DataFlow::ConfigSig {
     node.getType() instanceof NumericType or node.getType() instanceof BooleanType
   }
 
-  predicate filterForSourceOrSinkAlerts() { any() }
+  predicate diffInformedIncrementalMode() { any() }
 }
 
 /**

diff --git a/java/ql/lib/semmle/code/java/security/FragmentInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/FragmentInjectionQuery.qll
@@ -18,7 +18,7 @@ module FragmentInjectionTaintConfig implements DataFlow::ConfigSig {
     any(FragmentInjectionAdditionalTaintStep c).step(n1, n2)
   }
 
-  predicate filterForSourceOrSinkAlerts() { any() }
+  predicate diffInformedIncrementalMode() { any() }
 }
 
 /**

diff --git a/java/ql/lib/semmle/code/java/security/GroovyInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/GroovyInjectionQuery.qll
@@ -18,7 +18,7 @@ module GroovyInjectionConfig implements DataFlow::ConfigSig {
     any(GroovyInjectionAdditionalTaintStep c).step(fromNode, toNode)
   }
 
-  predicate filterForSourceOrSinkAlerts() { any() }
+  predicate diffInformedIncrementalMode() { any() }
 }
 
 /**

diff --git a/java/ql/lib/semmle/code/java/security/ImplicitPendingIntentsQuery.qll b/java/ql/lib/semmle/code/java/security/ImplicitPendingIntentsQuery.qll
@@ -49,7 +49,7 @@ module ImplicitPendingIntentStartConfig implements DataFlow::StateConfigSig {
     c instanceof DataFlow::ArrayContent
   }
 
-  predicate filterForSourceOrSinkAlerts() { any() }
+  predicate diffInformedIncrementalMode() { any() }
 }
 
 module ImplicitPendingIntentStartFlow =

diff --git a/java/ql/lib/semmle/code/java/security/InsecureBeanValidationQuery.qll b/java/ql/lib/semmle/code/java/security/InsecureBeanValidationQuery.qll
@@ -50,7 +50,7 @@ module BeanValidationConfig implements DataFlow::ConfigSig {
 
   predicate isSink(DataFlow::Node sink) { sink instanceof BeanValidationSink }
 
-  predicate filterForSourceOrSinkAlerts() { any() }
+  predicate diffInformedIncrementalMode() { any() }
 }
 
 /** Tracks flow from user input to the argument of a method that builds constraint error messages. */

diff --git a/java/ql/lib/semmle/code/java/security/InsecureLdapAuthQuery.qll b/java/ql/lib/semmle/code/java/security/InsecureLdapAuthQuery.qll
@@ -23,7 +23,7 @@ module InsecureLdapUrlConfig implements DataFlow::ConfigSig {
     )
   }
 
-  predicate filterForSourceOrSinkAlerts() { any() }
+  predicate diffInformedIncrementalMode() { any() }
 }
 
 module InsecureLdapUrlFlow = TaintTracking::Global<InsecureLdapUrlConfig>;
-Original file line number
+Diff line change
@@ Expand Up @@
         node.getType() instanceof NumericType or node.getType() instanceof BooleanType
       }
-      predicate filterForSourceOrSinkAlerts() { any() }
+      predicate diffInformedIncrementalMode() { any() }
     }
     /**
@@ Expand Down @@