Skip to content

Saml2 LogoutFilter Should Come Before Common LogoutFilter #14549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 5, 2024
Merged

Saml2 LogoutFilter Should Come Before Common LogoutFilter #14549

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1752fa4
Saml2 LogoutFilter Is Placed Before Common LogoutFilter
aspan Feb 1, 2024
acfd3fb
Fix Compilation Errors
jzheaux Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions ...ringframework/security/config/annotation/web/configurers/saml2/Saml2LogoutConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,12 +268,14 @@ private Saml2LogoutResponseFilter createLogoutResponseProcessingFilter(
return postProcess(logoutResponseFilter);
}

private LogoutFilter createRelyingPartyLogoutFilter(RelyingPartyRegistrationResolver registrations) {
private Saml2RelyingPartyInitiatedLogoutFilter createRelyingPartyLogoutFilter(
RelyingPartyRegistrationResolver registrations) {
LogoutHandler[] logoutHandlers = this.logoutHandlers.toArray(new LogoutHandler[0]);
Saml2RelyingPartyInitiatedLogoutSuccessHandler logoutRequestSuccessHandler = createSaml2LogoutRequestSuccessHandler(
registrations);
logoutRequestSuccessHandler.setLogoutRequestRepository(this.logoutRequestConfigurer.logoutRequestRepository);
LogoutFilter logoutFilter = new LogoutFilter(logoutRequestSuccessHandler, logoutHandlers);
Saml2RelyingPartyInitiatedLogoutFilter logoutFilter = new Saml2RelyingPartyInitiatedLogoutFilter(
logoutRequestSuccessHandler, logoutHandlers);
logoutFilter.setLogoutRequestMatcher(createLogoutMatcher());
return postProcess(logoutFilter);
}
Expand Down Expand Up @@ -568,4 +570,12 @@ private static Saml2LogoutRequestResolver getLogoutRequestResolver(

}

private static class Saml2RelyingPartyInitiatedLogoutFilter extends LogoutFilter {

Saml2RelyingPartyInitiatedLogoutFilter(LogoutSuccessHandler logoutSuccessHandler, LogoutHandler... handlers) {
super(logoutSuccessHandler, handlers);
}

}

}