Skip to content

Ruby: remove some unneeded code from ConditionalBypass #18569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Ruby: remove some unneeded code from ConditionalBypass #18569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6fb0fe
Ruby: remove an unused sink
asgerf Jan 23, 2025
9d600d4
Ruby: remove another unused class
asgerf Jan 23, 2025
3c41835
Merge branch 'main' into rb/conditional-bypass-sink
asgerf Jan 28, 2025
96b90b8
Ruby: accept test output
asgerf Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions ruby/ql/src/experimental/cwe-807/ConditionalBypass.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,40 +28,6 @@ predicate flowsToGuardExpr(DataFlow::Node nd, SensitiveActionGuardConditional gu
exists(DataFlow::Node succ | localFlowStep(nd, succ) | flowsToGuardExpr(succ, guard))
}

/**
* A comparison that guards a sensitive action, e.g. the comparison in:
* ```rb
* ok = x == y
* if ok
* login
* end
* ```
*/
class SensitiveActionGuardComparison extends ComparisonOperation {
SensitiveActionGuardConditional guard;

SensitiveActionGuardComparison() {
exists(DataFlow::Node node | this = node.asExpr().getExpr() | flowsToGuardExpr(node, guard))
}

/**
* Gets the guard that uses this comparison.
*/
SensitiveActionGuardConditional getGuard() { result = guard }
}

/**
* An intermediary sink to enable reuse of the taint configuration.
* This sink should not be presented to the client of this query.
*/
class SensitiveActionGuardComparisonOperand extends Sink {
SensitiveActionGuardComparison comparison;

SensitiveActionGuardComparisonOperand() { this.asExpr().getExpr() = comparison.getAnOperand() }

override SensitiveAction getAction() { result = comparison.getGuard().getAction() }
}

/**
* Holds if `sink` guards `action`, and `source` taints `sink`.
*
Expand All @@ -73,8 +39,6 @@ predicate isTaintedGuardForSensitiveAction(
SensitiveAction action
) {
action = sink.getNode().(Sink).getAction() and
// exclude the intermediary sink
not sink.getNode() instanceof SensitiveActionGuardComparisonOperand and
ConditionalBypassFlow::flowPath(source, sink)
}

Expand Down
2 changes: 0 additions & 2 deletions ruby/ql/test/query-tests/security/cwe-807-user-controlled-bypass/ConditionalBypass.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ edges
| ConditionalBypass.rb:14:14:14:19 | call to params | ConditionalBypass.rb:14:14:14:27 | ...[...] | provenance | |
| ConditionalBypass.rb:25:5:25:5 | p | ConditionalBypass.rb:27:8:27:8 | p | provenance | |
| ConditionalBypass.rb:25:10:25:15 | call to params | ConditionalBypass.rb:25:10:25:22 | ...[...] | provenance | |
| ConditionalBypass.rb:25:10:25:15 | call to params | ConditionalBypass.rb:25:10:25:22 | ...[...] | provenance | |
| ConditionalBypass.rb:25:10:25:22 | ...[...] | ConditionalBypass.rb:25:5:25:5 | p | provenance | |
nodes
| ConditionalBypass.rb:3:5:3:9 | check | semmle.label | check |
Expand All @@ -17,7 +16,6 @@ nodes
| ConditionalBypass.rb:25:5:25:5 | p | semmle.label | p |
| ConditionalBypass.rb:25:10:25:15 | call to params | semmle.label | call to params |
| ConditionalBypass.rb:25:10:25:22 | ...[...] | semmle.label | ...[...] |
| ConditionalBypass.rb:25:10:25:22 | ...[...] | semmle.label | ...[...] |
| ConditionalBypass.rb:27:8:27:8 | p | semmle.label | p |
subpaths
#select
Expand Down
Loading