diff --git a/actions/ql/lib/codeql/actions/security/ControlChecks.qll b/actions/ql/lib/codeql/actions/security/ControlChecks.qll index 244c04310d6d..3bb69b65f42c 100644 --- a/actions/ql/lib/codeql/actions/security/ControlChecks.qll +++ b/actions/ql/lib/codeql/actions/security/ControlChecks.qll @@ -37,8 +37,7 @@ string actor_not_attacker_event() { // actor and attacker can be different // actor may be a collaborator, but the attacker is may be the author of the PR that gets commented // therefore it may be vulnerable to TOCTOU races where the actor reviews one thing and the attacker changes it - "issue_comment", - "pull_request_comment", + "pull_request_comment", "issue_comment" ] } diff --git a/actions/ql/lib/codeql/actions/security/UntrustedCheckoutQuery.qll b/actions/ql/lib/codeql/actions/security/UntrustedCheckoutQuery.qll index 9668fce2ae00..605008c2402d 100644 --- a/actions/ql/lib/codeql/actions/security/UntrustedCheckoutQuery.qll +++ b/actions/ql/lib/codeql/actions/security/UntrustedCheckoutQuery.qll @@ -3,7 +3,11 @@ private import codeql.actions.DataFlow private import codeql.actions.dataflow.FlowSources private import codeql.actions.TaintTracking -string checkoutTriggers() { +string checkoutTriggers() { result = ["pull_request_target", "workflow_run", "workflow_call"] } + +string issueCommentTriggers() { result = ["issue_comment"] } + +string allCheckoutTriggers() { result = ["pull_request_target", "workflow_run", "workflow_call", "issue_comment"] } @@ -76,8 +80,7 @@ module ActionsMutableRefCheckoutFlow = TaintTracking::Global