safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 13:41:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-323: Merge login help test for CAS.

Browse Source
This commit is contained in:
Michael Jumper
2017-06-23 14:36:40 -07:00
parent 80b681e18d bc59074808
commit 04c70c7e49
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java
View File

@@ -29,7 +29,7 @@ import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.form.Field; import org.apache.guacamole.form.Field;
import org.apache.guacamole.net.auth.Credentials; import org.apache.guacamole.net.auth.Credentials;
import org.apache.guacamole.net.auth.credentials.CredentialsInfo; import org.apache.guacamole.net.auth.credentials.CredentialsInfo;
import org.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException; import org.apache.guacamole.net.auth.credentials.GuacamoleInsufficientCredentialsException;
import org.apache.guacamole.auth.cas.conf.ConfigurationService; import org.apache.guacamole.auth.cas.conf.ConfigurationService;
import org.apache.guacamole.auth.cas.form.CASTicketField; import org.apache.guacamole.auth.cas.form.CASTicketField;
import org.apache.guacamole.auth.cas.ticket.TicketValidationService; import org.apache.guacamole.auth.cas.ticket.TicketValidationService;
@@ -89,7 +89,8 @@ public class AuthenticationProviderService {
} }
// Request CAS ticket // Request CAS ticket
throw new GuacamoleInvalidCredentialsException("Invalid login.", throw new GuacamoleInsufficientCredentialsException(
"LOGIN.INFO_CAS_REDIRECT_PENDING",
new CredentialsInfo(Arrays.asList(new Field[] { new CredentialsInfo(Arrays.asList(new Field[] {
// CAS-specific ticket (will automatically redirect the user // CAS-specific ticket (will automatically redirect the user

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

@@ -9,6 +9,10 @@
"org.apache.guacamole.auth.cas.CASAuthenticationProvider" "org.apache.guacamole.auth.cas.CASAuthenticationProvider"
], ],
"translations" : [
"translations/en.json"
],
"js" : [ "js" : [
"casModule.js", "casModule.js",
"casController.js", "casController.js",

12
extensions/guacamole-auth-cas/src/main/resources/translations/en.json Normal file
View File

@@ -0,0 +1,12 @@
{
"DATA_SOURCE_CAS" : {
"NAME" : "CAS SSO Backend"
},
"LOGIN" : {
"FIELD_HEADER_TICKET" : "",
"INFO_CAS_REDIRECT_PENDING" : "Please wait, redirecting to CAS authentication."
}
}