mirror of
https://github.com/github/codeql.git
synced 2026-06-05 13:37:06 +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>
157 lines
5.6 KiB
Plaintext
157 lines
5.6 KiB
Plaintext
/**
|
|
* Provides classes modeling security-relevant aspects of the `MarkupSafe` PyPI package.
|
|
* See https://markupsafe.palletsprojects.com/en/2.0.x/.
|
|
*/
|
|
|
|
private import python
|
|
private import semmle.python.controlflow.internal.Cfg as Cfg
|
|
private import semmle.python.dataflow.new.DataFlow
|
|
private import semmle.python.dataflow.new.TaintTracking
|
|
private import semmle.python.Concepts
|
|
private import semmle.python.ApiGraphs
|
|
private import semmle.python.frameworks.internal.InstanceTaintStepsHelper
|
|
private import semmle.python.frameworks.data.ModelsAsData
|
|
|
|
/**
|
|
* INTERNAL: Do not use.
|
|
*
|
|
* Provides models for the `MarkupSafe` PyPI package.
|
|
* See https://markupsafe.palletsprojects.com/en/2.0.x/.
|
|
*/
|
|
module MarkupSafeModel {
|
|
/**
|
|
* Provides models for the `markupsafe.Markup` class
|
|
*
|
|
* See https://markupsafe.palletsprojects.com/en/2.0.x/escaping/#markupsafe.Markup.
|
|
*/
|
|
module Markup {
|
|
/** Gets a reference to the `markupsafe.Markup` class. */
|
|
API::Node classRef() {
|
|
result = API::moduleImport("markupsafe").getMember("Markup")
|
|
or
|
|
result = API::moduleImport("flask").getMember("Markup")
|
|
or
|
|
result = ModelOutput::getATypeNode("markupsafe.Markup~Subclass").getASubclass*()
|
|
}
|
|
|
|
/**
|
|
* A source of instances of `markupsafe.Markup`, extend this class to model new instances.
|
|
*
|
|
* This can include instantiations of the class, return values from function
|
|
* calls, or a special parameter that will be set when functions are called by an external
|
|
* library.
|
|
*
|
|
* Use the predicate `Markup::instance()` to get references to instances of `markupsafe.Markup`.
|
|
*/
|
|
abstract class InstanceSource extends DataFlow::LocalSourceNode { }
|
|
|
|
/** A direct instantiation of `markupsafe.Markup`. */
|
|
private class ClassInstantiation extends InstanceSource, DataFlow::CallCfgNode {
|
|
override Cfg::CallNode node;
|
|
|
|
ClassInstantiation() { this = classRef().getACall() }
|
|
}
|
|
|
|
/** Gets a reference to an instance of `markupsafe.Markup`. */
|
|
private DataFlow::TypeTrackingNode instance(DataFlow::TypeTracker t) {
|
|
t.start() and
|
|
result instanceof InstanceSource
|
|
or
|
|
exists(DataFlow::TypeTracker t2 | result = instance(t2).track(t2, t))
|
|
}
|
|
|
|
/** Gets a reference to an instance of `markupsafe.Markup`. */
|
|
DataFlow::Node instance() { instance(DataFlow::TypeTracker::end()).flowsTo(result) }
|
|
|
|
/** A string concatenation with a `markupsafe.Markup` involved. */
|
|
class StringConcat extends Markup::InstanceSource, DataFlow::CfgNode {
|
|
override Cfg::BinaryExprNode node;
|
|
|
|
StringConcat() {
|
|
node.getOp() instanceof Add and
|
|
instance().asCfgNode() in [node.getLeft(), node.getRight()]
|
|
}
|
|
}
|
|
|
|
/** A string format with `markupsafe.Markup` as the format string. */
|
|
class StringFormat extends Markup::InstanceSource, DataFlow::MethodCallNode {
|
|
StringFormat() { this.calls(instance(), "format") }
|
|
}
|
|
|
|
/** A %-style string format with `markupsafe.Markup` as the format string. */
|
|
class PercentStringFormat extends Markup::InstanceSource, DataFlow::CfgNode {
|
|
override Cfg::BinaryExprNode node;
|
|
|
|
PercentStringFormat() {
|
|
node.getOp() instanceof Mod and
|
|
instance().asCfgNode() = node.getLeft()
|
|
}
|
|
}
|
|
|
|
/** Taint propagation for `markupsafe.Markup`. */
|
|
private class AdditionalTaintStep extends TaintTracking::AdditionalTaintStep {
|
|
override predicate step(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
|
|
nodeTo.(ClassInstantiation).getArg(0) = nodeFrom
|
|
}
|
|
}
|
|
}
|
|
|
|
/** Any escaping performed via the `markupsafe` package. */
|
|
abstract private class MarkupSafeEscape extends Escaping::Range {
|
|
override string getKind() { result in [Escaping::getHtmlKind(), Escaping::getXmlKind()] }
|
|
}
|
|
|
|
/** A call to any of the escaping functions in `markupsafe` */
|
|
private class MarkupSafeEscapeCall extends Markup::InstanceSource, MarkupSafeEscape,
|
|
DataFlow::CallCfgNode
|
|
{
|
|
MarkupSafeEscapeCall() {
|
|
this = API::moduleImport("markupsafe").getMember(["escape", "escape_silent"]).getACall()
|
|
or
|
|
this = Markup::classRef().getMember("escape").getACall()
|
|
or
|
|
this = API::moduleImport("flask").getMember("escape").getACall()
|
|
}
|
|
|
|
override DataFlow::Node getAnInput() { result = this.getArg(0) }
|
|
|
|
override DataFlow::Node getOutput() { result = this }
|
|
}
|
|
|
|
/**
|
|
* An escape from string concatenation with a `markupsafe.Markup` involved.
|
|
*
|
|
* Only things that are not already a `markupsafe.Markup` instances will be escaped.
|
|
*/
|
|
private class MarkupEscapeFromStringConcat extends MarkupSafeEscape, Markup::StringConcat {
|
|
override DataFlow::Node getAnInput() {
|
|
result.asCfgNode() in [node.getLeft(), node.getRight()] and
|
|
not result = Markup::instance()
|
|
}
|
|
|
|
override DataFlow::Node getOutput() { result = this }
|
|
}
|
|
|
|
/** A escape from string format with `markupsafe.Markup` as the format string. */
|
|
private class MarkupEscapeFromStringFormat extends MarkupSafeEscape, Markup::StringFormat {
|
|
override DataFlow::Node getAnInput() {
|
|
result in [this.getArg(_), this.getArgByName(_)] and
|
|
not result = Markup::instance()
|
|
}
|
|
|
|
override DataFlow::Node getOutput() { result = this }
|
|
}
|
|
|
|
/** A escape from %-style string format with `markupsafe.Markup` as the format string. */
|
|
private class MarkupEscapeFromPercentStringFormat extends MarkupSafeEscape,
|
|
Markup::PercentStringFormat
|
|
{
|
|
override DataFlow::Node getAnInput() {
|
|
result.asCfgNode() = node.getRight() and
|
|
not result = Markup::instance()
|
|
}
|
|
|
|
override DataFlow::Node getOutput() { result = this }
|
|
}
|
|
}
|