[java-idp-testbed COMMIT] in /trunk/src: main/java/idp/BuildMockSaml2Response.java main/java/idp/PrepareOutboundMessa...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Feb 19 16:41:03 2014
New Revision: 149

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=149&view=rev
Log:
Replace mock action with draft actions for outbound context mgmt

Modified:
    trunk/src/main/java/idp/BuildMockSaml2Response.java
    trunk/src/main/java/idp/PrepareOutboundMessageContext.java
    trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java

Modified: trunk/src/main/java/idp/BuildMockSaml2Response.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/idp/BuildMockSaml2Response.java?rev=149&r1=148&r2=149&view=diff
==============================================================================
--- trunk/src/main/java/idp/BuildMockSaml2Response.java (original)
+++ trunk/src/main/java/idp/BuildMockSaml2Response.java Wed Feb 19 16:41:03 2014
@@ -46,18 +46,9 @@
 		
 		Response response = buildResponse(springRequestContext, profileRequestContext);
 		
-		MessageContext<SAMLObject> outboundMessageContext = buildOutboundMessageContext(response);
-		
-		profileRequestContext.setOutboundMessageContext(outboundMessageContext);
+		profileRequestContext.getOutboundMessageContext().setMessage(response);
 		
 		return ActionSupport.buildProceedEvent(this);
-	}
-
-	private MessageContext<SAMLObject> buildOutboundMessageContext(Response response) {
-		MessageContext<SAMLObject> messageContext = new MessageContext<>();
-		messageContext.setMessage(response);
-		
-		return messageContext;
 	}
 
 	private Response buildResponse(RequestContext springRequestContext, ProfileRequestContext<SAMLObject, SAMLObject> profileRequestContext) {

Modified: trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java?rev=149&r1=148&r2=149&view=diff
==============================================================================
--- trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java (original)
+++ trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java Wed Feb 19 16:41:03 2014
@@ -27,6 +27,7 @@
 
 import net.shibboleth.utilities.java.support.collection.Pair;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.net.SimpleUrlCanonicalizer;
 import net.shibboleth.utilities.java.support.net.UrlBuilder;
 import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
 
@@ -169,14 +170,14 @@
     private String getDestinationRedirect(HttpServletRequest servletRequest) {
         // TODO servlet context
         String destinationPath = "/idp/SAML2/Redirect/SSO";
-        String baseUrl = getBaseUrl(servletRequest);
-        try {
+        try {
+            String baseUrl = SimpleUrlCanonicalizer.canonicalize(getBaseUrl(servletRequest));
             UrlBuilder urlBuilder = new UrlBuilder(baseUrl);
             urlBuilder.setPath(destinationPath);
             log.debug("set des redi {}", urlBuilder.buildURL());
             return urlBuilder.buildURL();
         } catch (MalformedURLException e) {
-            log.error("Couldn't parse base URL, reverting to internal default destination: {}", baseUrl);
+            log.error("Couldn't parse base URL, reverting to internal default destination");
             return "http://localhost:8080" + destinationPath;
         }
     }
@@ -211,7 +212,7 @@
         String acsPath = "/sp/SAML2/POST/ACS";
         String baseUrl = getBaseUrl(servletRequest);
         try {
-            UrlBuilder urlBuilder = new UrlBuilder(baseUrl);
+            UrlBuilder urlBuilder = new UrlBuilder(SimpleUrlCanonicalizer.canonicalize(baseUrl));
             urlBuilder.setPath(acsPath);
             return urlBuilder.buildURL();
         } catch (MalformedURLException e) {