Skip to content

Commit 6a2d7be

Browse files
committed
Merge branch 'main' of https://github.com/github/codeql into fix/actions-cache-poisoning-cache-write-access
2 parents d8b3f3a + 2f2b4c8 commit 6a2d7be

16 files changed

Lines changed: 200 additions & 341 deletions

File tree

‎MODULE.bazel‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,10 +326,11 @@ ripunzip_archive = use_repo_rule("//misc/ripunzip:ripunzip.bzl", "ripunzip_archi
326326
# go to https://github.com/GoogleChrome/ripunzip/releases to find latest version and corresponding sha256s
327327
ripunzip_archive(
328328
name = "ripunzip",
329-
sha256_linux = "71482d7a7e4ea9176d5596161c49250c34b136b157c45f632b1111323fbfc0de",
330-
sha256_macos_arm = "604194ab13f0aba3972995d995f11002b8fc285c8170401fcd46655065df20c9",
331-
sha256_macos_intel = "65367b94fd579d93d46f2d2595cc4c9a60cfcf497e3c824f9d1a7b80fa8bd38a",
332-
sha256_windows = "ac3874075def2b9e5074a3b5945005ab082cc6e689e1de658da8965bc23e643e",
329+
sha256_linux_arm64 = "a282740ef376ff8dc0de3c589b7457598db15cc045b7daa688f15531612e0bbe",
330+
sha256_linux_x64 = "71482d7a7e4ea9176d5596161c49250c34b136b157c45f632b1111323fbfc0de",
331+
sha256_macos_arm64 = "604194ab13f0aba3972995d995f11002b8fc285c8170401fcd46655065df20c9",
332+
sha256_macos_x64 = "65367b94fd579d93d46f2d2595cc4c9a60cfcf497e3c824f9d1a7b80fa8bd38a",
333+
sha256_windows_x64 = "ac3874075def2b9e5074a3b5945005ab082cc6e689e1de658da8965bc23e643e",
333334
version = "2.0.4",
334335
)
335336

‎actions/ql/integration-tests/query-suite/not_included_in_qls.expected‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ ql/actions/ql/src/experimental/Security/CWE-078/CommandInjectionMedium.ql
1111
ql/actions/ql/src/experimental/Security/CWE-088/ArgumentInjectionCritical.ql
1212
ql/actions/ql/src/experimental/Security/CWE-088/ArgumentInjectionMedium.ql
1313
ql/actions/ql/src/experimental/Security/CWE-200/SecretExfiltration.ql
14-
ql/actions/ql/src/experimental/Security/CWE-284/CodeExecutionOnSelfHostedRunner.ql
1514
ql/actions/ql/src/experimental/Security/CWE-829/ArtifactPoisoningPathTraversal.ql
1615
ql/actions/ql/src/experimental/Security/CWE-829/UnversionedImmutableAction.ql
1716
ql/actions/ql/src/experimental/Security/CWE-918/RequestForgery.ql
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: deprecated
3+
---
4+
* The `codeql.actions.security.SelfHostedQuery` module has been deprecated because runner labels do not reliably distinguish self-hosted runners from managed runners.

‎actions/ql/lib/codeql/actions/security/SelfHostedQuery.qll‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* DEPRECATED: Runner labels do not reliably distinguish self-hosted runners from managed runners.
3+
*/
4+
deprecated module;
5+
16
import actions
27

38
bindingset[runner]

‎actions/ql/src/Security/CWE-349/CachePoisoningViaCodeInjection.ql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @name Cache Poisoning via low-privileged code injection
2+
* @name Cache Poisoning via code injection
33
* @description The cache can be poisoned by untrusted code, leading to a cache poisoning attack.
44
* @kind path-problem
55
* @problem.severity error
@@ -28,5 +28,5 @@ where
2828
check.protects(source.getNode().asExpr(), event, "code-injection")
2929
)
3030
select sink.getNode(), source, sink,
31-
"Unprivileged code injection in $@, which may lead to cache poisoning ($@).", sink,
31+
"Code injection in $@ may allow poisoning the default-branch cache (event trigger: $@).", sink,
3232
sink.getNode().asExpr().(Expression).getRawExpression(), event, event.getName()
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: queryMetadata
3+
---
4+
* The name and alert message of the `actions/cache-poisoning/code-injection` query have been reworded for clarity.

‎actions/ql/src/experimental/Security/CWE-284/CodeExecutionOnSelfHostedRunner.ql‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎actions/ql/test/query-tests/Security/CWE-284/.github/workflows/test1.yml‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎actions/ql/test/query-tests/Security/CWE-284/.github/workflows/test2.yml‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎actions/ql/test/query-tests/Security/CWE-284/.github/workflows/test3.yml‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)