From 39af4c7272a3570dfec34ba544de18218f1534f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Oct 2026 13:13:57 +0000 Subject: [PATCH 1/4] Bump vscode-languageclient from 8.1.0 to 11.0.0 in /extensions/ql-vscode Bumps [vscode-languageclient](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/client) from 8.1.0 to 11.0.0. - [Release notes](https://github.com/Microsoft/vscode-languageserver-node/releases) - [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/client/11.0.0/client) --- updated-dependencies: - dependency-name: vscode-languageclient dependency-version: 11.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- extensions/ql-vscode/package-lock.json | 89 +++++++++++++++++--------- extensions/ql-vscode/package.json | 2 +- 2 files changed, 59 insertions(+), 32 deletions(-) diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json index f3f416bb9fd..005a5c2ab36 100644 --- a/extensions/ql-vscode/package-lock.json +++ b/extensions/ql-vscode/package-lock.json @@ -39,7 +39,7 @@ "tree-kill": "^1.2.2", "vscode-extension-telemetry": "^0.1.6", "vscode-jsonrpc": "^8.2.1", - "vscode-languageclient": "^8.0.2", + "vscode-languageclient": "^11.0.0", "yauzl": "^3.4.0", "zip-a-folder": "^4.0.4" }, @@ -15738,7 +15738,8 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true }, "node_modules/bare-events": { "version": "2.8.2", @@ -32891,60 +32892,86 @@ } }, "node_modules/vscode-languageclient": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.1.0.tgz", - "integrity": "sha512-GL4QdbYUF/XxQlAsvYWZRV3V34kOkpRlvV60/72ghHfsYFnS/v2MANZ9P6sHmxFcZKOse8O+L9G7Czg0NUWing==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-11.0.0.tgz", + "integrity": "sha512-kVyeGLfyd1M74PbMNPfFkgRnhMYgnt6YGc5uXr/tNMzCpfZ0wFtfiqmqX1M05kkdNgV0HSozEUPvgggJbyIAYw==", + "license": "MIT", "dependencies": { - "minimatch": "^5.1.0", - "semver": "^7.3.7", - "vscode-languageserver-protocol": "3.17.3" + "minimatch": "^10.2.6", + "semver": "^7.8.1", + "vscode-languageserver-protocol": "3.18.5", + "vscode-languageserver-textdocument": "1.0.16" }, "engines": { - "vscode": "^1.67.0" + "vscode": "^1.91.0" + } + }, + "node_modules/vscode-languageclient/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" } }, "node_modules/vscode-languageclient/node_modules/brace-expansion": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.7.tgz", - "integrity": "sha512-uZbew1NqdmPDTMJ8ah1y+b+9QEJrfkXFk3RcTQw3X0jW/xRUvFKsg1CfQdSYGdTbXZWExtU3J3ccxtnfw1Fi0g==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz", + "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==", "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0" + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "20 || >=22" } }, "node_modules/vscode-languageclient/node_modules/minimatch": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", - "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", - "license": "ISC", + "version": "10.2.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", + "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==", + "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^5.0.8" }, "engines": { - "node": ">=10" + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/vscode-languageserver-protocol": { - "version": "3.17.3", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz", - "integrity": "sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA==", + "version": "3.18.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.18.5.tgz", + "integrity": "sha512-FW4fBMzZ99N8xeob4py0l050wgCoRgTpEq5Xcsb9lM1bc29UKGR/wSV+4knaqFxssFHajy7OzNiKP/m3U1ZEuA==", + "license": "MIT", "dependencies": { - "vscode-jsonrpc": "8.1.0", - "vscode-languageserver-types": "3.17.3" + "vscode-jsonrpc": "10.0.0", + "vscode-languageserver-types": "3.18.5" } }, "node_modules/vscode-languageserver-protocol/node_modules/vscode-jsonrpc": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz", - "integrity": "sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-10.0.0.tgz", + "integrity": "sha512-USSfxg0vDIpTQqlQBGxF3mBARyoS8cU7LHLpbYNh6dOJt32dlskxPWB0Irrh5TllTmyf7oNLAvqDqzklbwwnpA==", + "license": "MIT", "engines": { - "node": ">=14.0.0" + "node": ">=14.17.0" } }, + "node_modules/vscode-languageserver-textdocument": { + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.16.tgz", + "integrity": "sha512-qeNEuOi9a3qkqRf7Gfez2WL2VwlBTLCNekHBGO9kxPVUp9XuY15yfTJ9jwvOwKI0I2MhUUfZq95NSp+LK1CLQg==", + "license": "MIT" + }, "node_modules/vscode-languageserver-types": { - "version": "3.17.3", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz", - "integrity": "sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==" + "version": "3.18.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.18.5.tgz", + "integrity": "sha512-kPd6+JQNz3HMJvjKlqUxERSlZHAntl/aGpsk7ImwIh0ewDKDcjgAEyVSYciPiOJD3ftbK9IrfiqUeTZLSbCizw==", + "license": "MIT" }, "node_modules/w3c-xmlserializer": { "version": "5.0.0", diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index 608db3748b4..bfb5836a9b4 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -2097,7 +2097,7 @@ "tree-kill": "^1.2.2", "vscode-extension-telemetry": "^0.1.6", "vscode-jsonrpc": "^8.2.1", - "vscode-languageclient": "^8.0.2", + "vscode-languageclient": "^11.0.0", "yauzl": "^3.4.0", "zip-a-folder": "^4.0.4" }, From b637c715c07d2ea726fa50ce818c9fa05baec74b Mon Sep 17 00:00:00 2001 From: Chuan-kai Lin Date: Fri, 20 Nov 2026 06:55:16 -0800 Subject: [PATCH 2/4] Separate language-client and server logs Let vscode-languageclient 11 manage its native log channel while preserving raw language-server output in the existing channel. Document the new channel and the log level needed for tracing. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 0757eb7c-b8a7-4586-af2f-9fd2c88ffbc2 --- extensions/ql-vscode/CHANGELOG.md | 1 + extensions/ql-vscode/src/language-support/language-client.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index c4370e5d279..37bf3127a2a 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -2,6 +2,7 @@ ## [UNRELEASED] +- Language-client messages and protocol traces now appear in a separate "CodeQL Language Client" output channel. Set that channel's log level to Trace to enable protocol tracing. Raw language-server output remains in "CodeQL Language Server". - After an extension-managed CodeQL CLI update, the notification now offers to open the CLI release notes instead of the extension log. [#1095](https://github.com/github/vscode-codeql/issues/1095) - Remove support for CodeQL CLI versions older than 2.24.3. [#4573](https://github.com/github/vscode-codeql/pull/4573) - Add support to the model editor for saving and loading JSON data extensions. [#4576](https://github.com/github/vscode-codeql/pull/4576) diff --git a/extensions/ql-vscode/src/language-support/language-client.ts b/extensions/ql-vscode/src/language-support/language-client.ts index df060c21944..0faa4fbe557 100644 --- a/extensions/ql-vscode/src/language-support/language-client.ts +++ b/extensions/ql-vscode/src/language-support/language-client.ts @@ -37,8 +37,8 @@ export class CodeQLLanguageClient extends LanguageClient { synchronize: { configurationSection: "codeQL", }, - // Ensure that language server exceptions are logged to the same channel as its output. - outputChannel: languageServerLogger.outputChannel, + // Keep client logs separate from raw language-server output. + outputChannelName: "CodeQL Language Client", }, true, ); From 835c78a13af9f5cb0541fcd6288c25ed707b976c Mon Sep 17 00:00:00 2001 From: Chuan-kai Lin Date: Fri, 20 Nov 2026 07:13:33 -0800 Subject: [PATCH 3/4] Override language-client minimatch to 11.0.1 Scope the override to vscode-languageclient to address GHSA-g3hv-75wg-m249 without changing other minimatch consumers. Update the lockfile with the patched version and its dependency. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 0757eb7c-b8a7-4586-af2f-9fd2c88ffbc2 --- extensions/ql-vscode/package-lock.json | 15 +++++++++++---- extensions/ql-vscode/package.json | 3 +++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json index 005a5c2ab36..39d431287eb 100644 --- a/extensions/ql-vscode/package-lock.json +++ b/extensions/ql-vscode/package-lock.json @@ -7828,6 +7828,12 @@ "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, + "node_modules/@isaacs/nonrecursive-glob-match": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@isaacs/nonrecursive-glob-match/-/nonrecursive-glob-match-1.1.0.tgz", + "integrity": "sha512-GPm/Dbvk5RLmhRnxXIa7nTpK0xtl4E0wj0MslsuNiJ1FIROU+2+9lgUC/dgF7Ey4QCWhfEsgxilMRMCdHPfDfw==", + "license": "BlueOak-1.0.0" + }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -32928,12 +32934,13 @@ } }, "node_modules/vscode-languageclient/node_modules/minimatch": { - "version": "10.2.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", - "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-11.0.1.tgz", + "integrity": "sha512-t+Vn6DX4wPCxS23y03C0uhF7S1jpi1GfqPrnlEipCJaA2ykiNbMkVlDutZtmvLfRcUN6R8AYVlzTsQrT4RZoLQ==", "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^5.0.8" + "@isaacs/nonrecursive-glob-match": "^1.0.1", + "brace-expansion": "^5.0.12" }, "engines": { "node": "18 || 20 || >=22" diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index bfb5836a9b4..588670e6a31 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -2186,6 +2186,9 @@ "@azure/identity": "^4.13.1", "jest-runner-vscode": { "@vscode/test-electron": "^3.1.0" + }, + "vscode-languageclient": { + "minimatch": "11.0.1" } }, "lint-staged": { From 1e19fc06d48409a7d13bec265649039595bb3dc2 Mon Sep 17 00:00:00 2001 From: Chuan-kai Lin Date: Fri, 20 Nov 2026 08:31:23 -0800 Subject: [PATCH 4/4] Check lockfile registry URLs before committing Reject non-public registry URLs, credentials, and insecure schemes with a dependency-free Node script. Run the check after lockfile formatting in lint-staged and before installing dependencies in CI. Cover accepted and rejected URLs with focused tests. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 0757eb7c-b8a7-4586-af2f-9fd2c88ffbc2 --- .github/workflows/main.yml | 4 ++ extensions/ql-vscode/package.json | 7 +- .../ql-vscode/scripts/check-lockfile-urls.cjs | 51 ++++++++++++++ .../scripts/check-lockfile-urls.test.ts | 68 +++++++++++++++++++ 4 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 extensions/ql-vscode/scripts/check-lockfile-urls.cjs create mode 100644 extensions/ql-vscode/test/unit-tests/scripts/check-lockfile-urls.test.ts diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8e255363e2a..2d1c7bcdf9b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -75,6 +75,10 @@ jobs: cache: 'npm' cache-dependency-path: extensions/ql-vscode/package-lock.json + - name: Check lockfile URLs + working-directory: extensions/ql-vscode + run: npm run check:lockfile-urls + - name: Install dependencies working-directory: extensions/ql-vscode run: | diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index 588670e6a31..6feab3fa7a7 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -2063,6 +2063,7 @@ "generate": "npm-run-all -p generate:*", "generate:schemas": "vite-node scripts/generate-schemas.ts", "generate:chromium-version": "vite-node scripts/generate-chromium-version.ts", + "check:lockfile-urls": "node scripts/check-lockfile-urls.cjs", "check-types": "find . -type f -name \"tsconfig.json\" -not -path \"./node_modules/*\" -not -path \"*/.vscode-test/*\" | sed -r 's|/[^/]+$||' | sort | uniq | xargs -I {} sh -c \"echo Checking types in {} && cd {} && npx tsc --noEmit\"", "postinstall": "patch-package", "prepare": "cd ../.. && husky" @@ -2192,9 +2193,13 @@ } }, "lint-staged": { - "./**/*.{json,css,scss}": [ + "./**/!(package-lock).{json,css,scss}": [ "prettier --write" ], + "./**/package-lock.json": [ + "prettier --write", + "node scripts/check-lockfile-urls.cjs" + ], "./**/*.{ts,tsx}": [ "prettier --write", "eslint --fix" diff --git a/extensions/ql-vscode/scripts/check-lockfile-urls.cjs b/extensions/ql-vscode/scripts/check-lockfile-urls.cjs new file mode 100644 index 00000000000..71ce1f0b2e0 --- /dev/null +++ b/extensions/ql-vscode/scripts/check-lockfile-urls.cjs @@ -0,0 +1,51 @@ +const { readFileSync } = require("node:fs"); +const { resolve } = require("node:path"); + +const paths = process.argv.slice(2); +if (paths.length === 0) { + paths.push(resolve(__dirname, "../package-lock.json")); +} + +for (const path of paths) { + const lockfile = JSON.parse(readFileSync(path, "utf8")); + if ( + !lockfile.packages || + typeof lockfile.packages !== "object" || + Array.isArray(lockfile.packages) + ) { + throw new Error(`${path}: expected a lockfile with a packages object`); + } + + for (const [name, entry] of Object.entries(lockfile.packages)) { + if (!Object.hasOwn(entry, "resolved")) { + continue; + } + + let url; + try { + if (typeof entry.resolved !== "string") { + throw new TypeError("Expected a URL string"); + } + url = new URL(entry.resolved); + } catch (error) { + if (!(error instanceof TypeError)) { + throw error; + } + console.error(`${path}: ${name}: invalid resolved URL`); + process.exitCode = 1; + continue; + } + + if ( + url.protocol !== "https:" || + url.host !== "registry.npmjs.org" || + url.username || + url.password + ) { + console.error( + `${path}: ${name}: resolved URL must use https://registry.npmjs.org without credentials (received ${url.protocol}//${url.host})`, + ); + process.exitCode = 1; + } + } +} diff --git a/extensions/ql-vscode/test/unit-tests/scripts/check-lockfile-urls.test.ts b/extensions/ql-vscode/test/unit-tests/scripts/check-lockfile-urls.test.ts new file mode 100644 index 00000000000..d16d9b9b9fe --- /dev/null +++ b/extensions/ql-vscode/test/unit-tests/scripts/check-lockfile-urls.test.ts @@ -0,0 +1,68 @@ +import { spawnSync } from "child_process"; +import { writeFileSync } from "fs"; +import { resolve, join } from "path"; +import type { DirResult } from "tmp"; +import { dirSync } from "tmp-promise"; + +describe("lockfile URL check", () => { + let directory: DirResult; + const script = resolve(__dirname, "../../../scripts/check-lockfile-urls.cjs"); + + beforeEach(() => { + directory = dirSync({ unsafeCleanup: true }); + }); + + afterEach(() => { + directory.removeCallback(); + }); + + function check(packages: Record) { + const path = join(directory.name, "package-lock.json"); + writeFileSync(path, JSON.stringify({ lockfileVersion: 3, packages })); + return spawnSync(process.execPath, [script, path], { encoding: "utf8" }); + } + + it("accepts public registry URLs and entries without resolved URLs", () => { + const result = check({ + "": { name: "test" }, + "node_modules/example": { + resolved: "https://registry.npmjs.org/example/-/example-1.0.0.tgz", + }, + "node_modules/@scope/example": { + resolved: + "https://registry.npmjs.org/@scope/example/-/example-1.0.0.tgz", + }, + }); + + expect(result.status).toBe(0); + expect(result.stderr).toBe(""); + }); + + it.each([ + "https://pkgs.dev.azure.com/example/package.tgz", + "https://registry.npmjs.org.example.com/package.tgz", + "http://registry.npmjs.org/package.tgz", + "https://registry.npmjs.org:8443/package.tgz", + "file:../example", + "not-a-url", + null, + ])("rejects an invalid download location: %s", (resolved) => { + const result = check({ "node_modules/example": { resolved } }); + + expect(result.status).toBe(1); + expect(result.stderr).toContain("node_modules/example"); + }); + + it("rejects credentials without exposing them in diagnostics", () => { + const result = check({ + "node_modules/example": { + resolved: + "https://user:example-password@registry.npmjs.org/package.tgz", + }, + }); + + expect(result.status).toBe(1); + expect(result.stderr).toContain("without credentials"); + expect(result.stderr).not.toContain("example-password"); + }); +});