Skip to content

Commit

Permalink
Merge branch 'working/login-restrictions' of https://github.com/necou…
Browse files Browse the repository at this point in the history
…chman/guacamole-client into loginrestr

Conflicts:
	extensions/guacamole-auth-restrict/pom.xml
  • Loading branch information
Steven T. Barnhart committed Sep 26, 2023
2 parents ab53428 + 8e12d86 commit a0ea24b
Show file tree
Hide file tree
Showing 138 changed files with 2,172 additions and 371 deletions.
5 changes: 5 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ RUN apt-get update && apt-get install -y firefox
# as well: `--build-arg MAVEN_ARGUMENTS="-P lgpl-extensions -DskipTests=false"`.
ARG MAVEN_ARGUMENTS="-DskipTests=false"

# Versions of JDBC drivers to bundle within image
ARG MSSQL_JDBC_VERSION=9.4.1
ARG MYSQL_JDBC_VERSION=8.0.33
ARG PGSQL_JDBC_VERSION=42.6.0

# Build environment variables
ENV \
BUILD_DIR=/tmp/guacamole-docker-BUILD
Expand Down
8 changes: 4 additions & 4 deletions doc/guacamole-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-example</artifactId>
<packaging>war</packaging>
<version>1.5.2</version>
<version>1.5.3</version>
<name>guacamole-example</name>
<url>http://guacamole.apache.org/</url>

Expand Down Expand Up @@ -106,23 +106,23 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
<version>1.5.2</version>
<version>1.5.3</version>
<scope>compile</scope>
</dependency>

<!-- Guacamole JavaScript library -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
<version>1.5.2</version>
<version>1.5.3</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.6</version>
<version>2.0.7</version>
</dependency>


Expand Down
4 changes: 2 additions & 2 deletions doc/guacamole-playback-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-playback-example</artifactId>
<packaging>war</packaging>
<version>1.5.2</version>
<version>1.5.3</version>
<name>guacamole-playback-example</name>
<url>http://guacamole.apache.org/</url>

Expand Down Expand Up @@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
<version>1.5.2</version>
<version>1.5.3</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>
Expand Down
1 change: 0 additions & 1 deletion doc/licenses/checker-qual-3.12.0/dep-coordinates.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Checker Framework qualifiers (https://checkerframework.org/)
------------------------------------------------------------

Version: 3.12.0
Version: 3.33.0
From: 'Checker Framework developers' (https://checkerframework.org/)
License(s):
MIT (bundled/checker-qual-3.12.0/LICENSE.txt)
MIT (bundled/checker-qual-3.33.0/LICENSE.txt)

1 change: 1 addition & 0 deletions doc/licenses/checker-qual-3.33.0/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.checkerframework:checker-qual:jar:3.33.0
1 change: 0 additions & 1 deletion doc/licenses/directory-api-2.1.2/dep-coordinates.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Apache Directory LDAP API
Copyright 2003-2021 The Apache Software Foundation
Copyright 2003-2022 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Apache Directory LDAP API (http://directory.apache.org)
-------------------------------------------------------

Version: 2.1.2
Version: 2.1.3
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0
Expand Down
1 change: 1 addition & 0 deletions doc/licenses/directory-api-2.1.3/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.apache.directory.api:api-all:jar:2.1.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2001-2016 (C) MetaStuff, Ltd. and DOM4J contributors. All Rights Reserved.
Copyright 2001-2023 © MetaStuff, Ltd. and DOM4J contributors. All Rights Reserved.

Redistribution and use of this software and associated documentation
("Software"), with or without modification, are permitted provided
Expand All @@ -7,24 +7,24 @@ that the following conditions are met:
1. Redistributions of source code must retain copyright
statements and notices. Redistributions must also contain a
copy of this document.

2. Redistributions in binary form must reproduce the
above copyright notice, this list of conditions and the
following disclaimer in the documentation and/or other
materials provided with the distribution.

3. The name "DOM4J" must not be used to endorse or promote
products derived from this Software without prior written
permission of MetaStuff, Ltd. For written permission,
please contact [email protected].

4. Products derived from this Software may not be called "DOM4J"
nor may "DOM4J" appear in their names without prior written
permission of MetaStuff, Ltd. DOM4J is a registered
trademark of MetaStuff, Ltd.

5. Due credit should be given to the DOM4J Project - https://dom4j.github.io/

THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
DOM4J (https://dom4j.github.io/)
--------------------------------

Version: 2.1.3
Version: 2.1.4
From: 'MetaStuff, Ltd. and DOM4J contributors'
License(s):
DOM4J License (bundled/dom4j-2.1.3/LICENSE)
DOM4J License (bundled/dom4j-2.1.4/LICENSE)

Original file line number Diff line number Diff line change
@@ -1 +1 @@
org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:jar:2.1.3_1
org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:jar:2.1.4_1
1 change: 0 additions & 1 deletion doc/licenses/error-prone-2.11.0/dep-coordinates.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Error Prone (https://errorprone.info/)
--------------------------------------

Version: 2.11.0
Version: 2.18.0
From: 'Google Inc.' (http://www.google.com/)
License(s):
Apache v2.0
Expand Down
1 change: 1 addition & 0 deletions doc/licenses/error-prone-2.18.0/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.google.errorprone:error_prone_annotations:jar:2.18.0
21 changes: 21 additions & 0 deletions doc/licenses/fuzzysort-2.0.4/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2018 Stephen Kamenar

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.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
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.
8 changes: 8 additions & 0 deletions doc/licenses/fuzzysort-2.0.4/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
fuzzysort (https://github.com/farzher/fuzzysort/tree/master)
---------------------------------------------

Version: 2.0.4
From: 'Stephen Kamenar' (https://github.com/farzher)
License(s):
MIT (bundled/fuzzysort-2.0.4/LICENSE)

1 change: 1 addition & 0 deletions doc/licenses/fuzzysort-2.0.4/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fuzzysort:2.0.4
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Guava: Google Core Libraries for Java (https://github.com/google/guava)
-----------------------------------------------------------------------

Version: 31.1-jre
Version: 32.1.1-jre
From: 'Google Inc.' (http://www.google.com/)
License(s):
Apache v2.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
com.google.guava:failureaccess:jar:1.0.1
com.google.guava:guava:jar:31.1-jre
com.google.guava:guava:jar:32.1.1-jre
com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava
1 change: 0 additions & 1 deletion doc/licenses/j2objc-annotations-1.3/dep-coordinates.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Java to Objective-C Annotations (https://github.com/google/j2objc)
------------------------------------------------------------------

Version: 1.3
Version: 2.8
From: 'Google Inc.' (http://www.google.com/)
License(s):
Apache v2.0
Expand Down
1 change: 1 addition & 0 deletions doc/licenses/j2objc-annotations-2.8/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.google.j2objc:j2objc-annotations:jar:2.8
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Jackson (https://github.com/FasterXML/jackson)
----------------------------------------------

Version: 2.15.0
Version: 2.15.2
From: 'FasterXML, LLC' (https://github.com/FasterXML)
License(s):
Apache v2.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
com.fasterxml.jackson.core:jackson-core:jar:2.15.0
com.fasterxml.jackson.core:jackson-annotations:jar:2.15.0
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.15.0
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.15.0
com.fasterxml.jackson.core:jackson-core:jar:2.15.2
com.fasterxml.jackson.core:jackson-annotations:jar:2.15.2
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.15.2
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.15.2
1 change: 0 additions & 1 deletion doc/licenses/jackson-databind-2.15.0/dep-coordinates.txt

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Jackson-databind (https://github.com/FasterXML/jackson-databind)
----------------------------------------------

Version: 2.15.0
Version: 2.15.2
From: 'FasterXML, LLC' (https://github.com/FasterXML)
License(s):
Apache v2.0
Expand Down
1 change: 1 addition & 0 deletions doc/licenses/jackson-databind-2.15.2/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.fasterxml.jackson.core:jackson-databind:jar:2.15.2
1 change: 0 additions & 1 deletion doc/licenses/javassist-3.29.0-ga/dep-coordinates.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Javassist (https://www.javassist.org/)
--------------------------------------

Version: 3.29.0-GA
Version: 3.29.2-GA
From: 'Shigeru Chiba' (https://github.com/chibash)
License(s):
Apache v2.0
Expand Down
1 change: 1 addition & 0 deletions doc/licenses/javassist-3.29.2-ga/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.javassist:javassist:jar:3.29.2-GA
7 changes: 0 additions & 7 deletions doc/licenses/jersey-2.39.1/dep-coordinates.txt

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Jersey (https://jersey.java.net/)
---------------------------------

Version: 2.39.1
Version: 2.40
From: 'Eclipse Foundation' (https://www.eclipse.org/)
License(s):
EPL v2.0 (bundled/jersey-2.39.1/LICENSE.md)
EPL v2.0 (bundled/jersey-2.40/LICENSE.md)

7 changes: 7 additions & 0 deletions doc/licenses/jersey-2.40/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.40
org.glassfish.jersey.core:jersey-common:jar:2.40
org.glassfish.jersey.core:jersey-server:jar:2.40
org.glassfish.jersey.core:jersey-client:jar:2.40
org.glassfish.jersey.inject:jersey-hk2:jar:2.40
org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.40
org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.40
5 changes: 0 additions & 5 deletions doc/licenses/kotlin-1.8.20/dep-coordinates.txt

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Kotlin (https://kotlinlang.org/)
--------------------------------

Version: 1.8.20
Version: 1.9.0
From: 'JetBrains s.r.o and respective authors and developers'
License(s):
Apache v2.0
Expand Down
5 changes: 5 additions & 0 deletions doc/licenses/kotlin-1.9.0/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
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
1 change: 0 additions & 1 deletion doc/licenses/ksm-sdk-16.5.3/dep-coordinates.txt

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ Keeper Secrets Manager Java SDK
(https://github.com/Keeper-Security/secrets-manager)
----------------------------------------------------

Version: 16.5.3
Version: 16.5.4
From: 'Keeper Security' (https://www.keepersecurity.com/)
License(s):
MIT (bundled/ksm-sdk-16.5.3/LICENSE)
MIT (bundled/ksm-sdk-16.5.4/LICENSE)

1 change: 1 addition & 0 deletions doc/licenses/ksm-sdk-16.5.4/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.keepersecurity.secrets-manager:core:jar:16.5.4
2 changes: 0 additions & 2 deletions doc/licenses/logback-1.3.7/dep-coordinates.txt

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Logback (http://logback.qos.ch/)
--------------------------------

Version: 1.3.7
Version: 1.3.8
From: 'QOS.ch Sàrl' (http://qos.ch/)
License(s):
EPL v1.0 (bundled/logback-1.3.7/LICENSE.txt)
EPL v1.0 (bundled/logback-1.3.8/LICENSE.txt)

2 changes: 2 additions & 0 deletions doc/licenses/logback-1.3.8/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ch.qos.logback:logback-classic:jar:1.3.8
ch.qos.logback:logback-core:jar:1.3.8
6 changes: 3 additions & 3 deletions extensions/guacamole-auth-ban/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-ban</artifactId>
<packaging>jar</packaging>
<version>1.5.2</version>
<version>1.5.3</version>
<name>guacamole-auth-ban</name>
<url>http://guacamole.apache.org/</url>

<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId>
<version>1.5.2</version>
<version>1.5.3</version>
<relativePath>../</relativePath>
</parent>

Expand All @@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>1.5.2</version>
<version>1.5.3</version>
<scope>provided</scope>

<!-- Exclude transitive dependencies that will be overridden by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{

"guacamoleVersion" : "1.5.2",
"guacamoleVersion" : "1.5.3",

"name" : "Brute-force Authentication Detection/Prevention",
"namespace" : "ban",
Expand Down
Loading

0 comments on commit a0ea24b

Please sign in to comment.