From 40a131a06da5088ad1d41a748ac2ab700ec1ad36 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 11 Mar 2025 17:00:02 +0000 Subject: [PATCH 1/2] Always require credentials when using command to download databases from github --- extensions/ql-vscode/CHANGELOG.md | 2 ++ extensions/ql-vscode/src/databases/database-fetcher.ts | 10 +--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index 25e4b778868..34220541f62 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -2,6 +2,8 @@ ## [UNRELEASED] +- Always authenticate when downloading databases from github, instead of only when in canary mode. [#3941](https://github.com/github/vscode-codeql/pull/3941) + ## 1.17.1 - 23 January 2025 - Remove support for CodeQL CLI versions older than 2.18.4. [#3895](https://github.com/github/vscode-codeql/pull/3895) diff --git a/extensions/ql-vscode/src/databases/database-fetcher.ts b/extensions/ql-vscode/src/databases/database-fetcher.ts index 0934bab6b70..d474f2d63e0 100644 --- a/extensions/ql-vscode/src/databases/database-fetcher.ts +++ b/extensions/ql-vscode/src/databases/database-fetcher.ts @@ -28,11 +28,8 @@ import { allowHttp, downloadTimeout, getGitHubInstanceUrl, - hasGhecDrUri, - isCanary, } from "../config"; import { showAndLogInformationMessage } from "../common/logging"; -import { AppOctokit } from "../common/octokit"; import type { DatabaseOrigin } from "./local-databases/database-origin"; import { createTimeoutSignal } from "../common/fetch-stream"; import type { App } from "../common/app"; @@ -187,12 +184,7 @@ export class DatabaseFetcher { throw new Error(`Invalid GitHub repository: ${githubRepo}`); } - const credentials = - isCanary() || hasGhecDrUri() ? this.app.credentials : undefined; - - const octokit = credentials - ? await credentials.getOctokit() - : new AppOctokit(); + const octokit = await this.app.credentials.getOctokit(); const result = await convertGithubNwoToDatabaseUrl( nwo, From f53c84642a900d258a370abaf880d68f26ec607c Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 12 Mar 2025 16:50:27 +0000 Subject: [PATCH 2/2] Update extensions/ql-vscode/CHANGELOG.md Co-authored-by: Koen Vlaswinkel --- extensions/ql-vscode/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index 34220541f62..1b0dd387ead 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -2,7 +2,7 @@ ## [UNRELEASED] -- Always authenticate when downloading databases from github, instead of only when in canary mode. [#3941](https://github.com/github/vscode-codeql/pull/3941) +- Always authenticate when downloading databases from GitHub, instead of only when in canary mode. [#3941](https://github.com/github/vscode-codeql/pull/3941) ## 1.17.1 - 23 January 2025