From 1fcac58caa12976042b965ffc600dd6110a3efcd Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Wed, 6 May 2020 11:33:30 -0400 Subject: [PATCH] Update SAML2 errors in integration tests --- .../authentication/Saml2LoginIntegrationTests.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/samples/boot/saml2login/src/integration-test/java/org/springframework/security/saml2/provider/service/authentication/Saml2LoginIntegrationTests.java b/samples/boot/saml2login/src/integration-test/java/org/springframework/security/saml2/provider/service/authentication/Saml2LoginIntegrationTests.java index 1cb224713e..c2b8abde21 100644 --- a/samples/boot/saml2login/src/integration-test/java/org/springframework/security/saml2/provider/service/authentication/Saml2LoginIntegrationTests.java +++ b/samples/boot/saml2login/src/integration-test/java/org/springframework/security/saml2/provider/service/authentication/Saml2LoginIntegrationTests.java @@ -77,7 +77,6 @@ import java.util.UUID; import static java.nio.charset.StandardCharsets.UTF_8; import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.matchesRegex; import static org.hamcrest.Matchers.startsWith; import static org.springframework.security.saml2.provider.service.authentication.OpenSamlActionTestingSupport.buildConditions; @@ -242,8 +241,8 @@ public class Saml2LoginIntegrationTests { sendResponse(response, "/login?error") .andExpect( saml2AuthenticationExceptionMatcher( - "invalid_signature", - equalTo("Assertion doesn't have a valid signature.") + "invalid_assertion", + containsString("Invalid assertion [assertion] for SAML response") ) ); } @@ -258,7 +257,7 @@ public class Saml2LoginIntegrationTests { .andExpect( saml2AuthenticationExceptionMatcher( "invalid_assertion", - containsString("Assertion 'assertion' with NotOnOrAfter condition of") + containsString("Invalid assertion [assertion] for SAML response") ) ); } @@ -273,7 +272,7 @@ public class Saml2LoginIntegrationTests { .andExpect( saml2AuthenticationExceptionMatcher( "invalid_assertion", - containsString("Assertion 'assertion' with NotBefore condition of") + containsString("Invalid assertion [assertion] for SAML response") ) ); } @@ -290,8 +289,7 @@ public class Saml2LoginIntegrationTests { saml2AuthenticationExceptionMatcher( "invalid_issuer", containsString( - "Response issuer 'invalid issuer' doesn't match "+ - "'https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php'" + "Invalid issuer [invalid issuer] for SAML response" ) ) );