VertxHttpClientHTTPConduit redirects the request body twice when the …

…body was passed through a single buffer, fix quarkiverse#1630
ppalaga · Dec 1, 2024 · bf68f97 · bf68f97
1 parent 0b09513
commit bf68f97
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/...core/deployment/src/test/java/io/quarkiverse/cxf/deployment/test/Client3xx4xx5xxTest.java b/...core/deployment/src/test/java/io/quarkiverse/cxf/deployment/test/Client3xx4xx5xxTest.java
@@ -1,5 +1,8 @@
 package io.quarkiverse.cxf.deployment.test;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import jakarta.enterprise.event.Observes;
 import jakarta.enterprise.inject.Instance;
 import jakarta.jws.WebMethod;
@@ -130,7 +133,28 @@ void init(@Observes Router router) {
         });
         router.post("/vertx-redirect").handler(ctx -> {
             Log.info("Redirecting");
-            ctx.redirect("http://localhost:8081/services/hello");
+            ctx.redirect("http://localhost:8081/vertx-hello");
+        });
+        router.post("/vertx-hello").handler(ctx -> {
+            final String requestBody = ctx.body().asString();
+            final Matcher m = Pattern.compile("<arg0>([^<]*)</arg0>").matcher(requestBody);
+            final StringBuilder response = new StringBuilder()
+                    .append("<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">")
+                    .append("<soap:Body>")
+                    .append("<ns2:helloResponse xmlns:ns2=\"http://test.deployment.cxf.quarkiverse.io/\">")
+                    .append("<return>");
+            while (m.find()) {
+                /*
+                 * Append as many hellos as many <arg0> elements we get to make sure
+                 * we do not get the request body twice - see https://github.com/quarkiverse/quarkus-cxf/issues/1630
+                 */
+                response.append("Hello ").append(m.group(1));
+            }
+            response.append("</return>")
+                    .append("</ns2:helloResponse>")
+                    .append("</soap:Body>")
+                    .append("</soap:Envelope>");
+            ctx.response().end(response.toString());
         });
     }
 
@@ -208,11 +232,11 @@ void endpointUri404OnEventLoop() throws InterruptedException {
     @Test
     void endpointUri302OnWorkerThread() {
         RestAssured.given()
-                .body("Joe")
+                .body("Single request body")
                 .post("http://localhost:8081/vertx-blocking/endpointUri302")
                 .then()
                 .statusCode(200)
-                .body(Matchers.is("Hello Joe"));
+                .body(Matchers.is("Hello Single request body"));
     }
 
     private static Throwable rootCause(Exception e) {

diff --git a/...untime/src/main/java/io/quarkiverse/cxf/vertx/http/client/VertxHttpClientHTTPConduit.java b/...untime/src/main/java/io/quarkiverse/cxf/vertx/http/client/VertxHttpClientHTTPConduit.java
@@ -674,10 +674,6 @@ void finishRequest(HttpClientRequest req, Buffer buffer) {
                         }
                         mode.responseReady(new Result<>(new ResponseEvent(response, sink), ar.cause()));
                     });
-            if (bodyRecorder != null) {
-                bodyRecorder.add(buffer.slice());
-            }
-
             req
                     .end(buffer)
                     .onFailure(t -> mode.responseFailed(t, true));
@@ -686,7 +682,9 @@ void finishRequest(HttpClientRequest req, Buffer buffer) {
 
         void redirectRetransmit(URI newURL) throws IOException {
             if (Log.isDebugEnabled()) {
-                Log.debugf("Redirect retransmit from %s to %s", redirects.get(redirects.size() - 1), newURL);
+                final int i = redirects.size() - 2;
+                final String previousUrl = i >= 0 ? redirects.get(i).toString() : "null";
+                Log.infof("Redirect retransmit from %s to %s", previousUrl, newURL);
             }
             boolean ssl;
             int port = newURL.getPort();