mirror of
https://github.com/github/codeql.git
synced 2026-06-03 04:40:14 +02:00
3f9c603115
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>
46 lines
1.6 KiB
Plaintext
46 lines
1.6 KiB
Plaintext
import python
|
|
private import semmle.python.controlflow.internal.Cfg as Cfg
|
|
import semmle.python.dataflow.new.DataFlow
|
|
private import semmle.python.dataflow.new.internal.DataFlowPrivate
|
|
import FlowTest
|
|
|
|
module MaximalFlowTest implements FlowTestSig {
|
|
string flowTag() { result = "flow" }
|
|
|
|
predicate relevantFlow(DataFlow::Node source, DataFlow::Node sink) {
|
|
source != sink and
|
|
MaximalFlows::flow(source, sink) and
|
|
// exclude ModuleVariableNodes (which have location 0:0:0:0)
|
|
not sink instanceof DataFlow::ModuleVariableNode
|
|
}
|
|
}
|
|
|
|
import MakeTest<MakeTestSig<MaximalFlowTest>>
|
|
|
|
/**
|
|
* A configuration to find all "maximal" flows.
|
|
* To be used on small programs.
|
|
*/
|
|
module MaximalFlowsConfig implements DataFlow::ConfigSig {
|
|
predicate isSource(DataFlow::Node node) {
|
|
exists(node.getLocation().getFile().getRelativePath()) and
|
|
not node.asCfgNode() instanceof Cfg::CallNode and
|
|
not node.asCfgNode().getNode() instanceof Return and
|
|
not node instanceof DataFlow::ParameterNode and
|
|
not node instanceof DataFlow::PostUpdateNode and
|
|
// not node.asExpr() instanceof FunctionExpr and
|
|
// not node.asExpr() instanceof ClassExpr and
|
|
not DataFlow::localFlowStep(_, node)
|
|
}
|
|
|
|
predicate isSink(DataFlow::Node node) {
|
|
exists(node.getLocation().getFile().getRelativePath()) and
|
|
not any(Cfg::CallNode c).getArg(_) = node.asCfgNode() and
|
|
not isArgumentNode(node, _, _) and
|
|
not node.asCfgNode().(Cfg::NameNode).getId().matches("SINK%") and
|
|
not DataFlow::localFlowStep(node, _)
|
|
}
|
|
}
|
|
|
|
module MaximalFlows = DataFlow::Global<MaximalFlowsConfig>;
|