From 36a02c1f90824447d4dd1c3277b8c11266cab93d Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 25 Nov 2021 17:54:08 -0800 Subject: [PATCH] GUACAMOLE-1364: Refactor all SSO extensions beneath common base. --- .../.ratignore | 0 .../guacamole-auth-sso-base/.gitignore | 2 + .../guacamole-auth-sso-base}/.ratignore | 0 .../modules/guacamole-auth-sso-base/pom.xml | 39 ++++++++ .../guacamole-auth-sso-cas}/.gitignore | 0 .../guacamole-auth-sso-cas}/.ratignore | 0 .../modules/guacamole-auth-sso-cas}/pom.xml | 24 ++--- .../src/main/assembly/dist.xml | 0 .../cas/AuthenticationProviderService.java | 0 .../auth/cas/CASAuthenticationProvider.java | 0 .../cas/CASAuthenticationProviderModule.java | 0 .../auth/cas/conf/CASGuacamoleProperties.java | 0 .../auth/cas/conf/ConfigurationService.java | 0 .../cas/conf/LdapNameGuacamoleProperty.java | 0 .../cas/conf/PrivateKeyGuacamoleProperty.java | 0 .../auth/cas/form/CASTicketField.java | 0 .../guacamole/auth/cas/group/GroupFormat.java | 0 .../guacamole/auth/cas/group/GroupParser.java | 0 .../auth/cas/group/LDAPGroupParser.java | 0 .../auth/cas/group/PlainGroupParser.java | 0 .../cas/ticket/TicketValidationService.java | 0 .../auth/cas/user/CASAuthenticatedUser.java | 0 .../src/main/resources/guac-manifest.json | 0 .../src/main/resources/license.txt | 0 .../src/main/resources/translations/ca.json | 0 .../src/main/resources/translations/de.json | 0 .../src/main/resources/translations/en.json | 0 .../src/main/resources/translations/fr.json | 0 .../src/main/resources/translations/ja.json | 0 .../src/main/resources/translations/ko.json | 0 .../src/main/resources/translations/pt.json | 0 .../src/main/resources/translations/ru.json | 0 .../src/main/resources/translations/zh.json | 0 .../auth/cas/group/LDAPGroupParserTest.java | 0 .../guacamole-auth-sso-dist/.ratignore | 0 .../modules/guacamole-auth-sso-dist/pom.xml | 72 +++++++++++++++ .../src/main/assembly/dist.xml | 73 +++++++++++++++ .../guacamole-auth-sso-openid}/.gitignore | 0 .../guacamole-auth-sso-openid/.ratignore | 0 .../guacamole-auth-sso-openid}/pom.xml | 24 ++--- .../src/main/assembly/dist.xml | 0 .../openid/AuthenticationProviderService.java | 0 .../openid/OpenIDAuthenticationProvider.java | 0 .../OpenIDAuthenticationProviderModule.java | 0 .../openid/conf/ConfigurationService.java | 0 .../auth/openid/form/TokenField.java | 0 .../auth/openid/token/NonceService.java | 0 .../openid/token/TokenValidationService.java | 0 .../auth/openid/user/AuthenticatedUser.java | 0 .../src/main/resources/guac-manifest.json | 0 .../src/main/resources/license.txt | 0 .../src/main/resources/transformToken.js | 0 .../src/main/resources/translations/ca.json | 0 .../src/main/resources/translations/de.json | 0 .../src/main/resources/translations/en.json | 0 .../src/main/resources/translations/fr.json | 0 .../src/main/resources/translations/ja.json | 0 .../src/main/resources/translations/ko.json | 0 .../src/main/resources/translations/pt.json | 0 .../src/main/resources/translations/ru.json | 0 .../src/main/resources/translations/zh.json | 0 .../guacamole-auth-sso-saml}/.gitignore | 0 .../guacamole-auth-sso-saml/.ratignore | 1 + .../modules/guacamole-auth-sso-saml}/pom.xml | 22 ++--- .../src/main/assembly/dist.xml | 0 .../saml/AuthenticationProviderService.java | 0 .../auth/saml/SAMLAuthenticationProvider.java | 0 .../SAMLAuthenticationProviderModule.java | 0 .../auth/saml/acs/AssertedIdentity.java | 0 .../acs/AssertionConsumerServiceResource.java | 0 .../auth/saml/acs/AuthenticationSession.java | 0 .../acs/AuthenticationSessionManager.java | 0 .../auth/saml/acs/IdentifierGenerator.java | 0 .../guacamole/auth/saml/acs/SAMLService.java | 0 .../auth/saml/conf/ConfigurationService.java | 0 .../auth/saml/user/SAMLAuthenticatedUser.java | 0 .../src/main/resources/guac-manifest.json | 0 .../src/main/resources/license.txt | 0 .../src/main/resources/translations/ca.json | 0 .../src/main/resources/translations/en.json | 0 .../src/main/resources/translations/fr.json | 0 .../src/main/resources/translations/ko.json | 0 .../src/main/resources/translations/pt.json | 0 extensions/guacamole-auth-sso/pom.xml | 92 +++++++++++++++++++ extensions/pom.xml | 4 +- guacamole-docker/bin/build-guacamole.sh | 35 +++---- 86 files changed, 326 insertions(+), 62 deletions(-) rename extensions/{guacamole-auth-cas => guacamole-auth-sso}/.ratignore (100%) create mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/.gitignore rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-base}/.ratignore (100%) create mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/pom.xml rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/.gitignore (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/.ratignore (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/pom.xml (87%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/assembly/dist.xml (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProvider.java (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProviderModule.java (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/java/org/apache/guacamole/auth/cas/conf/CASGuacamoleProperties.java (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/java/org/apache/guacamole/auth/cas/conf/ConfigurationService.java (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/java/org/apache/guacamole/auth/cas/conf/LdapNameGuacamoleProperty.java (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/java/org/apache/guacamole/auth/cas/conf/PrivateKeyGuacamoleProperty.java (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/java/org/apache/guacamole/auth/cas/form/CASTicketField.java (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/java/org/apache/guacamole/auth/cas/group/GroupFormat.java (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/java/org/apache/guacamole/auth/cas/group/GroupParser.java (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/java/org/apache/guacamole/auth/cas/group/LDAPGroupParser.java (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/java/org/apache/guacamole/auth/cas/group/PlainGroupParser.java (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/java/org/apache/guacamole/auth/cas/user/CASAuthenticatedUser.java (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/resources/guac-manifest.json (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/resources/license.txt (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/resources/translations/ca.json (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/resources/translations/de.json (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/resources/translations/en.json (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/resources/translations/fr.json (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/resources/translations/ja.json (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/resources/translations/ko.json (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/resources/translations/pt.json (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/resources/translations/ru.json (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/resources/translations/zh.json (100%) rename extensions/{guacamole-auth-cas => guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/test/java/org/apache/guacamole/auth/cas/group/LDAPGroupParserTest.java (100%) create mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/.ratignore create mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/pom.xml create mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/src/main/assembly/dist.xml rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/.gitignore (100%) create mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/.ratignore rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/pom.xml (90%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/assembly/dist.xml (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/java/org/apache/guacamole/auth/openid/AuthenticationProviderService.java (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/java/org/apache/guacamole/auth/openid/OpenIDAuthenticationProvider.java (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/java/org/apache/guacamole/auth/openid/OpenIDAuthenticationProviderModule.java (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/java/org/apache/guacamole/auth/openid/conf/ConfigurationService.java (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/java/org/apache/guacamole/auth/openid/form/TokenField.java (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/java/org/apache/guacamole/auth/openid/token/NonceService.java (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/java/org/apache/guacamole/auth/openid/token/TokenValidationService.java (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/java/org/apache/guacamole/auth/openid/user/AuthenticatedUser.java (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/resources/guac-manifest.json (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/resources/license.txt (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/resources/transformToken.js (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/resources/translations/ca.json (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/resources/translations/de.json (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/resources/translations/en.json (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/resources/translations/fr.json (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/resources/translations/ja.json (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/resources/translations/ko.json (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/resources/translations/pt.json (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/resources/translations/ru.json (100%) rename extensions/{guacamole-auth-openid => guacamole-auth-sso/modules/guacamole-auth-sso-openid}/src/main/resources/translations/zh.json (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/.gitignore (100%) create mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/.ratignore rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/pom.xml (87%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/assembly/dist.xml (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/java/org/apache/guacamole/auth/saml/AuthenticationProviderService.java (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/java/org/apache/guacamole/auth/saml/SAMLAuthenticationProvider.java (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/java/org/apache/guacamole/auth/saml/SAMLAuthenticationProviderModule.java (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/java/org/apache/guacamole/auth/saml/acs/AssertedIdentity.java (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/java/org/apache/guacamole/auth/saml/acs/AssertionConsumerServiceResource.java (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/java/org/apache/guacamole/auth/saml/acs/AuthenticationSession.java (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/java/org/apache/guacamole/auth/saml/acs/AuthenticationSessionManager.java (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/java/org/apache/guacamole/auth/saml/acs/IdentifierGenerator.java (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/java/org/apache/guacamole/auth/saml/acs/SAMLService.java (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/java/org/apache/guacamole/auth/saml/conf/ConfigurationService.java (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/java/org/apache/guacamole/auth/saml/user/SAMLAuthenticatedUser.java (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/resources/guac-manifest.json (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/resources/license.txt (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/resources/translations/ca.json (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/resources/translations/en.json (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/resources/translations/fr.json (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/resources/translations/ko.json (100%) rename extensions/{guacamole-auth-saml => guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/resources/translations/pt.json (100%) create mode 100644 extensions/guacamole-auth-sso/pom.xml diff --git a/extensions/guacamole-auth-cas/.ratignore b/extensions/guacamole-auth-sso/.ratignore similarity index 100% rename from extensions/guacamole-auth-cas/.ratignore rename to extensions/guacamole-auth-sso/.ratignore diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/.gitignore b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/.gitignore new file mode 100644 index 000000000..42f4a1a64 --- /dev/null +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/.gitignore @@ -0,0 +1,2 @@ +target/ +*~ diff --git a/extensions/guacamole-auth-openid/.ratignore b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/.ratignore similarity index 100% rename from extensions/guacamole-auth-openid/.ratignore rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/.ratignore diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/pom.xml new file mode 100644 index 000000000..50ec02f5f --- /dev/null +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/pom.xml @@ -0,0 +1,39 @@ + + + + + 4.0.0 + org.apache.guacamole + guacamole-auth-sso-base + jar + guacamole-auth-sso-base + http://guacamole.apache.org/ + + + org.apache.guacamole + guacamole-auth-sso + 1.3.0 + ../../ + + + diff --git a/extensions/guacamole-auth-cas/.gitignore b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/.gitignore similarity index 100% rename from extensions/guacamole-auth-cas/.gitignore rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/.gitignore diff --git a/extensions/guacamole-auth-saml/.ratignore b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/.ratignore similarity index 100% rename from extensions/guacamole-auth-saml/.ratignore rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/.ratignore diff --git a/extensions/guacamole-auth-cas/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml similarity index 87% rename from extensions/guacamole-auth-cas/pom.xml rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml index a40c0fb31..a876dca94 100644 --- a/extensions/guacamole-auth-cas/pom.xml +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml @@ -24,17 +24,17 @@ 4.0.0 org.apache.guacamole - guacamole-auth-cas + guacamole-auth-sso-cas jar 1.3.0 - guacamole-auth-cas + guacamole-auth-sso-cas http://guacamole.apache.org/ org.apache.guacamole - extensions + guacamole-auth-sso 1.3.0 - ../ + ../../ @@ -43,8 +43,12 @@ org.apache.guacamole guacamole-ext - 1.3.0 - provided + + + + + org.apache.guacamole + guacamole-auth-sso-base @@ -70,16 +74,12 @@ javax.servlet servlet-api - 2.5 - provided - - + + javax.ws.rs jsr311-api - 1.1.1 - provided diff --git a/extensions/guacamole-auth-cas/src/main/assembly/dist.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/assembly/dist.xml similarity index 100% rename from extensions/guacamole-auth-cas/src/main/assembly/dist.xml rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/assembly/dist.xml diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java similarity index 100% rename from extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProvider.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProvider.java similarity index 100% rename from extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProvider.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProvider.java diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProviderModule.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProviderModule.java similarity index 100% rename from extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProviderModule.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProviderModule.java diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/CASGuacamoleProperties.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/conf/CASGuacamoleProperties.java similarity index 100% rename from extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/CASGuacamoleProperties.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/conf/CASGuacamoleProperties.java diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/ConfigurationService.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/conf/ConfigurationService.java similarity index 100% rename from extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/ConfigurationService.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/conf/ConfigurationService.java diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/LdapNameGuacamoleProperty.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/conf/LdapNameGuacamoleProperty.java similarity index 100% rename from extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/LdapNameGuacamoleProperty.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/conf/LdapNameGuacamoleProperty.java diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/PrivateKeyGuacamoleProperty.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/conf/PrivateKeyGuacamoleProperty.java similarity index 100% rename from extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/PrivateKeyGuacamoleProperty.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/conf/PrivateKeyGuacamoleProperty.java diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/form/CASTicketField.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/form/CASTicketField.java similarity index 100% rename from extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/form/CASTicketField.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/form/CASTicketField.java diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/group/GroupFormat.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/group/GroupFormat.java similarity index 100% rename from extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/group/GroupFormat.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/group/GroupFormat.java diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/group/GroupParser.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/group/GroupParser.java similarity index 100% rename from extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/group/GroupParser.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/group/GroupParser.java diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/group/LDAPGroupParser.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/group/LDAPGroupParser.java similarity index 100% rename from extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/group/LDAPGroupParser.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/group/LDAPGroupParser.java diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/group/PlainGroupParser.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/group/PlainGroupParser.java similarity index 100% rename from extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/group/PlainGroupParser.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/group/PlainGroupParser.java diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java similarity index 100% rename from extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/user/CASAuthenticatedUser.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/user/CASAuthenticatedUser.java similarity index 100% rename from extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/user/CASAuthenticatedUser.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/user/CASAuthenticatedUser.java diff --git a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/guac-manifest.json similarity index 100% rename from extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/guac-manifest.json diff --git a/extensions/guacamole-auth-cas/src/main/resources/license.txt b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/license.txt similarity index 100% rename from extensions/guacamole-auth-cas/src/main/resources/license.txt rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/license.txt diff --git a/extensions/guacamole-auth-cas/src/main/resources/translations/ca.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ca.json similarity index 100% rename from extensions/guacamole-auth-cas/src/main/resources/translations/ca.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ca.json diff --git a/extensions/guacamole-auth-cas/src/main/resources/translations/de.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/de.json similarity index 100% rename from extensions/guacamole-auth-cas/src/main/resources/translations/de.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/de.json diff --git a/extensions/guacamole-auth-cas/src/main/resources/translations/en.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/en.json similarity index 100% rename from extensions/guacamole-auth-cas/src/main/resources/translations/en.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/en.json diff --git a/extensions/guacamole-auth-cas/src/main/resources/translations/fr.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/fr.json similarity index 100% rename from extensions/guacamole-auth-cas/src/main/resources/translations/fr.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/fr.json diff --git a/extensions/guacamole-auth-cas/src/main/resources/translations/ja.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ja.json similarity index 100% rename from extensions/guacamole-auth-cas/src/main/resources/translations/ja.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ja.json diff --git a/extensions/guacamole-auth-cas/src/main/resources/translations/ko.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ko.json similarity index 100% rename from extensions/guacamole-auth-cas/src/main/resources/translations/ko.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ko.json diff --git a/extensions/guacamole-auth-cas/src/main/resources/translations/pt.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/pt.json similarity index 100% rename from extensions/guacamole-auth-cas/src/main/resources/translations/pt.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/pt.json diff --git a/extensions/guacamole-auth-cas/src/main/resources/translations/ru.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ru.json similarity index 100% rename from extensions/guacamole-auth-cas/src/main/resources/translations/ru.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/ru.json diff --git a/extensions/guacamole-auth-cas/src/main/resources/translations/zh.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/zh.json similarity index 100% rename from extensions/guacamole-auth-cas/src/main/resources/translations/zh.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/translations/zh.json diff --git a/extensions/guacamole-auth-cas/src/test/java/org/apache/guacamole/auth/cas/group/LDAPGroupParserTest.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/test/java/org/apache/guacamole/auth/cas/group/LDAPGroupParserTest.java similarity index 100% rename from extensions/guacamole-auth-cas/src/test/java/org/apache/guacamole/auth/cas/group/LDAPGroupParserTest.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/test/java/org/apache/guacamole/auth/cas/group/LDAPGroupParserTest.java diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/.ratignore b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/.ratignore new file mode 100644 index 000000000..e69de29bb diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/pom.xml new file mode 100644 index 000000000..b1f2a352e --- /dev/null +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/pom.xml @@ -0,0 +1,72 @@ + + + + + 4.0.0 + org.apache.guacamole + guacamole-auth-sso-dist + pom + guacamole-auth-sso-dist + http://guacamole.apache.org/ + + + org.apache.guacamole + guacamole-auth-sso + 1.3.0 + ../../ + + + + + + + org.apache.guacamole + guacamole-auth-sso-cas + 1.3.0 + + + + + org.apache.guacamole + guacamole-auth-sso-openid + 1.3.0 + + + + + org.apache.guacamole + guacamole-auth-sso-saml + 1.3.0 + + + + + + + + ${project.parent.artifactId}-${project.parent.version} + + + + diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/src/main/assembly/dist.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/src/main/assembly/dist.xml new file mode 100644 index 000000000..f122c8d0a --- /dev/null +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/src/main/assembly/dist.xml @@ -0,0 +1,73 @@ + + + + + dist + ${project.parent.artifactId}-${project.parent.version} + + + + tar.gz + + + + + + + + cas + false + + org.apache.guacamole:guacamole-auth-sso-cas + + + + + + openid + false + + org.apache.guacamole:guacamole-auth-sso-openid + + + + + + saml + false + + org.apache.guacamole:guacamole-auth-sso-saml + + + + + + + + + + target/licenses + + + + diff --git a/extensions/guacamole-auth-openid/.gitignore b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/.gitignore similarity index 100% rename from extensions/guacamole-auth-openid/.gitignore rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/.gitignore diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/.ratignore b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/.ratignore new file mode 100644 index 000000000..e69de29bb diff --git a/extensions/guacamole-auth-openid/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml similarity index 90% rename from extensions/guacamole-auth-openid/pom.xml rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml index 7c578dc1f..25550ef45 100644 --- a/extensions/guacamole-auth-openid/pom.xml +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml @@ -24,17 +24,17 @@ 4.0.0 org.apache.guacamole - guacamole-auth-openid + guacamole-auth-sso-openid jar 1.3.0 - guacamole-auth-openid + guacamole-auth-sso-openid http://guacamole.apache.org/ org.apache.guacamole - extensions + guacamole-auth-sso 1.3.0 - ../ + ../../ @@ -94,8 +94,12 @@ org.apache.guacamole guacamole-ext - 1.3.0 - provided + + + + + org.apache.guacamole + guacamole-auth-sso-base @@ -115,16 +119,12 @@ javax.servlet servlet-api - 2.5 - provided - - + + javax.ws.rs jsr311-api - 1.1.1 - provided diff --git a/extensions/guacamole-auth-openid/src/main/assembly/dist.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/assembly/dist.xml similarity index 100% rename from extensions/guacamole-auth-openid/src/main/assembly/dist.xml rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/assembly/dist.xml diff --git a/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/AuthenticationProviderService.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/AuthenticationProviderService.java similarity index 100% rename from extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/AuthenticationProviderService.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/AuthenticationProviderService.java diff --git a/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/OpenIDAuthenticationProvider.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/OpenIDAuthenticationProvider.java similarity index 100% rename from extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/OpenIDAuthenticationProvider.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/OpenIDAuthenticationProvider.java diff --git a/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/OpenIDAuthenticationProviderModule.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/OpenIDAuthenticationProviderModule.java similarity index 100% rename from extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/OpenIDAuthenticationProviderModule.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/OpenIDAuthenticationProviderModule.java diff --git a/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/conf/ConfigurationService.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/conf/ConfigurationService.java similarity index 100% rename from extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/conf/ConfigurationService.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/conf/ConfigurationService.java diff --git a/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/form/TokenField.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/form/TokenField.java similarity index 100% rename from extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/form/TokenField.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/form/TokenField.java diff --git a/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/token/NonceService.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/token/NonceService.java similarity index 100% rename from extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/token/NonceService.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/token/NonceService.java diff --git a/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/token/TokenValidationService.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/token/TokenValidationService.java similarity index 100% rename from extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/token/TokenValidationService.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/token/TokenValidationService.java diff --git a/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/user/AuthenticatedUser.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/user/AuthenticatedUser.java similarity index 100% rename from extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/user/AuthenticatedUser.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/user/AuthenticatedUser.java diff --git a/extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/guac-manifest.json similarity index 100% rename from extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/guac-manifest.json diff --git a/extensions/guacamole-auth-openid/src/main/resources/license.txt b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/license.txt similarity index 100% rename from extensions/guacamole-auth-openid/src/main/resources/license.txt rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/license.txt diff --git a/extensions/guacamole-auth-openid/src/main/resources/transformToken.js b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/transformToken.js similarity index 100% rename from extensions/guacamole-auth-openid/src/main/resources/transformToken.js rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/transformToken.js diff --git a/extensions/guacamole-auth-openid/src/main/resources/translations/ca.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ca.json similarity index 100% rename from extensions/guacamole-auth-openid/src/main/resources/translations/ca.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ca.json diff --git a/extensions/guacamole-auth-openid/src/main/resources/translations/de.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/de.json similarity index 100% rename from extensions/guacamole-auth-openid/src/main/resources/translations/de.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/de.json diff --git a/extensions/guacamole-auth-openid/src/main/resources/translations/en.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/en.json similarity index 100% rename from extensions/guacamole-auth-openid/src/main/resources/translations/en.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/en.json diff --git a/extensions/guacamole-auth-openid/src/main/resources/translations/fr.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/fr.json similarity index 100% rename from extensions/guacamole-auth-openid/src/main/resources/translations/fr.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/fr.json diff --git a/extensions/guacamole-auth-openid/src/main/resources/translations/ja.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ja.json similarity index 100% rename from extensions/guacamole-auth-openid/src/main/resources/translations/ja.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ja.json diff --git a/extensions/guacamole-auth-openid/src/main/resources/translations/ko.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ko.json similarity index 100% rename from extensions/guacamole-auth-openid/src/main/resources/translations/ko.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ko.json diff --git a/extensions/guacamole-auth-openid/src/main/resources/translations/pt.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/pt.json similarity index 100% rename from extensions/guacamole-auth-openid/src/main/resources/translations/pt.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/pt.json diff --git a/extensions/guacamole-auth-openid/src/main/resources/translations/ru.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ru.json similarity index 100% rename from extensions/guacamole-auth-openid/src/main/resources/translations/ru.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/ru.json diff --git a/extensions/guacamole-auth-openid/src/main/resources/translations/zh.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/zh.json similarity index 100% rename from extensions/guacamole-auth-openid/src/main/resources/translations/zh.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/translations/zh.json diff --git a/extensions/guacamole-auth-saml/.gitignore b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/.gitignore similarity index 100% rename from extensions/guacamole-auth-saml/.gitignore rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/.gitignore diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/.ratignore b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/.ratignore new file mode 100644 index 000000000..da318d12f --- /dev/null +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/.ratignore @@ -0,0 +1 @@ +src/main/resources/html/*.html diff --git a/extensions/guacamole-auth-saml/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml similarity index 87% rename from extensions/guacamole-auth-saml/pom.xml rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml index ed550e448..50f1363ba 100644 --- a/extensions/guacamole-auth-saml/pom.xml +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml @@ -24,17 +24,17 @@ 4.0.0 org.apache.guacamole - guacamole-auth-saml + guacamole-auth-sso-saml jar 1.3.0 - guacamole-auth-saml + guacamole-auth-sso-saml http://guacamole.apache.org/ org.apache.guacamole - extensions + guacamole-auth-sso 1.3.0 - ../ + ../../ @@ -43,8 +43,12 @@ org.apache.guacamole guacamole-ext - 1.3.0 - provided + + + + + org.apache.guacamole + guacamole-auth-sso-base @@ -57,16 +61,12 @@ javax.servlet servlet-api - 2.5 - provided - + javax.ws.rs jsr311-api - 1.1.1 - provided diff --git a/extensions/guacamole-auth-saml/src/main/assembly/dist.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/assembly/dist.xml similarity index 100% rename from extensions/guacamole-auth-saml/src/main/assembly/dist.xml rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/assembly/dist.xml diff --git a/extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/AuthenticationProviderService.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/AuthenticationProviderService.java similarity index 100% rename from extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/AuthenticationProviderService.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/AuthenticationProviderService.java diff --git a/extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/SAMLAuthenticationProvider.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/SAMLAuthenticationProvider.java similarity index 100% rename from extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/SAMLAuthenticationProvider.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/SAMLAuthenticationProvider.java diff --git a/extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/SAMLAuthenticationProviderModule.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/SAMLAuthenticationProviderModule.java similarity index 100% rename from extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/SAMLAuthenticationProviderModule.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/SAMLAuthenticationProviderModule.java diff --git a/extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/acs/AssertedIdentity.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/acs/AssertedIdentity.java similarity index 100% rename from extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/acs/AssertedIdentity.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/acs/AssertedIdentity.java diff --git a/extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/acs/AssertionConsumerServiceResource.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/acs/AssertionConsumerServiceResource.java similarity index 100% rename from extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/acs/AssertionConsumerServiceResource.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/acs/AssertionConsumerServiceResource.java diff --git a/extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/acs/AuthenticationSession.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/acs/AuthenticationSession.java similarity index 100% rename from extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/acs/AuthenticationSession.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/acs/AuthenticationSession.java diff --git a/extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/acs/AuthenticationSessionManager.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/acs/AuthenticationSessionManager.java similarity index 100% rename from extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/acs/AuthenticationSessionManager.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/acs/AuthenticationSessionManager.java diff --git a/extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/acs/IdentifierGenerator.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/acs/IdentifierGenerator.java similarity index 100% rename from extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/acs/IdentifierGenerator.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/acs/IdentifierGenerator.java diff --git a/extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/acs/SAMLService.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/acs/SAMLService.java similarity index 100% rename from extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/acs/SAMLService.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/acs/SAMLService.java diff --git a/extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/conf/ConfigurationService.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/conf/ConfigurationService.java similarity index 100% rename from extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/conf/ConfigurationService.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/conf/ConfigurationService.java diff --git a/extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/user/SAMLAuthenticatedUser.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/user/SAMLAuthenticatedUser.java similarity index 100% rename from extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/user/SAMLAuthenticatedUser.java rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/user/SAMLAuthenticatedUser.java diff --git a/extensions/guacamole-auth-saml/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/guac-manifest.json similarity index 100% rename from extensions/guacamole-auth-saml/src/main/resources/guac-manifest.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/guac-manifest.json diff --git a/extensions/guacamole-auth-saml/src/main/resources/license.txt b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/license.txt similarity index 100% rename from extensions/guacamole-auth-saml/src/main/resources/license.txt rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/license.txt diff --git a/extensions/guacamole-auth-saml/src/main/resources/translations/ca.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/ca.json similarity index 100% rename from extensions/guacamole-auth-saml/src/main/resources/translations/ca.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/ca.json diff --git a/extensions/guacamole-auth-saml/src/main/resources/translations/en.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/en.json similarity index 100% rename from extensions/guacamole-auth-saml/src/main/resources/translations/en.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/en.json diff --git a/extensions/guacamole-auth-saml/src/main/resources/translations/fr.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/fr.json similarity index 100% rename from extensions/guacamole-auth-saml/src/main/resources/translations/fr.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/fr.json diff --git a/extensions/guacamole-auth-saml/src/main/resources/translations/ko.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/ko.json similarity index 100% rename from extensions/guacamole-auth-saml/src/main/resources/translations/ko.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/ko.json diff --git a/extensions/guacamole-auth-saml/src/main/resources/translations/pt.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/pt.json similarity index 100% rename from extensions/guacamole-auth-saml/src/main/resources/translations/pt.json rename to extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/translations/pt.json diff --git a/extensions/guacamole-auth-sso/pom.xml b/extensions/guacamole-auth-sso/pom.xml new file mode 100644 index 000000000..c7dde0652 --- /dev/null +++ b/extensions/guacamole-auth-sso/pom.xml @@ -0,0 +1,92 @@ + + + + + 4.0.0 + org.apache.guacamole + guacamole-auth-sso + pom + 1.3.0 + guacamole-auth-sso + http://guacamole.apache.org/ + + + org.apache.guacamole + extensions + 1.3.0 + ../ + + + + + + modules/guacamole-auth-sso-dist + + + modules/guacamole-auth-sso-base + + + modules/guacamole-auth-sso-cas + modules/guacamole-auth-sso-openid + modules/guacamole-auth-sso-saml + + + + + + + + + org.apache.guacamole + guacamole-ext + 1.3.0 + provided + + + + + org.apache.guacamole + guacamole-auth-sso-base + 1.3.0 + + + + + javax.servlet + servlet-api + 2.5 + provided + + + + + javax.ws.rs + jsr311-api + 1.1.1 + provided + + + + + + diff --git a/extensions/pom.xml b/extensions/pom.xml index 4eac0725e..6ce255266 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -40,15 +40,13 @@ - guacamole-auth-cas guacamole-auth-duo guacamole-auth-header guacamole-auth-jdbc guacamole-auth-json guacamole-auth-ldap - guacamole-auth-openid guacamole-auth-quickconnect - guacamole-auth-saml + guacamole-auth-sso guacamole-auth-totp diff --git a/guacamole-docker/bin/build-guacamole.sh b/guacamole-docker/bin/build-guacamole.sh index d3f6741ac..ac6c4acd7 100755 --- a/guacamole-docker/bin/build-guacamole.sh +++ b/guacamole-docker/bin/build-guacamole.sh @@ -110,6 +110,17 @@ tar -xz \ echo "Downloading PostgreSQL JDBC driver ..." curl -L "https://jdbc.postgresql.org/download/postgresql-9.4-1201.jdbc41.jar" > "$DESTINATION/postgresql/postgresql-9.4-1201.jdbc41.jar" +# +# Copy SSO auth extensions +# + +tar -xzf extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/target/*.tar.gz \ + -C "$DESTINATION" \ + --wildcards \ + --no-anchored \ + --strip-components=1 \ + "*.jar" + # # Copy LDAP auth extension and schema modifications # @@ -132,15 +143,6 @@ if [ -f extensions/guacamole-auth-radius/target/guacamole-auth-radius*.jar ]; th cp extensions/guacamole-auth-radius/target/guacamole-auth-radius*.jar "$DESTINATION/radius" fi -# -# Copy OPENID auth extension and schema modifications -# - -if [ -f extensions/guacamole-auth-openid/target/guacamole-auth-openid*.jar ]; then - mkdir -p "$DESTINATION/openid" - cp extensions/guacamole-auth-openid/target/guacamole-auth-openid*.jar "$DESTINATION/openid" -fi - # # Copy TOTP auth extension if it was built # @@ -174,21 +176,6 @@ if [ -f extensions/guacamole-auth-header/target/guacamole-auth-header*.jar ]; th cp extensions/guacamole-auth-header/target/guacamole-auth-header*.jar "$DESTINATION/header" fi -# -# Copy CAS auth extension if it was built -# - -if [ -f extensions/guacamole-auth-cas/target/*.tar.gz ]; then - mkdir -p "$DESTINATION/cas" - tar -xzf extensions/guacamole-auth-cas/target/*.tar.gz \ - -C "$DESTINATION/cas/" \ - --wildcards \ - --no-anchored \ - --no-wildcards-match-slash \ - --strip-components=1 \ - "*.jar" -fi - # # Copy json auth extension if it was built #