github
diff --git a/‎rust/ql/test/library-tests/dataflow/barrier/inline-flow.expected
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions b/‎rust/ql/test/library-tests/dataflow/barrier/inline-flow.expected
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions
diff --git a/‎rust/ql/test/library-tests/dataflow/barrier/inline-flow.ql
Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions b/‎rust/ql/test/library-tests/dataflow/barrier/inline-flow.ql
Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions
diff --git a/‎rust/ql/test/library-tests/dataflow/barrier/main.rs
Copy file name to clipboard
+11-7Lines changed: 11 additions & 7 deletions b/‎rust/ql/test/library-tests/dataflow/barrier/main.rs
Copy file name to clipboard
+11-7Lines changed: 11 additions & 7 deletions
diff --git a/‎rust/ql/test/utils/InlineFlowTest.qll
Copy file name to clipboard
+42Lines changed: 42 additions & 0 deletions b/‎rust/ql/test/utils/InlineFlowTest.qll
Copy file name to clipboard
+42Lines changed: 42 additions & 0 deletions
@@ -0,0 +1,9 @@
+models
+edges
+nodes
+subpaths
+testFailures
+| main.rs:17:22:17:40 | Comment | Missing result: hasValueFlow=1 |
+| main.rs:22:14:22:32 | Comment | Missing result: hasValueFlow=1 |
+| main.rs:33:14:33:32 | Comment | Missing result: hasValueFlow=1 |
+#select
@@ -0,0 +1,12 @@
+/**
+ * @kind path-problem
+ */
+
+import rust
+import utils.InlineFlowTest
+import DefaultFlowTest
+import ValueFlow::PathGraph
+
+from ValueFlow::PathNode source, ValueFlow::PathNode sink
+where ValueFlow::flowPath(source, sink)
+select sink, source, sink, "$@", source, source.toString()
@@ -1,4 +1,4 @@
-fn source() -> &'static str {
+fn source(i: i64) -> &'static str {
     "source"
 }
 
@@ -13,18 +13,22 @@ fn sanitize(s: &str) -> &str {
     }
 }
 
-fn no_barrier() {
-    let s = source();
-    sink(s);
+fn directly() {
+    sink(source(1)); // $ hasValueFlow=1
+}
+
+fn through_variable() {
+    let s = source(1);
+    sink(s); // $ hasValueFlow=1
 }
 
 fn with_barrier() {
-    let s = source();
+    let s = source(1);
     let s = sanitize(s);
     sink(s);
 }
 
 fn main() {
-    let s = source();
-    sink(s);
+    let s = source(1);
+    sink(s); // $ hasValueFlow=1
 }
@@ -0,0 +1,42 @@
+/**
+ * Inline flow tests for Rust.
+ * See `shared/util/codeql/dataflow/test/InlineFlowTest.qll`
+ */
+
+import rust
+private import codeql.dataflow.test.InlineFlowTest
+private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.internal.DataFlowImpl
+private import codeql.rust.dataflow.internal.TaintTrackingImpl
+private import internal.InlineExpectationsTestImpl as InlineExpectationsTestImpl
+
+private module FlowTestImpl implements InputSig<Location, RustDataFlow> {
+  predicate defaultSource(DataFlow::Node source) {
+    source.asExpr().(CallExpr).getExpr().toString() = "source"
+  }
+
+  predicate defaultSink(DataFlow::Node sink) {
+    any(CallExpr call | call = sink.asExpr() and call.getExpr().toString() = "sink")
+        .getArgList()
+        .getAnArg() = sink.asExpr()
+  }
+
+  private string getSourceArgString(DataFlow::Node src) {
+    defaultSource(src) and
+    result = src.asExpr().(CallExpr).getArgList().getArg(0).toString()
+  }
+
+  bindingset[src, sink]
+  string getArgString(DataFlow::Node src, DataFlow::Node sink) {
+    (
+      result = getSourceArgString(src)
+      or
+      not exists(getSourceArgString(src)) and result = ""
+    ) and
+    exists(sink)
+  }
+
+  predicate interpretModelForTest(QlBuiltins::ExtensionId madId, string model) { none() }
+}
+
+import InlineFlowTestMake<Location, RustDataFlow, RustTaintTracking, InlineExpectationsTestImpl::Impl, FlowTestImpl>
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-fn source() -> &'static str {`
	`1`	`+fn source(i: i64) -> &'static str {`
`2`	`2`	`"source"`
`3`	`3`	`}`
`4`	`4`
`@@ -13,18 +13,22 @@ fn sanitize(s: &str) -> &str {`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`16`		`-fn no_barrier() {`
`17`		`- let s = source();`
`18`		`- sink(s);`
	`16`	`+fn directly() {`
	`17`	`+ sink(source(1)); // $ hasValueFlow=1`
	`18`	`+}`
	`19`	`+`
	`20`	`+fn through_variable() {`
	`21`	`+ let s = source(1);`
	`22`	`+ sink(s); // $ hasValueFlow=1`
`19`	`23`	`}`
`20`	`24`
`21`	`25`	`fn with_barrier() {`
`22`		`- let s = source();`
	`26`	`+ let s = source(1);`
`23`	`27`	`let s = sanitize(s);`
`24`	`28`	`sink(s);`
`25`	`29`	`}`
`26`	`30`
`27`	`31`	`fn main() {`
`28`		`- let s = source();`
`29`		`- sink(s);`
	`32`	`+ let s = source(1);`
	`33`	`+ sink(s); // $ hasValueFlow=1`
`30`	`34`	`}`