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

Ruby: Clean up

Browse Source
This commit is contained in:
Harry Maclean
2023-02-14 16:54:55 +13:00
parent 7a01c4a974
commit 2bc7d4e1ee
1 changed files with 26 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
ruby/ql/lib/codeql/ruby/frameworks/actioncontroller/Filters.qll
View File

@@ -397,8 +397,7 @@ module Filters {
/**
* Holds if `n` is a post-update node for `self` in method `m`.
*/
predicate selfPostUpdate(DataFlow::PostUpdateNode n, Method m) {
n.getPreUpdateNode().asExpr() instanceof SelfVariableAccessCfgNode and
private predicate selfPostUpdate(DataFlow::PostUpdateNode n, Method m) {
m = n.getPreUpdateNode().asExpr().getExpr().getEnclosingCallable() and
n.getPreUpdateNode()
.asExpr()
@@ -408,24 +407,6 @@ module Filters {
.getDeclaringScope() = m
}
/**
* Holds if `n` is the syntactically last dataflow node in `m` that satisfies `selfPostUpdate`.
* In the example below, `n` is the post-update node for `bar`.
* ```rb
* def m
* foo
* bar
* end
* ```
*/
predicate lastSelfPostUpdate(DataFlow::PostUpdateNode n, Method m) {
selfPostUpdate(n, m) and
not exists(DataFlow::PostUpdateNode n2 |
selfPostUpdate(n2, m) and
n.getPreUpdateNode().asExpr().getASuccessor+() = n2.getPreUpdateNode().asExpr()
)
}
/**
* Holds if `n` is the self parameter of method `m`.
*/
@@ -444,34 +425,31 @@ module Filters {
* part of the callback chain.
*/
override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
exists(Method predMethod, Method succMethod |
next(predMethod, succMethod) and
(
// Flow from a post-update node of self in `pred` to the self parameter of `succ`
//
// def a
// foo() ---------+
// @x = 1 ---+ |
// end | |
// | |
// def b <----+----+
// ...
//
selfPostUpdate(pred, predMethod) and
selfParameter(succ, succMethod)
or
// Flow from the self parameter of `pred` to the self parameter of `succ`
//
// def a ---+
// ... |
// end |
// |
// def b <-+
// ...
//
selfParameter(pred, predMethod) and
selfParameter(succ, succMethod)
)
exists(Method predMethod, Method succMethod | next(predMethod, succMethod) |
// Flow from a post-update node of self in `pred` to the self parameter of `succ`
//
// def a
// foo() ---------+
// @x = 1 ---+ |
// end | |
// | |
// def b <----+----+
// ...
//
selfPostUpdate(pred, predMethod) and
selfParameter(succ, succMethod)
or
// Flow from the self parameter of `pred` to the self parameter of `succ`
//
// def a ---+
// ... |
// end |
// |
// def b <-+
// ...
//
selfParameter(pred, predMethod) and
selfParameter(succ, succMethod)
)
}
}