Skip to content

C#: Add implicit System.Collections.Generic.KeyValuePair2.Value reads at taint sinks #21024

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
MathiasVP merged 3 commits into from
Dec 12, 2025
+2,271 −13
Merged

C#: Add implicit System.Collections.Generic.KeyValuePair2.Value reads at taint sinks #21024

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b499661
C#: Slightly refactor 'CollectionFlow' tests to add a taint-flow test.
MathiasVP Dec 12, 2025
f30ebab
C#: Add implicit reads of System.Collections.Generic.KeyValuePair`2.V…
MathiasVP Dec 12, 2025
2720f57
C#: Add change note.
MathiasVP Dec 12, 2025
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
Next Next commit
C#: Slightly refactor 'CollectionFlow' tests to add a taint-flow test.
  • Loading branch information
@MathiasVP
MathiasVP committed Dec 12, 2025
commit b499661c05bdf7742ac7f5437e7d655d022d6843
13 changes: 12 additions & 1 deletion csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,25 @@ predicate defaultTaintSanitizer(DataFlow::Node node) {
)
}

/**
* Gets the (unbound) property `System.Collections.Generic.KeyValuePair.Value`.
*/
private Property keyValuePairValue() {
result.hasFullyQualifiedName("System.Collections.Generic", "KeyValuePair`2", "Value")
}

/**
* Holds if default `TaintTracking::Configuration`s should allow implicit reads
* of `c` at sinks and inputs to additional taint steps.
*/
bindingset[node]
predicate defaultImplicitTaintRead(DataFlow::Node node, DataFlow::ContentSet c) {
exists(node) and
c.isElement()
(
c.isElement()
or
c.isProperty(keyValuePairValue())
)
}

private class LocalTaintExprStepConfiguration extends ControlFlowReachabilityConfiguration {
Expand Down
840 changes: 840 additions & 0 deletions csharp/ql/test/library-tests/dataflow/collections/CollectionDataFlow.expected
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 1 addition & 12 deletions ...ts/dataflow/collections/CollectionFlow.ql → ...ataflow/collections/CollectionDataFlow.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,9 @@
* @kind path-problem
*/

import csharp
import CollectionFlowCommon
import utils.test.ProvenancePathGraph::ShowProvenance<ArrayFlow::PathNode, ArrayFlow::PathGraph>

module ArrayFlowConfig implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node src) { src.asExpr() instanceof ObjectCreation }

predicate isSink(DataFlow::Node sink) {
exists(MethodCall mc |
mc.getTarget().hasUndecoratedName("Sink") and
mc.getAnArgument() = sink.asExpr()
)
}
}

module ArrayFlow = DataFlow::Global<ArrayFlowConfig>;

from ArrayFlow::PathNode source, ArrayFlow::PathNode sink
Expand Down
6 changes: 6 additions & 0 deletions csharp/ql/test/library-tests/dataflow/collections/CollectionFlow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,4 +550,10 @@ public void ReadOnlySpanConstructorFlow()
ReadOnlySpan<A> span = new ReadOnlySpan<A>(new[] { a });
Sink(span[0]); // flow
}

public void ImplicitMapValueRead(Dictionary<int, A> dict) {
var a = new A();
dict[0] = a;
Sink(dict); // no taint flow
}
}
12 changes: 12 additions & 0 deletions csharp/ql/test/library-tests/dataflow/collections/CollectionFlowCommon.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import csharp

module ArrayFlowConfig implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node src) { src.asExpr() instanceof ObjectCreation }

predicate isSink(DataFlow::Node sink) {
exists(MethodCall mc |
mc.getTarget().hasUndecoratedName("Sink") and
mc.getAnArgument() = sink.asExpr()
)
}
}
1,374 changes: 1,374 additions & 0 deletions csharp/ql/test/library-tests/dataflow/collections/CollectionTaintFlow.expected
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions csharp/ql/test/library-tests/dataflow/collections/CollectionTaintFlow.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/**
* @kind path-problem
*/

import CollectionFlowCommon
import utils.test.ProvenancePathGraph::ShowProvenance<ArrayFlow::PathNode, ArrayFlow::PathGraph>

module ArrayFlow = TaintTracking::Global<ArrayFlowConfig>;

from ArrayFlow::PathNode source, ArrayFlow::PathNode sink
where ArrayFlow::flowPath(source, sink)
select source, source, sink, "$@", sink, sink.toString()