Skip to content

Commit

Permalink
[backend] Upgrade of xmldom and SAML(#8379)
Browse files Browse the repository at this point in the history
  • Loading branch information
aHenryJard committed Oct 14, 2024
1 parent 3497f88 commit 3d67167
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 84 deletions.
7 changes: 5 additions & 2 deletions opencti-platform/opencti-dev/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3'
services:
opencti-dev-redis:
container_name: opencti-dev-redis
Expand Down Expand Up @@ -139,6 +138,8 @@ services:
opencti-dev-keycloak:
profiles: [ keycloak ]
image: quay.io/keycloak/keycloak:25.0.6
volumes:
- keycloakdata:/opt/keycloak/data
container_name: opencti-dev-keycloak
command: start-dev
environment:
Expand Down Expand Up @@ -211,4 +212,6 @@ volumes:
osdata:
driver: local
ossnapshots:
driver: local
driver: local
keycloakdata:
driver: local
6 changes: 3 additions & 3 deletions opencti-platform/opencti-graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@graphql-tools/utils": "10.5.4",
"@jorgeferrero/stream-to-buffer": "2.0.6",
"@mistralai/mistralai": "0.5.0",
"@node-saml/passport-saml": "4.0.4",
"@node-saml/passport-saml": "5.0.0",
"@opensearch-project/opensearch": "2.12.0",
"@opentelemetry/api": "1.9.0",
"@opentelemetry/api-metrics": "0.33.0",
Expand Down Expand Up @@ -208,11 +208,11 @@
"resolutions": {
"axios": "1.7.7",
"body-parser": "1.20.3",
"json5": "2.2.3",
"cross-fetch": "4.0.0",
"jose": "5.6.3",
"json5": "2.2.3",
"lodash": "4.17.21",
"@xmldom/xmldom": "0.8.10",
"@xmldom/xmldom": "0.9.2",
"eventsource": "patch:[email protected]#./patch/eventsource-2.0.2.patch",
"ldap-filter": "patch:[email protected]#./patch/ldap-filter-0.3.3.patch",
"node-calls-python": "patch:[email protected]#./patch/node-calls-python-1.9.1.patch",
Expand Down
1 change: 1 addition & 0 deletions opencti-platform/opencti-graphql/src/config/providers.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ const configurationMapping = {
force_authn: 'forceAuthn',
disable_request_acs_url: 'disableRequestAcsUrl',
skip_request_compression: 'skipRequestCompression',
cert: 'idpCert',
// OpenID Client - everything is already in snake case
};
const configRemapping = (config) => {
Expand Down
143 changes: 64 additions & 79 deletions opencti-platform/opencti-graphql/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2987,36 +2987,37 @@ __metadata:
languageName: node
linkType: hard

"@node-saml/node-saml@npm:^4.0.4":
version: 4.0.5
resolution: "@node-saml/node-saml@npm:4.0.5"
dependencies:
"@types/debug": "npm:^4.1.7"
"@types/passport": "npm:^1.0.11"
"@types/xml-crypto": "npm:^1.4.2"
"@types/xml-encryption": "npm:^1.2.1"
"@types/xml2js": "npm:^0.4.11"
"@xmldom/xmldom": "npm:^0.8.6"
"@node-saml/node-saml@npm:^5.0.0":
version: 5.0.0
resolution: "@node-saml/node-saml@npm:5.0.0"
dependencies:
"@types/debug": "npm:^4.1.12"
"@types/qs": "npm:^6.9.11"
"@types/xml-encryption": "npm:^1.2.4"
"@types/xml2js": "npm:^0.4.14"
"@xmldom/is-dom-node": "npm:^1.0.1"
"@xmldom/xmldom": "npm:^0.8.10"
debug: "npm:^4.3.4"
xml-crypto: "npm:^3.0.1"
xml-crypto: "npm:^6.0.0"
xml-encryption: "npm:^3.0.2"
xml2js: "npm:^0.5.0"
xml2js: "npm:^0.6.2"
xmlbuilder: "npm:^15.1.1"
checksum: 10/91295b8b0bec57a017d7818c20d38712fba60212b7788dc8bffefeaa77591801ae551070e461ef49118418a8f5d728b8496690056077626c01dbd4013b69de19
xpath: "npm:^0.0.34"
checksum: 10/e886f0831321997f682e2f1c652dee4c42e47e417bbe09c7d0f237ccd4604c8212449091398157e09cef03d389e7009b01413d7dedc97f275590317aff7185ff
languageName: node
linkType: hard

"@node-saml/passport-saml@npm:4.0.4":
version: 4.0.4
resolution: "@node-saml/passport-saml@npm:4.0.4"
"@node-saml/passport-saml@npm:5.0.0":
version: 5.0.0
resolution: "@node-saml/passport-saml@npm:5.0.0"
dependencies:
"@node-saml/node-saml": "npm:^4.0.4"
"@types/express": "npm:^4.17.14"
"@types/passport": "npm:^1.0.11"
"@types/passport-strategy": "npm:^0.2.35"
passport: "npm:^0.6.0"
"@node-saml/node-saml": "npm:^5.0.0"
"@types/express": "npm:^4.17.21"
"@types/passport": "npm:^1.0.16"
"@types/passport-strategy": "npm:^0.2.38"
passport: "npm:^0.7.0"
passport-strategy: "npm:^1.0.0"
checksum: 10/a29274ef0ce8688e4b45c1921642b1676033a7ceb3c391ab7fc517d6893b79b611cf8c48b184fcfdba92b1c7989be132bbe18e8edef198f62f54efdf0db04ebd
checksum: 10/3142f1f69c011288edd4c6a9d252b3186c3bcf7af6d0995b52258d7c1ba1c86a5b8ee5fa9306a522cf1d6c525da775439bc50164664a72aebb86ead7244fcc9e
languageName: node
linkType: hard

Expand Down Expand Up @@ -4423,7 +4424,7 @@ __metadata:
languageName: node
linkType: hard

"@types/debug@npm:^4.1.7":
"@types/debug@npm:^4.1.12":
version: 4.1.12
resolution: "@types/debug@npm:4.1.12"
dependencies:
Expand Down Expand Up @@ -4465,7 +4466,7 @@ __metadata:
languageName: node
linkType: hard

"@types/express@npm:*, @types/express@npm:4.17.21, @types/express@npm:^4.17.13, @types/express@npm:^4.17.14":
"@types/express@npm:*, @types/express@npm:4.17.21, @types/express@npm:^4.17.13, @types/express@npm:^4.17.21":
version: 4.17.21
resolution: "@types/express@npm:4.17.21"
dependencies:
Expand Down Expand Up @@ -4636,7 +4637,7 @@ __metadata:
languageName: node
linkType: hard

"@types/passport-strategy@npm:^0.2.35":
"@types/passport-strategy@npm:^0.2.38":
version: 0.2.38
resolution: "@types/passport-strategy@npm:0.2.38"
dependencies:
Expand All @@ -4646,7 +4647,7 @@ __metadata:
languageName: node
linkType: hard

"@types/passport@npm:*, @types/passport@npm:^1.0.11":
"@types/passport@npm:*, @types/passport@npm:^1.0.16":
version: 1.0.16
resolution: "@types/passport@npm:1.0.16"
dependencies:
Expand Down Expand Up @@ -4759,17 +4760,7 @@ __metadata:
languageName: node
linkType: hard

"@types/xml-crypto@npm:^1.4.2":
version: 1.4.6
resolution: "@types/xml-crypto@npm:1.4.6"
dependencies:
"@types/node": "npm:*"
xpath: "npm:0.0.27"
checksum: 10/e53516a2f5e4e018e164eb1cb9fc922294b9a339624e567c1c00a2b1496e9f86826210473e62ceb0b45949638c9d149da088b3598f6b3acd86e933f0a2b23f2c
languageName: node
linkType: hard

"@types/xml-encryption@npm:^1.2.1":
"@types/xml-encryption@npm:^1.2.4":
version: 1.2.4
resolution: "@types/xml-encryption@npm:1.2.4"
dependencies:
Expand All @@ -4778,7 +4769,7 @@ __metadata:
languageName: node
linkType: hard

"@types/xml2js@npm:0.4.14, @types/xml2js@npm:^0.4.11":
"@types/xml2js@npm:0.4.14, @types/xml2js@npm:^0.4.14":
version: 0.4.14
resolution: "@types/xml2js@npm:0.4.14"
dependencies:
Expand Down Expand Up @@ -5057,10 +5048,17 @@ __metadata:
languageName: node
linkType: hard

"@xmldom/xmldom@npm:0.8.10":
version: 0.8.10
resolution: "@xmldom/xmldom@npm:0.8.10"
checksum: 10/62400bc5e0e75b90650e33a5ceeb8d94829dd11f9b260962b71a784cd014ddccec3e603fe788af9c1e839fa4648d8c521ebd80d8b752878d3a40edabc9ce7ccf
"@xmldom/is-dom-node@npm:^1.0.1":
version: 1.0.1
resolution: "@xmldom/is-dom-node@npm:1.0.1"
checksum: 10/45683a6a192e4eff0f5189d4e3ef5272fcf8e3458f598f99614810490a8163c9a7ebe4ecaf241286fb74fcd762610b46c062ad3c7fddaa6eafa9a9f1537e338a
languageName: node
linkType: hard

"@xmldom/xmldom@npm:0.9.2":
version: 0.9.2
resolution: "@xmldom/xmldom@npm:0.9.2"
checksum: 10/ac92fb641859650acdb37012775a41a58edffb7541fae3575792c3f09c2e7228f00d309c47ebc61d307a460c687137c260213dd2e962d42b940e96f7c125c576
languageName: node
linkType: hard

Expand Down Expand Up @@ -10775,7 +10773,7 @@ __metadata:
"@jorgeferrero/stream-to-buffer": "npm:2.0.6"
"@luckycatfactory/esbuild-graphql-loader": "npm:3.8.1"
"@mistralai/mistralai": "npm:0.5.0"
"@node-saml/passport-saml": "npm:4.0.4"
"@node-saml/passport-saml": "npm:5.0.0"
"@opensearch-project/opensearch": "npm:2.12.0"
"@opentelemetry/api": "npm:1.9.0"
"@opentelemetry/api-metrics": "npm:0.33.0"
Expand Down Expand Up @@ -11234,7 +11232,7 @@ __metadata:
languageName: node
linkType: hard

"passport@npm:0.7.0":
"passport@npm:0.7.0, passport@npm:^0.7.0":
version: 0.7.0
resolution: "passport@npm:0.7.0"
dependencies:
Expand All @@ -11245,17 +11243,6 @@ __metadata:
languageName: node
linkType: hard

"passport@npm:^0.6.0":
version: 0.6.0
resolution: "passport@npm:0.6.0"
dependencies:
passport-strategy: "npm:1.x.x"
pause: "npm:0.0.1"
utils-merge: "npm:^1.0.1"
checksum: 10/5051e1d773ac0d802d4d71315f5fee566b8765b9731396b60c1d6822b7983bef31ae2f51af94d973ade94fb040efae0816e736e534b55294d0fbd10efcdf2d36
languageName: node
linkType: hard

"path-case@npm:^3.0.4":
version: 3.0.4
resolution: "path-case@npm:3.0.4"
Expand Down Expand Up @@ -13869,13 +13856,14 @@ __metadata:
languageName: node
linkType: hard

"xml-crypto@npm:^3.0.1":
version: 3.2.0
resolution: "xml-crypto@npm:3.2.0"
"xml-crypto@npm:^6.0.0":
version: 6.0.0
resolution: "xml-crypto@npm:6.0.0"
dependencies:
"@xmldom/xmldom": "npm:^0.8.8"
xpath: "npm:0.0.32"
checksum: 10/ea9c3ecf60fbe54b947aff86f56f5b50ecc6713f5e514b268262610c97d1f602aacfff07bc4e972d1c1dd5ca4f591aeadb723abe081eae5033c701bcecfaa765
"@xmldom/is-dom-node": "npm:^1.0.1"
"@xmldom/xmldom": "npm:^0.8.10"
xpath: "npm:^0.0.33"
checksum: 10/bc8f634618e8c30844546cf7a19d3c80634f8134118a2d2b9b76f0bb094b745c53ad94214cd3577fba93327d5d992c7570903e4463ce078d9699e45008246400
languageName: node
linkType: hard

Expand All @@ -13890,7 +13878,7 @@ __metadata:
languageName: node
linkType: hard

"xml2js@npm:0.6.2":
"xml2js@npm:0.6.2, xml2js@npm:^0.6.2":
version: 0.6.2
resolution: "xml2js@npm:0.6.2"
dependencies:
Expand All @@ -13900,16 +13888,6 @@ __metadata:
languageName: node
linkType: hard

"xml2js@npm:^0.5.0":
version: 0.5.0
resolution: "xml2js@npm:0.5.0"
dependencies:
sax: "npm:>=0.6.0"
xmlbuilder: "npm:~11.0.0"
checksum: 10/27c4d759214e99be5ec87ee5cb1290add427fa43df509d3b92d10152b3806fd2f7c9609697a18b158ccf2caa01e96af067cdba93196f69ca10c90e4f79a08896
languageName: node
linkType: hard

"xmlbuilder@npm:^15.1.1":
version: 15.1.1
resolution: "xmlbuilder@npm:15.1.1"
Expand All @@ -13924,20 +13902,27 @@ __metadata:
languageName: node
linkType: hard

"xpath@npm:0.0.27":
version: 0.0.27
resolution: "xpath@npm:0.0.27"
checksum: 10/e4648276cc3dba7e368c4b6604baf5130600988b4b371c6d1bc4b01e893dc1a8c4521193478ea43bb3588a7c028f082ce5cb7204415c7636730a710d6e04a826
languageName: node
linkType: hard

"xpath@npm:0.0.32":
version: 0.0.32
resolution: "xpath@npm:0.0.32"
checksum: 10/9d8be7adde4500e9ee96db963838269021f89ef1ad222fdfd41b7266336e851a38416b4a710c194dcf9eb35cf58ad11e023e5951e919151b76ffcd6eb3b2cbf4
languageName: node
linkType: hard

"xpath@npm:^0.0.33":
version: 0.0.33
resolution: "xpath@npm:0.0.33"
checksum: 10/09c539661cafc0d75bb48d13fee7ce6e7593d88f4387c401a3b15d46d543e81f46680be5c6ecf868c11f6090ee67ea78e0c327c4e0ffceb2969308a2d1e238bb
languageName: node
linkType: hard

"xpath@npm:^0.0.34":
version: 0.0.34
resolution: "xpath@npm:0.0.34"
checksum: 10/77ce03c4494dab97b70fa443761c35a6bd484538a449714b981387a532a6eb22e245b29164f5d8a4a82f4f3cfd71d27ba71d09ed2b6fe933654585c6e46c0a25
languageName: node
linkType: hard

"xss@npm:^1.0.8":
version: 1.0.15
resolution: "xss@npm:1.0.15"
Expand Down

0 comments on commit 3d67167

Please sign in to comment.