Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do Not Invalidate Current Session When Its Registered #15066

Closed
wants to merge 2 commits into from
Closed

Do Not Invalidate Current Session When Its Registered #15066

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c25129
Update InvalidateLeastUsedServerMaximumSessionsExceededHandler.java
joaquinjsb May 13, 2024
72ba6a4
more elegant
joaquinjsb May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 22 additions & 16 deletions ...ty/web/server/authentication/InvalidateLeastUsedServerMaximumSessionsExceededHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@

package org.springframework.security.web.server.authentication;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;

import org.springframework.security.core.session.ReactiveSessionInformation;
import org.springframework.security.web.server.authentication.MaximumSessionsContext;
import org.springframework.security.web.server.authentication.ServerMaximumSessionsExceededHandler;
import org.springframework.web.server.session.WebSessionStore;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

import org.springframework.security.core.session.ReactiveSessionInformation;
import org.springframework.web.server.session.WebSessionStore;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;

/**
* Implementation of {@link ServerMaximumSessionsExceededHandler} that invalidates the
Expand All @@ -47,16 +49,20 @@ public InvalidateLeastUsedServerMaximumSessionsExceededHandler(WebSessionStore w

@Override
public Mono<Void> handle(MaximumSessionsContext context) {
List<ReactiveSessionInformation> sessions = new ArrayList<>(context.getSessions());
sessions.sort(Comparator.comparing(ReactiveSessionInformation::getLastAccessTime));
int maximumSessionsExceededBy = sessions.size() - context.getMaximumSessionsAllowed() + 1;
List<ReactiveSessionInformation> leastRecentlyUsedSessionsToInvalidate = sessions.subList(0,
maximumSessionsExceededBy);

return Flux.fromIterable(leastRecentlyUsedSessionsToInvalidate)
.flatMap((toInvalidate) -> toInvalidate.invalidate().thenReturn(toInvalidate))
.flatMap((toInvalidate) -> this.webSessionStore.removeSession(toInvalidate.getSessionId()))
.then();
List<ReactiveSessionInformation> sessions = context.getSessions().stream()
.filter(toFilter -> !toFilter.getSessionId().equals(context.getCurrentSession().getId()))
.sorted(Comparator.comparing(ReactiveSessionInformation::getLastAccessTime))
.collect(Collectors.toCollection(ArrayList::new));

int maximumSessionsExceededBy = sessions.size() - context.getMaximumSessionsAllowed() + 1;

List<ReactiveSessionInformation> leastRecentlyUsedSessionsToInvalidate = sessions.subList(0,
maximumSessionsExceededBy);

return Flux.fromIterable(leastRecentlyUsedSessionsToInvalidate)
.flatMap(toInvalidate -> toInvalidate.invalidate().thenReturn(toInvalidate))
.flatMap(toInvalidate -> this.webSessionStore.removeSession(toInvalidate.getSessionId()))
.then();
}

}