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.4.0 changes back to master.

Browse Source
This commit is contained in:
Virtually Nick
2021-12-12 07:25:13 -05:00
parent 666ae93a9d a9e15a9988
commit 588915d232
43 changed files with 99 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/guacamole-example/pom.xml
View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-example</artifactId> <artifactId>guacamole-example</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole-example</name> <name>guacamole-example</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
@@ -106,7 +106,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId> <artifactId>guacamole-common</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@@ -114,7 +114,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId> <artifactId>guacamole-common-js</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<type>zip</type> <type>zip</type>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>

4
doc/guacamole-playback-example/pom.xml
View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-playback-example</artifactId> <artifactId>guacamole-playback-example</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole-playback-example</name> <name>guacamole-playback-example</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
@@ -88,7 +88,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId> <artifactId>guacamole-common-js</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<type>zip</type> <type>zip</type>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>

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

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-duo</artifactId> <artifactId>guacamole-auth-duo</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole-auth-duo</name> <name>guacamole-auth-duo</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>
@@ -132,7 +132,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

2
extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"guacamoleVersion" : "1.3.0", "guacamoleVersion" : "1.4.0",
"name" : "Duo TFA Authentication Backend", "name" : "Duo TFA Authentication Backend",
"namespace" : "duo", "namespace" : "duo",

6
extensions/guacamole-auth-header/pom.xml
View File

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-header</artifactId> <artifactId>guacamole-auth-header</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole-auth-header</name> <name>guacamole-auth-header</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>
@@ -43,7 +43,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

2
extensions/guacamole-auth-header/src/main/resources/guac-manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"guacamoleVersion" : "1.2.0", "guacamoleVersion" : "1.4.0",
"name" : "HTTP Header Authentication Extension", "name" : "HTTP Header Authentication Extension",
"namespace" : "header", "namespace" : "header",

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

@@ -32,7 +32,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId> <artifactId>guacamole-auth-jdbc</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>

8
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
View File

@@ -32,7 +32,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId> <artifactId>guacamole-auth-jdbc</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
@@ -42,21 +42,21 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-mysql</artifactId> <artifactId>guacamole-auth-jdbc-mysql</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
</dependency> </dependency>
<!-- PostgreSQL Authentication Extension --> <!-- PostgreSQL Authentication Extension -->
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-postgresql</artifactId> <artifactId>guacamole-auth-jdbc-postgresql</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
</dependency> </dependency>
<!-- SQL Server Authentication Extension --> <!-- SQL Server Authentication Extension -->
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-sqlserver</artifactId> <artifactId>guacamole-auth-jdbc-sqlserver</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
</dependency> </dependency>
</dependencies> </dependencies>

4
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
View File

@@ -32,7 +32,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId> <artifactId>guacamole-auth-jdbc</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
@@ -49,7 +49,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-base</artifactId> <artifactId>guacamole-auth-jdbc-base</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"guacamoleVersion" : "1.3.0", "guacamoleVersion" : "1.4.0",
"name" : "MySQL Authentication", "name" : "MySQL Authentication",
"namespace" : "mysql", "namespace" : "mysql",

4
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
View File

@@ -32,7 +32,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId> <artifactId>guacamole-auth-jdbc</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
@@ -49,7 +49,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-base</artifactId> <artifactId>guacamole-auth-jdbc-base</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"guacamoleVersion" : "1.3.0", "guacamoleVersion" : "1.4.0",
"name" : "PostgreSQL Authentication", "name" : "PostgreSQL Authentication",
"namespace" : "postgresql", "namespace" : "postgresql",

4
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
View File

@@ -32,7 +32,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId> <artifactId>guacamole-auth-jdbc</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
@@ -49,7 +49,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-base</artifactId> <artifactId>guacamole-auth-jdbc-base</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"guacamoleVersion" : "1.3.0", "guacamoleVersion" : "1.4.0",
"name" : "SQLServer Authentication", "name" : "SQLServer Authentication",
"namespace" : "sqlserver", "namespace" : "sqlserver",

6
extensions/guacamole-auth-jdbc/pom.xml
View File

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId> <artifactId>guacamole-auth-jdbc</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole-auth-jdbc</name> <name>guacamole-auth-jdbc</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>
@@ -59,7 +59,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

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

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-json</artifactId> <artifactId>guacamole-auth-json</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole-auth-json</name> <name>guacamole-auth-json</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>
@@ -43,7 +43,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

2
extensions/guacamole-auth-json/src/main/resources/guac-manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"guacamoleVersion" : "1.3.0", "guacamoleVersion" : "1.4.0",
"name" : "Encrypted JSON Authentication", "name" : "Encrypted JSON Authentication",
"namespace" : "json", "namespace" : "json",

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

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-ldap</artifactId> <artifactId>guacamole-auth-ldap</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole-auth-ldap</name> <name>guacamole-auth-ldap</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>
@@ -43,7 +43,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

2
extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"guacamoleVersion" : "1.3.0", "guacamoleVersion" : "1.4.0",
"name" : "LDAP Authentication", "name" : "LDAP Authentication",
"namespace" : "ldap", "namespace" : "ldap",

6
extensions/guacamole-auth-quickconnect/pom.xml
View File

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-quickconnect</artifactId> <artifactId>guacamole-auth-quickconnect</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole-auth-quickconnect</name> <name>guacamole-auth-quickconnect</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>
@@ -98,7 +98,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

2
extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json
View File

@@ -1,5 +1,5 @@
{ {
"guacamoleVersion" : "1.3.0", "guacamoleVersion" : "1.4.0",
"name" : "Adhoc Guacamole Connections", "name" : "Adhoc Guacamole Connections",
"namespace" : "quickconnect", "namespace" : "quickconnect",

6
extensions/guacamole-auth-radius/pom.xml
View File

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-radius</artifactId> <artifactId>guacamole-auth-radius</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole-auth-radius</name> <name>guacamole-auth-radius</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>
@@ -115,7 +115,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

2
extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"guacamoleVersion" : "1.3.0", "guacamoleVersion" : "1.4.0",
"name" : "RADIUS Authentication Backend", "name" : "RADIUS Authentication Backend",
"namespace" : "radius", "namespace" : "radius",

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

@@ -32,7 +32,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso</artifactId> <artifactId>guacamole-auth-sso</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>

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

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso-cas</artifactId> <artifactId>guacamole-auth-sso-cas</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole-auth-sso-cas</name> <name>guacamole-auth-sso-cas</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso</artifactId> <artifactId>guacamole-auth-sso</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>

2
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/guac-manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"guacamoleVersion" : "1.3.0", "guacamoleVersion" : "1.4.0",
"name" : "CAS Authentication Extension", "name" : "CAS Authentication Extension",
"namespace" : "cas", "namespace" : "cas",

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

@@ -32,7 +32,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso</artifactId> <artifactId>guacamole-auth-sso</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
@@ -42,21 +42,21 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso-cas</artifactId> <artifactId>guacamole-auth-sso-cas</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
</dependency> </dependency>
<!-- OpenID Authentication Extension --> <!-- OpenID Authentication Extension -->
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso-openid</artifactId> <artifactId>guacamole-auth-sso-openid</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
</dependency> </dependency>
<!-- SAML Authentication Extension --> <!-- SAML Authentication Extension -->
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso-saml</artifactId> <artifactId>guacamole-auth-sso-saml</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
</dependency> </dependency>
</dependencies> </dependencies>

4
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml
View File

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso-openid</artifactId> <artifactId>guacamole-auth-sso-openid</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole-auth-sso-openid</name> <name>guacamole-auth-sso-openid</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso</artifactId> <artifactId>guacamole-auth-sso</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>

2
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/guac-manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"guacamoleVersion" : "1.3.0", "guacamoleVersion" : "1.4.0",
"name" : "OpenID Authentication Extension", "name" : "OpenID Authentication Extension",
"namespace" : "openid", "namespace" : "openid",

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

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso-saml</artifactId> <artifactId>guacamole-auth-sso-saml</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole-auth-sso-saml</name> <name>guacamole-auth-sso-saml</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso</artifactId> <artifactId>guacamole-auth-sso</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>

2
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/guac-manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"guacamoleVersion" : "1.3.0", "guacamoleVersion" : "1.4.0",
"name" : "SAML Authentication Extension", "name" : "SAML Authentication Extension",
"namespace" : "saml", "namespace" : "saml",

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

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso</artifactId> <artifactId>guacamole-auth-sso</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole-auth-sso</name> <name>guacamole-auth-sso</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>
@@ -59,7 +59,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@@ -67,7 +67,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso-base</artifactId> <artifactId>guacamole-auth-sso-base</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
</dependency> </dependency>
<!-- Java servlet API --> <!-- Java servlet API -->

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

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-totp</artifactId> <artifactId>guacamole-auth-totp</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole-auth-totp</name> <name>guacamole-auth-totp</name>
<url>http://guacamole.incubator.apache.org/</url> <url>http://guacamole.incubator.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>
@@ -127,7 +127,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

2
extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"guacamoleVersion" : "1.3.0", "guacamoleVersion" : "1.4.0",
"name" : "TOTP TFA Authentication Backend", "name" : "TOTP TFA Authentication Backend",
"namespace" : "totp", "namespace" : "totp",

4
extensions/pom.xml
View File

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>extensions</name> <name>extensions</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-client</artifactId> <artifactId>guacamole-client</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>

4
guacamole-common-js/pom.xml
View File

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId> <artifactId>guacamole-common-js</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole-common-js</name> <name>guacamole-common-js</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-client</artifactId> <artifactId>guacamole-client</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>

2
guacamole-common-js/src/main/webapp/modules/Version.js
View File

@@ -27,4 +27,4 @@ var Guacamole = Guacamole || {};
* *
* @type {String} * @type {String}
*/ */
Guacamole.API_VERSION = "1.3.0"; Guacamole.API_VERSION = "1.4.0";

4
guacamole-common/pom.xml
View File

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId> <artifactId>guacamole-common</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole-common</name> <name>guacamole-common</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-client</artifactId> <artifactId>guacamole-client</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>

6
guacamole-ext/pom.xml
View File

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole-ext</name> <name>guacamole-ext</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-client</artifactId> <artifactId>guacamole-client</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>
@@ -87,7 +87,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId> <artifactId>guacamole-common</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

8
guacamole/pom.xml
View File

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole</artifactId> <artifactId>guacamole</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole</name> <name>guacamole</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-client</artifactId> <artifactId>guacamole-client</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>
@@ -237,14 +237,14 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
</dependency> </dependency>
<!-- Guacamole JavaScript API --> <!-- Guacamole JavaScript API -->
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId> <artifactId>guacamole-common-js</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
<type>zip</type> <type>zip</type>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>

18
guacamole/src/main/frontend/src/app/index/controllers/indexController.js
View File

@@ -25,6 +25,7 @@ angular.module('index').controller('indexController', ['$scope', '$injector',
// Required services // Required services
const $document = $injector.get('$document'); const $document = $injector.get('$document');
const $location = $injector.get('$location');
const $route = $injector.get('$route'); const $route = $injector.get('$route');
const $window = $injector.get('$window'); const $window = $injector.get('$window');
const clipboardService = $injector.get('clipboardService'); const clipboardService = $injector.get('clipboardService');
@@ -220,13 +221,22 @@ angular.module('index').controller('indexController', ['$scope', '$injector',
}, true); }, true);
/** /**
* Reloads the current route and controller, effectively forcing * Navigates the user back to the root of the application (or reloads the
* reauthentication. If the user is not logged in, this will result in * current route and controller if the user is already there), effectively
* the login screen appearing. * forcing reauthentication. If the user is not logged in, this will result
* in the login screen appearing.
*/ */
$scope.reAuthenticate = function reAuthenticate() { $scope.reAuthenticate = function reAuthenticate() {
$scope.reAuthenticating = true; $scope.reAuthenticating = true;
$route.reload();
// Clear out URL state to conveniently bring user back to home screen
// upon relogin
if ($location.path() !== '/')
$location.url('/');
else
$route.reload();
}; };
// Display login screen if a whole new set of credentials is needed // Display login screen if a whole new set of credentials is needed

3
guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
View File

@@ -66,7 +66,8 @@ public class ExtensionModule extends ServletModule {
"1.0.0", "1.0.0",
"1.1.0", "1.1.0",
"1.2.0", "1.2.0",
"1.3.0" "1.3.0",
"1.4.0"
)); ));
/** /**

2
pom.xml
View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-client</artifactId> <artifactId>guacamole-client</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.3.0</version> <version>1.4.0</version>
<name>guacamole-client</name> <name>guacamole-client</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>