This is an automated email from the ASF dual-hosted git repository. jmuehlner pushed a commit to branch staging/1.4.0 in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 82e48c30bf031d2a45297b65fa6abd7261ff6897 Merge: ea65709 7dc0b3b Author: James Muehlner <[email protected]> AuthorDate: Fri Dec 3 20:35:17 2021 -0800 GUACAMOLE-1364: Merge SSO extensions refactoring. .../guacamole-auth-cas/src/main/assembly/dist.xml | 53 ------- .../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 -- .../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 | 2 + .../modules/guacamole-auth-sso-base}/.ratignore | 0 .../modules/guacamole-auth-sso-base}/pom.xml | 51 +------ .../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} | 25 +++- .../auth/cas/CASAuthenticationProviderModule.java} | 15 +- .../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 | 72 ++++++++++ .../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} | 23 +++- .../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 | 1 + .../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 extensions/guacamole-auth-sso/pom.xml | 92 +++++++++++++ extensions/pom.xml | 4 +- guacamole-docker/bin/build-guacamole.sh | 35 ++--- 99 files changed, 752 insertions(+), 1203 deletions(-)
