mindol1004/spring-session
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memory leak with null principal in Redis

Browse Source 
Closes gh-1987
This commit is contained in:
Ruslan Molchanov
2021-12-28 16:46:32 +03:00
committed by Eleftheria Stein
parent dba22292a3
commit 12ce8de84e
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisIndexedSessionRepositoryITests.java
View File

@@ -527,6 +527,30 @@ class RedisIndexedSessionRepositoryITests extends AbstractRedisITests {
assertThat(findByPrincipalName.keySet()).containsOnly(changeSessionId); assertThat(findByPrincipalName.keySet()).containsOnly(changeSessionId);
} }
@Test // gh-1987
void changeSessionIdWhenPrincipalNameChangesFromNullThenIndexShouldNotBeCreated() {
String principalName = null;
String principalNameChanged = "findByChangedPrincipalName" + UUID.randomUUID();
RedisSession toSave = this.repository.createSession();
toSave.setAttribute(INDEX_NAME, principalName);
this.repository.save(toSave);
RedisSession findById = this.repository.findById(toSave.getId());
String changeSessionId = findById.changeSessionId();
findById.setAttribute(INDEX_NAME, principalNameChanged);
this.repository.save(findById);
Map<String, RedisSession> findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
principalName);
assertThat(findByPrincipalName).isEmpty();
findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME, principalNameChanged);
assertThat(findByPrincipalName).hasSize(1);
assertThat(findByPrincipalName.keySet()).containsOnly(changeSessionId);
}
@Test @Test
void changeSessionIdWhenOnlyChangeId() { void changeSessionIdWhenOnlyChangeId() {
String attrName = "changeSessionId"; String attrName = "changeSessionId";

12
spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisIndexedSessionRepository.java
View File

@@ -858,11 +858,13 @@ public class RedisIndexedSessionRepository
catch (NonTransientDataAccessException ex) { catch (NonTransientDataAccessException ex) {
handleErrNoSuchKeyError(ex); handleErrNoSuchKeyError(ex);
} }
String originalPrincipalRedisKey = getPrincipalKey(this.originalPrincipalName); if (this.originalPrincipalName != null) {
RedisIndexedSessionRepository.this.sessionRedisOperations.boundSetOps(originalPrincipalRedisKey) String originalPrincipalRedisKey = getPrincipalKey(this.originalPrincipalName);
.remove(this.originalSessionId); RedisIndexedSessionRepository.this.sessionRedisOperations.boundSetOps(originalPrincipalRedisKey)
RedisIndexedSessionRepository.this.sessionRedisOperations.boundSetOps(originalPrincipalRedisKey) .remove(this.originalSessionId);
.add(sessionId); RedisIndexedSessionRepository.this.sessionRedisOperations.boundSetOps(originalPrincipalRedisKey)
.add(sessionId);
}
} }
this.originalSessionId = sessionId; this.originalSessionId = sessionId;
} }