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

SpringSessionWebSessionManager writes on commit

Browse Source 
when the ServerHttpResonse is commited the cookie and the session are written

Fixes gh-856
This commit is contained in:
Rob Winch
2017-08-18 14:30:22 -05:00
parent 5f0e4c3b85
commit a7bb9d3b31
4 changed files with 86 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-session-core/src/main/java/org/springframework/session/web/server/session/SpringSessionWebSessionManager.java
View File

@@ -109,21 +109,21 @@ public class SpringSessionWebSessionManager implements WebSessionManager {
public Mono<WebSession> getSession(ServerWebExchange exchange) {
// @formatter:off
return Mono.defer(() ->
retrieveSession(exchange)
retrieveSession(exchange))
.flatMap(session -> removeSessionIfExpired(exchange, session))
.flatMap(session -> {
Instant lastAccessTime = Instant.now(getClock());
return this.sessionStore.setLastAccessedTime(session, lastAccessTime);
})
.switchIfEmpty(createSession(exchange))
.doOnNext(session -> exchange.getResponse().beforeCommit(session::save)));
.doOnNext(session -> exchange.getResponse().beforeCommit(session::save));
// @formatter:on
}
private Mono<WebSession> retrieveSession(ServerWebExchange exchange) {
// @formatter:off
return Flux.fromIterable(getSessionIdResolver().resolveSessionIds(exchange))
.concatMap(this.sessionStore::retrieveSession)
.concatMap(sessionId -> this.sessionStore.retrieveSession(sessionId, session -> saveSession(exchange, session)))
.cast(WebSession.class)
.next();
// @formatter:on
@@ -167,7 +167,7 @@ public class SpringSessionWebSessionManager implements WebSessionManager {
}
private Mono<WebSession> createSession(ServerWebExchange exchange) {
return this.sessionStore.createSession();
return this.sessionStore.createSession(session -> saveSession(exchange, session));
}
}

27
spring-session-core/src/main/java/org/springframework/session/web/server/session/SpringSessionWebSessionStore.java
View File

@@ -27,7 +27,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Supplier;
import java.util.function.Function;
import reactor.core.publisher.Mono;
@@ -56,8 +56,8 @@ class SpringSessionWebSessionStore<S extends Session> implements WebSessionStore
this.sessions = sessions;
}
public Mono<WebSession> createSession() {
return this.sessions.createSession().map(this::createSession);
public Mono<WebSession> createSession(Function<WebSession, Mono<Void>> saveOperation) {
return this.sessions.createSession().map(session -> this.createSession(session, saveOperation));
}
public Mono<WebSession> setLastAccessedTime(WebSession session,
@@ -77,7 +77,11 @@ class SpringSessionWebSessionStore<S extends Session> implements WebSessionStore
@Override
public Mono<WebSession> retrieveSession(String sessionId) {
return this.sessions.findById(sessionId).map(this::existingSession);
return Mono.error(new UnsupportedOperationException("This method is not supported. Use retrieveSession(String,Function<WebSession, Mono<Void>>)"));
}
public Mono<WebSession> retrieveSession(String sessionId, Function<WebSession, Mono<Void>> saveOperation) {
return this.sessions.findById(sessionId).map(session -> this.existingSession(session, saveOperation));
}
@Override
@@ -85,12 +89,12 @@ class SpringSessionWebSessionStore<S extends Session> implements WebSessionStore
return storeSession(webSession);
}
private SpringSessionWebSession createSession(S session) {
return new SpringSessionWebSession(session, State.NEW);
private SpringSessionWebSession createSession(S session, Function<WebSession, Mono<Void>> saveOperation) {
return new SpringSessionWebSession(session, State.NEW, saveOperation);
}
private SpringSessionWebSession existingSession(S session) {
return new SpringSessionWebSession(session, State.STARTED);
private SpringSessionWebSession existingSession(S session, Function<WebSession, Mono<Void>> saveOperation) {
return new SpringSessionWebSession(session, State.STARTED, saveOperation);
}
@Override
@@ -250,13 +254,14 @@ class SpringSessionWebSessionStore<S extends Session> implements WebSessionStore
private AtomicReference<State> state = new AtomicReference<>();
private volatile transient Supplier<Mono<Void>> saveOperation = Mono::empty;
private final Function<WebSession, Mono<Void>> saveOperation;
SpringSessionWebSession(S session, State state) {
SpringSessionWebSession(S session, State state, Function<WebSession, Mono<Void>> saveOperation) {
Assert.notNull(session, "session cannot be null");
this.session = session;
this.attributes = new SpringSessionMap(session);
this.state.set(state);
this.saveOperation = saveOperation;
}
@Override
@@ -291,7 +296,7 @@ class SpringSessionWebSessionStore<S extends Session> implements WebSessionStore
@Override
public Mono<Void> save() {
return this.saveOperation.get();
return this.saveOperation.apply(this);
}
@Override

29
spring-session-core/src/test/java/org/springframework/session/web/server/session/SpringSessionWebSessionManagerTests.java
View File

@@ -29,11 +29,15 @@ import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import org.springframework.http.HttpCookie;
import org.springframework.http.ResponseCookie;
import org.springframework.http.codec.ServerCodecConfigurer;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.session.MapReactorSessionRepository;
import org.springframework.session.ReactorSessionRepository;
import org.springframework.session.Session;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebSession;
import org.springframework.web.server.i18n.LocaleContextResolver;
import org.springframework.web.server.session.WebSessionIdResolver;
import static org.assertj.core.api.Assertions.assertThat;
@@ -56,6 +60,12 @@ public class SpringSessionWebSessionManagerTests<S extends Session> {
@Mock
private WebSessionIdResolver resolver;
@Mock
private ServerCodecConfigurer serverCodecConfigurer;
@Mock
private LocaleContextResolver localeContextResolver;
@Mock
private S createSession;
@@ -143,4 +153,23 @@ public class SpringSessionWebSessionManagerTests<S extends Session> {
verify(this.sessions).findById(findByIdSessionId);
}
@Test
public void commitWrites() {
MapReactorSessionRepository repository = new MapReactorSessionRepository();
this.manager = new SpringSessionWebSessionManager(repository);
Mono<Void> getSession = this.manager.getSession(this.exchange)
.doOnSuccess(session -> session.getAttributes().put("foo", "bar"))
.flatMap(webSession -> this.exchange.getResponse().setComplete());
StepVerifier.create(getSession)
.expectComplete()
.verify();
ResponseCookie sessionCookie = this.exchange.getResponse().getCookies()
.getFirst("SESSION");
assertThat(sessionCookie).isNotNull();
Session session = repository.findById(sessionCookie.getValue()).block();
assertThat(session).isNotNull();
assertThat(session.<String>getAttribute("foo")).isEqualTo("bar");
}
}

54
spring-session-core/src/test/java/org/springframework/session/web/server/session/SpringSessionWebSessionStoreTests.java
View File

@@ -20,6 +20,7 @@ import java.util.AbstractMap;
import java.util.Collections;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import org.junit.Before;
import org.junit.Test;
@@ -55,6 +56,8 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
@Mock
private S findByIdSession;
private Function<WebSession, Mono<Void>> saveOperation;
private SpringSessionWebSessionStore<S> webSessionStore;
@Before
@@ -73,7 +76,8 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
@Test
public void createSessionWhenNoAttributesThenNotStarted() {
WebSession createdWebSession = this.webSessionStore.createSession().block();
WebSession createdWebSession = this.webSessionStore.createSession(this.saveOperation)
.block();
assertThat(createdWebSession.isStarted()).isFalse();
}
@@ -82,14 +86,16 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
public void createSessionWhenAddAttributeThenStarted() {
given(this.createSession.getAttributeNames())
.willReturn(Collections.singleton("a"));
WebSession createdWebSession = this.webSessionStore.createSession().block();
WebSession createdWebSession = this.webSessionStore.createSession(this.saveOperation)
.block();
assertThat(createdWebSession.isStarted()).isTrue();
}
@Test
public void createSessionWhenGetAttributesAndSizeThenDelegatesToCreateSession() {
WebSession createdWebSession = this.webSessionStore.createSession().block();
WebSession createdWebSession = this.webSessionStore.createSession(this.saveOperation)
.block();
Map<String, Object> attributes = createdWebSession.getAttributes();
@@ -103,7 +109,8 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
@Test
public void createSessionWhenGetAttributesAndIsEmptyThenDelegatesToCreateSession() {
WebSession createdWebSession = this.webSessionStore.createSession().block();
WebSession createdWebSession = this.webSessionStore.createSession(this.saveOperation)
.block();
Map<String, Object> attributes = createdWebSession.getAttributes();
@@ -117,7 +124,8 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
@Test
public void createSessionWhenGetAttributesAndContainsKeyAndNotStringThenFalse() {
WebSession createdWebSession = this.webSessionStore.createSession().block();
WebSession createdWebSession = this.webSessionStore.createSession(this.saveOperation)
.block();
Map<String, Object> attributes = createdWebSession.getAttributes();
@@ -126,7 +134,8 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
@Test
public void createSessionWhenGetAttributesAndContainsKeyAndNotFoundThenFalse() {
WebSession createdWebSession = this.webSessionStore.createSession().block();
WebSession createdWebSession = this.webSessionStore.createSession(this.saveOperation)
.block();
Map<String, Object> attributes = createdWebSession.getAttributes();
@@ -137,7 +146,8 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
public void createSessionWhenGetAttributesAndContainsKeyAndFoundThenTrue() {
given(this.createSession.getAttributeNames())
.willReturn(Collections.singleton("a"));
WebSession createdWebSession = this.webSessionStore.createSession().block();
WebSession createdWebSession = this.webSessionStore.createSession(this.saveOperation)
.block();
Map<String, Object> attributes = createdWebSession.getAttributes();
@@ -146,7 +156,8 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
@Test
public void createSessionWhenGetAttributesAndPutThenDelegatesToCreateSession() {
WebSession createdWebSession = this.webSessionStore.createSession().block();
WebSession createdWebSession = this.webSessionStore.createSession(this.saveOperation)
.block();
Map<String, Object> attributes = createdWebSession.getAttributes();
attributes.put("a", "b");
@@ -156,7 +167,8 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
@Test
public void createSessionWhenGetAttributesAndPutNullThenDelegatesToCreateSession() {
WebSession createdWebSession = this.webSessionStore.createSession().block();
WebSession createdWebSession = this.webSessionStore.createSession(this.saveOperation)
.block();
Map<String, Object> attributes = createdWebSession.getAttributes();
attributes.put("a", null);
@@ -166,7 +178,8 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
@Test
public void createSessionWhenGetAttributesAndRemoveThenDelegatesToCreateSession() {
WebSession createdWebSession = this.webSessionStore.createSession().block();
WebSession createdWebSession = this.webSessionStore.createSession(this.saveOperation)
.block();
Map<String, Object> attributes = createdWebSession.getAttributes();
attributes.remove("a");
@@ -176,7 +189,8 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
@Test
public void createSessionWhenGetAttributesAndPutAllThenDelegatesToCreateSession() {
WebSession createdWebSession = this.webSessionStore.createSession().block();
WebSession createdWebSession = this.webSessionStore.createSession(this.saveOperation)
.block();
Map<String, Object> attributes = createdWebSession.getAttributes();
attributes.putAll(Collections.singletonMap("a", "b"));
@@ -188,7 +202,8 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
public void createSessionWhenGetAttributesAndClearThenDelegatesToCreateSession() {
given(this.createSession.getAttributeNames())
.willReturn(Collections.singleton("a"));
WebSession createdWebSession = this.webSessionStore.createSession().block();
WebSession createdWebSession = this.webSessionStore.createSession(this.saveOperation)
.block();
Map<String, Object> attributes = createdWebSession.getAttributes();
attributes.clear();
@@ -200,7 +215,8 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
public void createSessionWhenGetAttributesAndKeySetThenDelegatesToCreateSession() {
given(this.createSession.getAttributeNames())
.willReturn(Collections.singleton("a"));
WebSession createdWebSession = this.webSessionStore.createSession().block();
WebSession createdWebSession = this.webSessionStore.createSession(this.saveOperation)
.block();
Map<String, Object> attributes = createdWebSession.getAttributes();
@@ -212,7 +228,8 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
given(this.createSession.getAttributeNames())
.willReturn(Collections.singleton("a"));
given(this.createSession.getAttribute("a")).willReturn("b");
WebSession createdWebSession = this.webSessionStore.createSession().block();
WebSession createdWebSession = this.webSessionStore.createSession(this.saveOperation)
.block();
Map<String, Object> attributes = createdWebSession.getAttributes();
@@ -226,7 +243,8 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
.willReturn(Collections.singleton(attrName));
String attrValue = "attrValue";
given(this.createSession.getAttribute(attrName)).willReturn(attrValue);
WebSession createdWebSession = this.webSessionStore.createSession().block();
WebSession createdWebSession = this.webSessionStore.createSession(this.saveOperation)
.block();
Map<String, Object> attributes = createdWebSession.getAttributes();
Set<Map.Entry<String, Object>> entries = attributes.entrySet();
@@ -238,7 +256,8 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
@Test
public void storeSessionWhenInvokedThenSessionSaved() {
given(this.sessionRepository.save(this.createSession)).willReturn(Mono.empty());
WebSession createdSession = this.webSessionStore.createSession().block();
WebSession createdSession = this.webSessionStore.createSession(this.saveOperation)
.block();
this.webSessionStore.storeSession(createdSession).block();
@@ -248,7 +267,8 @@ public class SpringSessionWebSessionStoreTests<S extends Session> {
@Test
public void retrieveSessionThenStarted() {
String id = "id";
WebSession retrievedWebSession = this.webSessionStore.retrieveSession(id).block();
WebSession retrievedWebSession = this.webSessionStore
.retrieveSession(id, this.saveOperation).block();
assertThat(retrievedWebSession.isStarted()).isTrue();
}