root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Remove only leading space for SSE data 

Prior to this commit, all white space was trimmed from Server Sent Event
data. After this commit, only a leading space is removed (if present).

Closes gh-27473
This commit is contained in:
Arjen Poutsma 2021-09-28 14:56:39 +02:00
parent 85bdea6f47
commit 3be2b32e21
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java
View File

@ -147,7 +147,13 @@ public class ServerSentEventHttpMessageReader implements HttpMessageReader<Objec
for (String line : lines) {
if (line.startsWith("data:")) {
data = (data != null ? data : new StringBuilder());
data.append(line.substring(5).trim()).append('\n');
if (line.charAt(5) != ' ') {
data.append(line, 5, line.length());
}
else {
data.append(line, 6, line.length());
}
data.append('\n');
}
if (shouldWrap) {
if (line.startsWith("id:")) {

14
spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java
View File

@ -138,6 +138,20 @@ public class ServerSentEventHttpMessageReaderTests extends AbstractLeakCheckingT
.verify();
}
@Test
public void trimWhitespace() {
MockServerHttpRequest request = MockServerHttpRequest.post("/")
.body(Mono.just(stringBuffer("data: \tfoo \ndata:bar\t\n\n")));
Flux<String> data = reader.read(ResolvableType.forClass(String.class),
request, Collections.emptyMap()).cast(String.class);
StepVerifier.create(data)
.expectNext("\tfoo \nbar\t")
.expectComplete()
.verify();
}
@Test
public void readPojo() {
MockServerHttpRequest request = MockServerHttpRequest.post("/")