Send saml logout response even when validation errors happen #14676
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,6 +31,7 @@ | |
| import org.springframework.security.core.context.SecurityContextHolder; | ||
| import org.springframework.security.core.context.SecurityContextHolderStrategy; | ||
| import org.springframework.security.saml2.core.Saml2Error; | ||
| import org.springframework.security.saml2.core.Saml2ErrorCodes; | ||
| import org.springframework.security.saml2.core.Saml2ParameterNames; | ||
| import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticatedPrincipal; | ||
| import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationException; | ||
|
|
@@ -125,40 +126,31 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse | |
| chain.doFilter(request, response); | ||
| return; | ||
| } | ||
|
|
||
| try { | ||
| validateLogoutRequest(request, parameters); | ||
| } | ||
| catch (Saml2AuthenticationException ex) { | ||
| Saml2LogoutResponse errorLogoutResponse = this.logoutResponseResolver.resolve(request, authentication, ex); | ||
| if (errorLogoutResponse == null) { | ||
| this.logger.trace(LogMessage.format( | ||
| "Returning error since no error logout response could be generated: %s", ex.getSaml2Error())); | ||
| response.sendError(HttpServletResponse.SC_UNAUTHORIZED); | ||
|
There was a problem hiding this comment. Please have this include the error message from the exception so that it gives the same information that this did |
||
| return; | ||
| } | ||
|
|
||
| sendLogoutResponse(request, response, errorLogoutResponse); | ||
| return; | ||
| } | ||
|
|
||
| this.handler.logout(request, response, authentication); | ||
| Saml2LogoutResponse logoutResponse = this.logoutResponseResolver.resolve(request, authentication); | ||
| if (logoutResponse == null) { | ||
| this.logger.trace("Returning error since no logout response generated"); | ||
| response.sendError(HttpServletResponse.SC_UNAUTHORIZED); | ||
| return; | ||
| } | ||
| sendLogoutResponse(request, response, logoutResponse); | ||
| } | ||
|
|
||
| public void setLogoutRequestMatcher(RequestMatcher logoutRequestMatcher) { | ||
|
There was a problem hiding this comment. See if you can avoid moving these, so that it's easier to identify the changes to fix the bug. |
||
|
|
@@ -180,6 +172,40 @@ public void setSecurityContextHolderStrategy(SecurityContextHolderStrategy secur | |
| this.securityContextHolderStrategy = securityContextHolderStrategy; | ||
| } | ||
|
|
||
| private void validateLogoutRequest(HttpServletRequest request, Saml2LogoutRequestValidatorParameters parameters) { | ||
| RelyingPartyRegistration registration = parameters.getRelyingPartyRegistration(); | ||
| if (registration.getSingleLogoutServiceLocation() == null) { | ||
| this.logger.trace( | ||
| "Did not process logout request since RelyingPartyRegistration has not been configured with a logout request endpoint"); | ||
| throw new Saml2AuthenticationException(new Saml2Error(Saml2ErrorCodes.INVALID_DESTINATION, | ||
| "RelyingPartyRegistration has not been configured with a logout request endpoint")); | ||
| } | ||
|
|
||
| Saml2MessageBinding saml2MessageBinding = Saml2MessageBindingUtils.resolveBinding(request); | ||
| if (!registration.getSingleLogoutServiceBindings().contains(saml2MessageBinding)) { | ||
| this.logger.trace("Did not process logout request since used incorrect binding"); | ||
| throw new Saml2AuthenticationException( | ||
| new Saml2Error(Saml2ErrorCodes.INVALID_REQUEST, "Logout request used invalid binding")); | ||
| } | ||
|
|
||
| Saml2LogoutValidatorResult result = this.logoutRequestValidator.validate(parameters); | ||
| if (result.hasErrors()) { | ||
| this.logger.debug(LogMessage.format("Failed to validate LogoutRequest: %s", result.getErrors())); | ||
| throw new Saml2AuthenticationException( | ||
| new Saml2Error(Saml2ErrorCodes.INVALID_REQUEST, "Failed to validate the logout request")); | ||
| } | ||
| } | ||
|
|
||
| private void sendLogoutResponse(HttpServletRequest request, HttpServletResponse response, | ||
| Saml2LogoutResponse logoutResponse) throws IOException { | ||
| if (logoutResponse.getBinding() == Saml2MessageBinding.REDIRECT) { | ||
| doRedirect(request, response, logoutResponse); | ||
| } | ||
| else { | ||
| doPost(response, logoutResponse); | ||
| } | ||
| } | ||
|
|
||
| private void doRedirect(HttpServletRequest request, HttpServletResponse response, | ||
| Saml2LogoutResponse logoutResponse) throws IOException { | ||
| String location = logoutResponse.getResponseLocation(); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you, this makes sense to change this test since it is what the bug is about