mirror of
https://github.com/github/codeql.git
synced 2026-06-03 04:40:14 +02:00
4ed5722e3e
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>
40 lines
1.7 KiB
Plaintext
40 lines
1.7 KiB
Plaintext
// This query should be more focused yet.
|
|
import python
|
|
import utils.test.dataflow.FlowTest
|
|
private import semmle.python.dataflow.new.internal.PrintNode
|
|
private import semmle.python.dataflow.new.internal.DataFlowPrivate as DP
|
|
private import semmle.python.dataflow.new.internal.SsaImpl as SsaImpl
|
|
|
|
module ImportTimeLocalFlowTest implements FlowTestSig {
|
|
string flowTag() { result = "importTimeFlow" }
|
|
|
|
predicate relevantFlow(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
|
|
nodeFrom.getLocation().getFile().getBaseName() = "multiphase.py" and
|
|
// results are displayed next to `nodeTo`, so we need a line to write on
|
|
nodeTo.getLocation().getStartLine() > 0 and
|
|
exists(SsaImpl::EssaVariable g |
|
|
g.getSourceVariable().getVariable() instanceof GlobalVariable and
|
|
nodeTo.asCfgNode() = g.getDefinition().(SsaImpl::EssaNodeDefinition).getDefiningNode()
|
|
) and
|
|
// nodeTo.asVar() instanceof GlobalSsaVariable and
|
|
DP::PhaseDependentFlow<DP::LocalFlow::localFlowStep/2>::importTimeStep(nodeFrom, nodeTo)
|
|
}
|
|
}
|
|
|
|
module RuntimeLocalFlowTest implements FlowTestSig {
|
|
string flowTag() { result = "runtimeFlow" }
|
|
|
|
predicate relevantFlow(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
|
|
nodeFrom.getLocation().getFile().getBaseName() = "multiphase.py" and
|
|
// results are displayed next to `nodeTo`, so we need a line to write on
|
|
nodeTo.getLocation().getStartLine() > 0 and
|
|
(
|
|
nodeFrom instanceof DataFlow::ModuleVariableNode or
|
|
nodeTo instanceof DataFlow::ModuleVariableNode
|
|
) and
|
|
DP::runtimeJumpStep(nodeFrom, nodeTo)
|
|
}
|
|
}
|
|
|
|
import MakeTest<MergeTests<MakeTestSig<ImportTimeLocalFlowTest>, MakeTestSig<RuntimeLocalFlowTest>>>
|