Bug for overriding the request in the samlContext

RallySoftware · Mar 29, 2017 · d6d8b88 · d6d8b88
1 parent 7130e12
commit d6d8b88
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 15 deletions.
diff --git a/mujina-common/pom.xml b/mujina-common/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.openconext</groupId>
     <artifactId>mujina</artifactId>
-    <version>5.0.1</version>
+    <version>5.0.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/mujina-idp/pom.xml b/mujina-idp/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.openconext</groupId>
     <artifactId>mujina</artifactId>
-    <version>5.0.1</version>
+    <version>5.0.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/mujina-idp/src/main/java/mujina/idp/SAMLMessageHandler.java b/mujina-idp/src/main/java/mujina/idp/SAMLMessageHandler.java
@@ -80,7 +80,6 @@ public SAMLMessageContext extractSAMLMessageContext(HttpServletRequest request,
 
     proxiedSAMLContextProviderLB.populateGenericContext(request, response, messageContext);
 
-    messageContext.setInboundMessageTransport(new HttpServletRequestAdapter(request));
     messageContext.setSecurityPolicyResolver(resolver);
 
     SAMLMessageDecoder samlMessageDecoder = samlMessageDecoder(postRequest);

diff --git a/mujina-idp/src/main/java/mujina/idp/WebSecurityConfigurer.java b/mujina-idp/src/main/java/mujina/idp/WebSecurityConfigurer.java
@@ -74,13 +74,6 @@ public SAMLMessageHandler samlMessageHandler(@Value("${idp.clock_skew}") int clo
     HTTPRedirectDeflateDecoder httpRedirectDeflateDecoder = new HTTPRedirectDeflateDecoder(parserPool);
     HTTPPostDecoder httpPostDecoder = new HTTPPostDecoder(parserPool);
 
-    if (environment.acceptsProfiles("test")) {
-      //Lenient URI comparision
-      URIComparator lenientURIComparator = (uri1, uri2) -> true;
-      httpRedirectDeflateDecoder.setURIComparator(lenientURIComparator);
-      httpPostDecoder.setURIComparator(lenientURIComparator);
-    }
-
     parserPool.initialize();
     HTTPPostSimpleSignEncoder httpPostSimpleSignEncoder = new HTTPPostSimpleSignEncoder(VelocityFactory.getEngine(), "/templates/saml2-post-simplesign-binding.vm", true);
 

diff --git a/mujina-idp/src/test/java/mujina/idp/AuthenticationProviderTest.java b/mujina-idp/src/test/java/mujina/idp/AuthenticationProviderTest.java
@@ -13,7 +13,6 @@
 import static org.hamcrest.core.StringContains.containsString;
 
 @TestPropertySource(properties = {"idp.expires:" + (Integer.MAX_VALUE / 2 - 1), "idp.clock_skew: " + (Integer.MAX_VALUE / 2 - 1)})
-@ActiveProfiles(profiles = "test")
 public class AuthenticationProviderTest extends AbstractIntegrationTest {
 
   @Test

diff --git a/mujina-idp/src/test/java/mujina/idp/SsoControllerTest.java b/mujina-idp/src/test/java/mujina/idp/SsoControllerTest.java
@@ -21,7 +21,6 @@
 import static org.junit.Assert.assertTrue;
 
 @TestPropertySource(properties = {"idp.expires:" + (Integer.MAX_VALUE / 2 - 1), "idp.clock_skew: " + (Integer.MAX_VALUE / 2 - 1)})
-@ActiveProfiles(profiles = "test")
 public class SsoControllerTest extends AbstractIntegrationTest {
 
   private List<String[]> params = Arrays.asList(

diff --git a/mujina-idp/src/test/java/mujina/idp/UserControllerTest.java b/mujina-idp/src/test/java/mujina/idp/UserControllerTest.java
@@ -12,7 +12,6 @@
 import static org.hamcrest.core.StringContains.containsString;
 
 @TestPropertySource(properties = {"idp.expires:" + (Integer.MAX_VALUE / 2 - 1), "idp.clock_skew: " + (Integer.MAX_VALUE / 2 - 1)})
-@ActiveProfiles(profiles = "test")
 public class UserControllerTest extends AbstractIntegrationTest {
 
   @Test

diff --git a/mujina-sp/pom.xml b/mujina-sp/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.openconext</groupId>
     <artifactId>mujina</artifactId>
-    <version>5.0.1</version>
+    <version>5.0.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
 
   <groupId>org.openconext</groupId>
   <artifactId>mujina</artifactId>
-  <version>5.0.1</version>
+  <version>5.0.2</version>
   <packaging>pom</packaging>
 
   <properties>