Changeset 287056 in webkit

Timestamp:

Dec 14, 2021, 3:48:21 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Remove properties set by NSURLProtocol on NSURLRequest before serializing
​https://bugs.webkit.org/show_bug.cgi?id=232332
<rdar://79227845>

Patch by Alex Christensen <​achristensen@webkit.org> on 2021-12-14
Reviewed by Geoff Garen.

Source/WebCore/PAL:

• pal/spi/cf/CFNetworkSPI.h:

Source/WebKit:

NSURLRequest encodeWithCoder: encodes the protocol properties, which are not used by WebKit.
They exist to be used by NSURLProtocol. Serializing them can serialize a large amount of data,
so to be more efficient and hopefully run out of memory less, remove the properties before serializing.

• Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:

(IPC::ArgumentCoder<WebCore::ResourceRequest>::encodePlatformData):

Source/WTF:

• wtf/PlatformHave.h:

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/LoadInvalidURLRequest.mm:

(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/PlatformHave.h (modified) (1 diff)
• Source/WebCore/PAL/ChangeLog (modified) (1 diff)
• Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/LoadInvalidURLRequest.mm (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-12-14  Alex Christensen  <achristensen@webkit.org>
+
+        Remove properties set by NSURLProtocol on NSURLRequest before serializing
+        https://bugs.webkit.org/show_bug.cgi?id=232332
+        <rdar://79227845>
+
+        Reviewed by Geoff Garen.
+
+        * wtf/PlatformHave.h:
+
 2021-12-14  Darin Adler  <darin@apple.com>
 

trunk/Source/WTF/wtf/PlatformHave.h

@@ -935 +935 @@
     || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED >= 80400)
 #define HAVE_RSA_PSS_OID 1
+#define HAVE_NSURLREQUEST_REMOVE_ALL_PROTOCOL_PROPERTIES 1
 #endif
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2021-12-14  Alex Christensen  <achristensen@webkit.org>
+
+        Remove properties set by NSURLProtocol on NSURLRequest before serializing
+        https://bugs.webkit.org/show_bug.cgi?id=232332
+        <rdar://79227845>
+
+        Reviewed by Geoff Garen.
+
+        * pal/spi/cf/CFNetworkSPI.h:
+
 2021-12-14  Andreu Botella  <andreu@andreubotella.com>
 

trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h

@@ -175 +175 @@
 
 @interface NSMutableURLRequest ()
+#if HAVE(NSURLREQUEST_REMOVE_ALL_PROTOCOL_PROPERTIES)
+- (void)_removeAllProtocolProperties;
+#endif
 - (void)setContentDispositionEncodingFallbackArray:(NSArray *)theEncodingFallbackArray;
 - (void)setBoundInterfaceIdentifier:(NSString *)identifier;
@@ -192 +195 @@
 
 @interface NSURLRequest ()
+#if HAVE(NSURLREQUEST_REMOVE_ALL_PROTOCOL_PROPERTIES)
+@property (nonatomic, readonly, nullable, retain) NSDictionary<NSString *, id> *_allProtocolProperties;
+#endif
 + (NSArray *)allowsSpecificHTTPSCertificateForHost:(NSString *)host;
 + (void)setAllowsSpecificHTTPSCertificate:(NSArray *)allow forHost:(NSString *)host;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-12-14  Alex Christensen  <achristensen@webkit.org>
+
+        Remove properties set by NSURLProtocol on NSURLRequest before serializing
+        https://bugs.webkit.org/show_bug.cgi?id=232332
+        <rdar://79227845>
+
+        Reviewed by Geoff Garen.
+
+        NSURLRequest encodeWithCoder: encodes the protocol properties, which are not used by WebKit.
+        They exist to be used by NSURLProtocol.  Serializing them can serialize a large amount of data,
+        so to be more efficient and hopefully run out of memory less, remove the properties before serializing.
+
+        * Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:
+        (IPC::ArgumentCoder<WebCore::ResourceRequest>::encodePlatformData):
+
 2021-12-14  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm

@@ -38 +38 @@
 #import <WebCore/ResourceRequest.h>
 #import <WebCore/TextRecognitionResult.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <pal/spi/cf/CoreTextSPI.h>
 
@@ -626 +627 @@
     // We don't send HTTP body over IPC for better performance.
     // Also, it's not always possible to do, as streams can only be created in process that does networking.
-    if ([requestToSerialize HTTPBody] || [requestToSerialize HTTPBodyStream]) {
+    bool hasHTTPBody = [requestToSerialize HTTPBody] || [requestToSerialize HTTPBodyStream];
+#if HAVE(NSURLREQUEST_REMOVE_ALL_PROTOCOL_PROPERTIES)
+    bool hasProtocolProperties = [requestToSerialize _allProtocolProperties];
+#else
+    bool hasProtocolProperties = false;
+#endif
+
+    if (hasHTTPBody || hasProtocolProperties) {
         auto mutableRequest = adoptNS([requestToSerialize mutableCopy]);
         [mutableRequest setHTTPBody:nil];
         [mutableRequest setHTTPBodyStream:nil];
+#if HAVE(NSURLREQUEST_REMOVE_ALL_PROTOCOL_PROPERTIES)
+        [mutableRequest _removeAllProtocolProperties];
+#endif
         requestToSerialize = WTFMove(mutableRequest);
     }

trunk/Tools/ChangeLog

@@ +1 @@
+2021-12-14  Alex Christensen  <achristensen@webkit.org>
+
+        Remove properties set by NSURLProtocol on NSURLRequest before serializing
+        https://bugs.webkit.org/show_bug.cgi?id=232332
+        <rdar://79227845>
+
+        Reviewed by Geoff Garen.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/LoadInvalidURLRequest.mm:
+        (TestWebKitAPI::TEST):
+
 2021-12-14  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/LoadInvalidURLRequest.mm

@@ -138 +138 @@
 }
 
+TEST(WebKit, LoadNSURLRequestWithProtocolProperties)
+{
+    auto request = adoptNS([[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:@"test:///"]]);
+
+    [NSURLProtocol setProperty:@"world" forKey:@"hello" inRequest:request.get()];
+    auto handler = adoptNS([TestURLSchemeHandler new]);
+    __block bool done = false;
+    handler.get().startURLSchemeTaskHandler = ^(WKWebView *, id<WKURLSchemeTask> task) {
+#if HAVE(NSURLREQUEST_REMOVE_ALL_PROTOCOL_PROPERTIES)
+        EXPECT_FALSE([NSURLProtocol propertyForKey:@"hello" inRequest:task.request]);
+#else
+        EXPECT_TRUE([NSURLProtocol propertyForKey:@"hello" inRequest:task.request]);
+#endif
+        done = true;
+    };
+    auto configuration = adoptNS([WKWebViewConfiguration new]);
+    [configuration setURLSchemeHandler:handler.get() forURLScheme:@"test"];
+    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSZeroRect configuration:configuration.get()]);
+    [webView loadRequest:request.get()];
+    Util::run(&done);
+}
+
 } // namespace TestWebKitAPI