Python: Update query and expectation

This commit is contained in:
Rasmus Lerchedahl Petersen
2020-11-04 15:17:38 +01:00
parent 9baa7b73da
commit 6df3b8d524
2 changed files with 9 additions and 22 deletions

View File

@@ -1,13 +0,0 @@
| test.py:9:1:9:13 | ControlFlowNode for FunctionExpr | test.py:16:9:16:14 | ControlFlowNode for source |
| test.py:9:1:9:13 | ControlFlowNode for FunctionExpr | test.py:24:9:24:14 | ControlFlowNode for source |
| test.py:9:1:9:13 | ControlFlowNode for FunctionExpr | test.py:44:12:44:17 | ControlFlowNode for source |
| test.py:12:1:12:14 | ControlFlowNode for FunctionExpr | test.py:21:5:21:8 | ControlFlowNode for sink |
| test.py:12:1:12:14 | ControlFlowNode for FunctionExpr | test.py:25:5:25:8 | ControlFlowNode for sink |
| test.py:12:1:12:14 | ControlFlowNode for FunctionExpr | test.py:47:5:47:8 | ControlFlowNode for sink |
| test.py:12:1:12:14 | ControlFlowNode for FunctionExpr | test.py:51:9:51:12 | ControlFlowNode for sink |
| test.py:43:1:43:17 | ControlFlowNode for FunctionExpr | test.py:54:9:54:15 | ControlFlowNode for source2 |
| test.py:46:1:46:15 | ControlFlowNode for FunctionExpr | test.py:55:5:55:9 | ControlFlowNode for sink2 |
| test.py:49:1:49:21 | ControlFlowNode for FunctionExpr | test.py:63:5:63:9 | ControlFlowNode for sink3 |
| test.py:49:1:49:21 | ControlFlowNode for FunctionExpr | test.py:70:5:70:9 | ControlFlowNode for sink3 |
| test.py:72:1:72:13 | ControlFlowNode for FunctionExpr | test.py:77:9:77:11 | ControlFlowNode for hub |
| test.py:72:1:72:13 | ControlFlowNode for FunctionExpr | test.py:82:9:82:11 | ControlFlowNode for hub |

View File

@@ -1,27 +1,27 @@
private import python
import experimental.dataflow.DataFlow
import semmle.python.dataflow.new.DataFlow
predicate pointsToOrigin(DataFlow::DataFlowCfgNode pointer, DataFlow::DataFlowCfgNode origin) {
origin = pointer.pointsTo().getOrigin()
predicate pointsToOrigin(DataFlow::CfgNode pointer, DataFlow::CfgNode origin) {
origin.getNode() = pointer.getNode().pointsTo().getOrigin()
}
class PointsToConfiguration extends DataFlow::Configuration {
PointsToConfiguration() { this = "PointsToConfiguration" }
override predicate isSource(DataFlow::Node node) { pointsToOrigin(_, node.asCfgNode()) }
override predicate isSource(DataFlow::Node node) { pointsToOrigin(_, node) }
override predicate isSink(DataFlow::Node node) { pointsToOrigin(node.asCfgNode(), _) }
override predicate isSink(DataFlow::Node node) { pointsToOrigin(node, _) }
}
predicate hasFlow(ControlFlowNode origin, ControlFlowNode pointer) {
predicate hasFlow(DataFlow::Node origin, DataFlow::Node pointer) {
exists(PointsToConfiguration config, DataFlow::PathNode source, DataFlow::PathNode sink |
source.getNode().asCfgNode() = origin and
sink.getNode().asCfgNode() = pointer and
source.getNode() = origin and
sink.getNode() = pointer and
config.hasFlowPath(source, sink)
)
}
from DataFlow::DataFlowCfgNode pointer, DataFlow::DataFlowCfgNode origin
from DataFlow::Node pointer, DataFlow::Node origin
where
pointsToOrigin(pointer, origin) and
not hasFlow(origin, pointer)