Python: Update tests to new dataflow lib

Avoids some deprecation warnings :)

Author: RasmusWL

python/ql/test/experimental/dataflow/basic/callGraph.ql

@@ -2,7 +2,7 @@ import experimental.dataflow.callGraphConfig
 
 from DataFlow::Node source, DataFlow::Node sink
 where
-  exists(CallGraphConfig cfg | cfg.hasFlow(source, sink)) and
+  CallGraphFlow::flow(source, sink) and
   exists(source.getLocation().getFile().getRelativePath()) and
   exists(sink.getLocation().getFile().getRelativePath())
 select source, sink

python/ql/test/experimental/dataflow/basic/callGraphSinks.ql

@@ -2,6 +2,6 @@ import experimental.dataflow.callGraphConfig
 
 from DataFlow::Node sink
 where
-  exists(CallGraphConfig cfg | cfg.isSink(sink)) and
+  CallGraphConfig::isSink(sink) and
   exists(sink.getLocation().getFile().getRelativePath())
 select sink

python/ql/test/experimental/dataflow/basic/callGraphSources.ql

@@ -2,6 +2,6 @@ import experimental.dataflow.callGraphConfig
 
 from DataFlow::Node source
 where
-  exists(CallGraphConfig cfg | cfg.isSource(source)) and
+  CallGraphConfig::isSource(source) and
   exists(source.getLocation().getFile().getRelativePath())
 select source

python/ql/test/experimental/dataflow/callGraphConfig.qll

@@ -5,18 +5,18 @@ private import semmle.python.dataflow.new.internal.DataFlowPrivate as DataFlowPr
 /**
  * A configuration to find the call graph edges.
  */
-class CallGraphConfig extends DataFlow::Configuration {
-  CallGraphConfig() { this = "CallGraphConfig" }
-
-  override predicate isSource(DataFlow::Node node) {
+module CallGraphConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node node) {
     node instanceof DataFlowPrivate::ReturnNode
     or
     node instanceof DataFlow::ArgumentNode
   }
 
-  override predicate isSink(DataFlow::Node node) {
+  predicate isSink(DataFlow::Node node) {
     node instanceof DataFlowPrivate::OutNode
     or
     node instanceof DataFlow::ParameterNode
   }
 }
+
+module CallGraphFlow = DataFlow::Global<CallGraphConfig>;

python/ql/test/library-tests/frameworks/modeling-example/NaiveModel.ql

@@ -5,7 +5,7 @@
 private import python
 private import semmle.python.dataflow.new.DataFlow
 private import semmle.python.dataflow.new.TaintTracking
-import DataFlow::PathGraph
+import SharedFlow::PathGraph
 import SharedCode
 
 class MyClassGetValueAdditionalTaintStep extends TaintTracking::AdditionalTaintStep {
@@ -18,7 +18,7 @@ class MyClassGetValueAdditionalTaintStep extends TaintTracking::AdditionalTaintS
   }
 }
 
-from SharedConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
-where config.hasFlowPath(source, sink)
+from SharedFlow::PathNode source, SharedFlow::PathNode sink
+where SharedFlow::flowPath(source, sink)
 select sink.getNode(), source, sink,
   "test flow (naive): " + source.getNode().asCfgNode().getScope().getName()

python/ql/test/library-tests/frameworks/modeling-example/ProperModel.ql

@@ -5,7 +5,7 @@
 private import python
 private import semmle.python.dataflow.new.DataFlow
 private import semmle.python.dataflow.new.TaintTracking
-import DataFlow::PathGraph
+import SharedFlow::PathGraph
 import SharedCode
 
 class MyClassGetValueAdditionalTaintStep extends TaintTracking::AdditionalTaintStep {
@@ -20,7 +20,7 @@ class MyClassGetValueAdditionalTaintStep extends TaintTracking::AdditionalTaintS
   }
 }
 
-from SharedConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
-where config.hasFlowPath(source, sink)
+from SharedFlow::PathNode source, SharedFlow::PathNode sink
+where SharedFlow::flowPath(source, sink)
 select sink.getNode(), source, sink,
   "test flow (proper): " + source.getNode().asCfgNode().getScope().getName()

python/ql/test/library-tests/frameworks/modeling-example/SharedCode.qll

@@ -22,15 +22,15 @@ class SourceCall extends DataFlow::Node, MyClass {
   SourceCall() { this.asCfgNode().(CallNode).getFunction().(NameNode).getId() = "source" }
 }
 
-class SharedConfig extends TaintTracking::Configuration {
-  SharedConfig() { this = "SharedConfig" }
+private module SharedConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { source instanceof SourceCall }
 
-  override predicate isSource(DataFlow::Node source) { source instanceof SourceCall }
-
-  override predicate isSink(DataFlow::Node sink) {
+  predicate isSink(DataFlow::Node sink) {
     exists(CallNode call |
       call.getFunction().(NameNode).getId() = "sink" and
       call.getArg(0) = sink.asCfgNode()
     )
   }
 }
+
+module SharedFlow = TaintTracking::Global<SharedConfig>;