Skip to content

fix: backport 4 CVE fixes from main to 7.121.x #802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sbouchet wants to merge 1 commit into from
Closed

fix: backport 4 CVE fixes from main to 7.121.x #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions code/build/agent-sdk/agents/claude/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions code/build/agent-sdk/agents/claude/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@
"comment": "Pinned dependency set for the build/agent-sdk claude tarball. The package-lock.json alongside is the source of truth for transitive deps — produce.ts runs `npm ci` against this directory to get byte-deterministic output across pipeline runs.",
"dependencies": {
"@anthropic-ai/claude-agent-sdk": "0.3.198"
},
"overrides": {
"ip-address": "^10.5.0"
}
}
8 changes: 4 additions & 4 deletions code/build/gulpfile.cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
*--------------------------------------------------------------------------------------------*/

import es from 'event-stream';
import { gulp } from './lib/gulp/facade.ts';
import decompress from 'gulp-decompress';
import { gulp, gunzip } from './lib/gulp/facade.ts';
import * as path from 'path';
import fancyLog from 'fancy-log';
import ansiColors from 'ansi-colors';
Expand All @@ -14,7 +13,7 @@ import { tmpdir } from 'os';
import { existsSync, mkdirSync, rmSync } from 'fs';
import * as task from './lib/gulp/task.ts';
import watcher from './lib/watch/index.ts';
import { debounce } from './lib/util.ts';
import { debounce, untar } from './lib/util.ts';
import { createReporter } from './lib/reporter.ts';

const root = 'cli';
Expand Down Expand Up @@ -86,7 +85,8 @@ const acquireBuiltOpenSSL = (callback: (err?: unknown) => void) => {
);

gulp.src('*.tgz', { cwd: dir })
.pipe(decompress())
.pipe(gunzip())
.pipe(untar())
.pipe(gulp.dest(`${root}/openssl`))
.on('error', callback)
.on('end', () => {
Expand Down
8 changes: 4 additions & 4 deletions code/build/gulpfile.reh.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { gulp, rename, replace, filter, jsonEditor } from './lib/gulp/facade.ts';
import decompress from 'gulp-decompress';
import { gulp, rename, replace, filter, flatmap, gunzip, jsonEditor } from './lib/gulp/facade.ts';
import * as path from 'path';
import es from 'event-stream';
import * as util from './lib/util.ts';
Expand All @@ -18,6 +17,7 @@ import { getProductionDependencies } from './lib/dependencies.ts';
import { readISODate } from './lib/date.ts';
import vfs from 'vinyl-fs';
import packageJson from '../package.json' with { type: 'json' };
import { untar } from './lib/util.ts';
import File from 'vinyl';
import * as fs from 'fs';
import glob from 'glob';
Expand Down Expand Up @@ -319,7 +319,7 @@ function nodejs(platform: string, arch: string): NodeJS.ReadWriteStream | undefi
const downloaded = (nodejsArtifactFeed ?
fetchNodejs(expectedName!, checksumSha256) :
fetchUrls(`/dist/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`, { base: 'https://nodejs.org', checksumSha256 })
).pipe(decompress())
).pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar())))
.pipe(filter('**/node'))
.pipe(util.setExecutableBit('**'))
.pipe(rename('node'));
Expand All @@ -328,7 +328,7 @@ function nodejs(platform: string, arch: string): NodeJS.ReadWriteStream | undefi
case 'alpine':
return nodejsArtifactFeed ?
fetchNodejs(expectedName!, checksumSha256)
.pipe(decompress())
.pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar())))
.pipe(filter('**/node'))
.pipe(util.setExecutableBit('**'))
.pipe(rename('node'))
Expand Down
24 changes: 0 additions & 24 deletions code/build/lib/typings/gulp-decompress.d.ts
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions code/build/npm/gyp/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion code/build/npm/gyp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"node-gyp": "^11.2.0"
},
"overrides": {
"ip-address": "^10.2.0",
"ip-address": "^10.5.0",
"brace-expansion@2": "^2.1.4",
"tar": "^7.5.22"
},
Expand Down
14 changes: 7 additions & 7 deletions code/build/vite/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions code/build/vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"build": "vite build",
"preview": "vite preview"
},
"overrides": {
"vite": {
"postcss": "^8.5.26"
}
},
"devDependencies": {
"@vscode/component-explorer": "^0.2.1-58",
"@vscode/component-explorer-vite-plugin": "^0.2.1-58",
Expand Down
6 changes: 3 additions & 3 deletions code/extensions/che-api/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion code/extensions/che-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"axios": "^0.32.0"
},
"follow-redirects": "^1.16.0",
"ip-address": "^10.2.0",
"ip-address": "^10.5.0",
"ws": "^8.21.0",
"@devfile/api": {
"form-data@2": "^2.5.6"
Expand Down
6 changes: 3 additions & 3 deletions code/extensions/che-commands/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion code/extensions/che-commands/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@types/node": "22.x"
},
"overrides": {
"ip-address": "^10.2.0",
"ip-address": "^10.5.0",
"ws": "^8.21.0",
"@devfile/api": {
"form-data@2": "^2.5.6"
Expand Down
6 changes: 3 additions & 3 deletions code/extensions/che-github-authentication/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion code/extensions/che-github-authentication/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"@types/uuid": "8.0.0"
},
"overrides": {
"ip-address": "^10.2.0",
"ip-address": "^10.5.0",
"ws": "^8.21.0",
"@devfile/api": {
"form-data@2": "^2.5.6"
Expand Down
6 changes: 3 additions & 3 deletions code/extensions/che-resource-monitor/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion code/extensions/che-resource-monitor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"overrides": {
"minimatch": "^3.1.5",
"handlebars": "4.7.9",
"ip-address": "^10.2.0",
"ip-address": "^10.5.0",
"ws": "^8.21.0",
"@devfile/api": {
"form-data@2": "^2.5.6"
Expand Down
14 changes: 7 additions & 7 deletions code/extensions/copilot/chat-lib/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions code/extensions/copilot/chat-lib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@
},
"overrides": {
"shell-quote": "^1.8.4",
"vite": {
"postcss": "^8.5.26"
},
"brace-expansion@1": "^1.1.18",
"minimatch@10": {
"brace-expansion": "5.0.9"
Expand Down
20 changes: 10 additions & 10 deletions code/extensions/copilot/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion code/extensions/copilot/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7250,7 +7250,7 @@
"zod": "3.25.76",
"shell-quote": "^1.8.4",
"qs": "6.15.2",
"ip-address": "^10.2.0",
"ip-address": "^10.5.0",
"ws": "^8.21.0",
"brace-expansion@1": "^1.1.18",
"brace-expansion@2": "^2.1.4",
Expand All @@ -7261,6 +7261,9 @@
},
"@grpc/proto-loader": {
"protobufjs": "^7.6.5"
},
"vite": {
"postcss": "^8.5.26"
}
},
"vscodeCommit": "94c8e2adc50e26ef70af85a0de3a9efed757acaa",
Expand Down
Loading