Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-29 15:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEC-1280: NullPointerException in PersistentTokenBasedRememberMeServices when logging out twice. Added check for null authentication in logout method.

Browse Source
This commit is contained in:
Luke Taylor 2009-11-04 17:20:13 +00:00
parent 197737a2b4
commit 617e517e5e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java
View File

@ -142,8 +142,11 @@ public class PersistentTokenBasedRememberMeServices extends AbstractRememberMeSe
@Override @Override
public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) { public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) {
super.logout(request, response, authentication); super.logout(request, response, authentication);
if (authentication != null) {
tokenRepository.removeUserTokens(authentication.getName()); tokenRepository.removeUserTokens(authentication.getName());
} }
}
protected String generateSeriesData() { protected String generateSeriesData() {
byte[] newSeries = new byte[seriesLength]; byte[] newSeries = new byte[seriesLength];

3
web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java
View File

@ -121,6 +121,9 @@ public class PersistentTokenBasedRememberMeServicesTests {
Cookie returnedCookie = response.getCookie("mycookiename"); Cookie returnedCookie = response.getCookie("mycookiename");
assertNotNull(returnedCookie); assertNotNull(returnedCookie);
assertEquals(0, returnedCookie.getMaxAge()); assertEquals(0, returnedCookie.getMaxAge());
// SEC-1280
services.logout(request, response, null);
} }
private class MockTokenRepository implements PersistentTokenRepository { private class MockTokenRepository implements PersistentTokenRepository {