[java] JdkHttpClient - Downgrade the method for a 303 redirect (#12070)

joerg1985 · web-flow · commit 922aaf301619 · 2023-05-19T22:27:09.000+02:00
Downgrade the method for a 303 redirect
diff --git a/java/src/org/openqa/selenium/remote/http/jdk/JdkHttpClient.java b/java/src/org/openqa/selenium/remote/http/jdk/JdkHttpClient.java
@@ -55,6 +55,7 @@
 import org.openqa.selenium.remote.http.CloseMessage;
 import org.openqa.selenium.remote.http.HttpClient;
 import org.openqa.selenium.remote.http.HttpClientName;
+import org.openqa.selenium.remote.http.HttpMethod;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
 import org.openqa.selenium.remote.http.Message;
@@ -357,14 +358,15 @@ public HttpResponse execute(HttpRequest req) throws UncheckedIOException {
 
     BodyHandler<byte[]> byteHandler = BodyHandlers.ofByteArray();
     try {
+      HttpMethod method = req.getMethod();
       URI rawUri = messages.getRawUri(req);
 
       // We need a custom handling of redirects to:
       // - increase the maximum number of retries to 100
       // - avoid a downgrade of POST requests, see the javadoc of j.n.h.HttpClient.Redirect
       // - not run into https://bugs.openjdk.org/browse/JDK-8304701
       for (int i = 0; i < 100; i++) {
-        java.net.http.HttpRequest request = messages.createRequest(req, rawUri);
+        java.net.http.HttpRequest request = messages.createRequest(req, method, rawUri);
         java.net.http.HttpResponse<byte[]> response;
 
         // use sendAsync to not run into https://bugs.openjdk.org/browse/JDK-8258397
@@ -393,9 +395,11 @@ public HttpResponse execute(HttpRequest req) throws UncheckedIOException {
         }
 
         switch (response.statusCode()) {
+          case 303:
+            method = HttpMethod.GET;
+            // fall-through
           case 301:
           case 302:
-          case 303:
           case 307:
           case 308:
             URI location =
diff --git a/java/src/org/openqa/selenium/remote/http/jdk/JdkHttpMessages.java b/java/src/org/openqa/selenium/remote/http/jdk/JdkHttpMessages.java
@@ -31,6 +31,7 @@
 import org.openqa.selenium.remote.http.AddSeleniumUserAgent;
 import org.openqa.selenium.remote.http.ClientConfig;
 import org.openqa.selenium.remote.http.Contents;
+import org.openqa.selenium.remote.http.HttpMethod;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
 
@@ -44,7 +45,7 @@ public JdkHttpMessages(ClientConfig config) {
     this.config = Objects.requireNonNull(config, "Client config");
   }
 
-  public java.net.http.HttpRequest createRequest(HttpRequest req, URI rawUri) {
+  public java.net.http.HttpRequest createRequest(HttpRequest req, HttpMethod method, URI rawUri) {
     String rawUrl = rawUri.toString();
 
     // Add query string if necessary
@@ -69,7 +70,7 @@ public java.net.http.HttpRequest createRequest(HttpRequest req, URI rawUri) {
     java.net.http.HttpRequest.Builder builder =
         java.net.http.HttpRequest.newBuilder().uri(URI.create(rawUrl));
 
-    switch (req.getMethod()) {
+    switch (method) {
       case DELETE:
         builder = builder.DELETE();
         break;
