This is an automated email from the ASF dual-hosted git repository.
jmuehlner pushed a change to branch staging/1.4.0
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.
from ea65709 GUACAMOLE-1364: Merge do not rely on
Collectors.toUnmodifiableMap().
add 36a02c1 GUACAMOLE-1364: Refactor all SSO extensions beneath common
base.
add 817f192 GUACAMOLE-1364: Unify translations of SSO extensions.
add ba93d17 GUACAMOLE-1364: Correct naming of SAML auth field and
translation.
add a6b38be GUACAMOLE-1364: Remove unnecessary separate dist .tar.gz for
SSO extensions (now distributed within common .tar.gz).
add 7dc0b3b GUACAMOLE-1364: Extract common base SSO classes.
new 82e48c3 GUACAMOLE-1364: Merge SSO extensions refactoring.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../auth/cas/CASAuthenticationProvider.java | 90 ------------
.../auth/cas/CASAuthenticationProviderModule.java | 81 -----------
.../src/main/resources/translations/ca.json | 11 --
.../src/main/resources/translations/de.json | 12 --
.../src/main/resources/translations/en.json | 12 --
.../src/main/resources/translations/fr.json | 12 --
.../src/main/resources/translations/ja.json | 7 -
.../src/main/resources/translations/ko.json | 7 -
.../src/main/resources/translations/pt.json | 12 --
.../src/main/resources/translations/ru.json | 11 --
.../src/main/resources/translations/zh.json | 12 --
.../src/main/assembly/dist.xml | 53 -------
.../auth/openid/OpenIDAuthenticationProvider.java | 75 ----------
.../openid/OpenIDAuthenticationProviderModule.java | 83 -----------
.../auth/openid/user/AuthenticatedUser.java | 85 ------------
.../src/main/resources/translations/ca.json | 12 --
.../src/main/resources/translations/en.json | 12 --
.../src/main/resources/translations/fr.json | 12 --
.../src/main/resources/translations/ja.json | 7 -
.../src/main/resources/translations/ko.json | 7 -
.../src/main/resources/translations/pt.json | 12 --
.../src/main/resources/translations/ru.json | 11 --
.../src/main/resources/translations/zh.json | 12 --
.../guacamole-auth-saml/src/main/assembly/dist.xml | 53 -------
.../auth/saml/SAMLAuthenticationProvider.java | 102 --------------
.../src/main/resources/translations/ca.json | 12 --
.../src/main/resources/translations/en.json | 12 --
.../src/main/resources/translations/fr.json | 12 --
.../src/main/resources/translations/pt.json | 12 --
.../.ratignore | 0
.../modules/guacamole-auth-sso-base}/.gitignore | 0
.../modules/guacamole-auth-sso-base}/.ratignore | 0
.../modules/guacamole-auth-sso-base}/pom.xml | 14 +-
.../auth/sso/SSOAuthenticationProvider.java | 153 +++++++++++++++++++++
.../auth/sso/SSOAuthenticationProviderService.java | 60 ++++++++
.../auth/sso/user/SSOAuthenticatedUser.java} | 62 ++++-----
.../src/main/resources/translations/ca.json | 15 ++
.../src/main/resources/translations/de.json | 2 +-
.../src/main/resources/translations/en.json | 22 +++
.../src/main/resources/translations/fr.json | 7 +
.../src/main/resources/translations/ja.json | 7 +
.../src/main/resources/translations/ko.json | 2 +-
.../src/main/resources/translations/pt.json | 7 +
.../src/main/resources/translations/ru.json | 15 ++
.../src/main/resources/translations/zh.json | 15 ++
.../modules/guacamole-auth-sso-cas}/.gitignore | 0
.../modules/guacamole-auth-sso-cas}/.ratignore | 0
.../modules/guacamole-auth-sso-cas}/pom.xml | 24 ++--
.../auth/cas/AuthenticationProviderService.java | 33 ++---
.../auth/cas/CASAuthenticationProvider.java} | 29 ++--
.../auth/cas/CASAuthenticationProviderModule.java} | 23 ++--
.../auth/cas/conf/CASGuacamoleProperties.java | 0
.../auth/cas/conf/ConfigurationService.java | 0
.../auth/cas/conf/LdapNameGuacamoleProperty.java | 0
.../auth/cas/conf/PrivateKeyGuacamoleProperty.java | 0
.../guacamole/auth/cas/form/CASTicketField.java | 0
.../guacamole/auth/cas/group/GroupFormat.java | 0
.../guacamole/auth/cas/group/GroupParser.java | 0
.../guacamole/auth/cas/group/LDAPGroupParser.java | 0
.../guacamole/auth/cas/group/PlainGroupParser.java | 0
.../auth/cas/ticket/TicketValidationService.java | 13 +-
.../src/main/resources/guac-manifest.json | 0
.../src/main/resources/license.txt | 0
.../auth/cas/group/LDAPGroupParserTest.java | 0
.../modules/guacamole-auth-sso-dist}/.ratignore | 0
.../modules/guacamole-auth-sso-dist}/pom.xml | 22 +--
.../src/main/assembly/dist.xml | 52 ++++---
.../modules/guacamole-auth-sso-openid}/.gitignore | 0
.../modules/guacamole-auth-sso-openid}/.ratignore | 0
.../modules/guacamole-auth-sso-openid}/pom.xml | 24 ++--
.../auth/openid/AuthenticationProviderService.java | 47 +++----
.../auth/openid/OpenIDAuthenticationProvider.java | 36 ++---
.../openid/OpenIDAuthenticationProviderModule.java | 17 ++-
.../auth/openid/conf/ConfigurationService.java | 0
.../guacamole/auth/openid/form/TokenField.java | 0
.../guacamole/auth/openid/token/NonceService.java | 0
.../auth/openid/token/TokenValidationService.java | 0
.../src/main/resources/guac-manifest.json | 0
.../src/main/resources/license.txt | 0
.../src/main/resources/transformToken.js | 0
.../modules/guacamole-auth-sso-saml}/.gitignore | 0
.../modules/guacamole-auth-sso-saml}/.ratignore | 0
.../modules/guacamole-auth-sso-saml}/pom.xml | 22 +--
.../auth/saml/AuthenticationProviderService.java | 30 ++--
.../auth/saml/SAMLAuthenticationProvider.java | 52 +++++++
.../saml/SAMLAuthenticationProviderModule.java | 38 -----
.../guacamole/auth/saml/acs/AssertedIdentity.java | 0
.../saml/acs/AssertionConsumerServiceResource.java | 0
.../auth/saml/acs/AuthenticationSession.java | 0
.../saml/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 | 57 +-------
.../src/main/resources/guac-manifest.json | 8 +-
.../src/main/resources/license.txt | 0
.../pom.xml | 41 ++++--
extensions/pom.xml | 4 +-
guacamole-docker/bin/build-guacamole.sh | 35 ++---
99 files changed, 620 insertions(+), 1219 deletions(-)
delete mode 100644
extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProvider.java
delete mode 100644
extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProviderModule.java
delete mode 100644
extensions/guacamole-auth-cas/src/main/resources/translations/ca.json
delete mode 100644
extensions/guacamole-auth-cas/src/main/resources/translations/de.json
delete mode 100644
extensions/guacamole-auth-cas/src/main/resources/translations/en.json
delete mode 100644
extensions/guacamole-auth-cas/src/main/resources/translations/fr.json
delete mode 100644
extensions/guacamole-auth-cas/src/main/resources/translations/ja.json
delete mode 100644
extensions/guacamole-auth-cas/src/main/resources/translations/ko.json
delete mode 100644
extensions/guacamole-auth-cas/src/main/resources/translations/pt.json
delete mode 100644
extensions/guacamole-auth-cas/src/main/resources/translations/ru.json
delete mode 100644
extensions/guacamole-auth-cas/src/main/resources/translations/zh.json
delete mode 100644 extensions/guacamole-auth-openid/src/main/assembly/dist.xml
delete mode 100644
extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/OpenIDAuthenticationProvider.java
delete mode 100644
extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/OpenIDAuthenticationProviderModule.java
delete mode 100644
extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/user/AuthenticatedUser.java
delete mode 100644
extensions/guacamole-auth-openid/src/main/resources/translations/ca.json
delete mode 100644
extensions/guacamole-auth-openid/src/main/resources/translations/en.json
delete mode 100644
extensions/guacamole-auth-openid/src/main/resources/translations/fr.json
delete mode 100644
extensions/guacamole-auth-openid/src/main/resources/translations/ja.json
delete mode 100644
extensions/guacamole-auth-openid/src/main/resources/translations/ko.json
delete mode 100644
extensions/guacamole-auth-openid/src/main/resources/translations/pt.json
delete mode 100644
extensions/guacamole-auth-openid/src/main/resources/translations/ru.json
delete mode 100644
extensions/guacamole-auth-openid/src/main/resources/translations/zh.json
delete mode 100644 extensions/guacamole-auth-saml/src/main/assembly/dist.xml
delete mode 100644
extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/SAMLAuthenticationProvider.java
delete mode 100644
extensions/guacamole-auth-saml/src/main/resources/translations/ca.json
delete mode 100644
extensions/guacamole-auth-saml/src/main/resources/translations/en.json
delete mode 100644
extensions/guacamole-auth-saml/src/main/resources/translations/fr.json
delete mode 100644
extensions/guacamole-auth-saml/src/main/resources/translations/pt.json
rename extensions/{guacamole-auth-saml => guacamole-auth-sso}/.ratignore (100%)
copy {guacamole-ext =>
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base}/.gitignore (100%)
rename extensions/{guacamole-auth-openid =>
guacamole-auth-sso/modules/guacamole-auth-sso-base}/.ratignore (100%)
copy extensions/{guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql =>
guacamole-auth-sso/modules/guacamole-auth-sso-base}/pom.xml (81%)
create mode 100644
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/java/org/apache/guacamole/auth/sso/SSOAuthenticationProvider.java
create mode 100644
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/java/org/apache/guacamole/auth/sso/SSOAuthenticationProviderService.java
rename
extensions/{guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/user/CASAuthenticatedUser.java
=>
guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/java/org/apache/guacamole/auth/sso/user/SSOAuthenticatedUser.java}
(61%)
create mode 100644
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/ca.json
rename extensions/{guacamole-auth-openid =>
guacamole-auth-sso/modules/guacamole-auth-sso-base}/src/main/resources/translations/de.json
(52%)
create mode 100644
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/en.json
create mode 100644
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/fr.json
create mode 100644
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/ja.json
rename extensions/{guacamole-auth-saml =>
guacamole-auth-sso/modules/guacamole-auth-sso-base}/src/main/resources/translations/ko.json
(71%)
create mode 100644
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/pt.json
create mode 100644
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/ru.json
create mode 100644
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/zh.json
rename extensions/{guacamole-auth-saml =>
guacamole-auth-sso/modules/guacamole-auth-sso-cas}/.gitignore (100%)
rename extensions/{guacamole-auth-cas =>
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/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java
(76%)
copy
extensions/{guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/ConnectionGroupPermissionSet.java
=>
guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProvider.java}
(54%)
copy
extensions/{guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/security/SecureRandomSaltService.java
=>
guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/CASAuthenticationProviderModule.java}
(64%)
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
(95%)
rename extensions/{guacamole-auth-cas =>
guacamole-auth-sso/modules/guacamole-auth-sso-cas}/src/main/resources/guac-manifest.json
(100%)
rename extensions/{guacamole-auth-saml =>
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/test/java/org/apache/guacamole/auth/cas/group/LDAPGroupParserTest.java
(100%)
copy {guacamole-ext =>
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist}/.ratignore (100%)
copy extensions/{guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist =>
guacamole-auth-sso/modules/guacamole-auth-sso-dist}/pom.xml (74%)
rename extensions/{guacamole-auth-cas =>
guacamole-auth-sso/modules/guacamole-auth-sso-dist}/src/main/assembly/dist.xml
(55%)
rename extensions/{guacamole-auth-openid =>
guacamole-auth-sso/modules/guacamole-auth-sso-openid}/.gitignore (100%)
copy {guacamole-ext =>
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid}/.ratignore
(100%)
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/java/org/apache/guacamole/auth/openid/AuthenticationProviderService.java
(76%)
copy guacamole/src/main/java/org/apache/guacamole/EnvironmentModule.java =>
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/OpenIDAuthenticationProvider.java
(53%)
copy
guacamole-ext/src/main/java/org/apache/guacamole/properties/StringGuacamoleProperty.java
=>
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/OpenIDAuthenticationProviderModule.java
(59%)
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/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-cas =>
guacamole-auth-sso/modules/guacamole-auth-sso-saml}/.gitignore (100%)
copy extensions/{guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base =>
guacamole-auth-sso/modules/guacamole-auth-sso-saml}/.ratignore (100%)
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/java/org/apache/guacamole/auth/saml/AuthenticationProviderService.java
(82%)
create mode 100644
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/SAMLAuthenticationProvider.java
rename extensions/{guacamole-auth-saml =>
guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/java/org/apache/guacamole/auth/saml/SAMLAuthenticationProviderModule.java
(57%)
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
(75%)
rename extensions/{guacamole-auth-saml =>
guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/resources/guac-manifest.json
(70%)
rename extensions/{guacamole-auth-cas =>
guacamole-auth-sso/modules/guacamole-auth-sso-saml}/src/main/resources/license.txt
(100%)
copy extensions/{guacamole-auth-jdbc => guacamole-auth-sso}/pom.xml (61%)
