SEC-3170: Polish

* Prevent a null LogoutHandler from being set when RememberMeServices
does not implement LogoutHandler
* Fix test which invoked Mock from outside spock which failed
* Add explicit test for adding null LogoutHandler to
RememberMeConfigurer
This commit is contained in:
Rob Winch
2015-12-15 09:34:34 -06:00
parent b28c62a6fe
commit 337f1885ea
2 changed files with 18 additions and 7 deletions

View File

@@ -230,7 +230,7 @@ public final class RememberMeConfigurer<H extends HttpSecurityBuilder<H>> extend
RememberMeServices rememberMeServices = getRememberMeServices(http, key);
http.setSharedObject(RememberMeServices.class, rememberMeServices);
LogoutConfigurer<H> logoutConfigurer = http.getConfigurer(LogoutConfigurer.class);
if (logoutConfigurer != null) {
if (logoutConfigurer != null && logoutHandler != null) {
logoutConfigurer.addLogoutHandler(logoutHandler);
}