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

Merge staging/1.2.0 changes back to master.

Browse Source
This commit is contained in:
Virtually Nick
2020-06-24 19:42:04 -04:00
parent e652d29978 eb56eb652f
commit c061d78d54
3 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/AuthenticationProviderService.java
View File

@@ -26,7 +26,6 @@ import com.onelogin.saml2.authn.SamlResponse;
import com.onelogin.saml2.exception.SettingsException; import com.onelogin.saml2.exception.SettingsException;
import com.onelogin.saml2.exception.ValidationError; import com.onelogin.saml2.exception.ValidationError;
import com.onelogin.saml2.settings.Saml2Settings; import com.onelogin.saml2.settings.Saml2Settings;
import com.onelogin.saml2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
@@ -39,6 +38,7 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.UriBuilder;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathExpressionException;
import org.apache.guacamole.auth.saml.conf.ConfigurationService; import org.apache.guacamole.auth.saml.conf.ConfigurationService;
@@ -196,8 +196,9 @@ public class AuthenticationProviderService {
AuthnRequest samlReq = new AuthnRequest(samlSettings); AuthnRequest samlReq = new AuthnRequest(samlSettings);
URI authUri; URI authUri;
try { try {
authUri = new URI(samlSettings.getIdpSingleSignOnServiceUrl() + "?SAMLRequest=" + authUri = UriBuilder.fromUri(samlSettings.getIdpSingleSignOnServiceUrl().toURI())
Util.urlEncoder(samlReq.getEncodedAuthnRequest())); .queryParam("SAMLRequest", samlReq.getEncodedAuthnRequest())
.build();
} }
catch (IOException e) { catch (IOException e) {
logger.error("Error encoding authentication request to string: {}", e.getMessage()); logger.error("Error encoding authentication request to string: {}", e.getMessage());

13
extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/SAMLAuthenticationProviderResource.java
View File

@@ -26,7 +26,6 @@ import com.onelogin.saml2.exception.ValidationError;
import com.onelogin.saml2.http.HttpRequest; import com.onelogin.saml2.http.HttpRequest;
import com.onelogin.saml2.servlet.ServletUtils; import com.onelogin.saml2.servlet.ServletUtils;
import com.onelogin.saml2.settings.Saml2Settings; import com.onelogin.saml2.settings.Saml2Settings;
import com.onelogin.saml2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
@@ -39,6 +38,7 @@ import javax.ws.rs.FormParam;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import javax.ws.rs.POST; import javax.ws.rs.POST;
import javax.ws.rs.core.Context; import javax.ws.rs.core.Context;
import javax.ws.rs.core.UriBuilder;
import javax.xml.bind.DatatypeConverter; import javax.xml.bind.DatatypeConverter;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathExpressionException;
@@ -101,7 +101,7 @@ public class SAMLAuthenticationProviderResource {
@Context HttpServletRequest consumedRequest) @Context HttpServletRequest consumedRequest)
throws GuacamoleException { throws GuacamoleException {
String guacBase = confService.getCallbackUrl().toString(); URI guacBase = confService.getCallbackUrl();
Saml2Settings samlSettings = confService.getSamlSettings(); Saml2Settings samlSettings = confService.getSamlSettings();
try { try {
HttpRequest request = ServletUtils HttpRequest request = ServletUtils
@@ -111,9 +111,9 @@ public class SAMLAuthenticationProviderResource {
String responseHash = hashSamlResponse(samlResponseString); String responseHash = hashSamlResponse(samlResponseString);
samlResponseMap.putSamlResponse(responseHash, samlResponse); samlResponseMap.putSamlResponse(responseHash, samlResponse);
return Response.seeOther(new URI(guacBase return Response.seeOther(UriBuilder.fromUri(guacBase)
+ "?responseHash=" .queryParam("responseHash", responseHash)
+ Util.urlEncoder(responseHash)) .build()
).build(); ).build();
} }
@@ -132,9 +132,6 @@ public class SAMLAuthenticationProviderResource {
catch (SettingsException e) { catch (SettingsException e) {
throw new GuacamoleServerException("Settings exception processing SAML response.", e); throw new GuacamoleServerException("Settings exception processing SAML response.", e);
} }
catch (URISyntaxException e) {
throw new GuacamoleServerException("URI exception process SAML response.", e);
}
catch (ValidationError e) { catch (ValidationError e) {
throw new GuacamoleServerException("Exception validating SAML response.", e); throw new GuacamoleServerException("Exception validating SAML response.", e);
} }

20
extensions/guacamole-auth-saml/src/main/java/org/apache/guacamole/auth/saml/conf/ConfigurationService.java
View File

@@ -27,6 +27,7 @@ import com.onelogin.saml2.util.Constants;
import java.net.URI; import java.net.URI;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.ws.rs.core.UriBuilder;
import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleServerException; import org.apache.guacamole.GuacamoleServerException;
import org.apache.guacamole.environment.Environment; import org.apache.guacamole.environment.Environment;
@@ -330,13 +331,18 @@ public class ConfigurationService {
samlMap.put(SettingsBuilder.IDP_SINGLE_SIGN_ON_SERVICE_BINDING_PROPERTY_KEY, samlMap.put(SettingsBuilder.IDP_SINGLE_SIGN_ON_SERVICE_BINDING_PROPERTY_KEY,
Constants.BINDING_HTTP_REDIRECT); Constants.BINDING_HTTP_REDIRECT);
} }
// Common settings, required with or without metadata file. // Read entity ID from properties if not provided within metadata XML
samlMap.put(SettingsBuilder.SP_ENTITYID_PROPERTY_KEY, if (!samlMap.containsKey(SettingsBuilder.SP_ENTITYID_PROPERTY_KEY)) {
getEntityId().toString()); samlMap.put(SettingsBuilder.SP_ENTITYID_PROPERTY_KEY, getEntityId().toString());
samlMap.put(SettingsBuilder.SP_ASSERTION_CONSUMER_SERVICE_URL_PROPERTY_KEY, }
getCallbackUrl().toString() + "/api/ext/saml/callback");
// Derive ACS URL from properties if not provided within metadata XML
if (!samlMap.containsKey(SettingsBuilder.SP_ASSERTION_CONSUMER_SERVICE_URL_PROPERTY_KEY)) {
samlMap.put(SettingsBuilder.SP_ASSERTION_CONSUMER_SERVICE_URL_PROPERTY_KEY,
UriBuilder.fromUri(getCallbackUrl()).path("api/ext/saml/callback").build().toString());
}
SettingsBuilder samlBuilder = new SettingsBuilder(); SettingsBuilder samlBuilder = new SettingsBuilder();
Saml2Settings samlSettings = samlBuilder.fromValues(samlMap).build(); Saml2Settings samlSettings = samlBuilder.fromValues(samlMap).build();
samlSettings.setStrict(getStrict()); samlSettings.setStrict(getStrict());