mirror of
https://github.com/github/codeql.git
synced 2026-07-31 07:22:56 +02:00
Flips the Python dataflow trunk from the legacy CFG (semmle/python/Flow.qll) and legacy ESSA SSA (semmle/python/essa/*) to the new shared CFG facade (semmle.python.controlflow.internal.Cfg) and the new SSA adapter (semmle.python.dataflow.new.internal.SsaImpl), both introduced additively in the preceding PRs in this stack. This is the trunk-flip equivalent of the original draft PR #21894 (kept around as documentation), rebased on top of the four preparatory PRs: P1: Remove AstNode.getAFlowNode() and rewrite callers (#21919). P2: Qualify Flow.qll's AST references with Py:: prefix (#21920). P3: Add new shared-CFG-backed control flow graph (#21921). P4: Add new shared-SSA-backed SSA adapter (#21923). The Python dataflow library (semmle/python/dataflow/new/) now imports the new CFG facade and SSA adapter. All CFG-typed predicates (ControlFlowNode, CallNode, BasicBlock, NameNode, AttrNode, ...) are qualified with the Cfg:: prefix; SSA references switch from EssaVariable/EssaDefinition to SsaImpl::Definition/SourceVariable. GuardNode is redesigned to use the new CFG's outcome-node model (isAfterTrue / isAfterFalse) instead of the legacy ConditionBlock + flipped indirection. Only BarrierGuard<...> is preserved as public API. Framework files (Bottle, FastApi, Django, Tornado, Pyramid, Stdlib, ...) are updated to take CFG nodes from the new facade. A handful of dataflow consistency tweaks for the new CFG: - Augmented-assignment targets are treated as both load and store. - 'from X import *' produces uncertain SSA writes for unknown names. - CFG nodes are canonicalised so dataflow does not see equivalent pre/post-order pairs as distinct nodes. Two AST tweaks for the new CFG: - AstNodeImpl: omit PEP 695 type-parameter names from FunctionDefExpr / ClassDefExpr children. - ImportResolution: drop the legacy essa import. Test churn (~175 files): reblessed library- and query-test .expected files reflect slightly different CFG granularity, different toString output, and a handful of true alert deltas in security queries. Verification: all 367 lib + src + consistency-queries compile clean. 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()
|
|
)
|
|
)
|
|
}
|
|
}
|