Changeset 269697 in webkit

Timestamp:

Nov 11, 2020, 12:15:07 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Use _CFURLConnectionSetFrameworkStubs instead of DYLD_INTERPOSE on Intel Macs
​https://bugs.webkit.org/show_bug.cgi?id=218810

Patch by Alex Christensen <​achristensen@webkit.org> on 2020-11-11
Reviewed by Geoffrey Garen.

A long, long time ago, we realized that CFNetwork was looking in the keychain for persistent credentials,
and in order to make the network process get credentials as the UI process, we introduced SecItemShim which
used DYLD_INTERPOSE to intercept the calls to the security framework and synchronously message the UI process
for those calls. Over the last 6 years we have realized that doesn't work on iOS or Apple silicon Macs, so
we use _CFURLConnectionSetFrameworkStubs instead. That works on Intel Macs, too, and I'm reasonably certain
that using it everywhere won't break anything, so as a step towards rdar://problem/15588174 which should allow
us to use asynchronous messages and no more globalNetworkProcess pointer, let's stop using DYLD_INTERPOSE.

• Shared/mac/SecItemShim.cpp:

(WebKit::initializeSecItemShim):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/mac/SecItemShim.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-11-11  Alex Christensen  <achristensen@webkit.org>
+
+        Use _CFURLConnectionSetFrameworkStubs instead of DYLD_INTERPOSE on Intel Macs
+        https://bugs.webkit.org/show_bug.cgi?id=218810
+
+        Reviewed by Geoffrey Garen.
+
+        A long, long time ago, we realized that CFNetwork was looking in the keychain for persistent credentials,
+        and in order to make the network process get credentials as the UI process, we introduced SecItemShim which
+        used DYLD_INTERPOSE to intercept the calls to the security framework and synchronously message the UI process
+        for those calls.  Over the last 6 years we have realized that doesn't work on iOS or Apple silicon Macs, so
+        we use _CFURLConnectionSetFrameworkStubs instead.  That works on Intel Macs, too, and I'm reasonably certain
+        that using it everywhere won't break anything, so as a step towards rdar://problem/15588174 which should allow
+        us to use asynchronous messages and no more globalNetworkProcess pointer, let's stop using DYLD_INTERPOSE.
+
+        * Shared/mac/SecItemShim.cpp:
+        (WebKit::initializeSecItemShim):
+
 2020-11-11  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/Shared/mac/SecItemShim.cpp

@@ -144 +144 @@
     globalNetworkProcess() = makeWeakPtr(process);
 
-#if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && !CPU(X86_64))
     struct _CFNFrameworksStubs stubs = {
         .version = 0,
@@ -154 +153 @@
 
     _CFURLConnectionSetFrameworkStubs(&stubs);
-#endif
-
-#if PLATFORM(MAC) && CPU(X86_64)
-    const SecItemShimCallbacks callbacks = {
-        webSecItemCopyMatching,
-        webSecItemAdd,
-        webSecItemUpdate,
-        webSecItemDelete
-    };
-    
-    SecItemShimInitializeFunc func = reinterpret_cast<SecItemShimInitializeFunc>(dlsym(RTLD_DEFAULT, "WebKitSecItemShimInitialize"));
-    func(callbacks);
-#endif
 }