mirror of
https://github.com/github/codeql.git
synced 2026-08-01 16:02:57 +02:00
Switches the trunk dataflow library and all in-tree consumers
(frameworks, ApiGraphs, Concepts, regexp, security customisations,
test harness) from the legacy Flow.qll/ESSA stack to the new
shared-CFG facade (Cfg.qll) and the ESSA-shaped adapter on the
shared-SSA library (SsaImpl.qll).
Highlights:
* DataFlowPublic/Private/Dispatch, Attributes, VariableCapture,
IterableUnpacking, ImportResolution, ImportStar, LocalSources,
TaintTrackingPrivate, MatchUnpacking, TypeTrackingImpl,
SsaImpl, Builtins all now qualify CFG/SSA references with
Cfg:: / SsaImpl:: and stop pulling in semmle.python.essa.*.
* AstNodeImpl.qll/Cfg.qll: ImportMember exposes its inner
ImportExpr, DefinitionNode.getValue covers Alias / AnnAssign /
AugAssign / AssignExpr / For-target / Parameter-default,
ForNode is treated as an expression node, AnnotatedExitNode is
canonical, and BoolExprNode.getAnOperand drops the dominance
constraint that did not hold for short-circuit BBs.
* SsaImpl.qll: parameters always get a ParameterDefinition (so
unused parameters still have SSA defs), scope-entry defs for
module globals require an actual store somewhere, scope-exit
has a synthetic use so reaching-defs survives to module
boundary, and the legacy SsaSourceVariable / EssaVariable
surface (getName, getScope, getAUse, getASourceUse,
getAnImplicitUse) is reinstated for downstream queries.
* DataFlowPublic.qll: GuardNode redesigned around the new
structural outcome nodes (isAfterTrue / isAfterFalse). The
legacy ConditionBlock + flipped indirection is gone;
controlsBlock walks UP through 'not' / '==True' / 'is False'
etc. via outcomeOfGuard, accumulating polarity cleanly. Only
BarrierGuard<...> is preserved as public API.
* ModuleVariableNode.getAWrite and LocalFlow::definitionFlowStep
bypass SSA and consult Cfg::NameNode.defines /
Cfg::DefinitionNode.getValue directly, so that write defs
pruned by shared SSA (because the variable has no in-scope
read) still produce dataflow steps.
* Frameworks + downstream consumers: replace
EssaVariable.hasDefiningNode, getAReturnValueFlowNode,
Parameter.getDefault, Scope.getEntryNode / getANormalExit etc.
with CFG-side bridges through Cfg::ControlFlowNode.
The legacy Flow.qll / Essa.qll stack is untouched and remains
available for queries that import it directly.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
113 lines
3.9 KiB
Plaintext
113 lines
3.9 KiB
Plaintext
/**
|
|
* Defines a InlineExpectationsTest for checking whether any arguments in
|
|
* `ensure_tainted` and `ensure_not_tainted` calls are tainted.
|
|
*
|
|
* Also defines query predicates to ensure that:
|
|
* - if any arguments to `ensure_not_tainted` are tainted, their annotation is marked with `SPURIOUS`.
|
|
* - if any arguments to `ensure_tainted` are not tainted, their annotation is marked with `MISSING`.
|
|
*
|
|
* The functionality of this module is tested in `ql/test/experimental/meta/inline-taint-test-demo`.
|
|
*/
|
|
|
|
import python
|
|
private import semmle.python.controlflow.internal.Cfg as Cfg
|
|
import semmle.python.dataflow.new.DataFlow
|
|
import semmle.python.dataflow.new.TaintTracking
|
|
import semmle.python.dataflow.new.RemoteFlowSources
|
|
import utils.test.InlineExpectationsTest
|
|
private import semmle.python.dataflow.new.internal.PrintNode
|
|
private import semmle.python.Concepts
|
|
|
|
DataFlow::Node shouldBeTainted() {
|
|
exists(DataFlow::CallCfgNode call |
|
|
call.getFunction().asCfgNode().(Cfg::NameNode).getId() = "ensure_tainted" and
|
|
result in [call.getArg(_), call.getArgByName(_)]
|
|
)
|
|
}
|
|
|
|
DataFlow::Node shouldNotBeTainted() {
|
|
exists(DataFlow::CallCfgNode call |
|
|
call.getFunction().asCfgNode().(Cfg::NameNode).getId() = "ensure_not_tainted" and
|
|
result in [call.getArg(_), call.getArgByName(_)]
|
|
)
|
|
}
|
|
|
|
// this module allows the configuration to be imported in other `.ql` files without the
|
|
// top level query predicates of this file coming into scope.
|
|
module Conf {
|
|
module TestTaintTrackingConfig implements DataFlow::ConfigSig {
|
|
predicate isSource(DataFlow::Node source) {
|
|
source.asCfgNode().(Cfg::NameNode).getId() in [
|
|
"TAINTED_STRING", "TAINTED_BYTES", "TAINTED_LIST", "TAINTED_DICT"
|
|
]
|
|
or
|
|
// User defined sources
|
|
exists(Cfg::CallNode call |
|
|
call.getFunction().(Cfg::NameNode).getId() = "taint" and
|
|
source.(DataFlow::CfgNode).getNode() = call.getAnArg()
|
|
)
|
|
or
|
|
source instanceof ThreatModelSource
|
|
}
|
|
|
|
predicate isSink(DataFlow::Node sink) {
|
|
sink = shouldBeTainted()
|
|
or
|
|
sink = shouldNotBeTainted()
|
|
}
|
|
}
|
|
}
|
|
|
|
import Conf
|
|
|
|
module MakeInlineTaintTest<DataFlow::ConfigSig Config> {
|
|
private module Flow = TaintTracking::Global<Config>;
|
|
|
|
private module InlineTaintTest implements TestSig {
|
|
string getARelevantTag() { result = "tainted" }
|
|
|
|
predicate hasActualResult(Location location, string element, string tag, string value) {
|
|
exists(location.getFile().getRelativePath()) and
|
|
exists(DataFlow::Node sink |
|
|
Flow::flowTo(sink) and
|
|
location = sink.getLocation() and
|
|
element = prettyExpr(sink.asExpr()) and
|
|
value = "" and
|
|
tag = "tainted"
|
|
)
|
|
}
|
|
}
|
|
|
|
import MakeTest<InlineTaintTest>
|
|
|
|
query predicate argumentToEnsureNotTaintedNotMarkedAsSpurious(
|
|
Location location, string error, string element
|
|
) {
|
|
error = "ERROR, you should add `SPURIOUS:` to this annotation" and
|
|
location = shouldNotBeTainted().getLocation() and
|
|
InlineTaintTest::hasActualResult(location, element, "tainted", _) and
|
|
exists(GoodTestExpectation good, ActualTestResult actualResult |
|
|
good.matchesActualResult(actualResult) and
|
|
actualResult.getLocation() = location and
|
|
actualResult.toString() = element
|
|
)
|
|
}
|
|
|
|
query predicate untaintedArgumentToEnsureTaintedNotMarkedAsMissing(
|
|
Location location, string error, string element
|
|
) {
|
|
error = "ERROR, you should add `# $ MISSING: tainted` annotation" and
|
|
exists(DataFlow::Node sink |
|
|
sink = shouldBeTainted() and
|
|
element = prettyExpr(sink.asExpr()) and
|
|
not Flow::flowTo(sink) and
|
|
location = sink.getLocation() and
|
|
not exists(FalseNegativeTestExpectation missingResult |
|
|
missingResult.getTag() = "tainted" and
|
|
missingResult.getLocation().getFile() = location.getFile() and
|
|
missingResult.getLocation().getStartLine() = location.getStartLine()
|
|
)
|
|
)
|
|
}
|
|
}
|