Browse Source

Merge branch '5.6.x' into 5.7.x

Closes gh-12208
pull/12265/head
Josh Cummings 3 years ago
parent
commit
79483b2bc9
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5
  1. 4
      saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/logout/OpenSamlLogoutRequestValidator.java
  2. 2
      saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2LogoutResponseFilter.java

4
saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/logout/OpenSamlLogoutRequestValidator.java

@ -128,7 +128,7 @@ public final class OpenSamlLogoutRequestValidator implements Saml2LogoutRequestV @@ -128,7 +128,7 @@ public final class OpenSamlLogoutRequestValidator implements Saml2LogoutRequestV
RelyingPartyRegistration registration) {
return (errors) -> {
if (request.getIssuer() == null) {
errors.add(new Saml2Error(Saml2ErrorCodes.INVALID_ISSUER, "Failed to find issuer in LogoutResponse"));
errors.add(new Saml2Error(Saml2ErrorCodes.INVALID_ISSUER, "Failed to find issuer in LogoutRequest"));
return;
}
String issuer = request.getIssuer().getValue();
@ -144,7 +144,7 @@ public final class OpenSamlLogoutRequestValidator implements Saml2LogoutRequestV @@ -144,7 +144,7 @@ public final class OpenSamlLogoutRequestValidator implements Saml2LogoutRequestV
return (errors) -> {
if (request.getDestination() == null) {
errors.add(new Saml2Error(Saml2ErrorCodes.INVALID_DESTINATION,
"Failed to find destination in LogoutResponse"));
"Failed to find destination in LogoutRequest"));
return;
}
String destination = request.getDestination();

2
saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2LogoutResponseFilter.java

@ -114,7 +114,7 @@ public final class Saml2LogoutResponseFilter extends OncePerRequestFilter { @@ -114,7 +114,7 @@ public final class Saml2LogoutResponseFilter extends OncePerRequestFilter {
logoutRequest.getRelyingPartyRegistrationId());
if (registration == null) {
this.logger
.trace("Did not process logout request since failed to find associated RelyingPartyRegistration");
.trace("Did not process logout response since failed to find associated RelyingPartyRegistration");
Saml2Error error = new Saml2Error(Saml2ErrorCodes.RELYING_PARTY_REGISTRATION_NOT_FOUND,
"Failed to find associated RelyingPartyRegistration");
response.sendError(HttpServletResponse.SC_BAD_REQUEST, error.toString());

Loading…
Cancel
Save