hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 19:26:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Python: Small rearrangement

Browse Source
This commit is contained in:
Rasmus Lerchedahl Petersen
2020-08-19 17:56:02 +02:00
parent 676690acb2
commit 18e946d4aa
6 changed files with 23 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,24 @@ private import DataFlowPublic
//--------
// Nodes
//--------
/** A control flow node which is also a dataflow node */
abstract class DataFlowCfgNode extends ControlFlowNode { }
/** Literals contribute to dataflow */
class CfgLiteralNode extends DataFlowCfgNode {
CfgLiteralNode() { this.isLiteral() }
}
/** Variables contribute to dataflow */
class CfgNameNode extends DataFlowCfgNode {
CfgNameNode() { this instanceof NameNode }
}
/** Calls contribute to dataflow */
class CfgCallNode extends DataFlowCfgNode {
CfgCallNode() { this instanceof CallNode }
}
/**
* A node associated with an object after an operation that might have
* changed its state.

20
python/ql/src/experimental/dataflow/internal/DataFlowPublic.qll
View File

@@ -20,7 +20,7 @@ newtype TNode =
/** A node corresponding to an SSA variable. */
TEssaNode(EssaVariable var) or
/** A node corresponding to a control flow node. */
TCfgNode(ControlFlowNode node)
TCfgNode(DataFlowCfgNode node)
/**
* An element, viewed as a node in a data flow graph. Either an SSA variable
@@ -68,12 +68,12 @@ class EssaNode extends Node, TEssaNode {
override Location getLocation() { result = var.getDefinition().getLocation() }
}
abstract class CfgNode extends Node, TCfgNode {
ControlFlowNode node;
class CfgNode extends Node, TCfgNode {
DataFlowCfgNode node;
CfgNode() { this = TCfgNode(node) }
ControlFlowNode getNode() { result = node }
DataFlowCfgNode getNode() { result = node }
/** Gets a textual representation of this element. */
override string toString() { result = node.toString() }
@@ -83,10 +83,6 @@ abstract class CfgNode extends Node, TCfgNode {
override Location getLocation() { result = node.getLocation() }
}
class CfgLiteralNode extends CfgNode {
CfgLiteralNode() { node.isLiteral() }
}
/**
* An expression, viewed as a node in a data flow graph.
*
@@ -94,13 +90,7 @@ class CfgLiteralNode extends CfgNode {
* to multiple `ExprNode`s, just like it may correspond to multiple
* `ControlFlow::Node`s.
*/
class ExprNode extends CfgNode {
ExprNode() {
// node.isAttribute()
// or
node instanceof NameNode
}
}
class ExprNode extends CfgNode { }
/** Gets a node corresponding to expression `e`. */
ExprNode exprNode(DataFlowExpr e) { none() }

6
python/ql/test/experimental/dataflow/basic/local.expected
View File

@@ -1,9 +1,3 @@
| file://:0:0:0:0 | Data flow node | file://:0:0:0:0 | Data flow node |
| file://:0:0:0:0 | Data flow node | file://:0:0:0:0 | Data flow node |
| file://:0:0:0:0 | Data flow node | file://:0:0:0:0 | Data flow node |
| file://:0:0:0:0 | Data flow node | file://:0:0:0:0 | Data flow node |
| file://:0:0:0:0 | Data flow node | file://:0:0:0:0 | Data flow node |
| file://:0:0:0:0 | Data flow node | file://:0:0:0:0 | Data flow node |
| test.py:0:0:0:0 | GSSA Variable __name__ | 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 __package__ |
| test.py:0:0:0:0 | GSSA Variable b | test.py:0:0:0:0 | GSSA Variable b |

6
python/ql/test/experimental/dataflow/basic/sinks.expected
View File

@@ -1,9 +1,3 @@
| file://:0:0:0:0 | Data flow node |
| file://:0:0:0:0 | Data flow node |
| file://:0:0:0:0 | Data flow node |
| file://:0:0:0:0 | Data flow node |
| file://:0:0:0:0 | Data flow node |
| file://:0:0:0:0 | Data flow node |
| 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 b |

6
python/ql/test/experimental/dataflow/basic/sources.expected
View File

@@ -1,9 +1,3 @@
| file://:0:0:0:0 | Data flow node |
| file://:0:0:0:0 | Data flow node |
| file://:0:0:0:0 | Data flow node |
| file://:0:0:0:0 | Data flow node |
| file://:0:0:0:0 | Data flow node |
| file://:0:0:0:0 | Data flow node |
| 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 b |

116
python/ql/test/experimental/dataflow/consistency/dataflow-consistency.expected
View File

@@ -37,123 +37,7 @@ uniqueEnclosingCallable
| test.py:140:6:140:11 | ControlFlowNode for unsafe | Node should have one enclosing callable but has 0. |
uniqueType
uniqueNodeLocation
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
| file://:0:0:0:0 | Data flow node | Node should have one location but has 0. |
missingLocation
| Nodes without location: 115 |
uniqueNodeToString
missingToString
parameterCallable