Actions Query Fix: UntrustedCheckoutTOCTOU[High|Critical] ControlCheck model fix#22154
Open
knewbury01 wants to merge 1 commit into
Open
Actions Query Fix: UntrustedCheckoutTOCTOU[High|Critical] ControlCheck model fix#22154knewbury01 wants to merge 1 commit into
knewbury01 wants to merge 1 commit into
Conversation
knewbury01
changed the title
knewbury01
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the Actions TOCTOU (“untrusted checkout”) modeling so that deployment environment approvals (EnvironmentCheck / “environment protection rules”) no longer count as sufficient protection for TOCTOU-category findings, matching the documented limitation that an attacker can mutate the checked-out ref after the environment gate.
Changes:
- Tighten
EnvironmentCheck.protectsCategoryAndEventso it only applies tonon_toctou_category()(for both attacker and non-attacker event variants). - Update the
UntrustedCheckoutTOCTOUCriticaltest expected output to include newly-detected findings indeployment1.yml. - Minor formatting adjustment in
UntrustedCheckoutTOCTOUCritical.ql(no apparent semantic change).
Show a summary per file
| File | Description |
|---|---|
| actions/ql/lib/codeql/actions/security/ControlChecks.qll | Adjusts the EnvironmentCheck protection predicate to exclude TOCTOU categories. |
| actions/ql/src/Security/CWE-367/UntrustedCheckoutTOCTOUCritical.ql | Minor formatting change around the privileged-context clause. |
| actions/ql/test/query-tests/Security/CWE-367/UntrustedCheckoutTOCTOUCritical.expected | Updates expected results to reflect new detections (adds deployment1.yml edges). |
Review details
- Files reviewed: 3/3 changed files
- Comments generated: 0
- Review effort level: Low
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add UntrustedCheckoutTOCTOUHigh and UntrustedCheckoutTOCTOUCritical use of
ControlCheckmodel fixcurrently EnvironmentCheck has a doc that mentions that environment requirements are not sufficient to prevent mutation attacks bc mutation could still occur after the env check is satisfied. the modelling however still considered that check to suffice when it is an attacker condition , which is incorrect. that check should not suffice ever, for toctou category
the example of bad usage in the helpfile for these vuln types and also one of the testcases demonstrated the above, and were previously not detected. With this change, these cases are now detected.
Perhaps in this PR it would be good to review if any other check types have this issue