fix: call callout endpoint with proper body when it contains accents

gravitee-io/issues#8109

Author: gaetanmaisse

src/main/java/io/gravitee/policy/callout/CalloutHttpPolicy.java

@@ -244,7 +244,8 @@ private void doCallout(ExecutionContext context, Consumer<Void> onSuccess, Consu
                 // Check the resolved body before trying to send it.
                 if (body != null && !body.isEmpty()) {
                     httpClientRequest.headers().remove(HttpHeaders.TRANSFER_ENCODING);
-                    httpClientRequest.putHeader(HttpHeaders.CONTENT_LENGTH, Integer.toString(body.length()));
+                    // Removing Content-Length header to let VertX automatically set it correctly
+                    httpClientRequest.headers().remove(HttpHeaders.CONTENT_LENGTH);
                     futureResponse = httpClientRequest.send(Buffer.buffer(body));
                 } else {
                     futureResponse = httpClientRequest.send();

src/test/java/io/gravitee/policy/CalloutHttpPolicyIntegrationTest.java

@@ -15,12 +15,7 @@
  */
 package io.gravitee.policy;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.ok;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -35,6 +30,8 @@
 import io.gravitee.policy.callout.CalloutHttpPolicy;
 import io.gravitee.policy.callout.configuration.CalloutHttpPolicyConfiguration;
 import io.reactivex.observers.TestObserver;
+import io.vertx.core.http.HttpHeaders;
+import io.vertx.core.json.JsonObject;
 import io.vertx.reactivex.core.buffer.Buffer;
 import io.vertx.reactivex.ext.web.client.HttpResponse;
 import io.vertx.reactivex.ext.web.client.WebClient;
@@ -103,6 +100,37 @@ void shouldDoCalloutAndSetResponseAsAttribute(WebClient client) throws Exception
         calloutServer.verify(getRequestedFor(urlPathEqualTo("/callout")).withHeader("X-Callout", equalTo("calloutHeader")));
     }
 
+    @Test
+    @DisplayName("Should call callout endpoint with proper body when it contains accents")
+    @DeployApi("/apis/callout-http-post-with-accents.json")
+    void shouldDoCalloutAndSetResponseWithAccentAsAttribute(WebClient client) {
+        wiremock.stubFor(post("/endpoint").willReturn(ok("réponse from backend")));
+        calloutServer.stubFor(post("/callout").willReturn(ok("response from callout")));
+
+        final TestObserver<HttpResponse<Buffer>> obs = client
+            .post("/test")
+            .rxSendJsonObject(new JsonObject().put("clé", "value").put("key", "välæur"))
+            .test();
+
+        awaitTerminalEvent(obs);
+        obs
+            .assertComplete()
+            .assertValue(response -> {
+                assertThat(response.statusCode()).isEqualTo(200);
+                assertThat(response.bodyAsString()).isEqualTo("réponse from backend");
+                return true;
+            })
+            .assertNoErrors();
+
+        wiremock.verify(postRequestedFor(urlPathEqualTo("/endpoint")));
+        calloutServer.verify(
+            postRequestedFor(urlPathEqualTo("/callout"))
+                .withoutHeader(HttpHeaders.TRANSFER_ENCODING.toString())
+                .withHeader(HttpHeaders.CONTENT_LENGTH.toString(), equalTo("33"))
+                .withRequestBody(equalToJson("{\"clé\":\"value\", \"key\":\"välæur\"}"))
+        );
+    }
+
     @Test
     @DisplayName("Should do callout Fire and Forget")
     @DeployApi("/apis/callout-http-fire-and-forget.json")

src/test/resources/apis/callout-http-post-with-accents.json

@@ -0,0 +1,45 @@
+{
+  "id": "my-api",
+  "name": "my-api",
+  "gravitee": "2.0.0",
+  "proxy": {
+    "context_path": "/test",
+    "endpoints": [
+      {
+        "name": "default",
+        "target": "http://localhost:8080/endpoint",
+        "http": {
+          "connectTimeout": 3000,
+          "readTimeout": 60000
+        }
+      }
+    ]
+  },
+  "flows": [
+    {
+      "name": "flow-1",
+      "methods": [
+        "POST"
+      ],
+      "enabled": true,
+      "path-operator": {
+        "path": "/",
+        "operator": "STARTS_WITH"
+      },
+      "pre": [
+        {
+          "name": "Callout HTTP",
+          "description": "",
+          "enabled": true,
+          "policy": "policy-http-callout",
+          "configuration": {
+            "method": "POST",
+            "url": "http://localhost:8089/callout",
+            "scope": "REQUEST_CONTENT",
+            "body": "{#request.content}"
+          }
+        }
+      ]
+    }
+  ]
+}