Changeset 293861 in webkit

Timestamp:

May 5, 2022, 3:14:41 PM (3 years ago)

Author:

achristensen@apple.com

Message:

Unreviewed, reverting r293697.

Mergred to branch, not needed on trunk

Reverted changeset:

"Revert all use of
_setPrivacyProxyFailClosedForUnreachableNonMainHosts"
​https://bugs.webkit.org/show_bug.cgi?id=239977
​https://commits.webkit.org/r293697

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (modified) (1 diff)
• NetworkProcess/cocoa/NetworkSessionCocoa.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-05-05  Alex Christensen  <achristensen@webkit.org>
+
+        Unreviewed, reverting r293697.
+
+        Mergred to branch, not needed on trunk
+
+        Reverted changeset:
+
+        "Revert all use of
+        _setPrivacyProxyFailClosedForUnreachableNonMainHosts"
+        https://bugs.webkit.org/show_bug.cgi?id=239977
+        https://commits.webkit.org/r293697
+
 2022-05-05  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm

@@ -340 +340 @@
     RetainPtr<NSURLRequest> nsRequest = request.nsURLRequest(WebCore::HTTPBodyUpdatePolicy::UpdateHTTPBody);
     RetainPtr<NSMutableURLRequest> mutableRequest = adoptNS([nsRequest.get() mutableCopy]);
+
+    if (parameters.isMainFrameNavigation
+        || parameters.hadMainFrameMainResourcePrivateRelayed
+        || !parameters.topOrigin
+        || request.url().host() == parameters.topOrigin->host()) {
+        if ([mutableRequest respondsToSelector:@selector(_setPrivacyProxyFailClosedForUnreachableNonMainHosts:)])
+            [mutableRequest _setPrivacyProxyFailClosedForUnreachableNonMainHosts:YES];
+    }
 
 #if ENABLE(APP_PRIVACY_REPORT)

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm

@@ -1714 +1714 @@
 #endif
 
+    // FIXME: This function can make up to 3 copies of a request.
+    // Reduce that to one if the protocol is null, the request isn't app initiated,
+    // or the main frame main resource was private relayed, then set all properties
+    // on the one copy.
+    if (hadMainFrameMainResourcePrivateRelayed || request.url().host() == clientOrigin.topOrigin.host) {
+        RetainPtr<NSMutableURLRequest> mutableRequest = adoptNS([nsRequest.get() mutableCopy]);
+        if ([mutableRequest respondsToSelector:@selector(_setPrivacyProxyFailClosedForUnreachableNonMainHosts:)])
+            [mutableRequest _setPrivacyProxyFailClosedForUnreachableNonMainHosts:YES];
+        nsRequest = WTFMove(mutableRequest);
+    }
+
     auto& sessionSet = sessionSetForPage(webPageProxyID);
     RetainPtr<NSURLSessionWebSocketTask> task = [sessionSet.sessionWithCredentialStorage.session webSocketTaskWithRequest:nsRequest.get()];