Skip to content

Commit 8eb57e0

Browse files
committed
[backend] Upgrade of xmldom and SAML(#8379)
1 parent 0ee6cbc commit 8eb57e0

File tree

4 files changed

+74
-85
lines changed

4 files changed

+74
-85
lines changed

opencti-platform/opencti-dev/docker-compose.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: '3'
21
services:
32
opencti-dev-redis:
43
container_name: opencti-dev-redis
@@ -139,6 +138,8 @@ services:
139138
opencti-dev-keycloak:
140139
profiles: [ keycloak ]
141140
image: quay.io/keycloak/keycloak:25.0.5
141+
volumes:
142+
- keycloakdata:/opt/keycloak/data
142143
container_name: opencti-dev-keycloak
143144
command: start-dev
144145
environment:
@@ -211,4 +212,6 @@ volumes:
211212
osdata:
212213
driver: local
213214
ossnapshots:
214-
driver: local
215+
driver: local
216+
keycloakdata:
217+
driver: local

opencti-platform/opencti-graphql/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"@graphql-tools/utils": "10.5.4",
5656
"@jorgeferrero/stream-to-buffer": "2.0.6",
5757
"@mistralai/mistralai": "0.5.0",
58-
"@node-saml/passport-saml": "4.0.4",
58+
"@node-saml/passport-saml": "5.0.0",
5959
"@opensearch-project/opensearch": "2.12.0",
6060
"@opentelemetry/api": "1.9.0",
6161
"@opentelemetry/api-metrics": "0.33.0",
@@ -208,11 +208,11 @@
208208
"resolutions": {
209209
"axios": "1.7.7",
210210
"body-parser": "1.20.3",
211-
"json5": "2.2.3",
212211
"cross-fetch": "4.0.0",
213212
"jose": "5.6.3",
213+
"json5": "2.2.3",
214214
"lodash": "4.17.21",
215-
"@xmldom/xmldom": "0.8.10",
215+
"@xmldom/xmldom": "0.9.2",
216216
"eventsource": "patch:[email protected]#./patch/eventsource-2.0.2.patch",
217217
"ldap-filter": "patch:[email protected]#./patch/ldap-filter-0.3.3.patch",
218218
"node-calls-python": "patch:[email protected]#./patch/node-calls-python-1.9.1.patch",

opencti-platform/opencti-graphql/src/config/providers.js

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ const configurationMapping = {
8585
force_authn: 'forceAuthn',
8686
disable_request_acs_url: 'disableRequestAcsUrl',
8787
skip_request_compression: 'skipRequestCompression',
88+
cert: 'idpCert',
8889
// OpenID Client - everything is already in snake case
8990
};
9091
const configRemapping = (config) => {

opencti-platform/opencti-graphql/yarn.lock

+65-80
Original file line numberDiff line numberDiff line change
@@ -2987,36 +2987,37 @@ __metadata:
29872987
languageName: node
29882988
linkType: hard
29892989

2990-
"@node-saml/node-saml@npm:^4.0.4":
2991-
version: 4.0.5
2992-
resolution: "@node-saml/node-saml@npm:4.0.5"
2993-
dependencies:
2994-
"@types/debug": "npm:^4.1.7"
2995-
"@types/passport": "npm:^1.0.11"
2996-
"@types/xml-crypto": "npm:^1.4.2"
2997-
"@types/xml-encryption": "npm:^1.2.1"
2998-
"@types/xml2js": "npm:^0.4.11"
2999-
"@xmldom/xmldom": "npm:^0.8.6"
2990+
"@node-saml/node-saml@npm:^5.0.0":
2991+
version: 5.0.0
2992+
resolution: "@node-saml/node-saml@npm:5.0.0"
2993+
dependencies:
2994+
"@types/debug": "npm:^4.1.12"
2995+
"@types/qs": "npm:^6.9.11"
2996+
"@types/xml-encryption": "npm:^1.2.4"
2997+
"@types/xml2js": "npm:^0.4.14"
2998+
"@xmldom/is-dom-node": "npm:^1.0.1"
2999+
"@xmldom/xmldom": "npm:^0.8.10"
30003000
debug: "npm:^4.3.4"
3001-
xml-crypto: "npm:^3.0.1"
3001+
xml-crypto: "npm:^6.0.0"
30023002
xml-encryption: "npm:^3.0.2"
3003-
xml2js: "npm:^0.5.0"
3003+
xml2js: "npm:^0.6.2"
30043004
xmlbuilder: "npm:^15.1.1"
3005-
checksum: 10/91295b8b0bec57a017d7818c20d38712fba60212b7788dc8bffefeaa77591801ae551070e461ef49118418a8f5d728b8496690056077626c01dbd4013b69de19
3005+
xpath: "npm:^0.0.34"
3006+
checksum: 10/e886f0831321997f682e2f1c652dee4c42e47e417bbe09c7d0f237ccd4604c8212449091398157e09cef03d389e7009b01413d7dedc97f275590317aff7185ff
30063007
languageName: node
30073008
linkType: hard
30083009

3009-
"@node-saml/passport-saml@npm:4.0.4":
3010-
version: 4.0.4
3011-
resolution: "@node-saml/passport-saml@npm:4.0.4"
3010+
"@node-saml/passport-saml@npm:5.0.0":
3011+
version: 5.0.0
3012+
resolution: "@node-saml/passport-saml@npm:5.0.0"
30123013
dependencies:
3013-
"@node-saml/node-saml": "npm:^4.0.4"
3014-
"@types/express": "npm:^4.17.14"
3015-
"@types/passport": "npm:^1.0.11"
3016-
"@types/passport-strategy": "npm:^0.2.35"
3017-
passport: "npm:^0.6.0"
3014+
"@node-saml/node-saml": "npm:^5.0.0"
3015+
"@types/express": "npm:^4.17.21"
3016+
"@types/passport": "npm:^1.0.16"
3017+
"@types/passport-strategy": "npm:^0.2.38"
3018+
passport: "npm:^0.7.0"
30183019
passport-strategy: "npm:^1.0.0"
3019-
checksum: 10/a29274ef0ce8688e4b45c1921642b1676033a7ceb3c391ab7fc517d6893b79b611cf8c48b184fcfdba92b1c7989be132bbe18e8edef198f62f54efdf0db04ebd
3020+
checksum: 10/3142f1f69c011288edd4c6a9d252b3186c3bcf7af6d0995b52258d7c1ba1c86a5b8ee5fa9306a522cf1d6c525da775439bc50164664a72aebb86ead7244fcc9e
30203021
languageName: node
30213022
linkType: hard
30223023

@@ -4423,7 +4424,7 @@ __metadata:
44234424
languageName: node
44244425
linkType: hard
44254426

4426-
"@types/debug@npm:^4.1.7":
4427+
"@types/debug@npm:^4.1.12":
44274428
version: 4.1.12
44284429
resolution: "@types/debug@npm:4.1.12"
44294430
dependencies:
@@ -4465,7 +4466,7 @@ __metadata:
44654466
languageName: node
44664467
linkType: hard
44674468

4468-
"@types/express@npm:*, @types/express@npm:4.17.21, @types/express@npm:^4.17.13, @types/express@npm:^4.17.14":
4469+
"@types/express@npm:*, @types/express@npm:4.17.21, @types/express@npm:^4.17.13, @types/express@npm:^4.17.21":
44694470
version: 4.17.21
44704471
resolution: "@types/express@npm:4.17.21"
44714472
dependencies:
@@ -4636,7 +4637,7 @@ __metadata:
46364637
languageName: node
46374638
linkType: hard
46384639

4639-
"@types/passport-strategy@npm:^0.2.35":
4640+
"@types/passport-strategy@npm:^0.2.38":
46404641
version: 0.2.38
46414642
resolution: "@types/passport-strategy@npm:0.2.38"
46424643
dependencies:
@@ -4646,7 +4647,7 @@ __metadata:
46464647
languageName: node
46474648
linkType: hard
46484649

4649-
"@types/passport@npm:*, @types/passport@npm:^1.0.11":
4650+
"@types/passport@npm:*, @types/passport@npm:^1.0.16":
46504651
version: 1.0.16
46514652
resolution: "@types/passport@npm:1.0.16"
46524653
dependencies:
@@ -4662,7 +4663,7 @@ __metadata:
46624663
languageName: node
46634664
linkType: hard
46644665

4665-
"@types/qs@npm:^6.9.15":
4666+
"@types/qs@npm:^6.9.11, @types/qs@npm:^6.9.15":
46664667
version: 6.9.16
46674668
resolution: "@types/qs@npm:6.9.16"
46684669
checksum: 10/2e8918150c12735630f7ee16b770c72949274938c30306025f68aaf977227f41fe0c698ed93db1099e04916d582ac5a1faf7e3c7061c8d885d9169f59a184b6c
@@ -4766,17 +4767,7 @@ __metadata:
47664767
languageName: node
47674768
linkType: hard
47684769

4769-
"@types/xml-crypto@npm:^1.4.2":
4770-
version: 1.4.6
4771-
resolution: "@types/xml-crypto@npm:1.4.6"
4772-
dependencies:
4773-
"@types/node": "npm:*"
4774-
xpath: "npm:0.0.27"
4775-
checksum: 10/e53516a2f5e4e018e164eb1cb9fc922294b9a339624e567c1c00a2b1496e9f86826210473e62ceb0b45949638c9d149da088b3598f6b3acd86e933f0a2b23f2c
4776-
languageName: node
4777-
linkType: hard
4778-
4779-
"@types/xml-encryption@npm:^1.2.1":
4770+
"@types/xml-encryption@npm:^1.2.4":
47804771
version: 1.2.4
47814772
resolution: "@types/xml-encryption@npm:1.2.4"
47824773
dependencies:
@@ -4785,7 +4776,7 @@ __metadata:
47854776
languageName: node
47864777
linkType: hard
47874778

4788-
"@types/xml2js@npm:0.4.14, @types/xml2js@npm:^0.4.11":
4779+
"@types/xml2js@npm:0.4.14, @types/xml2js@npm:^0.4.14":
47894780
version: 0.4.14
47904781
resolution: "@types/xml2js@npm:0.4.14"
47914782
dependencies:
@@ -5064,10 +5055,17 @@ __metadata:
50645055
languageName: node
50655056
linkType: hard
50665057

5067-
"@xmldom/xmldom@npm:0.8.10":
5068-
version: 0.8.10
5069-
resolution: "@xmldom/xmldom@npm:0.8.10"
5070-
checksum: 10/62400bc5e0e75b90650e33a5ceeb8d94829dd11f9b260962b71a784cd014ddccec3e603fe788af9c1e839fa4648d8c521ebd80d8b752878d3a40edabc9ce7ccf
5058+
"@xmldom/is-dom-node@npm:^1.0.1":
5059+
version: 1.0.1
5060+
resolution: "@xmldom/is-dom-node@npm:1.0.1"
5061+
checksum: 10/45683a6a192e4eff0f5189d4e3ef5272fcf8e3458f598f99614810490a8163c9a7ebe4ecaf241286fb74fcd762610b46c062ad3c7fddaa6eafa9a9f1537e338a
5062+
languageName: node
5063+
linkType: hard
5064+
5065+
"@xmldom/xmldom@npm:0.9.2":
5066+
version: 0.9.2
5067+
resolution: "@xmldom/xmldom@npm:0.9.2"
5068+
checksum: 10/ac92fb641859650acdb37012775a41a58edffb7541fae3575792c3f09c2e7228f00d309c47ebc61d307a460c687137c260213dd2e962d42b940e96f7c125c576
50715069
languageName: node
50725070
linkType: hard
50735071

@@ -10784,7 +10782,7 @@ __metadata:
1078410782
"@jorgeferrero/stream-to-buffer": "npm:2.0.6"
1078510783
"@luckycatfactory/esbuild-graphql-loader": "npm:3.8.1"
1078610784
"@mistralai/mistralai": "npm:0.5.0"
10787-
"@node-saml/passport-saml": "npm:4.0.4"
10785+
"@node-saml/passport-saml": "npm:5.0.0"
1078810786
"@opensearch-project/opensearch": "npm:2.12.0"
1078910787
"@opentelemetry/api": "npm:1.9.0"
1079010788
"@opentelemetry/api-metrics": "npm:0.33.0"
@@ -11243,7 +11241,7 @@ __metadata:
1124311241
languageName: node
1124411242
linkType: hard
1124511243

11246-
"passport@npm:0.7.0":
11244+
"passport@npm:0.7.0, passport@npm:^0.7.0":
1124711245
version: 0.7.0
1124811246
resolution: "passport@npm:0.7.0"
1124911247
dependencies:
@@ -11254,17 +11252,6 @@ __metadata:
1125411252
languageName: node
1125511253
linkType: hard
1125611254

11257-
"passport@npm:^0.6.0":
11258-
version: 0.6.0
11259-
resolution: "passport@npm:0.6.0"
11260-
dependencies:
11261-
passport-strategy: "npm:1.x.x"
11262-
pause: "npm:0.0.1"
11263-
utils-merge: "npm:^1.0.1"
11264-
checksum: 10/5051e1d773ac0d802d4d71315f5fee566b8765b9731396b60c1d6822b7983bef31ae2f51af94d973ade94fb040efae0816e736e534b55294d0fbd10efcdf2d36
11265-
languageName: node
11266-
linkType: hard
11267-
1126811255
"path-case@npm:^3.0.4":
1126911256
version: 3.0.4
1127011257
resolution: "path-case@npm:3.0.4"
@@ -13878,13 +13865,14 @@ __metadata:
1387813865
languageName: node
1387913866
linkType: hard
1388013867

13881-
"xml-crypto@npm:^3.0.1":
13882-
version: 3.2.0
13883-
resolution: "xml-crypto@npm:3.2.0"
13868+
"xml-crypto@npm:^6.0.0":
13869+
version: 6.0.0
13870+
resolution: "xml-crypto@npm:6.0.0"
1388413871
dependencies:
13885-
"@xmldom/xmldom": "npm:^0.8.8"
13886-
xpath: "npm:0.0.32"
13887-
checksum: 10/ea9c3ecf60fbe54b947aff86f56f5b50ecc6713f5e514b268262610c97d1f602aacfff07bc4e972d1c1dd5ca4f591aeadb723abe081eae5033c701bcecfaa765
13872+
"@xmldom/is-dom-node": "npm:^1.0.1"
13873+
"@xmldom/xmldom": "npm:^0.8.10"
13874+
xpath: "npm:^0.0.33"
13875+
checksum: 10/bc8f634618e8c30844546cf7a19d3c80634f8134118a2d2b9b76f0bb094b745c53ad94214cd3577fba93327d5d992c7570903e4463ce078d9699e45008246400
1388813876
languageName: node
1388913877
linkType: hard
1389013878

@@ -13899,7 +13887,7 @@ __metadata:
1389913887
languageName: node
1390013888
linkType: hard
1390113889

13902-
"xml2js@npm:0.6.2":
13890+
"xml2js@npm:0.6.2, xml2js@npm:^0.6.2":
1390313891
version: 0.6.2
1390413892
resolution: "xml2js@npm:0.6.2"
1390513893
dependencies:
@@ -13909,16 +13897,6 @@ __metadata:
1390913897
languageName: node
1391013898
linkType: hard
1391113899

13912-
"xml2js@npm:^0.5.0":
13913-
version: 0.5.0
13914-
resolution: "xml2js@npm:0.5.0"
13915-
dependencies:
13916-
sax: "npm:>=0.6.0"
13917-
xmlbuilder: "npm:~11.0.0"
13918-
checksum: 10/27c4d759214e99be5ec87ee5cb1290add427fa43df509d3b92d10152b3806fd2f7c9609697a18b158ccf2caa01e96af067cdba93196f69ca10c90e4f79a08896
13919-
languageName: node
13920-
linkType: hard
13921-
1392213900
"xmlbuilder@npm:^15.1.1":
1392313901
version: 15.1.1
1392413902
resolution: "xmlbuilder@npm:15.1.1"
@@ -13933,20 +13911,27 @@ __metadata:
1393313911
languageName: node
1393413912
linkType: hard
1393513913

13936-
"xpath@npm:0.0.27":
13937-
version: 0.0.27
13938-
resolution: "xpath@npm:0.0.27"
13939-
checksum: 10/e4648276cc3dba7e368c4b6604baf5130600988b4b371c6d1bc4b01e893dc1a8c4521193478ea43bb3588a7c028f082ce5cb7204415c7636730a710d6e04a826
13940-
languageName: node
13941-
linkType: hard
13942-
1394313914
"xpath@npm:0.0.32":
1394413915
version: 0.0.32
1394513916
resolution: "xpath@npm:0.0.32"
1394613917
checksum: 10/9d8be7adde4500e9ee96db963838269021f89ef1ad222fdfd41b7266336e851a38416b4a710c194dcf9eb35cf58ad11e023e5951e919151b76ffcd6eb3b2cbf4
1394713918
languageName: node
1394813919
linkType: hard
1394913920

13921+
"xpath@npm:^0.0.33":
13922+
version: 0.0.33
13923+
resolution: "xpath@npm:0.0.33"
13924+
checksum: 10/09c539661cafc0d75bb48d13fee7ce6e7593d88f4387c401a3b15d46d543e81f46680be5c6ecf868c11f6090ee67ea78e0c327c4e0ffceb2969308a2d1e238bb
13925+
languageName: node
13926+
linkType: hard
13927+
13928+
"xpath@npm:^0.0.34":
13929+
version: 0.0.34
13930+
resolution: "xpath@npm:0.0.34"
13931+
checksum: 10/77ce03c4494dab97b70fa443761c35a6bd484538a449714b981387a532a6eb22e245b29164f5d8a4a82f4f3cfd71d27ba71d09ed2b6fe933654585c6e46c0a25
13932+
languageName: node
13933+
linkType: hard
13934+
1395013935
"xss@npm:^1.0.8":
1395113936
version: 1.0.15
1395213937
resolution: "xss@npm:1.0.15"

0 commit comments

Comments
 (0)