Changeset 258512 in webkit

Timestamp:

Mar 16, 2020 12:50:59 PM (4 years ago)

Author:

pvollan@apple.com

Message:

[Cocoa] Only set CF prefs direct mode for the WebContent process
​https://bugs.webkit.org/show_bug.cgi?id=209091
<rdar://problem/60337842>

Reviewed by Brent Fulgham.

Currently, we enable CF prefs direct mode in XPCServiceMain. This is incorrect, it should only be enabled
for the WebContent process.

• Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:

(WebKit::XPCServiceMain):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-03-16  Per Arne Vollan  <pvollan@apple.com>
+
+        [Cocoa] Only set CF prefs direct mode for the WebContent process
+        https://bugs.webkit.org/show_bug.cgi?id=209091
+        <rdar://problem/60337842>
+
+        Reviewed by Brent Fulgham.
+
+        Currently, we enable CF prefs direct mode in XPCServiceMain. This is incorrect, it should only be enabled
+        for the WebContent process.
+
+        * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:
+        (WebKit::XPCServiceMain):
+
 2020-03-16  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm

@@ -71 +71 @@
                     RELEASE_ASSERT_NOT_REACHED();
 
-                
                 typedef void (*InitializerFunction)(xpc_connection_t, xpc_object_t, xpc_object_t);
                 InitializerFunction initializerFunctionPtr = reinterpret_cast<InitializerFunction>(CFBundleGetFunctionPointerForName(webKitBundle, entryPointFunctionName));
@@ -107 +106 @@
 }
 
-int XPCServiceMain(int, const char**)
+int XPCServiceMain(int argc, const char** argv)
 {
+    ASSERT(argc >= 1);
+    ASSERT(argv[0]);
+#if ENABLE(CFPREFS_DIRECT_MODE)
+    if (argc >= 1 && argv[0] && strstr(argv[0], "com.apple.WebKit.WebContent")) {
+        // Enable CFPrefs direct mode to avoid unsuccessfully attempting to connect to the daemon and getting blocked by the sandbox.
+        _CFPrefsSetDirectModeEnabled(YES);
+    }
+#endif
+
     auto bootstrap = adoptOSObject(xpc_copy_bootstrap());
 #if PLATFORM(IOS_FAMILY)
@@ -116 +124 @@
         return true;
     });
-#endif
-
-#if ENABLE(CFPREFS_DIRECT_MODE)
-    // Enable CF prefs direct mode to avoid connecting to the CF prefs daemon.
-    _CFPrefsSetDirectModeEnabled(YES);
 #endif