MultipartParser should take into account read position

violetagg · Sep 11, 2023 · 8f9de72 · 8f9de72
1 parent 5c7bf0c
commit 8f9de72
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 30 deletions.
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java
@@ -523,7 +523,7 @@ public void onNext(DataBuffer buffer) {
 				if (logger.isTraceEnabled()) {
 					logger.trace("Boundary found @" + endIdx + " in " + buffer);
 				}
-				int len = endIdx - this.boundaryLength + 1;
+				int len = endIdx - this.boundaryLength + 1 - boundaryBuffer.readPosition();
 				if (len > 0) {
 					// whole boundary in buffer.
 					// slice off the body part, and flush
@@ -538,10 +538,11 @@ else if (len < 0) {
 					DataBufferUtils.release(boundaryBuffer);
 					DataBuffer prev;
 					while ((prev = this.queue.pollLast()) != null) {
-						int prevLen = prev.readableByteCount() + len;
+						int prevByteCount = prev.readableByteCount();
+						int prevLen = prevByteCount + len;
 						if (prevLen > 0) {
 							// slice body part of previous buffer, and flush it
-							DataBuffer body = prev.split(prevLen);
+							DataBuffer body = prev.split(prevLen + prev.readPosition());
 							DataBufferUtils.release(prev);
 							enqueue(body);
 							flush();
@@ -550,7 +551,7 @@ else if (len < 0) {
 						else {
 							// previous buffer only contains boundary bytes
 							DataBufferUtils.release(prev);
-							len += prev.readableByteCount();
+							len += prevByteCount;
 						}
 					}
 				}

diff --git a/...va/org/springframework/web/reactive/function/MultipartRouterFunctionIntegrationTests.java b/...va/org/springframework/web/reactive/function/MultipartRouterFunctionIntegrationTests.java
@@ -49,7 +49,6 @@
 import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.reactive.function.server.ServerResponse;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer;
-import org.springframework.web.testfixture.http.server.reactive.bootstrap.ReactorNetty2HttpServer;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -69,9 +68,6 @@ class MultipartRouterFunctionIntegrationTests extends AbstractRouterFunctionInte
 
 	@ParameterizedHttpServerTest
 	void multipartData(HttpServer httpServer) throws Exception {
-		// TODO Determine why Reactor Netty 2 fails:  https://github.com/spring-projects/spring-framework/issues/31110
-		assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
-
 		startServer(httpServer);
 
 		Mono<ResponseEntity<Void>> result = webClient
@@ -90,9 +86,6 @@ void multipartData(HttpServer httpServer) throws Exception {
 
 	@ParameterizedHttpServerTest
 	void parts(HttpServer httpServer) throws Exception {
-		// TODO Determine why Reactor Netty 2 fails:  https://github.com/spring-projects/spring-framework/issues/31110
-		assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
-
 		startServer(httpServer);
 
 		Mono<ResponseEntity<Void>> result = webClient
@@ -113,9 +106,6 @@ void parts(HttpServer httpServer) throws Exception {
 	void transferTo(HttpServer httpServer) throws Exception {
 		// TODO Determine why Undertow fails: https://github.com/spring-projects/spring-framework/issues/25310
 		assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails with transferTo");
-		// TODO Determine why Reactor Netty 2 fails:  https://github.com/spring-projects/spring-framework/issues/31110
-		assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
-
 		verifyTransferTo(httpServer);
 	}
 
@@ -154,9 +144,6 @@ private void verifyTransferTo(HttpServer httpServer) throws Exception {
 
 	@ParameterizedHttpServerTest
 	void partData(HttpServer httpServer) throws Exception {
-		// TODO Determine why Reactor Netty 2 fails:  https://github.com/spring-projects/spring-framework/issues/31110
-		assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
-
 		startServer(httpServer);
 
 		Mono<ResponseEntity<Void>> result = webClient
@@ -176,9 +163,6 @@ void partData(HttpServer httpServer) throws Exception {
 	@ParameterizedHttpServerTest
 	void proxy(HttpServer httpServer) throws Exception {
 		assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails proxying requests");
-		// TODO Determine why Reactor Netty 2 fails:  https://github.com/spring-projects/spring-framework/issues/31110
-		assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
-
 		startServer(httpServer);
 
 		Mono<ResponseEntity<Void>> result = webClient

diff --git a/...ngframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java b/...ngframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java
@@ -60,7 +60,6 @@
 import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.AbstractHttpHandlerIntegrationTests;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer;
-import org.springframework.web.testfixture.http.server.reactive.bootstrap.ReactorNetty2HttpServer;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -88,9 +87,6 @@ protected void startServer(HttpServer httpServer) throws Exception {
 
 	@ParameterizedHttpServerTest
 	void requestPart(HttpServer httpServer) throws Exception {
-		// TODO Determine why Reactor Netty 2 fails:  https://github.com/spring-projects/spring-framework/issues/31110
-		assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
-
 		startServer(httpServer);
 
 		Mono<ResponseEntity<Void>> result = webClient
@@ -174,9 +170,6 @@ void filePartsMono(HttpServer httpServer) throws Exception {
 	void transferTo(HttpServer httpServer) throws Exception {
 		// TODO Determine why Undertow fails: https://github.com/spring-projects/spring-framework/issues/25310
 		assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails with transferTo");
-		// TODO Determine why Reactor Netty 2 fails:  https://github.com/spring-projects/spring-framework/issues/31110
-		assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
-
 		startServer(httpServer);
 
 		Flux<String> result = webClient
@@ -195,9 +188,6 @@ void transferTo(HttpServer httpServer) throws Exception {
 
 	@ParameterizedHttpServerTest
 	void modelAttribute(HttpServer httpServer) throws Exception {
-		// TODO Determine why Reactor Netty 2 fails:  https://github.com/spring-projects/spring-framework/issues/31110
-		assumeFalse(httpServer instanceof ReactorNetty2HttpServer, "Potential bug in Netty 5 multipart support");
-
 		startServer(httpServer);
 
 		Mono<String> result = webClient