Skip to content

Commit e067f42

Browse files
committed
Ruby: Implement mustFlow
1 parent 7a2da2d commit e067f42

File tree

2 files changed

+24
-13
lines changed

2 files changed

+24
-13
lines changed

ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1835,7 +1835,30 @@ private predicate mustHaveLambdaType(ExprNode n, Callable c) {
18351835
)
18361836
}
18371837

1838-
predicate localMustFlowStep(Node node1, Node node2) { none() }
1838+
predicate localMustFlowStep(Node node1, Node node2) {
1839+
LocalFlow::localFlowSsaParamInput(node1, node2)
1840+
or
1841+
exists(SsaImpl::Definition def |
1842+
def.(Ssa::WriteDefinition).assigns(node1.asExpr()) and
1843+
node2.(SsaDefinitionExtNode).getDefinitionExt() = def
1844+
or
1845+
def = node1.(SsaDefinitionExtNode).getDefinitionExt() and
1846+
node2.asExpr() = SsaImpl::getARead(def)
1847+
)
1848+
or
1849+
node1.asExpr() = node2.asExpr().(CfgNodes::ExprNodes::AssignExprCfgNode).getRhs()
1850+
or
1851+
node1.asExpr() = node2.asExpr().(CfgNodes::ExprNodes::BlockArgumentCfgNode).getValue()
1852+
or
1853+
node1 instanceof BlockParameterNode and
1854+
node2 = node1
1855+
or
1856+
node1 =
1857+
unique(FlowSummaryNode n1 |
1858+
FlowSummaryImpl::Private::Steps::summaryLocalStep(n1.getSummaryNode(),
1859+
node2.(FlowSummaryNode).getSummaryNode(), true)
1860+
)
1861+
}
18391862

18401863
/** Gets the type of `n` used for type pruning. */
18411864
DataFlowType getNodeType(Node n) {

ruby/ql/test/library-tests/dataflow/global/Flow.expected

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11
testFailures
2-
| callbacks.rb:18:25:18:25 | x | Unexpected result: hasValueFlow=1 |
3-
| callbacks.rb:29:37:29:37 | x | Unexpected result: hasValueFlow=2 |
42
edges
53
| blocks.rb:14:12:14:20 | call to source | blocks.rb:8:10:8:14 | yield ... |
64
| callbacks.rb:9:15:9:15 | x | callbacks.rb:10:12:10:12 | x |
75
| callbacks.rb:10:12:10:12 | x | callbacks.rb:17:15:17:15 | x |
8-
| callbacks.rb:10:12:10:12 | x | callbacks.rb:18:15:18:15 | x |
96
| callbacks.rb:13:20:13:20 | x | callbacks.rb:14:14:14:14 | x |
107
| callbacks.rb:14:14:14:14 | x | callbacks.rb:9:15:9:15 | x |
118
| callbacks.rb:17:15:17:15 | x | callbacks.rb:17:25:17:25 | x |
129
| callbacks.rb:17:31:17:38 | call to taint | callbacks.rb:13:20:13:20 | x |
13-
| callbacks.rb:18:15:18:15 | x | callbacks.rb:18:25:18:25 | x |
1410
| callbacks.rb:20:17:20:17 | x | callbacks.rb:21:11:21:11 | x |
1511
| callbacks.rb:21:11:21:11 | x | callbacks.rb:28:31:28:31 | x |
16-
| callbacks.rb:21:11:21:11 | x | callbacks.rb:29:29:29:29 | x |
1712
| callbacks.rb:24:23:24:23 | x | callbacks.rb:25:17:25:17 | x |
1813
| callbacks.rb:25:17:25:17 | x | callbacks.rb:20:17:20:17 | x |
1914
| callbacks.rb:28:18:28:25 | call to taint | callbacks.rb:24:23:24:23 | x |
2015
| callbacks.rb:28:31:28:31 | x | callbacks.rb:28:39:28:39 | x |
21-
| callbacks.rb:29:29:29:29 | x | callbacks.rb:29:37:29:37 | x |
2216
| captured_variables.rb:9:24:9:24 | x | captured_variables.rb:10:10:10:23 | -> { ... } [captured x] |
2317
| captured_variables.rb:9:24:9:24 | x | captured_variables.rb:11:5:11:6 | fn [captured x] |
2418
| captured_variables.rb:10:5:10:6 | fn [captured x] | captured_variables.rb:11:5:11:6 | fn [captured x] |
@@ -281,17 +275,13 @@ nodes
281275
| callbacks.rb:17:15:17:15 | x | semmle.label | x |
282276
| callbacks.rb:17:25:17:25 | x | semmle.label | x |
283277
| callbacks.rb:17:31:17:38 | call to taint | semmle.label | call to taint |
284-
| callbacks.rb:18:15:18:15 | x | semmle.label | x |
285-
| callbacks.rb:18:25:18:25 | x | semmle.label | x |
286278
| callbacks.rb:20:17:20:17 | x | semmle.label | x |
287279
| callbacks.rb:21:11:21:11 | x | semmle.label | x |
288280
| callbacks.rb:24:23:24:23 | x | semmle.label | x |
289281
| callbacks.rb:25:17:25:17 | x | semmle.label | x |
290282
| callbacks.rb:28:18:28:25 | call to taint | semmle.label | call to taint |
291283
| callbacks.rb:28:31:28:31 | x | semmle.label | x |
292284
| callbacks.rb:28:39:28:39 | x | semmle.label | x |
293-
| callbacks.rb:29:29:29:29 | x | semmle.label | x |
294-
| callbacks.rb:29:37:29:37 | x | semmle.label | x |
295285
| captured_variables.rb:9:24:9:24 | x | semmle.label | x |
296286
| captured_variables.rb:10:5:10:6 | fn [captured x] | semmle.label | fn [captured x] |
297287
| captured_variables.rb:10:10:10:23 | -> { ... } [captured x] | semmle.label | -> { ... } [captured x] |
@@ -589,9 +579,7 @@ subpaths
589579
#select
590580
| blocks.rb:8:10:8:14 | yield ... | blocks.rb:14:12:14:20 | call to source | blocks.rb:8:10:8:14 | yield ... | $@ | blocks.rb:14:12:14:20 | call to source | call to source |
591581
| callbacks.rb:17:25:17:25 | x | callbacks.rb:17:31:17:38 | call to taint | callbacks.rb:17:25:17:25 | x | $@ | callbacks.rb:17:31:17:38 | call to taint | call to taint |
592-
| callbacks.rb:18:25:18:25 | x | callbacks.rb:17:31:17:38 | call to taint | callbacks.rb:18:25:18:25 | x | $@ | callbacks.rb:17:31:17:38 | call to taint | call to taint |
593582
| callbacks.rb:28:39:28:39 | x | callbacks.rb:28:18:28:25 | call to taint | callbacks.rb:28:39:28:39 | x | $@ | callbacks.rb:28:18:28:25 | call to taint | call to taint |
594-
| callbacks.rb:29:37:29:37 | x | callbacks.rb:28:18:28:25 | call to taint | callbacks.rb:29:37:29:37 | x | $@ | callbacks.rb:28:18:28:25 | call to taint | call to taint |
595583
| captured_variables.rb:10:20:10:20 | x | captured_variables.rb:13:20:13:29 | call to taint | captured_variables.rb:10:20:10:20 | x | $@ | captured_variables.rb:13:20:13:29 | call to taint | call to taint |
596584
| captured_variables.rb:17:14:17:14 | x | captured_variables.rb:20:25:20:34 | call to taint | captured_variables.rb:17:14:17:14 | x | $@ | captured_variables.rb:20:25:20:34 | call to taint | call to taint |
597585
| captured_variables.rb:24:14:24:14 | x | captured_variables.rb:27:48:27:57 | call to taint | captured_variables.rb:24:14:24:14 | x | $@ | captured_variables.rb:27:48:27:57 | call to taint | call to taint |

0 commit comments

Comments
 (0)