Skip to content

Commit a282887

Browse files
committed
Merge branch '6.2.x'
2 parents f679965 + b43b3b1 commit a282887

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LogoutConfigurer.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,12 +270,14 @@ private Saml2LogoutResponseFilter createLogoutResponseProcessingFilter(
270270
return postProcess(logoutResponseFilter);
271271
}
272272

273-
private LogoutFilter createRelyingPartyLogoutFilter(RelyingPartyRegistrationRepository registrations) {
273+
private Saml2RelyingPartyInitiatedLogoutFilter createRelyingPartyLogoutFilter(
274+
RelyingPartyRegistrationRepository registrations) {
274275
LogoutHandler[] logoutHandlers = this.logoutHandlers.toArray(new LogoutHandler[0]);
275276
Saml2RelyingPartyInitiatedLogoutSuccessHandler logoutRequestSuccessHandler = createSaml2LogoutRequestSuccessHandler(
276277
registrations);
277278
logoutRequestSuccessHandler.setLogoutRequestRepository(this.logoutRequestConfigurer.logoutRequestRepository);
278-
LogoutFilter logoutFilter = new LogoutFilter(logoutRequestSuccessHandler, logoutHandlers);
279+
Saml2RelyingPartyInitiatedLogoutFilter logoutFilter = new Saml2RelyingPartyInitiatedLogoutFilter(
280+
logoutRequestSuccessHandler, logoutHandlers);
279281
logoutFilter.setLogoutRequestMatcher(createLogoutMatcher());
280282
return postProcess(logoutFilter);
281283
}
@@ -523,4 +525,12 @@ public boolean matches(HttpServletRequest request) {
523525

524526
}
525527

528+
private static class Saml2RelyingPartyInitiatedLogoutFilter extends LogoutFilter {
529+
530+
Saml2RelyingPartyInitiatedLogoutFilter(LogoutSuccessHandler logoutSuccessHandler, LogoutHandler... handlers) {
531+
super(logoutSuccessHandler, handlers);
532+
}
533+
534+
}
535+
526536
}

0 commit comments

Comments
 (0)