Skip to content

Rust: Add support for defining barriers and barrier guards using models-as-data #21475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
owen-mc merged 17 commits into from
Mar 24, 2026
Merged

Rust: Add support for defining barriers and barrier guards using models-as-data #21475

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
bceab0b
Add extensible predicates
owen-mc Feb 21, 2026
f342bae
Update empty.model.yml
owen-mc Feb 21, 2026
f9521e9
Update `interpretModelForTest`
owen-mc Feb 24, 2026
f455054
Shared: Add `barrierElement` in FlowSummaryImpl.qll
owen-mc Mar 16, 2026
d3177b9
Add FlowBarrier.qll
owen-mc Mar 16, 2026
e86ce8f
Instantiate flow barriers from MaD
owen-mc Mar 16, 2026
93c6560
Add test for MaD barriers
owen-mc Mar 16, 2026
2f0d328
Misc: fix typos in QLDocs
owen-mc Mar 16, 2026
c5457d3
Add (failing) test for MaD barrier guard
owen-mc Mar 17, 2026
77cb353
Add MaD barrier guard model to make test pass
owen-mc Mar 17, 2026
7d65bac
Add `FlowBarrierGuard` to FlowBarrier.qll
owen-mc Mar 20, 2026
769b3a6
Instantiate flow barrier guards from MaD
owen-mc Mar 17, 2026
bde9378
Update MaD barrier guard test output
owen-mc Mar 20, 2026
093c279
Fix incorrect QLDoc
owen-mc Mar 20, 2026
d82fc67
Fix QLDoc formatting
owen-mc Mar 23, 2026
97ebc0e
Update QLDoc in FlowBarrier.qll
owen-mc Mar 23, 2026
8d16a2b
Fix `parameter` -> `argument` in QLDoc
owen-mc Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add test for MaD barriers
  • Loading branch information
@owen-mc
owen-mc committed Mar 20, 2026
commit 93c656065d20428fffe43d7c79850f5dca41fa4e
21 changes: 0 additions & 21 deletions rust/ql/test/library-tests/dataflow/barrier/inline-flow.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,20 @@
models
edges
| main.rs:9:13:9:19 | ...: ... | main.rs:10:11:10:11 | s | provenance | |
| main.rs:10:11:10:11 | s | main.rs:12:9:12:9 | s | provenance | |
| main.rs:12:9:12:9 | s | main.rs:9:30:14:1 | { ... } | provenance | |
| main.rs:21:9:21:9 | s | main.rs:22:10:22:10 | s | provenance | |
| main.rs:21:13:21:21 | source(...) | main.rs:21:9:21:9 | s | provenance | |
| main.rs:26:9:26:9 | s | main.rs:27:22:27:22 | s | provenance | |
| main.rs:26:13:26:21 | source(...) | main.rs:26:9:26:9 | s | provenance | |
| main.rs:27:9:27:9 | s | main.rs:28:10:28:10 | s | provenance | |
| main.rs:27:13:27:23 | sanitize(...) | main.rs:27:9:27:9 | s | provenance | |
| main.rs:27:22:27:22 | s | main.rs:9:13:9:19 | ...: ... | provenance | |
| main.rs:27:22:27:22 | s | main.rs:27:13:27:23 | sanitize(...) | 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 | |
nodes
| main.rs:9:13:9:19 | ...: ... | semmle.label | ...: ... |
| main.rs:9:30:14:1 | { ... } | semmle.label | { ... } |
| main.rs:10:11:10:11 | s | semmle.label | s |
| main.rs:12:9:12:9 | s | semmle.label | s |
| main.rs:17:10:17:18 | source(...) | semmle.label | source(...) |
| main.rs:21:9:21:9 | s | semmle.label | s |
| main.rs:21:13:21:21 | source(...) | semmle.label | source(...) |
| main.rs:22:10:22:10 | s | semmle.label | s |
| main.rs:26:9:26:9 | s | semmle.label | s |
| main.rs:26:13:26:21 | source(...) | semmle.label | source(...) |
| main.rs:27:9:27:9 | s | semmle.label | s |
| main.rs:27:13:27:23 | sanitize(...) | semmle.label | sanitize(...) |
| main.rs:27:22:27:22 | s | semmle.label | s |
| main.rs:28:10:28:10 | s | semmle.label | s |
| 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 |
subpaths
| main.rs:27:22:27:22 | s | main.rs:9:13:9:19 | ...: ... | main.rs:9:30:14:1 | { ... } | main.rs:27:13:27:23 | sanitize(...) |
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:28:10:28:10 | s | main.rs:26:13:26:21 | source(...) | main.rs:28:10:28:10 | s | $@ | main.rs:26:13:26: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(...) |
6 changes: 6 additions & 0 deletions rust/ql/test/library-tests/dataflow/barrier/inline-flow.ext.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
extensions:
- addsTo:
pack: codeql/rust-all
extensible: barrierModel
data:
- ["main::sanitize", "ReturnValue", "test-barrier", "manual"]
13 changes: 12 additions & 1 deletion rust/ql/test/library-tests/dataflow/barrier/inline-flow.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,19 @@
*/

import rust
import codeql.rust.dataflow.DataFlow
import codeql.rust.dataflow.FlowBarrier
import utils.test.InlineFlowTest
import DefaultFlowTest

module CustomConfig implements DataFlow::ConfigSig {
predicate isSource = DefaultFlowConfig::isSource/1;

predicate isSink = DefaultFlowConfig::isSink/1;

predicate isBarrier(DataFlow::Node n) { barrierNode(n, "test-barrier") }
}

import FlowTest<CustomConfig, CustomConfig>
import TaintFlow::PathGraph

from TaintFlow::PathNode source, TaintFlow::PathNode sink
Expand Down
2 changes: 1 addition & 1 deletion rust/ql/test/library-tests/dataflow/barrier/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ fn through_variable() {
fn with_barrier() {
let s = source(1);
let s = sanitize(s);
sink(s); // $ SPURIOUS: hasValueFlow=1
sink(s);
}

fn main() {
Expand Down