mirror of
https://github.com/github/codeql.git
synced 2026-05-27 17:41:24 +02:00
Option 2: eliminates the AST→CFG bridge from the AST layer. Previously
'AstNode.getAFlowNode()' returned a 'ControlFlowNode' from the legacy
'Flow.qll' CFG via 'py_flow_bb_node' — this hardcoded the AST to know
about the legacy CFG, preventing files from cleanly switching to the
new shared CFG.
Removes:
* 'AstNode.getAFlowNode()' from 'AstExtended.qll'
* Type-narrowing overrides on 'Attribute' / 'Subscript' / 'Call' /
'IfExp' / 'Name' / 'NameConstant' / 'ImportMember' (in Exprs.qll
and Import.qll)
Rewrites ~130 call sites across 'python/ql/lib/' and 'python/ql/src/'
to bridge from the CFG side instead:
Before: node = expr.getAFlowNode()
After: node.getNode() = expr
Before: expr.getAFlowNode().(DefinitionNode).getValue()
After: exists(DefinitionNode d | d.getNode() = expr | d.getValue())
Before: cn.operands(const.getAFlowNode(), op, x)
After: exists(ControlFlowNode c | c.getNode() = const | cn.operands(c, op, x))
This is semantically a no-op — both forms are duals of the same predicate.
Verified by passing all library tests:
* 64 dataflow tests
* 28 ControlFlow + dataflow-new-ssa tests
* 1 essa SSA-compute test
* 93 tests total in the focused suite
Once committed, files that want to switch from the legacy 'Flow' CFG
to the new 'Cfg' facade only need to change their imports — the
bridge sites are CFG-side and respect whichever ControlFlowNode is in
scope.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
188 lines
6.3 KiB
Plaintext
188 lines
6.3 KiB
Plaintext
/**
|
|
* Provides classes modeling security-relevant aspects of the `bottle` PyPI package.
|
|
* See https://bottlepy.org/docs/dev/.
|
|
*/
|
|
|
|
private import python
|
|
private import semmle.python.Concepts
|
|
private import semmle.python.ApiGraphs
|
|
private import semmle.python.dataflow.new.RemoteFlowSources
|
|
private import semmle.python.frameworks.internal.InstanceTaintStepsHelper
|
|
private import semmle.python.frameworks.Stdlib
|
|
|
|
/**
|
|
* INTERNAL: Do not use.
|
|
*
|
|
* Provides models for the `bottle` PyPI package.
|
|
* See https://bottlepy.org/docs/dev/.
|
|
*/
|
|
module Bottle {
|
|
/** Gets a reference to the `bottle` module. */
|
|
API::Node bottle() { result = API::moduleImport("bottle") }
|
|
|
|
/** Provides models for the `bottle` module. */
|
|
module BottleModule {
|
|
/**
|
|
* Provides models for Bottle applications.
|
|
*/
|
|
module App {
|
|
/** Gets a reference to a Bottle application (an instance of `bottle.Bottle`) */
|
|
API::Node app() { result = bottle().getMember(["Bottle", "app"]).getReturn() }
|
|
}
|
|
|
|
/** Provides models for functions that are possible "views" */
|
|
module View {
|
|
/**
|
|
* A Bottle view callable, that handles incoming requests.
|
|
*/
|
|
class ViewCallable extends Function {
|
|
ViewCallable() { this = any(BottleRouteSetup rs).getARequestHandler() }
|
|
}
|
|
|
|
/** Get methods that represent a route in Bottle */
|
|
string routeMethods() { result = ["route", "get", "post", "put", "delete", "patch"] }
|
|
|
|
private class BottleRouteSetup extends Http::Server::RouteSetup::Range, DataFlow::CallCfgNode {
|
|
BottleRouteSetup() {
|
|
this =
|
|
[
|
|
App::app().getMember(routeMethods()).getACall(),
|
|
bottle().getMember(routeMethods()).getACall()
|
|
]
|
|
}
|
|
|
|
override DataFlow::Node getUrlPatternArg() {
|
|
result in [this.getArg(0), this.getArgByName("route")]
|
|
}
|
|
|
|
override string getFramework() { result = "Bottle" }
|
|
|
|
override Parameter getARoutedParameter() { none() }
|
|
|
|
override Function getARequestHandler() { node.getNode() = result.getADecorator() }
|
|
}
|
|
}
|
|
|
|
/** Provides models for the `bottle.response` module */
|
|
module Response {
|
|
/** Gets a reference to the `bottle.response` module or instantiation of Bottle Response class. */
|
|
API::Node response() {
|
|
result = [bottle().getMember("response"), bottle().getMember("Response").getReturn()]
|
|
}
|
|
|
|
/** A response returned by a view callable. */
|
|
class BottleReturnResponse extends Http::Server::HttpResponse::Range {
|
|
BottleReturnResponse() {
|
|
this.asCfgNode() = any(View::ViewCallable vc).getAReturnValueFlowNode()
|
|
}
|
|
|
|
override DataFlow::Node getBody() { result = this }
|
|
|
|
override DataFlow::Node getMimetypeOrContentTypeArg() { none() }
|
|
|
|
override string getMimetypeDefault() { result = "text/html" }
|
|
}
|
|
|
|
/**
|
|
* A call to the `bottle.BaseResponse.set_header` or `bottle.BaseResponse.add_header` method.
|
|
*
|
|
* See https://bottlepy.org/docs/dev/api.html#bottle.BaseResponse.set_header
|
|
*/
|
|
class BottleResponseHandlerSetHeaderCall extends Http::Server::ResponseHeaderWrite::Range,
|
|
DataFlow::MethodCallNode
|
|
{
|
|
BottleResponseHandlerSetHeaderCall() {
|
|
this = response().getMember(["set_header", "add_header"]).getACall()
|
|
}
|
|
|
|
override DataFlow::Node getNameArg() {
|
|
result in [this.getArg(0), this.getArgByName("name")]
|
|
}
|
|
|
|
override DataFlow::Node getValueArg() {
|
|
result in [this.getArg(1), this.getArgByName("value")]
|
|
}
|
|
|
|
override predicate nameAllowsNewline() { none() }
|
|
|
|
override predicate valueAllowsNewline() { none() }
|
|
}
|
|
}
|
|
|
|
/** Provides models for the `bottle.request` module */
|
|
module Request {
|
|
/** Gets a reference to the `bottle.request` module. */
|
|
API::Node request() { result = bottle().getMember("request") }
|
|
|
|
private class Request extends RemoteFlowSource::Range {
|
|
Request() { this = request().asSource() }
|
|
|
|
override string getSourceType() { result = "bottle.request" }
|
|
}
|
|
|
|
/**
|
|
* Taint propagation for `bottle.request`.
|
|
*
|
|
* See https://bottlepy.org/docs/dev/api.html#bottle.request
|
|
*/
|
|
private class InstanceTaintSteps extends InstanceTaintStepsHelper {
|
|
InstanceTaintSteps() { this = "bottle.request" }
|
|
|
|
override DataFlow::Node getInstance() { result = request().getAValueReachableFromSource() }
|
|
|
|
override string getAttributeName() {
|
|
result in [
|
|
"headers", "query", "forms", "params", "json", "url", "body", "fullpath",
|
|
"query_string"
|
|
]
|
|
}
|
|
|
|
override string getMethodName() { none() }
|
|
|
|
override string getAsyncMethodName() { none() }
|
|
}
|
|
}
|
|
|
|
/** Provides models for the `bottle.headers` module */
|
|
module Headers {
|
|
/** Gets a reference to the `bottle.headers` module. */
|
|
API::Node headers() { result = bottle().getMember("response").getMember("headers") }
|
|
|
|
/** A dict-like write to a response header. */
|
|
class HeaderWriteSubscript extends Http::Server::ResponseHeaderWrite::Range, DataFlow::Node {
|
|
DataFlow::Node name;
|
|
DataFlow::Node value;
|
|
|
|
HeaderWriteSubscript() {
|
|
exists(SubscriptNode subscript |
|
|
this.asCfgNode() = subscript and
|
|
value.asCfgNode() = subscript.(DefinitionNode).getValue() and
|
|
name.asCfgNode() = subscript.getIndex() and
|
|
subscript.getObject() = headers().asSource().asCfgNode()
|
|
)
|
|
}
|
|
|
|
override DataFlow::Node getNameArg() { result = name }
|
|
|
|
override DataFlow::Node getValueArg() { result = value }
|
|
|
|
override predicate nameAllowsNewline() { none() }
|
|
|
|
override predicate valueAllowsNewline() { none() }
|
|
}
|
|
}
|
|
|
|
/** Provides models for functions that construct templates. */
|
|
module Templates {
|
|
/** A call to `bottle.template`or `bottle.SimpleTemplate`. */
|
|
private class BottleTemplateConstruction extends TemplateConstruction::Range, API::CallNode {
|
|
BottleTemplateConstruction() {
|
|
this = API::moduleImport("bottle").getMember(["template", "SimpleTemplate"]).getACall()
|
|
}
|
|
|
|
override DataFlow::Node getSourceArg() { result = this.getArg(0) }
|
|
}
|
|
}
|
|
}
|
|
}
|