Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.io.IOException;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;

import jakarta.servlet.FilterChain;
import jakarta.servlet.RequestDispatcher;
Expand Down Expand Up @@ -114,6 +115,8 @@ class HeaderWriterResponse extends OnCommittedResponseWrapper {

private final HttpServletRequest request;

private final AtomicBoolean headersWritten = new AtomicBoolean(false);

HeaderWriterResponse(HttpServletRequest request, HttpServletResponse response) {
super(response);
this.request = request;
Expand All @@ -129,7 +132,9 @@ protected void writeHeaders() {
if (isDisableOnResponseCommitted()) {
return;
}
HeaderWriterFilter.this.writeHeaders(this.request, getHttpResponse());
if (this.headersWritten.compareAndSet(false, true)) {
HeaderWriterFilter.this.writeHeaders(this.request, getHttpResponse());
}
}

private HttpServletResponse getHttpResponse() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,26 @@ public void doFilterWhenRequestContainsIncludeThenHeadersStillWritten() throws E
verifyNoMoreInteractions(this.writer1);
}

// gh-9175
@Test
public void doFilterWhenWriteHeadersCalledConcurrentlyThenHeadersWrittenOnlyOnce() throws Exception {
List<HeaderWriter> headerWriters = new ArrayList<>();
headerWriters.add(this.writer1);
HeaderWriterFilter filter = new HeaderWriterFilter(headerWriters);
MockHttpServletRequest request = new MockHttpServletRequest();
MockHttpServletResponse response = new MockHttpServletResponse();
filter.doFilter(request, response, (req, resp) -> {
// Calling writeHeaders() directly simulates the race window where an
// async thread enters writeHeaders() via onResponseCommitted() but has
// not yet called disableOnResponseCommitted().
((HeaderWriterFilter.HeaderWriterResponse) resp).writeHeaders();
});
// The finally block in doHeadersAfter also calls writeHeaders().
// Without the fix, the header writers would be invoked twice.
verify(this.writer1).writeHeaders(any(HttpServletRequest.class), any(HttpServletResponse.class));
verifyNoMoreInteractions(this.writer1);
}

@Test
public void headersWrittenAtBeginningOfRequest() throws Exception {
HeaderWriterFilter filter = new HeaderWriterFilter(Collections.singletonList(this.writer1));
Expand Down