Skip to content

Commit a8244d4

Browse files
chore(deps): bump xmldom and related deps (RocketChat#40270)
1 parent aa6187e commit a8244d4

5 files changed

Lines changed: 15 additions & 18 deletions

File tree

.github/actions/update-version-durability/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"colors": "^1.4.0",
1717
"diff": "^5.1.0",
1818
"semver": "^7.5.4",
19-
"@xmldom/xmldom": "^0.8.10"
19+
"@xmldom/xmldom": "^0.8.13"
2020
}
2121
}

apps/meteor/app/meteor-accounts-saml/server/lib/parsers/Response.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,9 @@ export class ResponseParser {
208208
let newXml = null;
209209

210210
if (typeof encAssertion !== 'undefined') {
211-
const options = { key: this.serviceProviderOptions.privateKey };
211+
// disallowDecryptionWithInsecureAlgorithm defaults to true in xml-encryption v4, but AES-CBC/3DES
212+
// are still widely used by SAML IdPs in practice, so we keep the pre-v4 behaviour here.
213+
const options = { key: this.serviceProviderOptions.privateKey, disallowDecryptionWithInsecureAlgorithm: false };
212214
const encData = encAssertion.getElementsByTagNameNS('*', 'EncryptedData')[0];
213215
xmlenc.decrypt(encData, options, (err, result) => {
214216
if (err) {
@@ -350,7 +352,7 @@ export class ResponseParser {
350352
const encSubject = assertion.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'EncryptedID')[0];
351353

352354
if (typeof encSubject !== 'undefined') {
353-
const options = { key: this.serviceProviderOptions.privateKey };
355+
const options = { key: this.serviceProviderOptions.privateKey, disallowDecryptionWithInsecureAlgorithm: false };
354356
xmlenc.decrypt(encSubject.getElementsByTagNameNS('*', 'EncryptedData')[0], options, (err, result) => {
355357
if (err) {
356358
SAMLUtils.error({ err });

apps/meteor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@
306306
"universal-perf-hooks": "^1.0.1",
307307
"webdav": "^4.11.5",
308308
"xml-crypto": "~3.2.1",
309-
"xml-encryption": "~3.1.0",
309+
"xml-encryption": "~4.0.0",
310310
"xml2js": "~0.6.2",
311311
"yaqrcode": "^0.2.1",
312312
"yoga-layout": "patch:yoga-layout@npm%3A3.2.1#~/.yarn/patches/yoga-layout-npm-3.2.1-51ec934670.patch",

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@
7575
"zod@npm:~4.3.6": "patch:zod@npm%3A4.3.6#~/.yarn/patches/zod-npm-4.3.6-a096e305e6.patch",
7676
"@react-aria/i18n@npm:^3.0.0-nightly-fb28ab3b4-241024": "patch:@react-aria/i18n@npm%3A3.12.5#~/.yarn/patches/@react-aria-i18n-npm-3.12.5-435edff786.patch",
7777
"@react-aria/i18n@npm:^3.12.5": "patch:@react-aria/i18n@npm%3A3.12.5#~/.yarn/patches/@react-aria-i18n-npm-3.12.5-435edff786.patch",
78-
"@react-aria/toolbar@npm:^3.0.0-nightly.5042": "3.0.0-nightly-fb28ab3b4-241024"
78+
"@react-aria/toolbar@npm:^3.0.0-nightly.5042": "3.0.0-nightly-fb28ab3b4-241024",
79+
"xml-crypto/@xmldom/xmldom": "0.8.13",
80+
"xml-encryption/@xmldom/xmldom": "0.8.13"
7981
},
8082
"dependencies": {
8183
"@types/stream-buffers": "^3.0.8",

yarn.lock

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10220,7 +10220,7 @@ __metadata:
1022010220
webdav: "npm:^4.11.5"
1022110221
webpack: "npm:~5.104.1"
1022210222
xml-crypto: "npm:~3.2.1"
10223-
xml-encryption: "npm:~3.1.0"
10223+
xml-encryption: "npm:~4.0.0"
1022410224
xml2js: "npm:~0.6.2"
1022510225
yaqrcode: "npm:^0.2.1"
1022610226
yoga-layout: "patch:yoga-layout@npm%3A3.2.1#~/.yarn/patches/yoga-layout-npm-3.2.1-51ec934670.patch"
@@ -16024,14 +16024,7 @@ __metadata:
1602416024
languageName: node
1602516025
linkType: hard
1602616026

16027-
"@xmldom/xmldom@npm:^0.8.5, @xmldom/xmldom@npm:^0.8.8":
16028-
version: 0.8.10
16029-
resolution: "@xmldom/xmldom@npm:0.8.10"
16030-
checksum: 10/62400bc5e0e75b90650e33a5ceeb8d94829dd11f9b260962b71a784cd014ddccec3e603fe788af9c1e839fa4648d8c521ebd80d8b752878d3a40edabc9ce7ccf
16031-
languageName: node
16032-
linkType: hard
16033-
16034-
"@xmldom/xmldom@npm:~0.8.13":
16027+
"@xmldom/xmldom@npm:0.8.13, @xmldom/xmldom@npm:~0.8.13":
1603516028
version: 0.8.13
1603616029
resolution: "@xmldom/xmldom@npm:0.8.13"
1603716030
checksum: 10/f8f3d56fa91d5026885c0c5c00b07eae47647bda0d742ecbf8e51e06bb287ab30222977b20529ee15c364031606225ebca58907a8ecc76a3add6b3f10e6ddfc6
@@ -38481,14 +38474,14 @@ __metadata:
3848138474
languageName: node
3848238475
linkType: hard
3848338476

38484-
"xml-encryption@npm:~3.1.0":
38485-
version: 3.1.0
38486-
resolution: "xml-encryption@npm:3.1.0"
38477+
"xml-encryption@npm:~4.0.0":
38478+
version: 4.0.0
38479+
resolution: "xml-encryption@npm:4.0.0"
3848738480
dependencies:
3848838481
"@xmldom/xmldom": "npm:^0.8.5"
3848938482
escape-html: "npm:^1.0.3"
3849038483
xpath: "npm:0.0.32"
38491-
checksum: 10/c84c1e11692181c24a1c30123fed4fa31015c58994bbdcf091f07fa79f0fb809774b1533d191c4739bf76bb0fb95f223d393e84cc48417480a1896b2b689373b
38484+
checksum: 10/319f5c0c591a5600f5f6846c9b27a69e6ecd7d4a2215cfb9ffac37490143d48239652097eae6ff33a0d55f8b534c03caa09e75ee260d89d3d1bc26802c1cfc36
3849238485
languageName: node
3849338486
linkType: hard
3849438487

0 commit comments

Comments
 (0)