Skip to content
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

Jump to bottom

DataFlow: Support stateless isSink in StateConfigSigs #13851

Merged
merged 8 commits into from
Aug 4, 2023
Merged

DataFlow: Support stateless isSink in StateConfigSigs #13851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b953c4a
DataFlow: Allow stateless sinks.
MathiasVP Aug 2, 2023
096eeeb
C++: Handle 'isSink' without states in the backwards-compatibility co…
MathiasVP Aug 2, 2023
3007fda
Sync identical files.
MathiasVP Aug 2, 2023
a5f521c
DataFlow: Add change note.
MathiasVP Aug 2, 2023
50f5c4d
DataFlow: Don't support stateless sink nodes in partial flow explorat…
MathiasVP Aug 3, 2023
981f675
DataFlow: Introduce 'revSinkNode'.
MathiasVP Aug 4, 2023
eb19052
Apply suggestions from code review
MathiasVP Aug 4, 2023
e066e87
Update shared/dataflow/codeql/dataflow/DataFlowImpl.qll
MathiasVP Aug 4, 2023
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
2 changes: 2 additions & 0 deletions cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
1 change: 1 addition & 0 deletions cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTracking.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ private module AddTaintDefaults<DataFlowInternal::FullStateConfigSig Config> imp
Config::allowImplicitRead(node, c)
or
(
Config::isSink(node) or
Config::isSink(node, _) or
Config::isAdditionalFlowStep(node, _) or
Config::isAdditionalFlowStep(node, _, _, _)
Expand Down
2 changes: 2 additions & 0 deletions cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
1 change: 1 addition & 0 deletions cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTracking.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ private module AddTaintDefaults<DataFlowInternal::FullStateConfigSig Config> imp
Config::allowImplicitRead(node, c)
or
(
Config::isSink(node) or
Config::isSink(node, _) or
Config::isAdditionalFlowStep(node, _) or
Config::isAdditionalFlowStep(node, _, _, _)
Expand Down
2 changes: 2 additions & 0 deletions csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
1 change: 1 addition & 0 deletions csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTracking.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ private module AddTaintDefaults<DataFlowInternal::FullStateConfigSig Config> imp
Config::allowImplicitRead(node, c)
or
(
Config::isSink(node) or
Config::isSink(node, _) or
Config::isAdditionalFlowStep(node, _) or
Config::isAdditionalFlowStep(node, _, _, _)
Expand Down
2 changes: 2 additions & 0 deletions go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions go/ql/lib/semmle/go/dataflow/internal/DataFlowImplForStringsNewReplacer.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
1 change: 1 addition & 0 deletions go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTracking.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ private module AddTaintDefaults<DataFlowInternal::FullStateConfigSig Config> imp
Config::allowImplicitRead(node, c)
or
(
Config::isSink(node) or
Config::isSink(node, _) or
Config::isAdditionalFlowStep(node, _) or
Config::isAdditionalFlowStep(node, _, _, _)
Expand Down
2 changes: 2 additions & 0 deletions java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
1 change: 1 addition & 0 deletions java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTracking.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ private module AddTaintDefaults<DataFlowInternal::FullStateConfigSig Config> imp
Config::allowImplicitRead(node, c)
or
(
Config::isSink(node) or
Config::isSink(node, _) or
Config::isAdditionalFlowStep(node, _) or
Config::isAdditionalFlowStep(node, _, _, _)
Expand Down
2 changes: 2 additions & 0 deletions python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
1 change: 1 addition & 0 deletions python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTracking.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ private module AddTaintDefaults<DataFlowInternal::FullStateConfigSig Config> imp
Config::allowImplicitRead(node, c)
or
(
Config::isSink(node) or
Config::isSink(node, _) or
Config::isAdditionalFlowStep(node, _) or
Config::isAdditionalFlowStep(node, _, _, _)
Expand Down
2 changes: 2 additions & 0 deletions ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForHttpClientLibraries.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
2 changes: 2 additions & 0 deletions ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForPathname.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ private module Config implements FullStateConfigSig {
getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
}

predicate isSink(Node sink) { none() }

predicate isSink(Node sink, FlowState state) {
getConfig(state).isSink(sink, getState(state))
or
Expand Down
1 change: 1 addition & 0 deletions ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTracking.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ private module AddTaintDefaults<DataFlowInternal::FullStateConfigSig Config> imp
Config::allowImplicitRead(node, c)
or
(
Config::isSink(node) or
Config::isSink(node, _) or
Config::isAdditionalFlowStep(node, _) or
Config::isAdditionalFlowStep(node, _, _, _)
Expand Down
4 changes: 4 additions & 0 deletions shared/dataflow/change-notes/2023-08-02-dataflow-isSink.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
category: feature
---
* The `StateConfigSig` signature now supports a unary `isSink` predicate that does not specify the `FlowState` for which the given node is a sink. Instead, any `FlowState` is considered a valid `FlowState` for such a sink.
5 changes: 5 additions & 0 deletions shared/dataflow/codeql/dataflow/DataFlow.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@ module Configs<DataFlowParameter Lang> {
*/
predicate isSink(Node sink, FlowState state);

/**
* Holds if `sink` is a relevant data flow sink for any state.
*/
default predicate isSink(Node sink) { none() }

/**
* Holds if data flow through `node` is prohibited. This completely removes
* `node` from the data flow graph.
Expand Down
Loading