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

Merge patch branch changes to main.

Browse Source
This commit is contained in:
Virtually Nick
2025-01-02 22:11:27 -05:00
parent 607e6118ff b3e21b7c70
commit 0995eb8eb8
86 changed files with 585 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/guacamole-auth-duo/pom.xml
View File

@@ -40,7 +40,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<okhttp.version>4.12.0</okhttp.version>
<kotlin.version>1.9.23</kotlin.version>
<kotlin.version>1.9.25</kotlin.version>
</properties>
<dependencies>
@@ -77,7 +77,7 @@
<dependency>
<groupId>com.duosecurity</groupId>
<artifactId>duo-universal-sdk</artifactId>
<version>1.1.3</version>
<version>1.2.0</version>
<exclusions>
<exclusion>
<groupId>com.squareup.okhttp3</groupId>
@@ -134,7 +134,6 @@
<dependency>
<groupId>com.github.seancfoley</groupId>
<artifactId>ipaddress</artifactId>
<version>5.5.0</version>
<scope>provided</scope>
</dependency>

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
View File

@@ -57,7 +57,7 @@
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>3.5.16</version>
<version>3.5.17</version>
</dependency>
<!-- MyBatis Guice -->

1
extensions/guacamole-auth-json/pom.xml
View File

@@ -77,7 +77,6 @@
<dependency>
<groupId>com.github.seancfoley</groupId>
<artifactId>ipaddress</artifactId>
<version>5.5.0</version>
<scope>provided</scope>
</dependency>

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

@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.16.0</version>
<version>3.17.0</version>
</dependency>
</dependencies>

13
extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/user/AuthenticatedUser.java
View File

@@ -23,8 +23,6 @@ import com.google.inject.Inject;
import org.apache.guacamole.net.auth.AbstractAuthenticatedUser;
import org.apache.guacamole.net.auth.AuthenticationProvider;
import org.apache.guacamole.net.auth.Credentials;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* An RADIUS-specific implementation of AuthenticatedUser, associating a
@@ -32,11 +30,6 @@ import org.slf4j.LoggerFactory;
*/
public class AuthenticatedUser extends AbstractAuthenticatedUser {
/**
* Logger for this class.
*/
private static final Logger LOGGER = LoggerFactory.getLogger(AuthenticatedUser.class);
/**
* Reference to the authentication provider associated with this
* authenticated user.
@@ -44,12 +37,6 @@ public class AuthenticatedUser extends AbstractAuthenticatedUser {
@Inject
private AuthenticationProvider authProvider;
/**
* A reference to the configuration service associated with this module.
*/
@Inject
private ConfigurationService confService;
/**
* The credentials provided when this user was authenticated.
*/

1
extensions/guacamole-auth-restrict/pom.xml
View File

@@ -170,7 +170,6 @@
<dependency>
<groupId>com.github.seancfoley</groupId>
<artifactId>ipaddress</artifactId>
<version>5.5.0</version>
<scope>provided</scope>
</dependency>

21
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml
View File

@@ -77,9 +77,28 @@
<artifactId>commons-codec</artifactId>
</exclusion>
<!--
Replace older BouncyCastle (1.70) with newer, compatible
version (1.79), which has since been renamed from
"bcpkix-jdk15on" to "bcpkix-jdk15to18".
-->
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- BouncyCastle for Java 5 and above (formerly "bcpkix-jdk15on", a
transitive dependency of cas-client-core that we are overriding to
force an update) -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15to18</artifactId>
<version>1.79</version>
</dependency>
<!-- Guava - Utility Library -->
<dependency>
<groupId>com.google.guava</groupId>

8
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml
View File

@@ -96,7 +96,7 @@
<!--
Replace slightly older commons-lang3 (3.12.0) with latest
compatible version (3.16.0) so that we don't need two copies
compatible version (3.17.0) so that we don't need two copies
of the same license information.
-->
<exclusion>
@@ -122,14 +122,14 @@
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>6.6.0</version>
<version>5.4.0</version>
</dependency>
<!-- Apache XML Security for Java (see exclusions for java-saml) -->
<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
<version>4.0.2</version>
<version>2.2.6</version>
<exclusions>
<!--
@@ -150,7 +150,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.16.0</version>
<version>3.17.0</version>
</dependency>
<!-- Apache Commons Codec (see exclusions for java-saml and xmlsec) -->

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

@@ -182,7 +182,6 @@
<dependency>
<groupId>com.github.seancfoley</groupId>
<artifactId>ipaddress</artifactId>
<version>5.5.0</version>
<scope>provided</scope>
</dependency>

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

@@ -38,7 +38,7 @@
</parent>
<properties>
<kotlin.version>1.9.23</kotlin.version>
<kotlin.version>1.9.25</kotlin.version>
</properties>
<dependencies>
@@ -60,7 +60,7 @@
<dependency>
<groupId>com.keepersecurity.secrets-manager</groupId>
<artifactId>core</artifactId>
<version>16.6.5</version>
<version>16.6.6</version>
<!-- Correct version conflict (different versions across transitive
dependencies) -->