Clean up unnecssary codes

- Removed SamlExtensionUrlForwardingFilter. Just commented out for now in case we need it later. - Removed unneeded comments in test code. [#186986697] Co-authored-by: Duane May <duane.may@broadcom.com>
cloudfoundry · Apr 30, 2024 · 6272b69 · 6272b69
1 parent 3740582
commit 6272b69
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/uaa/src/main/webapp/WEB-INF/spring-servlet.xml b/uaa/src/main/webapp/WEB-INF/spring-servlet.xml
@@ -234,8 +234,8 @@
                        key="#{T(org.cloudfoundry.identity.uaa.security.web.SecurityFilterChainPostProcessor.FilterPosition).after(T(org.cloudfoundry.identity.uaa.scim.DisableUserManagementSecurityFilter))}"/>
                 <entry value-ref="sessionResetFilter"
                        key="#{T(org.cloudfoundry.identity.uaa.security.web.SecurityFilterChainPostProcessor.FilterPosition).position(102)}"/>
-                <entry value-ref="SamlExtensionUrlForwardingFilter"
-                       key="#{T(org.cloudfoundry.identity.uaa.security.web.SecurityFilterChainPostProcessor.FilterPosition).before(@oauth2TokenParseFilter)}"/>
+<!--                <entry value-ref="SamlExtensionUrlForwardingFilter"-->
+<!--                       key="#{T(org.cloudfoundry.identity.uaa.security.web.SecurityFilterChainPostProcessor.FilterPosition).before(@oauth2TokenParseFilter)}"/>-->
             </map>
         </property>
     </bean>
@@ -520,6 +520,6 @@
                            @config['uaa']['limitedFunctionality']['whitelist']['methods']}"/>
     </bean>
 
-    <bean id="SamlExtensionUrlForwardingFilter" class="org.cloudfoundry.identity.uaa.provider.saml.SamlExtensionUrlForwardingFilter"></bean>
+<!--    <bean id="SamlExtensionUrlForwardingFilter" class="org.cloudfoundry.identity.uaa.provider.saml.SamlExtensionUrlForwardingFilter"></bean>-->
 
 </beans>
diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/saml/SamlMetadataMockMvcTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/saml/SamlMetadataMockMvcTests.java
@@ -2,7 +2,6 @@
 
 import java.net.URI;
 
-import org.junit.jupiter.api.Disabled;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.TestPropertySource;
@@ -35,21 +34,18 @@ void testSamlMetadataRootWithEndingSlash() throws Exception {
     }
 
     @Test
-//    @Disabled("SAML test fails (is /saml/metadata/example working a product requirement?)")
     void testSamlMetadataDefaultNoEndingSlash() throws Exception {
         mockMvc.perform(get(new URI("/saml/metadata/example")))
                 .andExpect(status().isOk());
     }
 
     @Test
-//    @Disabled("SAML test fails (is /saml/metadata/example/ working a product requirement?)")
     void testSamlMetadataDefaultWithEndingSlash() throws Exception {
         mockMvc.perform(get(new URI("/saml/metadata/example/")))
                 .andExpect(status().isOk());
     }
 
     @Test
-//    @Disabled("SAML test fails (though the endpoint works in real life, so it's a test issue)")
     void testSamlMetadataXMLValidation() throws Exception {
 
         mockMvc.perform(get(new URI("/saml/metadata")))
@@ -74,7 +70,6 @@ class SamlMetadataAlternativeConfigsMockMvcTests {
         private MockMvc mockMvc;
 
         @Test
-//        @Disabled("SAML test fails (though the endpoint works in real life, so it's a test issue)")
         void testSamlMetadataAuthnRequestsSignedIsFalse() throws Exception {
             mockMvc.perform(get(new URI("/saml/metadata")))
                     .andDo(print())