mirror of
https://github.com/github/codeql.git
synced 2026-06-07 22:31:39 +02:00
e9d6d8f72b
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>
64 lines
1.4 KiB
Python
64 lines
1.4 KiB
Python
# When this regression was discovered, we did not resolve the `self.f2()` call after the
|
|
# try-except block, but ONLY when passing an attribute to a method, as indicated in the
|
|
# other tests below.
|
|
|
|
class Wat(object):
|
|
def f1(self, arg): pass
|
|
def f2(self): pass
|
|
|
|
def func(self, foo):
|
|
try:
|
|
self.f1(foo.bar) # $ pt,tt=Wat.f1
|
|
except Exception as e:
|
|
raise e
|
|
|
|
self.f2() # $ pt=Wat.f2 tt=Wat.f2
|
|
|
|
|
|
# ==============================================================================
|
|
# variants that we are able to handle
|
|
# ==============================================================================
|
|
|
|
|
|
class Works(object):
|
|
"not using attribute"
|
|
def f1(self, arg): pass
|
|
def f2(self): pass
|
|
|
|
def func(self, foo):
|
|
try:
|
|
self.f1(foo) # $ pt,tt=Works.f1
|
|
except Exception as e:
|
|
raise e
|
|
|
|
self.f2() # $ pt,tt=Works.f2
|
|
|
|
|
|
class AlsoWorks(object):
|
|
"no exception"
|
|
def f1(self, arg): pass
|
|
def f2(self): pass
|
|
|
|
def func(self, foo):
|
|
self.f1(foo.bar) # $ pt,tt=AlsoWorks.f1
|
|
|
|
self.f2() # $ pt,tt=AlsoWorks.f2
|
|
|
|
|
|
def safe_func(arg):
|
|
pass
|
|
|
|
|
|
class Works3(object):
|
|
"call to non-self function"
|
|
def f1(self, arg): pass
|
|
def f2(self): pass
|
|
|
|
def func(self, foo):
|
|
try:
|
|
safe_func(foo.bar) # $ pt,tt=safe_func
|
|
except Exception as e:
|
|
raise e
|
|
|
|
self.f2() # $ pt,tt=Works3.f2
|