Update SAML2 errors in integration tests

This commit is contained in:
Eleftheria Stein 2020-05-06 11:33:30 -04:00
parent 026a951d4f
commit 545286188d
1 changed files with 5 additions and 7 deletions

View File

@ -77,7 +77,6 @@ import java.util.UUID;
import static java.nio.charset.StandardCharsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.matchesRegex; import static org.hamcrest.Matchers.matchesRegex;
import static org.hamcrest.Matchers.startsWith; import static org.hamcrest.Matchers.startsWith;
import static org.springframework.security.saml2.provider.service.authentication.OpenSamlActionTestingSupport.buildConditions; import static org.springframework.security.saml2.provider.service.authentication.OpenSamlActionTestingSupport.buildConditions;
@ -242,8 +241,8 @@ public class Saml2LoginIntegrationTests {
sendResponse(response, "/login?error") sendResponse(response, "/login?error")
.andExpect( .andExpect(
saml2AuthenticationExceptionMatcher( saml2AuthenticationExceptionMatcher(
"invalid_signature", "invalid_assertion",
equalTo("Assertion doesn't have a valid signature.") containsString("Invalid assertion [assertion] for SAML response")
) )
); );
} }
@ -258,7 +257,7 @@ public class Saml2LoginIntegrationTests {
.andExpect( .andExpect(
saml2AuthenticationExceptionMatcher( saml2AuthenticationExceptionMatcher(
"invalid_assertion", "invalid_assertion",
containsString("Assertion 'assertion' with NotOnOrAfter condition of") containsString("Invalid assertion [assertion] for SAML response")
) )
); );
} }
@ -273,7 +272,7 @@ public class Saml2LoginIntegrationTests {
.andExpect( .andExpect(
saml2AuthenticationExceptionMatcher( saml2AuthenticationExceptionMatcher(
"invalid_assertion", "invalid_assertion",
containsString("Assertion 'assertion' with NotBefore condition of") containsString("Invalid assertion [assertion] for SAML response")
) )
); );
} }
@ -290,8 +289,7 @@ public class Saml2LoginIntegrationTests {
saml2AuthenticationExceptionMatcher( saml2AuthenticationExceptionMatcher(
"invalid_issuer", "invalid_issuer",
containsString( containsString(
"Response issuer 'invalid issuer' doesn't match "+ "Invalid issuer [invalid issuer] for SAML response"
"'https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php'"
) )
) )
); );