Merge pull request #1945 from github/henrymercer/authenticate-api-url

Authenticate when downloading CodeQL Bundle from GHES API
github · Oct 12, 2023 · 82ba90b · 82ba90b
2 parents 34f97d7 + 74442e0
commit 82ba90b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
 
 ## [UNRELEASED]
 
-No user facing changes.
+- Provide an authentication token when downloading the CodeQL Bundle from the API of a GitHub Enterprise Server instance. [#1945](https://github.com/github/codeql-action/pull/1945)
 
 ## 2.22.2 - 12 Oct 2023
 

diff --git a/lib/setup-codeql.js b/lib/setup-codeql.js
diff --git a/lib/setup-codeql.js.map b/lib/setup-codeql.js.map
diff --git a/src/setup-codeql.ts b/src/setup-codeql.ts
@@ -546,7 +546,10 @@ export async function downloadCodeQL(
   let authorization: string | undefined = undefined;
   if (searchParams.has("token")) {
     logger.debug("CodeQL tools URL contains an authorization token.");
-  } else if (codeqlURL.startsWith(`${apiDetails.url}/`)) {
+  } else if (
+    codeqlURL.startsWith(`${apiDetails.url}/`) ||
+    (apiDetails.apiURL && codeqlURL.startsWith(`${apiDetails.apiURL}/`))
+  ) {
     logger.debug("Providing an authorization token to download CodeQL tools.");
     authorization = `token ${apiDetails.auth}`;
   } else {