Title: [294590] trunk
Revision
294590
Author
[email protected]
Date
2022-05-20 16:40:02 -0700 (Fri, 20 May 2022)

Log Message

Web Inspector: only override request headers if they are provided
https://bugs.webkit.org/show_bug.cgi?id=240734

Reviewed by Patrick Angle.

* Source/WebInspectorUI/UserInterface/Controllers/NetworkManager.js:
(WI.NetworkManager.prototype.async requestIntercepted):
(WI.NetworkManager.prototype.async responseIntercepted):

* LayoutTests/http/tests/inspector/network/intercept-request-properties.html:
* LayoutTests/http/tests/inspector/network/intercept-request-properties-expected.txt:
* LayoutTests/http/tests/inspector/network/local-resource-override-basic.html:
* LayoutTests/http/tests/inspector/network/local-resource-override-basic-expected.txt:

Canonical link: https://commits.webkit.org/250823@main

Modified Paths

Diff

Modified: trunk/LayoutTests/http/tests/inspector/network/intercept-request-properties-expected.txt (294589 => 294590)


--- trunk/LayoutTests/http/tests/inspector/network/intercept-request-properties-expected.txt	2022-05-20 23:09:44 UTC (rev 294589)
+++ trunk/LayoutTests/http/tests/inspector/network/intercept-request-properties-expected.txt	2022-05-20 23:40:02 UTC (rev 294590)
@@ -79,6 +79,17 @@
   Request Headers:
     X-Value: overridden
 
+-- Running test case: Network.interceptRequest.Headers.Passthrough
+Triggering load...
+Request details:
+  URI: /inspector/network/resources/intercept-echo.py
+  Response URL: http://127.0.0.1:8000/inspector/network/resources/intercept-echo.py
+  Method: POST
+  Request Headers:
+    Content-Type: application/x-www-form-urlencoded
+  Post:
+    value: overridden
+
 -- Running test case: Network.interceptRequest.PostData
 Triggering load...
 Request details:

Modified: trunk/LayoutTests/http/tests/inspector/network/intercept-request-properties.html (294589 => 294590)


--- trunk/LayoutTests/http/tests/inspector/network/intercept-request-properties.html	2022-05-20 23:09:44 UTC (rev 294589)
+++ trunk/LayoutTests/http/tests/inspector/network/intercept-request-properties.html	2022-05-20 23:40:02 UTC (rev 294590)
@@ -164,6 +164,16 @@
     });
 
     addTestCase({
+        name: "Network.interceptRequest.Headers.Passthrough",
+        description: "Tests request headers passthrough",
+        _expression_: "postData('resources/intercept-echo.py')",
+        override: {
+            requestMethod: "POST",
+            requestData: "value=overridden",
+        },
+    });
+
+    addTestCase({
         name: "Network.interceptRequest.PostData",
         description: "Tests request post data interception",
         _expression_: "postData('resources/intercept-echo.py')",

Modified: trunk/LayoutTests/http/tests/inspector/network/local-resource-override-basic-expected.txt (294589 => 294590)


--- trunk/LayoutTests/http/tests/inspector/network/local-resource-override-basic-expected.txt	2022-05-20 23:09:44 UTC (rev 294589)
+++ trunk/LayoutTests/http/tests/inspector/network/local-resource-override-basic-expected.txt	2022-05-20 23:40:02 UTC (rev 294590)
@@ -127,6 +127,26 @@
   X-Expected: PASS
 Content: PASS
 
+-- Running test case: LocalResourceOverride.Headers.Passthrough
+Creating Local Resource Override for: http://127.0.0.1:8000/inspector/network/resources/override.txt
+Triggering load...
+Resource Loaded:
+URL: http://127.0.0.1:8000/inspector/network/resources/override.txt
+MIME Type: text/plain
+Status: 200 OK
+Response Source: Symbol(inspector-override)
+Response Headers:
+  Accept-Ranges: <filtered>
+  Connection: <filtered>
+  Content-Length: 29
+  Content-Type: text/plain
+  Date: <filtered>
+  ETag: <filtered>
+  Keep-Alive: <filtered>
+  Last-Modified: <filtered>
+  Server: <filtered>
+Content: PASS
+
 -- Running test case: LocalResourceOverride.404
 Creating Local Resource Override for: http://127.0.0.1:8000/inspector/network/resources/override.txt
 Triggering load...

Modified: trunk/LayoutTests/http/tests/inspector/network/local-resource-override-basic.html (294589 => 294590)


--- trunk/LayoutTests/http/tests/inspector/network/local-resource-override-basic.html	2022-05-20 23:09:44 UTC (rev 294589)
+++ trunk/LayoutTests/http/tests/inspector/network/local-resource-override-basic.html	2022-05-20 23:40:02 UTC (rev 294590)
@@ -122,7 +122,7 @@
             responseBase64Encoded: true,
             responseStatusCode: 200,
             responseStatusText: "OK",
-            responseHeaders: {},
+            responseHeaders: {"Content-Type": "image/png"},
         }]
     });
 
@@ -214,6 +214,21 @@
     });
 
     addTestCase({
+        name: "LocalResourceOverride.Headers.Passthrough",
+        description: "Load an override without modifying headers.",
+        _expression_: `triggerOverrideLoad()`,
+        overrides: [{
+            url: "http://127.0.0.1:8000/inspector/network/resources/override.txt",
+            responseMIMEType: "text/plain",
+            responseContent: "PASS",
+            responseBase64Encoded: false,
+            responseStatusCode: 200,
+            responseStatusText: "OK",
+            responseHeaders: {},
+        }]
+    });
+
+    addTestCase({
         name: "LocalResourceOverride.404",
         description: "Test for a 404 override.",
         _expression_: `triggerOverrideLoad()`,

Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/NetworkManager.js (294589 => 294590)


--- trunk/Source/WebInspectorUI/UserInterface/Controllers/NetworkManager.js	2022-05-20 23:09:44 UTC (rev 294589)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/NetworkManager.js	2022-05-20 23:40:02 UTC (rev 294590)
@@ -982,7 +982,7 @@
                     requestId,
                     url: localResourceOverride.generateRequestRedirectURL(request.url) ?? undefined,
                     method: localResource.requestMethod ?? undefined,
-                    headers: localResource.requestHeaders,
+                    headers: !isEmptyObject(localResource.requestHeaders) ? localResource.requestHeaders : undefined,
                     postData: (WI.HTTPUtilities.RequestMethodsWithBody.has(localResource.requestMethod) && localResource.requestData) ? btoa(localResource.requestData) : undefined,
                 });
                 return;
@@ -1033,7 +1033,7 @@
                     mimeType: revision.mimeType ?? undefined,
                     status: !isNaN(localResource.statusCode) ? localResource.statusCode : undefined,
                     statusText: !isNaN(localResource.statusCode) ? (localResource.statusText ?? "") : undefined,
-                    headers: localResource.responseHeaders,
+                    headers: !isEmptyObject(localResource.responseHeaders) ? localResource.responseHeaders : undefined,
                 });
                 return;
             }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to