-
Notifications
You must be signed in to change notification settings - Fork 5.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SEC-2025: SecurityContextLogoutHandler removes Authentication from Se…
…curityContext Previously there was a race condition could occur when the user attempts to access a slow resource and then logs out which would result in the user not being logged out. SecurityContextLogoutHandler will now remove the Authentication from the SecurityContext to protect against this scenario.
- Loading branch information
Showing
2 changed files
with
98 additions
and
4 deletions.
There are no files selected for viewing
This file contains 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
73 changes: 73 additions & 0 deletions
73
...springframework/security/web/authentication/logout/SecurityContextLogoutHandlerTests.java
This file contains 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 |
---|---|---|
@@ -0,0 +1,73 @@ | ||
/* | ||
* Copyright 2002-2012 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations under the License. | ||
*/ | ||
package org.springframework.security.web.authentication.logout; | ||
|
||
import static org.junit.Assert.*; | ||
|
||
import org.junit.After; | ||
import org.junit.Before; | ||
import org.junit.Test; | ||
import org.springframework.mock.web.MockHttpServletRequest; | ||
import org.springframework.mock.web.MockHttpServletResponse; | ||
import org.springframework.security.authentication.TestingAuthenticationToken; | ||
import org.springframework.security.core.Authentication; | ||
import org.springframework.security.core.authority.AuthorityUtils; | ||
import org.springframework.security.core.context.SecurityContext; | ||
import org.springframework.security.core.context.SecurityContextHolder; | ||
|
||
/** | ||
* | ||
* @author Rob Winch | ||
* | ||
*/ | ||
public class SecurityContextLogoutHandlerTests { | ||
private MockHttpServletRequest request; | ||
private MockHttpServletResponse response; | ||
private SecurityContextLogoutHandler handler; | ||
|
||
@Before | ||
public void setUp() { | ||
request = new MockHttpServletRequest(); | ||
response = new MockHttpServletResponse(); | ||
|
||
handler = new SecurityContextLogoutHandler(); | ||
|
||
SecurityContext context = SecurityContextHolder.createEmptyContext(); | ||
context.setAuthentication(new TestingAuthenticationToken("user", "password", AuthorityUtils.createAuthorityList("ROLE_USER"))); | ||
SecurityContextHolder.setContext(context); | ||
} | ||
|
||
@After | ||
public void tearDown() { | ||
SecurityContextHolder.clearContext(); | ||
} | ||
|
||
// SEC-2025 | ||
@Test | ||
public void clearsAuthentication() { | ||
SecurityContext beforeContext = SecurityContextHolder.getContext(); | ||
handler.logout(request, response, SecurityContextHolder.getContext().getAuthentication()); | ||
assertNull(beforeContext.getAuthentication()); | ||
} | ||
|
||
@Test | ||
public void disableClearsAuthentication() { | ||
handler.setClearAuthentication(false); | ||
SecurityContext beforeContext = SecurityContextHolder.getContext(); | ||
Authentication beforeAuthentication = beforeContext.getAuthentication(); | ||
handler.logout(request, response, SecurityContextHolder.getContext().getAuthentication()); | ||
|
||
assertNotNull(beforeContext.getAuthentication()); | ||
assertSame(beforeAuthentication, beforeContext.getAuthentication()); | ||
} | ||
} |