hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-20 10:46:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Python: Use CallableValue and improve tests

Browse Source
This commit is contained in:
Rasmus Lerchedahl Petersen
2020-06-17 19:12:10 +02:00
parent f24dc69e1d
commit ce57a28c8f
4 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
python/ql/src/experimental/dataflow/internal/DataFlowPrivate.qll
View File

@@ -71,18 +71,24 @@ predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo) {
//--------
/** Represents a callable */
class DataFlowCallable = FunctionObject; // TODO: consider CallableValue
class DataFlowCallable = CallableValue;
/** Represents a call to a callable */
class DataFlowCall extends CallNode {
DataFlowCallable callable;
DataFlowCall() {
this = callable.getACall()
}
/** Gets the enclosing callable of this call. */
abstract DataFlowCallable getEnclosingCallable();
DataFlowCallable getEnclosingCallable() { result = callable }
}
/** A data flow node that represents a call argument. */
class ArgumentNode extends Node {
ArgumentNode() {
exists( DataFlowCall call, int pos |
exists(DataFlowCall call, int pos |
this.asCfgNode() = call.getArg(pos)
)
}
@@ -96,14 +102,9 @@ class ArgumentNode extends Node {
final DataFlowCall getCall() { this.argumentOf(result, _) }
}
import semmle.python.pointsto.CallGraph
/** Gets a viable run-time target for the call `call`. */
DataFlowCallable viableCallable(DataFlowCall call) {
exists(FunctionInvocation i |
call = i.getCall() and
result = i.getFunction()
)
result = call.getEnclosingCallable()
}
private newtype TReturnKind = TNormalReturnKind()

6
python/ql/test/experimental/dataflow/allFlowsConfig.qll
View File

@@ -9,6 +9,12 @@ class AllFlowsConfig extends DataFlow::Configuration {
override predicate isSource(DataFlow::Node node) {
node.asCfgNode().isEntryNode()
or
node = DataFlow::TEssaNode(_) and
not exists(DataFlow::Node pred |
pred = DataFlow::TEssaNode(_) and
DataFlow::localFlowStep(pred, node)
)
}
override predicate isSink(DataFlow::Node node) {

1
python/ql/test/experimental/dataflow/local.expected
View File

@@ -2,5 +2,6 @@
| test.py:1:5:1:5 | ControlFlowNode for IntegerLiteral | test.py:1:1:1:1 | GSSA Variable a |
| test.py:2:5:2:5 | ControlFlowNode for a | test.py:2:1:2:1 | GSSA Variable b |
| test.py:4:1:4:9 | ControlFlowNode for FunctionExpr | test.py:4:5:4:5 | GSSA Variable f |
| test.py:4:7:4:7 | ControlFlowNode for x | test.py:4:7:4:7 | SSA variable x |
| test.py:5:7:5:11 | ControlFlowNode for BinaryExpr | test.py:5:3:5:3 | SSA variable y |
| test.py:8:5:8:8 | ControlFlowNode for f() | test.py:8:1:8:1 | GSSA Variable c |

10
python/ql/test/experimental/dataflow/sources.expected
View File

@@ -1,2 +1,12 @@
| test.py:0:0:0:0 | Entry node for Module test |
| test.py:0:0:0:0 | GSSA Variable __name__ |
| test.py:0:0:0:0 | GSSA Variable __package__ |
| test.py:0:0:0:0 | GSSA Variable c |
| test.py:0:0:0:0 | SSA variable $ |
| test.py:1:1:1:1 | GSSA Variable a |
| test.py:2:1:2:1 | GSSA Variable b |
| test.py:4:1:4:9 | Entry node for Function f |
| test.py:4:5:4:5 | GSSA Variable f |
| test.py:4:7:4:7 | SSA variable x |
| test.py:5:3:5:3 | SSA variable y |
| test.py:8:1:8:1 | GSSA Variable c |