[java][cdp] Ensure request can be modified while intercepting

pujagani · pujagani · commit 7461f1d496e0 · 2023-10-17T11:32:39.000+05:30
Fixes #12930
diff --git a/java/src/org/openqa/selenium/devtools/v116/v116Network.java b/java/src/org/openqa/selenium/devtools/v116/v116Network.java
@@ -196,7 +196,7 @@ protected Command<Void> continueRequest(RequestPaused pausedReq, HttpRequest req
 
     return Fetch.continueRequest(
         pausedReq.getRequestId(),
-        Optional.empty(),
+        Optional.of(req.getUri()),
         Optional.of(req.getMethod().toString()),
         Optional.of(Base64.getEncoder().encodeToString(bos.toByteArray())),
         Optional.of(headers),
diff --git a/java/src/org/openqa/selenium/devtools/v117/v117Network.java b/java/src/org/openqa/selenium/devtools/v117/v117Network.java
@@ -191,7 +191,7 @@ protected Command<Void> continueRequest(RequestPaused pausedReq, HttpRequest req
 
     return Fetch.continueRequest(
         pausedReq.getRequestId(),
-        Optional.empty(),
+        Optional.of(req.getUri()),
         Optional.of(req.getMethod().toString()),
         Optional.of(Base64.getEncoder().encodeToString(bos.toByteArray())),
         Optional.of(headers),
diff --git a/java/src/org/openqa/selenium/devtools/v118/v118Network.java b/java/src/org/openqa/selenium/devtools/v118/v118Network.java
@@ -191,7 +191,7 @@ protected Command<Void> continueRequest(RequestPaused pausedReq, HttpRequest req
 
     return Fetch.continueRequest(
         pausedReq.getRequestId(),
-        Optional.empty(),
+        Optional.of(req.getUri()),
         Optional.of(req.getMethod().toString()),
         Optional.of(Base64.getEncoder().encodeToString(bos.toByteArray())),
         Optional.of(headers),
diff --git a/java/src/org/openqa/selenium/devtools/v85/V85Network.java b/java/src/org/openqa/selenium/devtools/v85/V85Network.java
@@ -200,7 +200,7 @@ protected Command<Void> continueRequest(RequestPaused pausedReq, HttpRequest req
 
     return Fetch.continueRequest(
         pausedReq.getRequestId(),
-        Optional.empty(),
+        Optional.of(req.getUri()),
         Optional.of(req.getMethod().toString()),
         Optional.of(Base64.getEncoder().encodeToString(bos.toByteArray())),
         Optional.of(headers));
diff --git a/java/test/org/openqa/selenium/devtools/NetworkInterceptorTest.java b/java/test/org/openqa/selenium/devtools/NetworkInterceptorTest.java
@@ -38,6 +38,8 @@
 import org.openqa.selenium.environment.webserver.NettyAppServer;
 import org.openqa.selenium.remote.http.Contents;
 import org.openqa.selenium.remote.http.Filter;
+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.Route;
 import org.openqa.selenium.testing.JupiterTestBase;
@@ -78,6 +80,17 @@ public void setup() {
                                     utf8String(
                                         "<html><head><title>Hello,"
                                             + " World!</title></head><body/></html>"))),
+            Route.matching(req -> req.getUri().contains("london"))
+                .to(
+                    () ->
+                        req ->
+                            new HttpResponse()
+                                .setStatus(200)
+                                .addHeader("Content-Type", XHTML_UTF_8.toString())
+                                .setContent(
+                                    utf8String(
+                                        "<html><head><title>Hello,"
+                                            + " London!</title></head><body/></html>"))),
             Route.get("/redirect")
                 .to(
                     () ->
@@ -132,6 +145,26 @@ void shouldAllowTheInterceptorToChangeTheResponse() {
     assertThat(source).contains("delicious cheese!");
   }
 
+  @Test
+  @NoDriverBeforeTest
+  void shouldAllowTheInterceptorToChangeTheRequest() {
+    interceptor =
+        new NetworkInterceptor(
+            driver,
+            (Filter)
+                next ->
+                    req -> {
+                      req = new HttpRequest(HttpMethod.GET, appServer.whereIs("/london"));
+                      return next.execute(req);
+                    });
+
+    driver.get(appServer.whereIs("/cheese"));
+
+    String source = driver.getPageSource();
+
+    assertThat(source).contains("London");
+  }
+
   @Test
   @NoDriverBeforeTest
   void shouldBeAbleToReturnAMagicResponseThatCausesTheOriginalRequestToProceed() {
