Skip to content

Commit

Permalink
Ignore non-functioning SAML tests
Browse files Browse the repository at this point in the history 
* Instead of calling fail(). We have a suspicion that there is a bug in
  the way the tests are running (most of them are somehow not running
  with "./gradlew test" and we have a theory that a combination of mixing
  junit4 imports and the junit5 fail() might be contributing.
* I was careful to use @ignore for tests importing the junit4 @test, and
  @disabled for tests using the junit5 @test.
* These annotations were added, with the idea that you can search for
  '@ignore("SAML' and '@disabled("SAML' to find the tests that need
  attention before we finish the SAML library conversion.
@ignore("SAML test fails")
@ignore("SAML test doesn't compile")
@ignore("SAML test setup doesn't compile")
@disabled("SAML test fails")
@disabled("SAML test doesn't compile")
* A few tests are set to ignore because they're failing for the right
  reasons, but more work is needed to finish that and get back to green.
  The goal is to start tracking these annotations instead of failing
  tests, so we can stay green.
* Tests now running:
    server module: 3,435 (in IntelliJ) (98 total ignored)
    uaa module: 67 (command line run of "./gradlew test" for all tests
    - still needs troubleshooting)

Co-authored-by: Danny Faught <danny.faught@broadcom.com>
  • Loading branch information
@swalchemist
swalchemist committed Mar 26, 2024
1 parent b020fb5 commit 73520d9
Show file tree
Hide file tree
Showing 28 changed files with 1,323 additions and 1,232 deletions.
40 changes: 20 additions & 20 deletions ...identity/uaa/authentication/BackwardsCompatibleTokenEndpointAuthenticationFilterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.cloudfoundry.identity.uaa.zone.IdentityZoneHolder;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.springframework.mock.web.MockHttpServletRequest;
Expand Down Expand Up @@ -53,7 +54,6 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyMap;
import static org.mockito.ArgumentMatchers.same;
Expand Down Expand Up @@ -173,31 +173,31 @@ public void attempt_password_authentication_with_details() throws Exception {
}

@Test
@Ignore("SAML test doesn't compile")
public void attempt_saml_assertion_authentication() throws Exception {
fail();
// request.addParameter(GRANT_TYPE, GRANT_TYPE_SAML2_BEARER);
// request.addParameter("assertion", "saml-assertion-value-here");
// filter.doFilter(request, response, chain);
// verify(filter, times(1)).attemptTokenAuthentication(same(request), same(response));
request.addParameter(GRANT_TYPE, GRANT_TYPE_SAML2_BEARER);
request.addParameter("assertion", "saml-assertion-value-here");
filter.doFilter(request, response, chain);
verify(filter, times(1)).attemptTokenAuthentication(same(request), same(response));
// verify(samlAuthFilter, times(1)).attemptAuthentication(same(request), same(response));
// verifyNoInteractions(passwordAuthManager);
// verifyNoInteractions(externalOAuthAuthenticationManager);
verifyNoInteractions(passwordAuthManager);
verifyNoInteractions(externalOAuthAuthenticationManager);
}

@Test
@Ignore("SAML test fails")
public void saml_assertion_missing() throws Exception {
fail();
// request.addParameter(GRANT_TYPE, GRANT_TYPE_SAML2_BEARER);
// filter.doFilter(request, response, chain);
// verify(filter, times(1)).attemptTokenAuthentication(same(request), same(response));
// verifyNoInteractions(externalOAuthAuthenticationManager);
// verifyNoInteractions(passwordAuthManager);
// verifyNoInteractions(externalOAuthAuthenticationManager);
// ArgumentCaptor<AuthenticationException> exceptionArgumentCaptor = ArgumentCaptor.forClass(AuthenticationException.class);
// verify(entryPoint, times(1)).commence(same(request), same(response), exceptionArgumentCaptor.capture());
// assertNotNull(exceptionArgumentCaptor.getValue());
// assertEquals("SAML Assertion is missing", exceptionArgumentCaptor.getValue().getMessage());
// assertTrue(exceptionArgumentCaptor.getValue() instanceof InsufficientAuthenticationException);
request.addParameter(GRANT_TYPE, GRANT_TYPE_SAML2_BEARER);
filter.doFilter(request, response, chain);
verify(filter, times(1)).attemptTokenAuthentication(same(request), same(response));
verifyNoInteractions(externalOAuthAuthenticationManager);
verifyNoInteractions(passwordAuthManager);
verifyNoInteractions(externalOAuthAuthenticationManager);
ArgumentCaptor<AuthenticationException> exceptionArgumentCaptor = ArgumentCaptor.forClass(AuthenticationException.class);
verify(entryPoint, times(1)).commence(same(request), same(response), exceptionArgumentCaptor.capture());
assertNotNull(exceptionArgumentCaptor.getValue());
assertEquals("SAML Assertion is missing", exceptionArgumentCaptor.getValue().getMessage());
assertTrue(exceptionArgumentCaptor.getValue() instanceof InsufficientAuthenticationException);
}

@Test
Expand Down
5 changes: 3 additions & 2 deletions ...src/test/java/org/cloudfoundry/identity/uaa/authentication/SamlAssertionBindingTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package org.cloudfoundry.identity.uaa.authentication;

import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
//import org.opensaml.ws.transport.http.HTTPInTransport;
//import org.opensaml.xml.parse.BasicParserPool;
Expand All @@ -37,8 +38,8 @@ public void setUp() {
}

@Test
@Ignore("SAML test doesn't compile")
public void supports() {
fail();
// HTTPInTransport transport = mock(HTTPInTransport.class);
// assertFalse(binding.supports(transport));
//
Expand All @@ -50,8 +51,8 @@ public void supports() {
}

@Test
@Ignore("SAML test doesn't compile")
public void getBindingURI() {
fail();
// assertEquals("urn:oasis:names:tc:SAML:2.0:bindings:URI", binding.getBindingURI());
}

Expand Down
58 changes: 31 additions & 27 deletions ...test/java/org/cloudfoundry/identity/uaa/authentication/SamlResponseLoggerBindingTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.apache.logging.log4j.core.config.Configurator;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
//import org.opensaml.ws.transport.InputStreamInTransportAdapter;
//import org.opensaml.ws.transport.http.HttpServletRequestAdapter;
Expand Down Expand Up @@ -50,46 +51,49 @@ void xVcapRequestId() {
}

@Test
@Disabled("SAML test doesn't compile")
void doesNotFailWithSomethingOtherThanHttpServletRequestAdapter() {
fail();
// InputStreamInTransportAdapter inputStreamInTransportAdapter = new InputStreamInTransportAdapter(null);
//
// assertDoesNotThrow(() -> samlResponseLoggerBinding.supports(inputStreamInTransportAdapter));
}

// @Test
// void doesNotFailWithNullServletRequest() {
@Test
@Disabled("SAML test doesn't compile")
void doesNotFailWithNullServletRequest() {
// HttpServletRequestAdapter httpServletRequestAdapter = new HttpServletRequestAdapter(null);
//
// Configurator.setRootLevel(DEBUG);
//
// assertDoesNotThrow(() -> samlResponseLoggerBinding.supports(httpServletRequestAdapter));
// }
//
// @Test
// void doesNotFailWithNullParameterMap() {
// HttpServletRequest mockHttpServletRequest = mock(HttpServletRequest.class);
// when(mockHttpServletRequest.getParameterMap()).thenReturn(null);
}

@Test
@Disabled("SAML test doesn't compile")
void doesNotFailWithNullParameterMap() {
HttpServletRequest mockHttpServletRequest = mock(HttpServletRequest.class);
when(mockHttpServletRequest.getParameterMap()).thenReturn(null);
// HttpServletRequestAdapter httpServletRequestAdapter = new HttpServletRequestAdapter(mockHttpServletRequest);
//
// Configurator.setRootLevel(DEBUG);
//

Configurator.setRootLevel(DEBUG);

// assertDoesNotThrow(() -> samlResponseLoggerBinding.supports(httpServletRequestAdapter));
// }
//
// @Test
// void doesNotFailWithNullParameter() {
// HttpServletRequest mockHttpServletRequest = mock(HttpServletRequest.class);
// Map<String, String[]> parameters = new HashMap<>();
// parameters.put(null, null);
// parameters.put("key1", null);
// parameters.put("key2", new String[]{null});
// parameters.put("key3", new String[]{"value", null});
// when(mockHttpServletRequest.getParameterMap()).thenReturn(parameters);
}

@Test
@Disabled("SAML test doesn't compile")
void doesNotFailWithNullParameter() {
HttpServletRequest mockHttpServletRequest = mock(HttpServletRequest.class);
Map<String, String[]> parameters = new HashMap<>();
parameters.put(null, null);
parameters.put("key1", null);
parameters.put("key2", new String[]{null});
parameters.put("key3", new String[]{"value", null});
when(mockHttpServletRequest.getParameterMap()).thenReturn(parameters);
// HttpServletRequestAdapter httpServletRequestAdapter = new HttpServletRequestAdapter(mockHttpServletRequest);
//
// Configurator.setRootLevel(DEBUG);
//

Configurator.setRootLevel(DEBUG);

// assertDoesNotThrow(() -> samlResponseLoggerBinding.supports(httpServletRequestAdapter));
// }
}
}
6 changes: 3 additions & 3 deletions server/src/test/java/org/cloudfoundry/identity/uaa/login/HomeControllerViewTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.cloudfoundry.identity.uaa.zone.*;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
Expand Down Expand Up @@ -42,7 +43,6 @@

import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
Expand Down Expand Up @@ -173,17 +173,17 @@ void error500WithGenericException() throws Exception {
}

@Test
@Disabled("SAML test doesn't compile")
void error500WithSAMLExceptionAsCause() throws Exception {
fail("dependency on SAMLException");
// mockMvc.perform(get("/error500").requestAttr("javax.servlet.error.exception", new Exception(new SAMLException("bad"))))
// .andExpect(status().isBadRequest())
// .andExpect(content().string(containsString(customFooterText)))
// .andExpect(content().string(containsString(base64ProductLogo)));
}

@Test
@Disabled("SAML test doesn't compile")
void error500WithMetadataProviderExceptionCause() throws Exception {
fail("dependency on MetadataProviderException");
// mockMvc.perform(get("/error500").requestAttr("javax.servlet.error.exception", new Exception(new MetadataProviderException("bad"))))
// .andExpect(status().isBadRequest())
// .andExpect(content().string(containsString(customFooterText)))
Expand Down
Loading

0 comments on commit 73520d9

Please sign in to comment.