Ruby: Use asCallable() to generate epsilon edges

asgerf · asgerf · commit 194fe8544283 · 2023-07-13T11:53:16.000+02:00
diff --git a/ruby/ql/lib/codeql/ruby/ApiGraphs.qll b/ruby/ql/lib/codeql/ruby/ApiGraphs.qll
@@ -978,6 +978,12 @@ module API {
         pred = Impl::MkModuleInstanceUp(mod) and
         succ = getBackwardEndNode(mod.getOwnInstanceMethod("call"))
       )
+      or
+      // Step through callable wrappers like `proc` and `lambda` calls.
+      exists(DataFlow::Node node |
+        pred = getBackwardEndNode(node) and
+        succ = getBackwardStartNode(node.asCallable())
+      )
     }
 
     pragma[nomagic]
diff --git a/ruby/ql/test/library-tests/dataflow/api-graphs/VerifyApiGraphExpectations.expected b/ruby/ql/test/library-tests/dataflow/api-graphs/VerifyApiGraphExpectations.expected
@@ -1,5 +1,3 @@
 failures
 testFailures
-| explicit-proc.rb:2:7:2:78 | # $ reachableFromSource=Member[Foo].Method[bar].Argument[0].Parameter[0] | Missing result:reachableFromSource=Member[Foo].Method[bar].Argument[0].Parameter[0] |
-| explicit-proc.rb:6:7:6:78 | # $ reachableFromSource=Member[Foo].Method[bar].Argument[0].Parameter[0] | Missing result:reachableFromSource=Member[Foo].Method[bar].Argument[0].Parameter[0] |
 | explicit-proc.rb:10:7:10:78 | # $ reachableFromSource=Member[Foo].Method[bar].Argument[0].Parameter[0] | Missing result:reachableFromSource=Member[Foo].Method[bar].Argument[0].Parameter[0] |

Original file line number	Diff line number	Diff line change
`@@ -978,6 +978,12 @@ module API {`
`978`	`978`	`pred = Impl::MkModuleInstanceUp(mod) and`
`979`	`979`	`succ = getBackwardEndNode(mod.getOwnInstanceMethod("call"))`
`980`	`980`	`)`
	`981`	`+ or`
	`982`	+ // Step through callable wrappers like `proc` and `lambda` calls.
	`983`	`+ exists(DataFlow::Node node \|`
	`984`	`+ pred = getBackwardEndNode(node) and`
	`985`	`+ succ = getBackwardStartNode(node.asCallable())`
	`986`	`+ )`
`981`	`987`	`}`
`982`	`988`
`983`	`989`	`pragma[nomagic]`