Skip to content

Rust: Regenerate models#21023

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
paldepind merged 7 commits into from
Jan 14, 2026
Merged

Rust: Regenerate models #21023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9cdf63e
Rust: Skip model generation for functions with a ; in their canonical…
paldepind Dec 12, 2025
8bfce6b
Shared, rust: Add option to disable reads steps as taint steps in mod…
paldepind Jan 12, 2026
1fbf038
Rust: Skip model generation for Rocket due to performance issue
paldepind Jan 7, 2026
862adec
Rust: Disable dynamic dispatch when generating models
paldepind Jan 7, 2026
d784912
Rust: Exclude reqwest response timeout field as a taint step
paldepind Jan 12, 2026
da43e8c
Rust: Regenerate models
paldepind Jan 7, 2026
76a1e22
Rust: Remove manual models that are now generated
paldepind Jan 13, 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
3 changes: 2 additions & 1 deletion rust/bulk_generation_targets.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,8 @@ targets:
- name: serde
- name: tokio
- name: reqwest
- name: rocket
# Disabled due to performance issue
# - name: rocket
- name: actix-web
- name: hyper
- name: clap
22 changes: 19 additions & 3 deletions rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -306,7 +306,11 @@ predicate indexAssignment(
not index.getResolvedTarget().fromSource()
}

module RustDataFlow implements InputSig<Location> {
signature module RustDataFlowInputSig {
predicate includeDynamicTargets();
}

module RustDataFlowGen<RustDataFlowInputSig Input> implements InputSig<Location> {

@paldepindpaldepindJan 12, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gen is for "generic" or something. Suggestions for better names are very welcome 🙏

private import Aliases
private import codeql.rust.dataflow.DataFlow
private import Node as Node
Expand DownExpand Up@@ -462,7 +466,11 @@ module RustDataFlow implements InputSig<Location> {
/** Gets a viable implementation of the target of the given `Call`. */
DataFlowCallable viableCallable(DataFlowCall call) {
exists(Call c | c = call.asCall() |
result.asCfgScope() = c.getARuntimeTarget()
(
if Input::includeDynamicTargets()
then result.asCfgScope() = c.getARuntimeTarget()
else result.asCfgScope() = c.getStaticTarget()
)
or
result.asSummarizedCallable() = getStaticTargetExt(c)
)
Expand DownExpand Up@@ -935,6 +943,12 @@ module RustDataFlow implements InputSig<Location> {
class DataFlowSecondLevelScope = Void;
}

module RustDataFlowInput implements RustDataFlowInputSig {

@hvitvedhvitvedJan 13, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

private?

@paldepindpaldepindJan 13, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's used over in TaintTrackingImpl.qll.

predicate includeDynamicTargets() { any() }
}

module RustDataFlow = RustDataFlowGen<RustDataFlowInput>;

/** Provides logic related to captured variables. */
module VariableCapture {
private import codeql.rust.internal.CachedStages
Expand DownExpand Up@@ -1110,7 +1124,7 @@ private module Cached {
}

cached
newtype TParameterPosition =
newtype TParameterPositionImpl =
TPositionalParameterPosition(int i) {
i in [0 .. max([any(ParamList l).getNumberOfParams(), any(ArgList l).getNumberOfArgs()]) - 1]
or
Expand All@@ -1121,6 +1135,8 @@ private module Cached {
TClosureSelfParameterPosition() or
TSelfParameterPosition()

final class TParameterPosition = TParameterPositionImpl;

@hvitvedhvitvedJan 13, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this achieve?

@paldepindpaldepindJan 13, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes a compile error on this line:

finalclassParameterPositionextendsTParameterPosition{

with the error being:

classes may not extend outside their parameterised module; consider extending through a final alias


cached
newtype TReturnKind = TNormalReturnKind()

Expand Down
23 changes: 16 additions & 7 deletions rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
private import rust
private import codeql.dataflow.DataFlow as DF
private import codeql.dataflow.TaintTracking
private import codeql.rust.dataflow.DataFlow
private import codeql.rust.dataflow.DataFlow as RustDataFlow
private import codeql.rust.dataflow.FlowSummary
private import DataFlowImpl
private import DataFlowImpl as DataFlowImpl
private import Node as Node
private import Content
private import FlowSummaryImpl as FlowSummaryImpl
Expand All@@ -29,7 +30,11 @@ private predicate excludedTaintStepContent(Content c) {
)
}

module RustTaintTracking implements InputSig<Location, RustDataFlow> {
module RustTaintTrackingGen<DataFlowImpl::RustDataFlowInputSig I> implements
InputSig<Location, DataFlowImpl::RustDataFlowGen<I>>
{
private module DataFlow = DataFlowImpl::RustDataFlowGen<I>;

predicate defaultTaintSanitizer(DataFlow::Node node) { none() }

/**
Expand All@@ -53,7 +58,7 @@ module RustTaintTracking implements InputSig<Location, RustDataFlow> {
// is tainted and an operation reads from `foo` (e.g., `foo.bar`) then
// taint is propagated.
exists(ContentSet cs |
RustDataFlow::readStep(pred, cs, succ) and
DataFlow::readStep(pred, cs, succ) and
not excludedTaintStepContent(cs.getAReadContent())
)
or
Expand All@@ -70,9 +75,11 @@ module RustTaintTracking implements InputSig<Location, RustDataFlow> {
)
or
succ.(Node::PostUpdateNode).getPreUpdateNode().asExpr() =
getPostUpdateReverseStep(pred.(Node::PostUpdateNode).getPreUpdateNode().asExpr(), false)
DataFlowImpl::getPostUpdateReverseStep(pred.(Node::PostUpdateNode)
.getPreUpdateNode()
.asExpr(), false)
or
indexAssignment(any(CompoundAssignmentExpr cae),
DataFlowImpl::indexAssignment(any(CompoundAssignmentExpr cae),
pred.(Node::PostUpdateNode).getPreUpdateNode().asExpr(), _, succ, _)
)
or
Expand All@@ -92,7 +99,7 @@ module RustTaintTracking implements InputSig<Location, RustDataFlow> {
c instanceof ReferenceContent
) and
// Optional steps are added through isAdditionalFlowStep but we don't want the implicit reads
not optionalStep(node, _, _)
not DataFlowImpl::optionalStep(node, _, _)
}

/**
Expand All@@ -101,3 +108,5 @@ module RustTaintTracking implements InputSig<Location, RustDataFlow> {
*/
predicate speculativeTaintStep(DataFlow::Node src, DataFlow::Node sink) { none() }
}

module RustTaintTracking = RustTaintTrackingGen<DataFlowImpl::RustDataFlowInput>;
5 changes: 5 additions & 0 deletions rust/ql/lib/codeql/rust/frameworks/reqwest.model.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,3 +29,8 @@ extensions:
- ["<reqwest::async_impl::response::Response>::text", "Argument[self]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
- ["<reqwest::async_impl::response::Response>::bytes", "Argument[self]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
- ["<reqwest::async_impl::response::Response>::chunk", "Argument[self].Reference", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]", "taint", "manual"]
- addsTo:
pack: codeql/rust-all
extensible: excludeFieldTaintStep
data:
- ["reqwest::blocking::response::Response::timeout"]
2 changes: 0 additions & 2 deletions rust/ql/lib/codeql/rust/frameworks/stdlib/fs.model.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,8 +63,6 @@ extensions:
- ["<std::path::Path>::new", "Argument[0].Reference", "ReturnValue.Reference", "value", "manual"]
- ["<std::path::Path>::join", "Argument[self].Reference", "ReturnValue", "taint", "manual"]
- ["<std::path::Path>::join", "Argument[0]", "ReturnValue", "taint", "manual"]
- ["<std::path::Path>::as_os_str", "Argument[self].Reference.Field[std::path::Path::inner]", "ReturnValue.Reference", "value", "manual"]
- ["<std::path::Path>::as_mut_os_str", "Argument[self].Reference.Field[std::path::Path::inner]", "ReturnValue.Reference", "value", "manual"]
- ["<std::path::Path>::canonicalize", "Argument[self].Reference.OptionalStep[normalize-path]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
- ["<std::path::Path>::canonicalize", "Argument[self].Reference.OptionalBarrier[normalize-path]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
- ["<std::path::Path>::extension", "Argument[self].Reference", "ReturnValue.Field[core::option::Option::Some(0)].Reference", "taint", "manual"]
Expand Down
Loading
Loading