InlineFlowTest: Allow for custom getArgString

hvitved · hvitved · commit 28a2d05cf8b6 · 2023-12-13T13:58:44.000+01:00
diff --git a/ruby/ql/test/TestUtilities/InlineFlowTest.qll b/ruby/ql/test/TestUtilities/InlineFlowTest.qll
@@ -12,6 +12,7 @@ private import internal.InlineExpectationsTestImpl
 private module FlowTestImpl implements InputSig<RubyDataFlow> {
   import TestUtilities.InlineFlowTestUtil
 
+  bindingset[src, sink]
   string getArgString(DataFlow::Node src, DataFlow::Node sink) {
     (if exists(getSourceArgString(src)) then result = getSourceArgString(src) else result = "") and
     exists(sink)
diff --git a/shared/dataflow/codeql/dataflow/test/InlineFlowTest.qll b/shared/dataflow/codeql/dataflow/test/InlineFlowTest.qll
@@ -35,6 +35,7 @@ signature module InputSig<DF::InputSig DataFlowLang> {
 
   predicate defaultSink(DataFlowLang::Node source);
 
+  bindingset[src, sink]
   string getArgString(DataFlowLang::Node src, DataFlowLang::Node sink);
 }
 
@@ -62,7 +63,13 @@ module InlineFlowTestMake<
     predicate isSink(DataFlowLang::Node sink) { none() }
   }
 
-  module FlowTest<DataFlow::ConfigSig ValueFlowConfig, DataFlow::ConfigSig TaintFlowConfig> {
+  bindingset[src, sink]
+  signature string getArgStringSig(DataFlowLang::Node src, DataFlowLang::Node sink);
+
+  module FlowTestArgString<
+    DataFlow::ConfigSig ValueFlowConfig, DataFlow::ConfigSig TaintFlowConfig,
+    getArgStringSig/2 getArgString>
+  {
     module ValueFlow = DataFlow::Global<ValueFlowConfig>;
 
     module TaintFlow = TaintTracking::Global<TaintFlowConfig>;
@@ -82,7 +89,7 @@ module InlineFlowTestMake<
         exists(DataFlowLang::Node src, DataFlowLang::Node sink | ValueFlow::flow(src, sink) |
           hasLocationInfo(sink, location) and
           element = sink.toString() and
-          value = Impl::getArgString(src, sink)
+          value = getArgString(src, sink)
         )
         or
         tag = "hasTaintFlow" and
@@ -91,7 +98,7 @@ module InlineFlowTestMake<
         |
           hasLocationInfo(sink, location) and
           element = sink.toString() and
-          value = Impl::getArgString(src, sink)
+          value = getArgString(src, sink)
         )
       }
     }
@@ -105,12 +112,26 @@ module InlineFlowTestMake<
     }
   }
 
+  module FlowTest<DataFlow::ConfigSig ValueFlowConfig, DataFlow::ConfigSig TaintFlowConfig> {
+    import FlowTestArgString<ValueFlowConfig, TaintFlowConfig, Impl::getArgString/2>
+  }
+
   module DefaultFlowTest = FlowTest<DefaultFlowConfig, DefaultFlowConfig>;
 
+  module ValueFlowTestArgString<DataFlow::ConfigSig ValueFlowConfig, getArgStringSig/2 getArgString>
+  {
+    import FlowTestArgString<ValueFlowConfig, NoFlowConfig, getArgString/2>
+  }
+
   module ValueFlowTest<DataFlow::ConfigSig ValueFlowConfig> {
     import FlowTest<ValueFlowConfig, NoFlowConfig>
   }
 
+  module TaintFlowTestArgString<DataFlow::ConfigSig TaintFlowConfig, getArgStringSig/2 getArgString>
+  {
+    import FlowTestArgString<NoFlowConfig, TaintFlowConfig, getArgString/2>
+  }
+
   module TaintFlowTest<DataFlow::ConfigSig TaintFlowConfig> {
     import FlowTest<NoFlowConfig, TaintFlowConfig>
   }

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ signature module InputSig<DF::InputSig DataFlowLang> {`
`35`	`35`
`36`	`36`	`predicate defaultSink(DataFlowLang::Node source);`
`37`	`37`
	`38`	`+ bindingset[src, sink]`
`38`	`39`	`string getArgString(DataFlowLang::Node src, DataFlowLang::Node sink);`
`39`	`40`	`}`
`40`	`41`
`@@ -62,7 +63,13 @@ module InlineFlowTestMake<`
`62`	`63`	`predicate isSink(DataFlowLang::Node sink) { none() }`
`63`	`64`	`}`
`64`	`65`
`65`		`- module FlowTest<DataFlow::ConfigSig ValueFlowConfig, DataFlow::ConfigSig TaintFlowConfig> {`
	`66`	`+ bindingset[src, sink]`
	`67`	`+ signature string getArgStringSig(DataFlowLang::Node src, DataFlowLang::Node sink);`
	`68`	`+`
	`69`	`+ module FlowTestArgString<`
	`70`	`+ DataFlow::ConfigSig ValueFlowConfig, DataFlow::ConfigSig TaintFlowConfig,`
	`71`	`+ getArgStringSig/2 getArgString>`
	`72`	`+ {`
`66`	`73`	`module ValueFlow = DataFlow::Global<ValueFlowConfig>;`
`67`	`74`
`68`	`75`	`module TaintFlow = TaintTracking::Global<TaintFlowConfig>;`
`@@ -82,7 +89,7 @@ module InlineFlowTestMake<`
`82`	`89`	`exists(DataFlowLang::Node src, DataFlowLang::Node sink \| ValueFlow::flow(src, sink) \|`
`83`	`90`	`hasLocationInfo(sink, location) and`
`84`	`91`	`element = sink.toString() and`
`85`		`- value = Impl::getArgString(src, sink)`
	`92`	`+ value = getArgString(src, sink)`
`86`	`93`	`)`
`87`	`94`	`or`
`88`	`95`	`tag = "hasTaintFlow" and`
`@@ -91,7 +98,7 @@ module InlineFlowTestMake<`
`91`	`98`	`\|`
`92`	`99`	`hasLocationInfo(sink, location) and`
`93`	`100`	`element = sink.toString() and`
`94`		`- value = Impl::getArgString(src, sink)`
	`101`	`+ value = getArgString(src, sink)`
`95`	`102`	`)`
`96`	`103`	`}`
`97`	`104`	`}`
`@@ -105,12 +112,26 @@ module InlineFlowTestMake<`
`105`	`112`	`}`
`106`	`113`	`}`
`107`	`114`
	`115`	`+ module FlowTest<DataFlow::ConfigSig ValueFlowConfig, DataFlow::ConfigSig TaintFlowConfig> {`
	`116`	`+ import FlowTestArgString<ValueFlowConfig, TaintFlowConfig, Impl::getArgString/2>`
	`117`	`+ }`
	`118`	`+`
`108`	`119`	`module DefaultFlowTest = FlowTest<DefaultFlowConfig, DefaultFlowConfig>;`
`109`	`120`
	`121`	`+ module ValueFlowTestArgString<DataFlow::ConfigSig ValueFlowConfig, getArgStringSig/2 getArgString>`
	`122`	`+ {`
	`123`	`+ import FlowTestArgString<ValueFlowConfig, NoFlowConfig, getArgString/2>`
	`124`	`+ }`
	`125`	`+`
`110`	`126`	`module ValueFlowTest<DataFlow::ConfigSig ValueFlowConfig> {`
`111`	`127`	`import FlowTest<ValueFlowConfig, NoFlowConfig>`
`112`	`128`	`}`
`113`	`129`
	`130`	`+ module TaintFlowTestArgString<DataFlow::ConfigSig TaintFlowConfig, getArgStringSig/2 getArgString>`
	`131`	`+ {`
	`132`	`+ import FlowTestArgString<NoFlowConfig, TaintFlowConfig, getArgString/2>`
	`133`	`+ }`
	`134`	`+`
`114`	`135`	`module TaintFlowTest<DataFlow::ConfigSig TaintFlowConfig> {`
`115`	`136`	`import FlowTest<NoFlowConfig, TaintFlowConfig>`
`116`	`137`	`}`