Skip to content

Commit c0ef687

Browse files
fix: upgrade form-data to 2.5.5 (CVE-2025-7783 / GHSA-fjxv-7rqg-78g4) (#17649)
* Initial plan * fix: upgrade form-data to 2.5.5 to resolve CVE-2025-7783 (GHSA-fjxv-7rqg-78g4) - Add `"form-data": "2.5.5"` to the `resolutions` field in package.json - Run yarn install (without frozen-lockfile) to update yarn.lock so all form-data constraints (~2.3.2, ^3.0.0, ^4.0.5) resolve to 2.5.5 - All 5337 unit tests pass; lint passes Agent-Logs-Url: https://github.com/rancher/dashboard/sessions/3206cbda-c90b-42b5-ac4f-50859e8df12f Co-authored-by: mantis-toboggan-md <42977925+mantis-toboggan-md@users.noreply.github.com> * switch cronjob before/after hooks to beforeEach/afterEach so resource names align with test run ids --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: mantis-toboggan-md <42977925+mantis-toboggan-md@users.noreply.github.com>
1 parent 18e57a1 commit c0ef687

3 files changed

Lines changed: 11 additions & 29 deletions

File tree

cypress/e2e/tests/pages/explorer2/workloads/cronjobs.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ describe('CronJobs', { testIsolation: 'off', tags: ['@explorer2', '@adminUser']
2121
let podName: string;
2222
const defaultNamespace = 'default';
2323

24-
before('set up', () => {
24+
beforeEach('set up', () => {
2525
// Create a cronjob for the test
2626
cy.getRootE2EResourceName().then((root) => {
2727
cronJobName = root;
@@ -116,7 +116,7 @@ describe('CronJobs', { testIsolation: 'off', tags: ['@explorer2', '@adminUser']
116116
});
117117
});
118118

119-
after('clean up', () => {
119+
afterEach('clean up', () => {
120120
// Ensure the default rows per page value is set after running the tests
121121
cy.tableRowsPerPageAndNamespaceFilter(100, localCluster, 'none', '{"local":["all://user"]}');
122122
// Delete the cronjob

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@
222222
"yarn": "1.22.22"
223223
},
224224
"resolutions": {
225-
"html-webpack-plugin": "5.0.0"
225+
"html-webpack-plugin": "5.0.0",
226+
"form-data": "2.5.5"
226227
}
227228
}

yarn.lock

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6322,7 +6322,7 @@ colorette@^2.0.10, colorette@^2.0.16:
63226322
resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
63236323
integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
63246324

6325-
combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
6325+
combined-stream@^1.0.8, combined-stream@~1.0.6:
63266326
version "1.0.8"
63276327
resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
63286328
integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -8851,36 +8851,17 @@ fork-ts-checker-webpack-plugin@^6.4.0:
88518851
semver "^7.3.2"
88528852
tapable "^1.0.0"
88538853

8854-
form-data@^3.0.0:
8855-
version "3.0.4"
8856-
resolved "https://registry.npmjs.org/form-data/-/form-data-3.0.4.tgz#938273171d3f999286a4557528ce022dc2c98df1"
8857-
integrity sha512-f0cRzm6dkyVYV3nPoooP8XlccPQukegwhAnpoLcXy+X+A8KfpGOoXwDr9FLZd3wzgLaBGQBE3lY93Zm/i1JvIQ==
8854+
form-data@2.5.5, form-data@^3.0.0, form-data@^4.0.5, form-data@~2.3.2:
8855+
version "2.5.5"
8856+
resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.5.tgz#a5f6364ad7e4e67e95b4a07e2d8c6f711c74f624"
8857+
integrity sha512-jqdObeR2rxZZbPSGL+3VckHMYtu+f9//KXBsVny6JSX/pa38Fy+bGjuG8eW/H6USNQWhLi8Num++cU2yOCNz4A==
88588858
dependencies:
88598859
asynckit "^0.4.0"
88608860
combined-stream "^1.0.8"
88618861
es-set-tostringtag "^2.1.0"
88628862
hasown "^2.0.2"
88638863
mime-types "^2.1.35"
8864-
8865-
form-data@^4.0.5:
8866-
version "4.0.5"
8867-
resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz#b49e48858045ff4cbf6b03e1805cebcad3679053"
8868-
integrity sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==
8869-
dependencies:
8870-
asynckit "^0.4.0"
8871-
combined-stream "^1.0.8"
8872-
es-set-tostringtag "^2.1.0"
8873-
hasown "^2.0.2"
8874-
mime-types "^2.1.12"
8875-
8876-
form-data@~2.3.2:
8877-
version "2.3.3"
8878-
resolved "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
8879-
integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
8880-
dependencies:
8881-
asynckit "^0.4.0"
8882-
combined-stream "^1.0.6"
8883-
mime-types "^2.1.12"
8864+
safe-buffer "^5.2.1"
88848865

88858866
forwarded@0.2.0:
88868867
version "0.2.0"
@@ -11584,7 +11565,7 @@ mime-db@1.52.0:
1158411565
resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz#cddb3ee4f9c64530dff640236661d42cb6a314f5"
1158511566
integrity sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==
1158611567

11587-
mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@^2.1.34, mime-types@^2.1.35, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34, mime-types@~2.1.35:
11568+
mime-types@^2.1.27, mime-types@^2.1.31, mime-types@^2.1.34, mime-types@^2.1.35, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34, mime-types@~2.1.35:
1158811569
version "2.1.35"
1158911570
resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
1159011571
integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==

0 commit comments

Comments
 (0)