Rust: Add source/sink/barrier MaD trait tests

Author: hvitved

rust/ql/test/library-tests/dataflow/barrier/external_file.rs

@@ -0,0 +1,8 @@
+pub trait MyBarrierTrait2 {
+    fn sanitize2(s: &str);
+}
+
+impl<T> MyBarrierTrait2 for T {
+    // inherits model from the trait function
+    fn sanitize2(s: &str) {}
+}

rust/ql/test/library-tests/dataflow/barrier/inline-flow.expected

@@ -4,6 +4,8 @@ edges
 | main.rs:21:13:21:21 | source(...) | main.rs:21:9:21:9 | s | provenance |  |
 | main.rs:32:9:32:9 | s | main.rs:33:10:33:10 | s | provenance |  |
 | main.rs:32:13:32:21 | source(...) | main.rs:32:9:32:9 | s | provenance |  |
+| main.rs:63:9:63:9 | s | main.rs:65:10:65:10 | s | provenance |  |
+| main.rs:63:13:63:21 | source(...) | main.rs:63:9:63:9 | s | provenance |  |
 nodes
 | main.rs:17:10:17:18 | source(...) | semmle.label | source(...) |
 | main.rs:21:9:21:9 | s | semmle.label | s |
@@ -12,9 +14,13 @@ nodes
 | main.rs:32:9:32:9 | s | semmle.label | s |
 | main.rs:32:13:32:21 | source(...) | semmle.label | source(...) |
 | main.rs:33:10:33:10 | s | semmle.label | s |
+| main.rs:63:9:63:9 | s | semmle.label | s |
+| main.rs:63:13:63:21 | source(...) | semmle.label | source(...) |
+| main.rs:65:10:65:10 | s | semmle.label | s |
 subpaths
 testFailures
 #select
 | main.rs:17:10:17:18 | source(...) | main.rs:17:10:17:18 | source(...) | main.rs:17:10:17:18 | source(...) | $@ | main.rs:17:10:17:18 | source(...) | source(...) |
 | main.rs:22:10:22:10 | s | main.rs:21:13:21:21 | source(...) | main.rs:22:10:22:10 | s | $@ | main.rs:21:13:21:21 | source(...) | source(...) |
 | main.rs:33:10:33:10 | s | main.rs:32:13:32:21 | source(...) | main.rs:33:10:33:10 | s | $@ | main.rs:32:13:32:21 | source(...) | source(...) |
+| main.rs:65:10:65:10 | s | main.rs:63:13:63:21 | source(...) | main.rs:65:10:65:10 | s | $@ | main.rs:63:13:63:21 | source(...) | source(...) |

rust/ql/test/library-tests/dataflow/barrier/inline-flow.ext.yml

@@ -4,8 +4,16 @@ extensions:
       extensible: barrierModel
     data:
       - ["main::sanitize", "ReturnValue", "test-barrier", "manual"]
+      - ["<main::external_file::MyBarrierTrait2>::sanitize2", "Argument[0]", "test-barrier", "manual"]
+      - ["<_ as main::MyBarrierTrait3>::sanitize3", "Argument[0]", "test-barrier", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: barrierGuardModel
     data:
       - ["main::verify_safe", "Argument[0]", "true", "test-barrier", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: additionalExternalFile
+    data:
+      - ["external_file.rs"]
+

rust/ql/test/library-tests/dataflow/barrier/main.rs

@@ -46,3 +46,25 @@ fn with_barrier_guard() {
         sink(s);
     }
 }
+
+mod external_file;
+use external_file::*;
+
+trait MyBarrierTrait3 {
+    fn sanitize3(s: &str);
+}
+
+impl<T> MyBarrierTrait3 for T {
+    // has an explicit model
+    fn sanitize3(s: &str) {}
+}
+
+fn with_trait_barriers() {
+    let s = source(2);
+    <()>::sanitize2(s);
+    sink(s); // $ SPURIOUS: hasValueFlow=2
+
+    let s = source(3);
+    <()>::sanitize3(s);
+    sink(s);
+}

rust/ql/test/library-tests/dataflow/models/external_file.rs

@@ -38,3 +38,23 @@ impl<T> MyTrait2 for T {
         0
     }
 }
+
+pub trait MySourceTrait2 {
+    fn produce2(i: i64) -> i64;
+}
+
+impl<T> MySourceTrait2 for T {
+    // inherits model from the trait function
+    fn produce2(i: i64) -> i64 {
+        0
+    }
+}
+
+pub trait MySinkTrait2 {
+    fn consume2(i: i64);
+}
+
+impl<T> MySinkTrait2 for T {
+    // inherits model from the trait function
+    fn consume2(i: i64) {}
+}

rust/ql/test/library-tests/dataflow/models/main.rs

@@ -471,6 +471,26 @@ impl<T> MyTrait3 for T {
     }
 }
 
+trait MySourceTrait3 {
+    fn produce3(i: i64) -> i64;
+}
+
+impl<T> MySourceTrait3 for T {
+    // has an explicit model
+    fn produce3(i: i64) -> i64 {
+        0
+    }
+}
+
+trait MySinkTrait3 {
+    fn consume3(i: i64);
+}
+
+impl<T> MySinkTrait3 for T {
+    // has an explicit model
+    fn consume3(i: i64) {}
+}
+
 fn test_trait_model<T: Ord>(x: T) {
     let x1 = source(20).max(0);
     sink(x1); // $ hasValueFlow=20
@@ -505,6 +525,16 @@ fn test_trait_model<T: Ord>(x: T) {
 
     let x9 = <()>::flow_through3(source(30));
     sink(x9); // $ hasValueFlow=30
+
+    let x10 = <()>::produce2(31);
+    sink(x10); // $ MISSING: hasValueFlow=31
+
+    let x11 = <()>::produce3(32);
+    sink(x11); // $ hasValueFlow=32
+
+    <()>::consume2(source(33)); // $ MISSING: hasValueFlow=33
+
+    <()>::consume3(source(34)); // $ hasValueFlow=34
 }
 
 mod external_file;

rust/ql/test/library-tests/dataflow/models/models.expected

@@ -14,6 +14,8 @@ extensions:
       - ["main::external_file::generated_source", "ReturnValue", "test-source", "dfc-generated"] # not actually generated, but we want to test behaviour of generated models here.
       - ["main::external_file::neutral_generated_source", "ReturnValue", "test-source", "dfc-generated"]
       - ["main::external_file::neutral_manual_source", "ReturnValue", "test-source", "manual"]
+      - ["<main::external_file::MySourceTrait2>::produce2", "ReturnValue", "test-source", "manual"]
+      - ["<_ as main::MySourceTrait3>::produce3", "ReturnValue", "test-source", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sinkModel
@@ -27,6 +29,8 @@ extensions:
       - ["main::external_file::generated_sink", "Argument[0]", "test-sink", "dfc-generated"]
       - ["main::external_file::neutral_generated_sink", "Argument[0]", "test-sink", "dfc-generated"]
       - ["main::external_file::neutral_manual_sink", "Argument[0]", "test-sink", "manual"]
+      - ["<main::external_file::MySinkTrait2>::consume2", "Argument[0]", "test-sink", "manual"]
+      - ["<_ as main::MySinkTrait3>::consume3", "Argument[0]", "test-sink", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: summaryModel