Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix off-by-one error in PartEvent part count

Browse Source 
This commit fixes an off-by-one error in the
PartEventHttpMessageReader,  so that it no longer counts empty windows.

Closes gh-32122
This commit is contained in:
Arjen Poutsma
2024-02-05 10:58:25 +01:00
parent 0fdf759896
commit c570f3b2da
2 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
spring-web/src/main/java/org/springframework/http/codec/multipart/PartEventHttpMessageReader.java
View File

@@ -155,29 +155,22 @@ public class PartEventHttpMessageReader extends LoggingCodecSupport implements H
AtomicInteger partCount = new AtomicInteger(); AtomicInteger partCount = new AtomicInteger();
return allPartsTokens return allPartsTokens
.windowUntil(t -> t instanceof MultipartParser.HeadersToken, true) .windowUntil(t -> t instanceof MultipartParser.HeadersToken, true)
.concatMap(partTokens -> { .concatMap(partTokens -> partTokens
if (tooManyParts(partCount)) { .switchOnFirst((signal, flux) -> {
return Mono.error(new DecodingException("Too many parts (" + partCount.get() + "/" + if (!signal.hasValue()) {
this.maxParts + " allowed)"));
}
else {
return partTokens.switchOnFirst((signal, flux) -> {
if (signal.hasValue()) {
MultipartParser.HeadersToken headersToken = (MultipartParser.HeadersToken) signal.get();
Assert.state(headersToken != null, "Signal should be headers token");
HttpHeaders headers = headersToken.headers();
Flux<MultipartParser.BodyToken> bodyTokens = flux.ofType(
MultipartParser.BodyToken.class);
return createEvents(headers, bodyTokens);
}
else {
// complete or error signal // complete or error signal
return flux.cast(PartEvent.class); return flux.cast(PartEvent.class);
} }
}); else if (tooManyParts(partCount)) {
} return Mono.error(new DecodingException("Too many parts (" + partCount.get() +
}); "/" + this.maxParts + " allowed)"));
}
MultipartParser.HeadersToken headersToken = (MultipartParser.HeadersToken) signal.get();
Assert.state(headersToken != null, "Signal should be headers token");
HttpHeaders headers = headersToken.headers();
return createEvents(headers, flux.ofType(MultipartParser.BodyToken.class));
}));
}); });
} }

1
spring-web/src/test/java/org/springframework/http/codec/multipart/PartEventHttpMessageReaderTests.java
View File

@@ -238,6 +238,7 @@ class PartEventHttpMessageReaderTests {
Flux<PartEvent> result = reader.read(forClass(PartEvent.class), request, emptyMap()); Flux<PartEvent> result = reader.read(forClass(PartEvent.class), request, emptyMap());
StepVerifier.create(result) StepVerifier.create(result)
.assertNext(form(headers -> assertThat(headers).isEmpty(), "This is implicitly typed plain ASCII text.\r\nIt does NOT end with a linebreak."))
.expectError(DecodingException.class) .expectError(DecodingException.class)
.verify(); .verify();
} }