Skip to content

Commit Session on Include Dispatch calls commitSession each time #2285

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

Closed
wants to merge 1 commit into from
Closed

Commit Session on Include Dispatch calls commitSession each time #2285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions ...sion-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ private final class SessionRepositoryRequestWrapper extends HttpServletRequestWr

private boolean requestedSessionInvalidated;

private boolean hasCommitedInInclude;

private SessionRepositoryRequestWrapper(HttpServletRequest request, HttpServletResponse response) {
super(request);
this.response = response;
Expand Down Expand Up @@ -338,7 +340,7 @@ public String getRequestedSessionId() {
@Override
public RequestDispatcher getRequestDispatcher(String path) {
RequestDispatcher requestDispatcher = super.getRequestDispatcher(path);
return new SessionCommittingRequestDispatcher(requestDispatcher);
return new SessionCommittingRequestDispatcher(requestDispatcher, this);
}

private S getRequestedSession() {
Expand Down Expand Up @@ -397,8 +399,11 @@ private final class SessionCommittingRequestDispatcher implements RequestDispatc

private final RequestDispatcher delegate;

SessionCommittingRequestDispatcher(RequestDispatcher delegate) {
private final SessionRepositoryRequestWrapper wrapper;

SessionCommittingRequestDispatcher(RequestDispatcher delegate, SessionRepositoryRequestWrapper wrapper) {
this.delegate = delegate;
this.wrapper = wrapper;
}

@Override
Expand All @@ -408,7 +413,10 @@ public void forward(ServletRequest request, ServletResponse response) throws Ser

@Override
public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException {
SessionRepositoryRequestWrapper.this.commitSession();
if (!this.wrapper.hasCommitedInInclude) {
SessionRepositoryRequestWrapper.this.commitSession();
this.wrapper.hasCommitedInInclude = true;
}
this.delegate.include(request, response);
}

Expand Down
26 changes: 26 additions & 0 deletions ...core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1320,6 +1320,32 @@ public void doFilter(HttpServletRequest wrappedRequest) {
assertThat(bindingListener.getCounter()).isEqualTo(1);
}

@Test // gh-2284
void doFilterIncludeCommitSessionOnce() throws Exception {
MapSession session = this.sessionRepository.createSession();
this.sessionRepository.save(session);
SessionRepository<MapSession> sessionRepository = spy(this.sessionRepository);
setSessionCookie(session.getId());

given(sessionRepository.findById(session.getId())).willReturn(session);

this.filter = new SessionRepositoryFilter<>(sessionRepository);

doFilter(new DoInFilter() {
@Override
public void doFilter(HttpServletRequest wrappedRequest, HttpServletResponse wrappedResponse)
throws IOException, ServletException {
String id = wrappedRequest.getSession().getId();
wrappedRequest.getRequestDispatcher("/").include(wrappedRequest, wrappedResponse);
assertThat(SessionRepositoryFilterTests.this.sessionRepository.findById(id)).isNotNull();
wrappedRequest.getRequestDispatcher("/").include(wrappedRequest, wrappedResponse);
verify(sessionRepository).findById(session.getId());
verify(sessionRepository).save(session);
verifyNoMoreInteractions(sessionRepository);
}
});
}

// --- helper methods

private void assertNewSession() {
Expand Down