safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 1.5.4 changes back to master.

Browse Source
This commit is contained in:
James Muehlner
2023-10-06 18:47:27 +00:00
parent e75c79f57c 557a62a16b
commit 3514a21b08
53 changed files with 175 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/licenses/apache-mina-2.2.1/dep-coordinates.txt
View File

@@ -1 +0,0 @@
org.apache.mina:mina-core:jar:2.2.1

2
doc/licenses/apache-mina-2.2.1/NOTICE → doc/licenses/apache-mina-2.2.2/NOTICE
View File

@@ -1,5 +1,5 @@
Apache MINA
Copyright 2007-2016 The Apache Software Foundation.
Copyright 2007-2023 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

2
doc/licenses/apache-mina-2.2.1/README → doc/licenses/apache-mina-2.2.2/README
View File

@@ -1,7 +1,7 @@
Apache Mina (https://mina.apache.org/)
--------------------------------------
Version: 2.2.1
Version: 2.2.2
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0

1
doc/licenses/apache-mina-2.2.2/dep-coordinates.txt Normal file
View File

@@ -0,0 +1 @@
org.apache.mina:mina-core:jar:2.2.2

1
doc/licenses/bouncycastle-fips-1.0.2.3/dep-coordinates.txt
View File

@@ -1 +0,0 @@
org.bouncycastle:bc-fips:jar:1.0.2.3

16
doc/licenses/bouncycastle-fips-1.0.2.3/LICENSE → doc/licenses/bouncycastle-fips-1.0.2.4/LICENSE
View File

@@ -1,12 +1,12 @@
Copyright (c) 2000 - 2021 The Legion of the Bouncy Castle Inc.
Copyright (c) 2000 - 2023 The Legion of the Bouncy Castle Inc.
(https://www.bouncycastle.org)
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
@@ -17,4 +17,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.

4
doc/licenses/bouncycastle-fips-1.0.2.3/README → doc/licenses/bouncycastle-fips-1.0.2.4/README
View File

@@ -1,8 +1,8 @@
BouncyCastle FIPS Distribution (https://www.bouncycastle.org/fips-java)
-----------------------------------------------------------------------
Version: 1.0.2.3
Version: 1.0.2.4
From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
License(s):
MIT (bundled/bouncycastle-fips-1.0.2.3/LICENSE)
MIT (bundled/bouncycastle-fips-1.0.2.4/LICENSE)

1
doc/licenses/bouncycastle-fips-1.0.2.4/dep-coordinates.txt Normal file
View File

@@ -0,0 +1 @@
org.bouncycastle:bc-fips:jar:1.0.2.4

5
doc/licenses/directory-api-2.1.3/NOTICE
View File

@@ -1,5 +0,0 @@
Apache Directory LDAP API
Copyright 2003-2022 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

1
doc/licenses/directory-api-2.1.3/dep-coordinates.txt
View File

@@ -1 +0,0 @@
org.apache.directory.api:api-all:jar:2.1.3

5
doc/licenses/directory-api-2.1.4/NOTICE Normal file
View File

@@ -0,0 +1,5 @@
Apache Directory LDAP API
Copyright 2003-2023 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).

2
doc/licenses/directory-api-2.1.3/README → doc/licenses/directory-api-2.1.4/README
View File

@@ -1,7 +1,7 @@
Apache Directory LDAP API (http://directory.apache.org)
-------------------------------------------------------
Version: 2.1.3
Version: 2.1.4
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0

1
doc/licenses/directory-api-2.1.4/dep-coordinates.txt Normal file
View File

@@ -0,0 +1 @@
org.apache.directory.api:api-all:jar:2.1.4

2
doc/licenses/guava-32.1.1-jre/README → doc/licenses/guava-32.1.2-jre/README
View File

@@ -1,7 +1,7 @@
Guava: Google Core Libraries for Java (https://github.com/google/guava)
-----------------------------------------------------------------------
Version: 32.1.1-jre
Version: 32.1.2-jre
From: 'Google Inc.' (http://www.google.com/)
License(s):
Apache v2.0

2
doc/licenses/guava-32.1.1-jre/dep-coordinates.txt → doc/licenses/guava-32.1.2-jre/dep-coordinates.txt
View File

@@ -1,3 +1,3 @@
com.google.guava:failureaccess:jar:1.0.1
com.google.guava:guava:jar:32.1.1-jre
com.google.guava:guava:jar:32.1.2-jre
com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava

1
doc/licenses/jquery-3.6.4/dep-coordinates.txt
View File

@@ -1 +0,0 @@
jquery:3.6.4

0
doc/licenses/jquery-3.6.4/LICENSE.txt → doc/licenses/jquery-3.7.1/LICENSE.txt
View File

4
doc/licenses/jquery-3.6.4/README → doc/licenses/jquery-3.7.1/README
View File

@@ -1,8 +1,8 @@
jQuery (http://jquery.com/)
---------------------------
Version: 3.6.4
Version: 3.7.1
From: 'OpenJS Foundation' (https://openjsf.org/)
License(s):
MIT (bundled/jquery-3.6.4/LICENSE.txt)
MIT (bundled/jquery-3.7.1/LICENSE.txt)

1
doc/licenses/jquery-3.7.1/dep-coordinates.txt Normal file
View File

@@ -0,0 +1 @@
jquery:3.7.1

5
doc/licenses/kotlin-1.9.0/dep-coordinates.txt
View File

@@ -1,5 +0,0 @@
org.jetbrains.kotlin:kotlin-reflect:jar:1.9.0
org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.0
org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.9.0
org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.0
org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.0

0
doc/licenses/kotlin-1.9.0/NOTICE.txt → doc/licenses/kotlin-1.9.10/NOTICE.txt
View File

2
doc/licenses/kotlin-1.9.0/README → doc/licenses/kotlin-1.9.10/README
View File

@@ -1,7 +1,7 @@
Kotlin (https://kotlinlang.org/)
--------------------------------
Version: 1.9.0
Version: 1.9.10
From: 'JetBrains s.r.o and respective authors and developers'
License(s):
Apache v2.0

5
doc/licenses/kotlin-1.9.10/dep-coordinates.txt Normal file
View File

@@ -0,0 +1,5 @@
org.jetbrains.kotlin:kotlin-reflect:jar:1.9.10
org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.10
org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.9.10
org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.10
org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.10

1
doc/licenses/ksm-sdk-16.5.4/dep-coordinates.txt
View File

@@ -1 +0,0 @@
com.keepersecurity.secrets-manager:core:jar:16.5.4

0
doc/licenses/ksm-sdk-16.5.4/LICENSE → doc/licenses/ksm-sdk-16.6.2/LICENSE
View File

4
doc/licenses/ksm-sdk-16.5.4/README → doc/licenses/ksm-sdk-16.6.2/README
View File

@@ -2,8 +2,8 @@ Keeper Secrets Manager Java SDK
(https://github.com/Keeper-Security/secrets-manager)
----------------------------------------------------
Version: 16.5.4
Version: 16.6.2
From: 'Keeper Security' (https://www.keepersecurity.com/)
License(s):
MIT (bundled/ksm-sdk-16.5.4/LICENSE)
MIT (bundled/ksm-sdk-16.6.2/LICENSE)

1
doc/licenses/ksm-sdk-16.6.2/dep-coordinates.txt Normal file
View File

@@ -0,0 +1 @@
com.keepersecurity.secrets-manager:core:jar:16.6.2

0
doc/licenses/logback-1.3.8/LICENSE.txt → doc/licenses/logback-1.3.11/LICENSE.txt
View File

4
doc/licenses/logback-1.3.8/README → doc/licenses/logback-1.3.11/README
View File

@@ -1,8 +1,8 @@
Logback (http://logback.qos.ch/)
--------------------------------
Version: 1.3.8
Version: 1.3.11
From: 'QOS.ch Sàrl' (http://qos.ch/)
License(s):
EPL v1.0 (bundled/logback-1.3.8/LICENSE.txt)
EPL v1.0 (bundled/logback-1.3.11/LICENSE.txt)

2
doc/licenses/logback-1.3.11/dep-coordinates.txt Normal file
View File

@@ -0,0 +1,2 @@
ch.qos.logback:logback-classic:jar:1.3.11
ch.qos.logback:logback-core:jar:1.3.11

2
doc/licenses/logback-1.3.8/dep-coordinates.txt
View File

@@ -1,2 +0,0 @@
ch.qos.logback:logback-classic:jar:1.3.8
ch.qos.logback:logback-core:jar:1.3.8

2
doc/licenses/slf4j-api-2.0.7/dep-coordinates.txt
View File

@@ -1,2 +0,0 @@
org.slf4j:jul-to-slf4j:jar:2.0.7
org.slf4j:slf4j-api:jar:2.0.7

0
doc/licenses/slf4j-api-2.0.7/LICENSE.txt → doc/licenses/slf4j-api-2.0.9/LICENSE.txt
View File

4
doc/licenses/slf4j-api-2.0.7/README → doc/licenses/slf4j-api-2.0.9/README
View File

@@ -1,8 +1,8 @@
Simple Logging Facade for Java (http://slf4j.org/)
--------------------------------------------------
Version: 2.0.7
Version: 2.0.9
From: 'QOS.ch Sàrl' (http://qos.ch/)
License(s):
MIT (bundled/slf4j-api-2.0.7/LICENSE.txt)
MIT (bundled/slf4j-api-2.0.9/LICENSE.txt)

2
doc/licenses/slf4j-api-2.0.9/dep-coordinates.txt Normal file
View File

@@ -0,0 +1,2 @@
org.slf4j:jul-to-slf4j:jar:2.0.9
org.slf4j:slf4j-api:jar:2.0.9

1
doc/licenses/webpack-4.46.0/dep-coordinates.txt
View File

@@ -1 +0,0 @@
webpack:4.46.0

0
doc/licenses/webpack-4.46.0/LICENSE → doc/licenses/webpack-4.47.0/LICENSE
View File

4
doc/licenses/webpack-4.46.0/README → doc/licenses/webpack-4.47.0/README
View File

@@ -1,8 +1,8 @@
Webpack (https://webpack.js.org/)
---------------------------------
Version: 4.46.0
Version: 4.47.0
From: 'JS Foundation and other contributors'
License(s):
MIT (bundled/webpack-4.46.0/LICENSE)
MIT (bundled/webpack-4.47.0/LICENSE)

1
doc/licenses/webpack-4.47.0/dep-coordinates.txt Normal file
View File

@@ -0,0 +1 @@
webpack:4.47.0

2
doc/licenses/zxing-3.5.1/dep-coordinates.txt
View File

@@ -1,2 +0,0 @@
com.google.zxing:core:jar:3.5.1
com.google.zxing:javase:jar:3.5.1

0
doc/licenses/zxing-3.5.1/AUTHORS → doc/licenses/zxing-3.5.2/AUTHORS
View File

0
doc/licenses/zxing-3.5.1/NOTICE → doc/licenses/zxing-3.5.2/NOTICE
View File

4
doc/licenses/zxing-3.5.1/README → doc/licenses/zxing-3.5.2/README
View File

@@ -1,8 +1,8 @@
ZXing Barcode Scanning Library (https://github.com/zxing/zxing/)
----------------------------------------------------------------
Version: 3.5.1
From: 'ZXing authors' (https://github.com/zxing/zxing/blob/zxing-3.5.1/AUTHORS)
Version: 3.5.2
From: 'ZXing authors' (https://github.com/zxing/zxing/blob/zxing-3.5.2/AUTHORS)
License(s):
Apache v2.0

2
doc/licenses/zxing-3.5.2/dep-coordinates.txt Normal file
View File

@@ -0,0 +1,2 @@
com.google.zxing:core:jar:3.5.2
com.google.zxing:javase:jar:3.5.2

2
extensions/guacamole-auth-ldap/pom.xml
View File

@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId>
<version>2.1.3</version>
<version>2.1.4</version>
<exclusions>
</exclusions>
</dependency>

4
extensions/guacamole-auth-totp/pom.xml
View File

@@ -162,12 +162,12 @@
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
</dependency>
<!-- Guacamole depends on an implementation of JAX-WS -->

6
extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml
View File

@@ -38,7 +38,7 @@
</parent>
<properties>
<kotlin.version>1.9.0</kotlin.version>
<kotlin.version>1.9.10</kotlin.version>
</properties>
<dependencies>
@@ -60,7 +60,7 @@
<dependency>
<groupId>com.keepersecurity.secrets-manager</groupId>
<artifactId>core</artifactId>
<version>16.5.4</version>
<version>16.6.2</version>
<!-- Correct version conflict (different versions across transitive
dependencies) -->
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bc-fips</artifactId>
<version>1.0.2.3</version>
<version>1.0.2.4</version>
</dependency>
</dependencies>

10
guacamole/pom.xml
View File

@@ -68,6 +68,13 @@
<configuration>
<workingDirectory>src/main/frontend</workingDirectory>
<installDirectory>${project.build.directory}</installDirectory>
<!-- Newer Node.js requires the following to avoid an "ERR_OSSL_EVP_UNSUPPORTED"
error when WebPack attempts to use its default hash (MD4) for content hashing -->
<environmentVariables>
<NODE_OPTIONS>--openssl-legacy-provider</NODE_OPTIONS>
</environmentVariables>
</configuration>
<executions>
<execution>
@@ -76,7 +83,8 @@
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<nodeVersion>v14.16.0</nodeVersion>
<nodeVersion>v18.18.0</nodeVersion>
<npmVersion>9.8.1</npmVersion>
</configuration>
</execution>
<execution>

84
guacamole/src/main/frontend/package-lock.json generated
View File

@@ -17,7 +17,7 @@
"datalist-polyfill": "^1.25.1",
"file-saver": "^2.0.5",
"fuzzysort": "^2.0.4",
"jquery": "^3.6.4",
"jquery": "^3.7.1",
"jstz": "^2.1.1",
"lodash": "^4.17.21",
"yaml": "^2.2.2"
@@ -36,7 +36,7 @@
"google-closure-compiler": "20221004.0.0",
"html-webpack-plugin": "^4.5.2",
"mini-css-extract-plugin": "^1.6.2",
"webpack": "^4.46.0",
"webpack": "^4.47.0",
"webpack-cli": "^4.10.0"
}
},
@@ -4328,9 +4328,9 @@
}
},
"node_modules/css-minimizer-webpack-plugin/node_modules/semver": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"dev": true,
"bin": {
"semver": "bin/semver.js"
@@ -6776,9 +6776,9 @@
}
},
"node_modules/jquery": {
"version": "3.6.4",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz",
"integrity": "sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ=="
"version": "3.7.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
"integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
},
"node_modules/js-tokens": {
"version": "4.0.0",
@@ -6955,9 +6955,9 @@
}
},
"node_modules/make-dir/node_modules/semver": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
"version": "5.7.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
"bin": {
"semver": "bin/semver"
}
@@ -7949,9 +7949,9 @@
}
},
"node_modules/postcss": {
"version": "8.4.21",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
"integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
"version": "8.4.31",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
"integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
"dev": true,
"funding": [
{
@@ -7961,10 +7961,14 @@
{
"type": "tidelift",
"url": "https://tidelift.com/funding/github/npm/postcss"
},
{
"type": "github",
"url": "https://github.com/sponsors/ai"
}
],
"dependencies": {
"nanoid": "^3.3.4",
"nanoid": "^3.3.6",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
},
@@ -9665,9 +9669,9 @@
}
},
"node_modules/semver": {
"version": "7.3.8",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
"version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
@@ -11187,9 +11191,9 @@
}
},
"node_modules/webpack": {
"version": "4.46.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz",
"integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==",
"version": "4.47.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.47.0.tgz",
"integrity": "sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==",
"dependencies": {
"@webassemblyjs/ast": "1.9.0",
"@webassemblyjs/helper-module-context": "1.9.0",
@@ -14672,9 +14676,9 @@
}
},
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"dev": true
},
"serialize-javascript": {
@@ -16522,9 +16526,9 @@
}
},
"jquery": {
"version": "3.6.4",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz",
"integrity": "sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ=="
"version": "3.7.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
"integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
},
"js-tokens": {
"version": "4.0.0",
@@ -16671,9 +16675,9 @@
},
"dependencies": {
"semver": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
"version": "5.7.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
}
}
},
@@ -17464,12 +17468,12 @@
"integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg=="
},
"postcss": {
"version": "8.4.21",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
"integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
"version": "8.4.31",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
"integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
"dev": true,
"requires": {
"nanoid": "^3.3.4",
"nanoid": "^3.3.6",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
}
@@ -18846,9 +18850,9 @@
}
},
"semver": {
"version": "7.3.8",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
"version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
"requires": {
"lru-cache": "^6.0.0"
@@ -20088,9 +20092,9 @@
}
},
"webpack": {
"version": "4.46.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz",
"integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==",
"version": "4.47.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.47.0.tgz",
"integrity": "sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==",
"requires": {
"@webassemblyjs/ast": "1.9.0",
"@webassemblyjs/helper-module-context": "1.9.0",

4
guacamole/src/main/frontend/package.json
View File

@@ -16,7 +16,7 @@
"datalist-polyfill": "^1.25.1",
"file-saver": "^2.0.5",
"fuzzysort": "^2.0.4",
"jquery": "^3.6.4",
"jquery": "^3.7.1",
"jstz": "^2.1.1",
"lodash": "^4.17.21",
"yaml": "^2.2.2"
@@ -35,7 +35,7 @@
"google-closure-compiler": "20221004.0.0",
"html-webpack-plugin": "^4.5.2",
"mini-css-extract-plugin": "^1.6.2",
"webpack": "^4.46.0",
"webpack": "^4.47.0",
"webpack-cli": "^4.10.0"
}
}

13
guacamole/src/main/frontend/plugins/dependency-list-plugin.js
View File

@@ -91,6 +91,13 @@ class DependencyListPlugin {
*/
const logger = compiler.getInfrastructureLogger(PLUGIN_NAME);
/**
* The directory receiving the dependency list file.
*
* @type {string}
*/
const outputPath = this.options.path || compiler.options.output.path;
/**
* The full path to the output file that should contain the list of
* discovered NPM module dependencies.
@@ -98,7 +105,7 @@ class DependencyListPlugin {
* @type {string}
*/
const outputFile = path.join(
this.options.path || compiler.options.output.path,
outputPath,
this.options.filename || 'npm-dependencies.txt'
);
@@ -132,6 +139,10 @@ class DependencyListPlugin {
});
// Create output path if it doesn't yet exist
if (!fs.existsSync(outputPath))
fs.mkdirSync(outputPath, { recursive: true, mode: 0o755 });
// Write all discovered NPM packages to configured output file
const sortedCoords = Object.keys(moduleCoords).sort();
fs.writeFileSync(outputFile, sortedCoords.join('\n') + '\n');

47
guacamole/util/run-npm.sh Executable file
View File

@@ -0,0 +1,47 @@
#!/bin/sh
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#
#
# run-npm.sh - Convenience script for automatically running the version of NPM
# used by the "guacamole" build. All command-line options given to this script
# are passed directly to NPM. The Guacamole build must have run at least once,
# even unsuccessfully, for copies of Node.js and NPM to have been downloaded.
#
##
## The directory containing this script.
##
UTIL_DIR="`dirname "$0"`"
##
## The directory containing the "guacamole" project.
##
PROJECT_DIR="$UTIL_DIR/.."
##
## The directory containing copies of Node.js and NPM that were downloaded by
## the "guacamole" project build process.
##
NODE_DIR="$PROJECT_DIR/target/node"
# Invoke NPM with provided arguments, using the Node.js and NPM versions
# downloaded by the "guacamole" project build
exec "$NODE_DIR/node" "$NODE_DIR/node_modules/npm/bin/npm-cli.js" "$@"

10
pom.xml
View File

@@ -36,16 +36,16 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Dependency versions -->
<guava.version>32.1.1-jre</guava.version>
<guava.version>32.1.2-jre</guava.version>
<guice.version>5.1.0</guice.version>
<hk2.version>2.6.1</hk2.version>
<jackson.version>2.15.2</jackson.version>
<jackson-databind.version>2.15.2</jackson-databind.version>
<jersey.version>2.40</jersey.version>
<junit.version>5.9.3</junit.version>
<junit.version>5.10.0</junit.version>
<junit4.version>4.13.2</junit4.version>
<logback.version>1.3.8</logback.version>
<slf4j.version>2.0.7</slf4j.version>
<logback.version>1.3.11</logback.version>
<slf4j.version>2.0.9</slf4j.version>
<!-- The directory that should receive all generated dependency lists
(for LICENSE generation) -->
@@ -512,7 +512,7 @@
</ignoreVersion>
<ignoreVersion>
<type>regex</type>
<version>.+-(alpha|beta)\b.*?</version>
<version>.+-(alpha|Alpha|beta|Beta)[0-9]*\b.*?</version>
</ignoreVersion>
</ignoreVersions>
<rules>