Skip to content

Commit c544f0f

Browse files
sbouchetRomanNikitenko
authored andcommitted
CRW-9702: fix CVE-2025-66031 node-forge ASN.1 Unbounded Recursion
Signed-off-by: Stephane Bouchet <sbouchet@redhat.com>
1 parent 86ea408 commit c544f0f

5 files changed

Lines changed: 45 additions & 5 deletions

File tree

.rebase/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
The file to keep a list of changed files which will potentionaly help to resolve rebase conflicts.
44

5+
#### @sbouchet
6+
https://github.com/che-incubator/che-code/pull/607
7+
8+
- code/extensions/vscode-api-tests/package.json
9+
---
10+
511
#### @sbouchet
612
https://github.com/che-incubator/che-code/pull/589
713

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"devDependencies": {
3+
"node-forge": "^1.3.2"
4+
}
5+
}

code/extensions/vscode-api-tests/package-lock.json

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

code/extensions/vscode-api-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@
268268
"@types/mocha": "^9.1.1",
269269
"@types/node": "22.x",
270270
"@types/node-forge": "^1.3.11",
271-
"node-forge": "^1.3.1",
271+
"node-forge": "^1.3.2",
272272
"straightforward": "^4.2.2"
273273
},
274274
"repository": {

rebase.sh

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,30 @@ apply_code_extensions_microsoft_authentication_package_lock_changes() {
203203
git add code/extensions/microsoft-authentication/package-lock.json > /dev/null 2>&1
204204
}
205205

206+
# Apply changes on code/extensions/vscode-api-tests/package-lock.json file
207+
apply_code_extensions_vscode_api_tests_package_lock_changes() {
208+
209+
echo " ⚙️ reworking code/extensions/vscode-api-tests/package-lock.json..."
210+
211+
conflicted_files=$(git diff --name-only --diff-filter=U)
212+
213+
# Check if code/extensions/vscode-api-tests/package.json is in the list
214+
if echo "$conflicted_files" | grep -q "^code/extensions/vscode-api-tests/package.json$"; then
215+
echo "Conflict for the code/extensions/vscode-api-tests/package.json should be fixed first!"
216+
apply_package_changes_by_path "code/extensions/vscode-api-tests/package.json"
217+
fi
218+
219+
# reset the file from what is upstream
220+
git checkout --ours code/extensions/vscode-api-tests/package-lock.json > /dev/null 2>&1
221+
222+
# update package-lock.json
223+
npm install --ignore-scripts --prefix code/extensions/vscode-api-tests
224+
225+
# resolve the change
226+
git add code/extensions/vscode-api-tests/package-lock.json > /dev/null 2>&1
227+
}
228+
229+
206230
# Apply changes on code/remote/package-lock.json file
207231
apply_code_remote_package_lock_changes() {
208232

@@ -420,6 +444,10 @@ resolve_conflicts() {
420444
apply_package_changes_by_path "$conflictingFile"
421445
elif [[ "$conflictingFile" == "code/extensions/microsoft-authentication/package-lock.json" ]]; then
422446
apply_code_extensions_microsoft_authentication_package_lock_changes
447+
elif [[ "$conflictingFile" == "code/extensions/vscode-api-tests/package.json" ]]; then
448+
apply_package_changes_by_path "$conflictingFile"
449+
elif [[ "$conflictingFile" == "code/extensions/vscode-api-tests/package-lock.json" ]]; then
450+
apply_code_extensions_vscode_api_tests_package_lock_changes
423451
elif [[ "$conflictingFile" == "code/build/lib/mangle/index.js" ]]; then
424452
apply_mangle_index_js_changes
425453
elif [[ "$conflictingFile" == "code/build/lib/mangle/index.ts" ]]; then

0 commit comments

Comments
 (0)