Changeset 269140 in webkit

Timestamp:

Oct 28, 2020, 11:31:36 PM (6 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r269094. rdar://problem/70795299

Use _CFURLConnectionSetFrameworkStubs for SecItemShim instead of DYLD_INTERPOSE on Apple Silicon Macs
​https://bugs.webkit.org/show_bug.cgi?id=218269
<rdar://problem/70491533>

Reviewed by Darin Adler.

Source/WebKit:

r171066 introduced the use of _CFURLConnectionSetFrameworkStubs on iOS for CFNetwork to be able
to get and set credentials as the UI process. This is also needed on Apple Silicon Macs.
We should eventually replace it with an even cleaner per-NSURLSession solution, but this is a step
in the right direction, and I verified manually that it fixes the radar.

Covered by an API test that used to fail on Apple Silicon Macs.

• Shared/mac/SecItemShim.cpp: (WebKit::initializeSecItemShim):

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm: (TEST):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@269094 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-610-branch

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Shared/mac/SecItemShim.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm (modified) (1 diff)

branches/safari-610-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2020-10-28  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r269094. rdar://problem/70795299
+
+    Use _CFURLConnectionSetFrameworkStubs for SecItemShim instead of DYLD_INTERPOSE on Apple Silicon Macs
+    https://bugs.webkit.org/show_bug.cgi?id=218269
+    <rdar://problem/70491533>
+    
+    Reviewed by Darin Adler.
+    
+    Source/WebKit:
+    
+    r171066 introduced the use of _CFURLConnectionSetFrameworkStubs on iOS for CFNetwork to be able
+    to get and set credentials as the UI process.  This is also needed on Apple Silicon Macs.
+    We should eventually replace it with an even cleaner per-NSURLSession solution, but this is a step
+    in the right direction, and I verified manually that it fixes the radar.
+    
+    Covered by an API test that used to fail on Apple Silicon Macs.
+    
+    * Shared/mac/SecItemShim.cpp:
+    (WebKit::initializeSecItemShim):
+    
+    Tools:
+    
+    * TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm:
+    (TEST):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269094 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-27  Alex Christensen  <achristensen@webkit.org>
+
+            Use _CFURLConnectionSetFrameworkStubs for SecItemShim instead of DYLD_INTERPOSE on Apple Silicon Macs
+            https://bugs.webkit.org/show_bug.cgi?id=218269
+            <rdar://problem/70491533>
+
+            Reviewed by Darin Adler.
+
+            r171066 introduced the use of _CFURLConnectionSetFrameworkStubs on iOS for CFNetwork to be able
+            to get and set credentials as the UI process.  This is also needed on Apple Silicon Macs.
+            We should eventually replace it with an even cleaner per-NSURLSession solution, but this is a step
+            in the right direction, and I verified manually that it fixes the radar.
+
+            Covered by an API test that used to fail on Apple Silicon Macs.
+
+            * Shared/mac/SecItemShim.cpp:
+            (WebKit::initializeSecItemShim):
+
 2020-10-27  Russell Epstein  <repstein@apple.com>
 

branches/safari-610-branch/Source/WebKit/Shared/mac/SecItemShim.cpp

@@ -144 +144 @@
     globalNetworkProcess() = makeWeakPtr(process);
 
-#if PLATFORM(IOS_FAMILY)
+#if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && !CPU(X86_64))
     struct _CFNFrameworksStubs stubs = {
         .version = 0,
@@ -156 +156 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && CPU(X86_64)
     const SecItemShimCallbacks callbacks = {
         webSecItemCopyMatching,

branches/safari-610-branch/Tools/ChangeLog

@@ +1 @@
+2020-10-28  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r269094. rdar://problem/70795299
+
+    Use _CFURLConnectionSetFrameworkStubs for SecItemShim instead of DYLD_INTERPOSE on Apple Silicon Macs
+    https://bugs.webkit.org/show_bug.cgi?id=218269
+    <rdar://problem/70491533>
+    
+    Reviewed by Darin Adler.
+    
+    Source/WebKit:
+    
+    r171066 introduced the use of _CFURLConnectionSetFrameworkStubs on iOS for CFNetwork to be able
+    to get and set credentials as the UI process.  This is also needed on Apple Silicon Macs.
+    We should eventually replace it with an even cleaner per-NSURLSession solution, but this is a step
+    in the right direction, and I verified manually that it fixes the radar.
+    
+    Covered by an API test that used to fail on Apple Silicon Macs.
+    
+    * Shared/mac/SecItemShim.cpp:
+    (WebKit::initializeSecItemShim):
+    
+    Tools:
+    
+    * TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm:
+    (TEST):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269094 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-27  Alex Christensen  <achristensen@webkit.org>
+
+            Use _CFURLConnectionSetFrameworkStubs for SecItemShim instead of DYLD_INTERPOSE on Apple Silicon Macs
+            https://bugs.webkit.org/show_bug.cgi?id=218269
+            <rdar://problem/70491533>
+
+            Reviewed by Darin Adler.
+
+            * TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm:
+            (TEST):
+
 2020-10-27  Russell Epstein  <repstein@apple.com>
 

branches/safari-610-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm

@@ -344 +344 @@
     // Clear persistent credentials created by this test.
     [[webView configuration].processPool _clearPermanentCredentialsForProtectionSpace:protectionSpace];
+}
+
+TEST(Challenge, BasicPersistentCredential)
+{
+    using namespace TestWebKitAPI;
+    HTTPServer server(HTTPServer::respondWithChallengeThenOK);
+    auto delegate = [[TestNavigationDelegate new] autorelease];
+    __block RetainPtr<NSURLProtectionSpace> protectionSpace;
+    auto credentialStorage = [NSURLCredentialStorage sharedCredentialStorage];
+    delegate.didReceiveAuthenticationChallenge = ^(WKWebView *, NSURLAuthenticationChallenge *challenge, void (^completionHandler)(NSURLSessionAuthChallengeDisposition, NSURLCredential *)) {
+        protectionSpace = challenge.protectionSpace;
+        NSURLCredential *existingCredential = [credentialStorage defaultCredentialForProtectionSpace:protectionSpace.get()];
+        EXPECT_NULL(existingCredential);
+        EXPECT_WK_STREQ(protectionSpace.get().authenticationMethod, NSURLAuthenticationMethodHTTPBasic);
+        completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialWithUser:@"testuser" password:@"testpassword" persistence:NSURLCredentialPersistencePermanent]);
+    };
+    auto webView = [[WKWebView new] autorelease];
+    webView.navigationDelegate = delegate;
+    [webView loadRequest:server.request()];
+    [delegate waitForDidFinishNavigation];
+
+    NSURLCredential *storedCredential = nil;
+    while (!storedCredential) {
+        storedCredential = [[NSURLCredentialStorage sharedCredentialStorage] defaultCredentialForProtectionSpace:protectionSpace.get()];
+        Util::spinRunLoop();
+    }
+    EXPECT_NOT_NULL(storedCredential);
+    EXPECT_WK_STREQ(storedCredential.user, "testuser");
+    EXPECT_WK_STREQ(storedCredential.password, "testpassword");
+    EXPECT_EQ(storedCredential.persistence, NSURLCredentialPersistencePermanent);
+
+    [credentialStorage removeCredential:storedCredential forProtectionSpace:protectionSpace.get()];
+    NSURLCredential *removedCredential = [credentialStorage defaultCredentialForProtectionSpace:protectionSpace.get()];
+    EXPECT_NULL(removedCredential);
 }