Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2026-03-30 14:08:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18989 from rwinch/gh-18970-null-oncommitted

Browse Source 
Merge Handle null value in OnCommittedResponseWrapper header methods
This commit is contained in:
Rob Winch 2026-03-26 17:29:33 -04:00 committed by GitHub
commit 3ecf84855e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 117 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/main/java/org/springframework/security/web/util/OnCommittedResponseWrapper.java
View File

@ -87,7 +87,7 @@ public abstract class OnCommittedResponseWrapper extends HttpServletResponseWrap
}
private void checkContentLengthHeader(String name, String value) {
if ("Content-Length".equalsIgnoreCase(name)) {
if (value != null && "Content-Length".equalsIgnoreCase(name)) {
setContentLength(Long.parseLong(value));
}
}
@ -505,7 +505,7 @@ public abstract class OnCommittedResponseWrapper extends HttpServletResponseWrap
@Override
public PrintWriter append(CharSequence csq) {
checkContentLength(csq.length());
checkContentLength((csq != null) ? csq.length() : 4);
return this.delegate.append(csq);
}

115
web/src/test/java/org/springframework/security/web/util/OnCommittedResponseWrapperTests.java
View File

@ -28,7 +28,10 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.HttpHeaders;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatNoException;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.verify;
@ -1006,6 +1009,16 @@ public class OnCommittedResponseWrapperTests {
assertThat(this.committed).isTrue();
}
@Test
public void addHeaderNullNameDoesNotThrow() {
assertThatNoException().isThrownBy(() -> this.response.addHeader(null, "value"));
}
@Test
public void addHeaderNullValueDoesNotThrow() {
assertThatNoException().isThrownBy(() -> this.response.addHeader(HttpHeaders.CONTENT_LENGTH, null));
}
@Test
public void addIntHeaderContentLengthPrintWriterWriteStringCommits() throws Exception {
givenGetWriterThenReturn();
@ -1015,6 +1028,11 @@ public class OnCommittedResponseWrapperTests {
assertThat(this.committed).isTrue();
}
@Test
public void addIntHeaderNullNameDoesNotThrow() {
assertThatNoException().isThrownBy(() -> this.response.addIntHeader(null, 1));
}
@Test
public void setHeaderContentLengthPrintWriterWriteStringCommits() throws Exception {
givenGetWriterThenReturn();
@ -1024,6 +1042,16 @@ public class OnCommittedResponseWrapperTests {
assertThat(this.committed).isTrue();
}
@Test
public void setHeaderNullNameDoesNotThrow() {
assertThatNoException().isThrownBy(() -> this.response.setHeader(null, "value"));
}
@Test
public void setHeaderNullValueDoesNotThrow() {
assertThatNoException().isThrownBy(() -> this.response.setHeader(HttpHeaders.CONTENT_LENGTH, null));
}
@Test
public void setIntHeaderContentLengthPrintWriterWriteStringCommits() throws Exception {
givenGetWriterThenReturn();
@ -1033,6 +1061,11 @@ public class OnCommittedResponseWrapperTests {
assertThat(this.committed).isTrue();
}
@Test
public void setIntHeaderNullNameDoesNotThrow() {
assertThatNoException().isThrownBy(() -> this.response.setIntHeader(null, 1));
}
@Test
public void bufferSizePrintWriterWriteCommits() throws Exception {
givenGetWriterThenReturn();
@ -1054,4 +1087,86 @@ public class OnCommittedResponseWrapperTests {
assertThat(this.committed).isFalse();
}
@Test
public void printWriterPrintNullStringDoesNotThrow() throws Exception {
givenGetWriterThenReturn();
String s = null;
assertThatNoException().isThrownBy(() -> this.response.getWriter().print(s));
verify(this.writer).print(s);
}
@Test
public void printWriterPrintlnNullStringDoesNotThrow() throws Exception {
givenGetWriterThenReturn();
String s = null;
assertThatNoException().isThrownBy(() -> this.response.getWriter().println(s));
verify(this.writer).println(s);
}
@Test
public void printWriterPrintNullObjectDoesNotThrow() throws Exception {
givenGetWriterThenReturn();
Object obj = null;
assertThatNoException().isThrownBy(() -> this.response.getWriter().print(obj));
verify(this.writer).print(obj);
}
@Test
public void printWriterPrintlnNullObjectDoesNotThrow() throws Exception {
givenGetWriterThenReturn();
Object obj = null;
assertThatNoException().isThrownBy(() -> this.response.getWriter().println(obj));
verify(this.writer).println(obj);
}
@Test
public void printWriterWriteNullStringDoesNotThrow() throws Exception {
givenGetWriterThenReturn();
String s = null;
assertThatNoException().isThrownBy(() -> this.response.getWriter().write(s));
verify(this.writer).write(s);
}
@Test
public void printWriterAppendNullCharSequenceDoesNotThrow() throws Exception {
givenGetWriterThenReturn();
CharSequence csq = null;
assertThatNoException().isThrownBy(() -> this.response.getWriter().append(csq));
verify(this.writer).append(csq);
}
@Test
public void printWriterAppendNullCharSequenceIntIntDoesNotThrow() throws Exception {
givenGetWriterThenReturn();
CharSequence csq = null;
assertThatNoException().isThrownBy(() -> this.response.getWriter().append(csq, 0, 3));
verify(this.writer).append(csq, 0, 3);
}
@Test
public void outputStreamPrintNullStringDoesNotThrow() throws Exception {
givenGetOutputStreamThenReturn();
String s = null;
assertThatNoException().isThrownBy(() -> this.response.getOutputStream().print(s));
verify(this.out).print(s);
}
@Test
public void outputStreamPrintlnNullStringDoesNotThrow() throws Exception {
givenGetOutputStreamThenReturn();
String s = null;
assertThatNoException().isThrownBy(() -> this.response.getOutputStream().println(s));
verify(this.out).println(s);
}
@Test
public void sendErrorWithNullMsgDoesNotThrow() throws Exception {
assertThatNoException().isThrownBy(() -> this.response.sendError(400, null));
}
@Test
public void sendRedirectWithNullLocationDoesNotThrow() throws Exception {
assertThatNoException().isThrownBy(() -> this.response.sendRedirect(null));
}
}