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 66e1f1f136e45dff9cb8186ece5953a0a8c3b8e0 Merge: 82e48c3 b6696b9 Author: James Muehlner <[email protected]> AuthorDate: Fri Dec 3 21:19:58 2021 -0800 GUACAMOLE-1364: Merge functionality to allow traditional username/password or SSO. .../modules/guacamole-auth-sso-base/.ratignore | 1 + .../modules/guacamole-auth-sso-base/pom.xml | 6 ++ .../auth/sso/SSOAuthenticationProvider.java | 29 +++++++- .../auth/sso/SSOAuthenticationProviderService.java | 14 ++++ .../org/apache/guacamole/auth/sso/SSOResource.java | 58 +++++++++++++++ .../src/main/resources/html/sso-providers.html | 7 ++ .../src/main/resources/styles/sso-providers.css} | 49 ++++++------ .../src/main/resources/translations/en.json | 12 ++- .../modules/guacamole-auth-sso-cas/.ratignore | 1 + .../auth/cas/AuthenticationProviderService.java | 39 +++++++--- .../auth/cas/CASAuthenticationProvider.java | 4 +- .../guacamole/auth/cas/form/CASTicketField.java | 78 ------------------- .../src/main/resources/guac-manifest.json | 9 +++ .../src/main/resources/html/sso-provider-cas.html | 4 + .../modules/guacamole-auth-sso-openid/.ratignore | 1 + .../auth/openid/AuthenticationProviderService.java | 42 +++++++---- .../auth/openid/OpenIDAuthenticationProvider.java | 4 +- .../guacamole/auth/openid/form/TokenField.java | 87 ---------------------- .../src/main/resources/guac-manifest.json | 9 +++ .../main/resources/html/sso-provider-openid.html | 4 + .../auth/saml/AuthenticationProviderService.java | 14 +++- .../auth/saml/SAMLAuthenticationProvider.java | 10 +-- .../saml/acs/AssertionConsumerServiceResource.java | 3 +- .../src/main/resources/guac-manifest.json | 9 +++ .../src/main/resources/html/sso-provider-saml.html | 4 + 25 files changed, 266 insertions(+), 232 deletions(-)
