From ce98043c161f4f4af60a2dbe78c06462c3366cea Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 1 Jan 2025 01:59:35 -0800 Subject: [PATCH 1/3] GUACAMOLE-1956: Revert upgrade of SAML dependencies back to latest compatible. --- .../NOTICE | 0 .../README | 2 +- doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt | 1 + doc/licenses/apache-santuario-4.0.2/dep-coordinates.txt | 1 - .../{woodstox-core-6.6.0 => woodstox-core-5.4.0}/README | 2 +- doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt | 1 + doc/licenses/woodstox-core-6.6.0/dep-coordinates.txt | 1 - .../woodstox-stax2-api-4.2.2/dep-coordinates.txt | 1 - .../LICENSE | 0 .../README | 2 +- doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt | 1 + .../modules/guacamole-auth-sso-saml/pom.xml | 9 +++++++-- 12 files changed, 13 insertions(+), 8 deletions(-) rename doc/licenses/{apache-santuario-4.0.2 => apache-santuario-2.2.6}/NOTICE (100%) rename doc/licenses/{apache-santuario-4.0.2 => apache-santuario-2.2.6}/README (91%) create mode 100644 doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt delete mode 100644 doc/licenses/apache-santuario-4.0.2/dep-coordinates.txt rename doc/licenses/{woodstox-core-6.6.0 => woodstox-core-5.4.0}/README (91%) create mode 100644 doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt delete mode 100644 doc/licenses/woodstox-core-6.6.0/dep-coordinates.txt delete mode 100644 doc/licenses/woodstox-stax2-api-4.2.2/dep-coordinates.txt rename doc/licenses/{woodstox-stax2-api-4.2.2 => woodstox-stax2-api-4.2}/LICENSE (100%) rename doc/licenses/{woodstox-stax2-api-4.2.2 => woodstox-stax2-api-4.2}/README (75%) create mode 100644 doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt diff --git a/doc/licenses/apache-santuario-4.0.2/NOTICE b/doc/licenses/apache-santuario-2.2.6/NOTICE similarity index 100% rename from doc/licenses/apache-santuario-4.0.2/NOTICE rename to doc/licenses/apache-santuario-2.2.6/NOTICE diff --git a/doc/licenses/apache-santuario-4.0.2/README b/doc/licenses/apache-santuario-2.2.6/README similarity index 91% rename from doc/licenses/apache-santuario-4.0.2/README rename to doc/licenses/apache-santuario-2.2.6/README index a5aa412db3..8ccae438df 100644 --- a/doc/licenses/apache-santuario-4.0.2/README +++ b/doc/licenses/apache-santuario-2.2.6/README @@ -1,7 +1,7 @@ Apache Santuario (https://santuario.apache.org/) ------------------------------------------------- - Version: 4.0.2 + Version: 2.2.6 From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt b/doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt new file mode 100644 index 0000000000..0a6929d5b7 --- /dev/null +++ b/doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt @@ -0,0 +1 @@ +org.apache.santuario:xmlsec:jar:2.2.6 diff --git a/doc/licenses/apache-santuario-4.0.2/dep-coordinates.txt b/doc/licenses/apache-santuario-4.0.2/dep-coordinates.txt deleted file mode 100644 index 26dd9249b8..0000000000 --- a/doc/licenses/apache-santuario-4.0.2/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.santuario:xmlsec:jar:4.0.2 \ No newline at end of file diff --git a/doc/licenses/woodstox-core-6.6.0/README b/doc/licenses/woodstox-core-5.4.0/README similarity index 91% rename from doc/licenses/woodstox-core-6.6.0/README rename to doc/licenses/woodstox-core-5.4.0/README index 136c40dddd..ad07e98290 100644 --- a/doc/licenses/woodstox-core-6.6.0/README +++ b/doc/licenses/woodstox-core-5.4.0/README @@ -1,7 +1,7 @@ Woodstox Core (https://github.com/FasterXML/woodstox) ------------------------------------------------------ - Version: 6.6.0 + Version: 5.4.0 From: 'FasterXML, LLC' (http://fasterxml.com/) License(s): Apache v2.0 diff --git a/doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt b/doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt new file mode 100644 index 0000000000..e879f958a7 --- /dev/null +++ b/doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt @@ -0,0 +1 @@ +com.fasterxml.woodstox:woodstox-core:jar:5.4.0 diff --git a/doc/licenses/woodstox-core-6.6.0/dep-coordinates.txt b/doc/licenses/woodstox-core-6.6.0/dep-coordinates.txt deleted file mode 100644 index ee286a084e..0000000000 --- a/doc/licenses/woodstox-core-6.6.0/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -com.fasterxml.woodstox:woodstox-core:jar:6.6.0 diff --git a/doc/licenses/woodstox-stax2-api-4.2.2/dep-coordinates.txt b/doc/licenses/woodstox-stax2-api-4.2.2/dep-coordinates.txt deleted file mode 100644 index 824c5a9410..0000000000 --- a/doc/licenses/woodstox-stax2-api-4.2.2/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.codehaus.woodstox:stax2-api:jar:4.2.2 diff --git a/doc/licenses/woodstox-stax2-api-4.2.2/LICENSE b/doc/licenses/woodstox-stax2-api-4.2/LICENSE similarity index 100% rename from doc/licenses/woodstox-stax2-api-4.2.2/LICENSE rename to doc/licenses/woodstox-stax2-api-4.2/LICENSE diff --git a/doc/licenses/woodstox-stax2-api-4.2.2/README b/doc/licenses/woodstox-stax2-api-4.2/README similarity index 75% rename from doc/licenses/woodstox-stax2-api-4.2.2/README rename to doc/licenses/woodstox-stax2-api-4.2/README index dbd1b8e709..b2936e350b 100644 --- a/doc/licenses/woodstox-stax2-api-4.2.2/README +++ b/doc/licenses/woodstox-stax2-api-4.2/README @@ -4,4 +4,4 @@ Woodstox Stax2-API (https://github.com/FasterXML/stax2-api) Version: 4.2 From: 'FasterXML, LLC' (http://fasterxml.com/) License(s): - BSD Simplified (bundled/woodstox-stax2-api-4.2.2/LICENSE) + BSD Simplified (bundled/woodstox-stax2-api-4.2/LICENSE) diff --git a/doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt b/doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt new file mode 100644 index 0000000000..c7bbc763fd --- /dev/null +++ b/doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt @@ -0,0 +1 @@ +org.codehaus.woodstox:stax2-api:jar:4.2 diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml index 28b975aee9..6622cc179d 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml @@ -122,14 +122,14 @@ com.fasterxml.woodstox woodstox-core - 6.6.0 + 5.4.0 org.apache.santuario xmlsec - 4.0.2 + 2.2.6 diff --git a/extensions/guacamole-auth-json/pom.xml b/extensions/guacamole-auth-json/pom.xml index 5fc38b0119..dbd1a8bda0 100644 --- a/extensions/guacamole-auth-json/pom.xml +++ b/extensions/guacamole-auth-json/pom.xml @@ -77,7 +77,6 @@ com.github.seancfoley ipaddress - 5.5.0 provided diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml index 05be824218..698c034960 100644 --- a/extensions/guacamole-auth-ldap/pom.xml +++ b/extensions/guacamole-auth-ldap/pom.xml @@ -87,7 +87,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 diff --git a/extensions/guacamole-auth-restrict/pom.xml b/extensions/guacamole-auth-restrict/pom.xml index b011568d6d..0fcf35e4ed 100644 --- a/extensions/guacamole-auth-restrict/pom.xml +++ b/extensions/guacamole-auth-restrict/pom.xml @@ -170,7 +170,6 @@ com.github.seancfoley ipaddress - 5.5.0 provided diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml index fc11fe6c0c..3eae6d75f1 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml @@ -77,9 +77,28 @@ commons-codec + + + org.bouncycastle + bcpkix-jdk15on + + - + + + + org.bouncycastle + bcpkix-jdk15to18 + 1.79 + + com.google.guava diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml index 6622cc179d..e4a7a73cf1 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml @@ -96,7 +96,7 @@ @@ -143,11 +143,6 @@ commons-codec - - com.fasterxml.woodstox - woodstox-core - - @@ -155,7 +150,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 diff --git a/extensions/guacamole-auth-totp/pom.xml b/extensions/guacamole-auth-totp/pom.xml index a637362e21..b11570e5d7 100644 --- a/extensions/guacamole-auth-totp/pom.xml +++ b/extensions/guacamole-auth-totp/pom.xml @@ -182,7 +182,6 @@ com.github.seancfoley ipaddress - 5.5.0 provided diff --git a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml index 223fd986b1..f1544cb98a 100644 --- a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml +++ b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml @@ -38,7 +38,7 @@ - 1.9.23 + 1.9.25 @@ -60,7 +60,7 @@ com.keepersecurity.secrets-manager core - 16.6.5 + 16.6.6 diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml index d903a9b49f..779dcc0c63 100644 --- a/guacamole-ext/pom.xml +++ b/guacamole-ext/pom.xml @@ -114,7 +114,6 @@ com.github.seancfoley ipaddress - 5.5.0 diff --git a/pom.xml b/pom.xml index a2155f4e31..215ba3a38c 100644 --- a/pom.xml +++ b/pom.xml @@ -39,13 +39,14 @@ 32.1.3-jre 5.1.0 2.6.1 - 2.17.0 - 2.17.0 - 2.42 - 5.10.2 + 5.5.1 + 2.18.2 + 2.18.2 + 2.46 + 5.11.4 4.13.2 1.3.14 - 2.0.12 + 2.0.16 @@ -344,7 +345,14 @@ guice-servlet ${guice.version} - + + + + com.github.seancfoley + ipaddress + ${ipaddress.version} + + org.glassfish.jersey.containers From 38d1bc0ef2ad5b8827337c14662ef87f0be531fa Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 1 Jan 2025 21:01:27 -0800 Subject: [PATCH 3/3] GUACAMOLE-1956: Update JavaScript build-only dependencies where possible. --- guacamole/src/main/frontend/package-lock.json | 201 ++++++++++++++---- 1 file changed, 163 insertions(+), 38 deletions(-) diff --git a/guacamole/src/main/frontend/package-lock.json b/guacamole/src/main/frontend/package-lock.json index b8cf35007e..7ad1e32ce7 100644 --- a/guacamole/src/main/frontend/package-lock.json +++ b/guacamole/src/main/frontend/package-lock.json @@ -4,6 +4,7 @@ "requires": true, "packages": { "": { + "name": "frontend", "dependencies": { "@simonwep/pickr": "^1.8.2", "angular": "^1.8.3", @@ -2440,17 +2441,20 @@ } }, "node_modules/asn1.js": { - "version": "5.4.1", + "version": "4.10.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", + "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", "license": "MIT", "dependencies": { "bn.js": "^4.0.0", "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "safer-buffer": "^2.1.0" + "minimalistic-assert": "^1.0.0" } }, "node_modules/asn1.js/node_modules/bn.js": { - "version": "4.12.0", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz", + "integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==", "license": "MIT" }, "node_modules/assert": { @@ -2654,7 +2658,9 @@ } }, "node_modules/babel-loader/node_modules/semver": { - "version": "6.3.0", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "license": "ISC", "bin": { @@ -2768,6 +2774,16 @@ "node": ">=8" } }, + "node_modules/bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "license": "MIT", + "optional": true, + "dependencies": { + "file-uri-to-path": "1.0.0" + } + }, "node_modules/blob-polyfill": { "version": "9.0.20240710", "resolved": "https://registry.npmjs.org/blob-polyfill/-/blob-polyfill-9.0.20240710.tgz", @@ -2874,30 +2890,37 @@ } }, "node_modules/browserify-sign": { - "version": "4.2.1", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.3.tgz", + "integrity": "sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==", "license": "ISC", "dependencies": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", + "bn.js": "^5.2.1", + "browserify-rsa": "^4.1.0", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", + "elliptic": "^6.5.5", + "hash-base": "~3.0", "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" + "parse-asn1": "^5.1.7", + "readable-stream": "^2.3.8", + "safe-buffer": "^5.2.1" + }, + "engines": { + "node": ">= 0.12" } }, - "node_modules/browserify-sign/node_modules/readable-stream": { - "version": "3.6.2", + "node_modules/browserify-sign/node_modules/hash-base": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.5.tgz", + "integrity": "sha512-vXm0l45VbcHEVlTCzs8M+s0VeYsB2lnlAaThoLKGXr3bE/VWDOelNUnycUPEhKEaXARL2TEFjBOyUiM6+55KBg==", "license": "MIT", "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "inherits": "^2.0.4", + "safe-buffer": "^5.2.1" }, "engines": { - "node": ">= 6" + "node": ">= 0.10" } }, "node_modules/browserify-sign/node_modules/safe-buffer": { @@ -3139,18 +3162,22 @@ } }, "node_modules/chokidar/node_modules/braces": { - "version": "3.0.2", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "license": "MIT", "optional": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" } }, "node_modules/chokidar/node_modules/fill-range": { - "version": "7.0.1", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "license": "MIT", "optional": true, "dependencies": { @@ -3162,6 +3189,8 @@ }, "node_modules/chokidar/node_modules/is-number": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "license": "MIT", "optional": true, "engines": { @@ -3170,6 +3199,8 @@ }, "node_modules/chokidar/node_modules/to-regex-range": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "license": "MIT", "optional": true, "dependencies": { @@ -3700,7 +3731,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -4612,7 +4645,9 @@ "license": "ISC" }, "node_modules/elliptic": { - "version": "6.5.4", + "version": "6.6.1", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.1.tgz", + "integrity": "sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==", "license": "MIT", "dependencies": { "bn.js": "^4.11.9", @@ -5110,6 +5145,13 @@ "version": "2.0.5", "license": "MIT" }, + "node_modules/file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "license": "MIT", + "optional": true + }, "node_modules/fill-range": { "version": "4.0.0", "license": "MIT", @@ -5237,6 +5279,20 @@ "version": "1.0.0", "license": "ISC" }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.1", "dev": true, @@ -6778,8 +6834,17 @@ "version": "2.0.0", "license": "MIT" }, + "node_modules/nan": { + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", + "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", + "license": "MIT", + "optional": true + }, "node_modules/nanoid": { - "version": "3.3.6", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "dev": true, "funding": [ { @@ -7154,16 +7219,55 @@ } }, "node_modules/parse-asn1": { - "version": "5.1.6", + "version": "5.1.7", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.7.tgz", + "integrity": "sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==", "license": "ISC", "dependencies": { - "asn1.js": "^5.2.0", - "browserify-aes": "^1.0.0", - "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3", - "safe-buffer": "^5.1.1" + "asn1.js": "^4.10.1", + "browserify-aes": "^1.2.0", + "evp_bytestokey": "^1.0.3", + "hash-base": "~3.0", + "pbkdf2": "^3.1.2", + "safe-buffer": "^5.2.1" + }, + "engines": { + "node": ">= 0.10" } }, + "node_modules/parse-asn1/node_modules/hash-base": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.5.tgz", + "integrity": "sha512-vXm0l45VbcHEVlTCzs8M+s0VeYsB2lnlAaThoLKGXr3bE/VWDOelNUnycUPEhKEaXARL2TEFjBOyUiM6+55KBg==", + "license": "MIT", + "dependencies": { + "inherits": "^2.0.4", + "safe-buffer": "^5.2.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/parse-asn1/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, "node_modules/parse-json": { "version": "4.0.0", "dev": true, @@ -8862,10 +8966,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "license": "MIT" - }, "node_modules/sax": { "version": "1.2.4", "dev": true, @@ -9637,13 +9737,15 @@ } }, "node_modules/tar": { - "version": "6.1.13", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", "dev": true, "license": "ISC", "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "minizlib": "^2.1.1", "mkdirp": "^1.0.3", "yallist": "^4.0.0" @@ -9661,7 +9763,9 @@ } }, "node_modules/tar/node_modules/minipass": { - "version": "4.2.5", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", "dev": true, "license": "ISC", "engines": { @@ -9700,7 +9804,9 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "1.4.5", + "version": "1.4.6", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.6.tgz", + "integrity": "sha512-2lBVf/VMVIddjSn3GqbT90GvIJ/eYXJkt8cTzU7NbjKqK8fwv18Ftr4PlbF46b/e88743iZFL5Dtr/rC4hjIeA==", "license": "MIT", "dependencies": { "cacache": "^12.0.2", @@ -10195,6 +10301,25 @@ "fsevents": "^1.2.7" } }, + "node_modules/watchpack-chokidar2/node_modules/fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "deprecated": "Upgrade to fsevents v2 to mitigate potential security issues", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "dependencies": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + }, + "engines": { + "node": ">= 4.0" + } + }, "node_modules/watchpack-chokidar2/node_modules/glob-parent": { "version": "3.1.0", "license": "ISC",