Changeset 254343 in webkit

Timestamp:

Jan 10, 2020 9:52:55 AM (4 years ago)

Author:

Brent Fulgham

Message:

[macOS] Issue sandbox extension to "com.apple.nesessionmanager" prior to 10.15
​https://bugs.webkit.org/show_bug.cgi?id=206031
<rdar://problem/58455467>

Reviewed by Per Arne Vollan.

The mach name of 'com.apple.nesessionmanager' changed between macOS 10.14 and 10.15.
We should continue to issue the old name when building for older operating systems."

Covered by existing tests.

• UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::WebProcessPool::platformInitializeWebProcess):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/WebProcessPoolCocoa.mm (modified) (1 diff)
• WebProcess/com.apple.WebProcess.sb.in (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-01-10  Brent Fulgham  <bfulgham@apple.com>
+
+        [macOS] Issue sandbox extension to "com.apple.nesessionmanager" prior to 10.15 
+        https://bugs.webkit.org/show_bug.cgi?id=206031
+        <rdar://problem/58455467>
+
+        Reviewed by Per Arne Vollan.
+
+        The mach name of 'com.apple.nesessionmanager' changed between macOS 10.14 and 10.15.
+        We should continue to issue the old name when building for older operating systems."
+
+        Covered by existing tests.
+
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::WebProcessPool::platformInitializeWebProcess):
+
 2020-01-10  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

@@ -335 +335 @@
         SandboxExtension::createHandleForMachLookup("com.apple.nehelper", WTF::nullopt, handle);
         parameters.neHelperExtensionHandle = WTFMove(handle);
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
+        SandboxExtension::createHandleForMachLookup("com.apple.nesessionmanager", WTF::nullopt, handle);
+#else
         SandboxExtension::createHandleForMachLookup("com.apple.nesessionmanager.content-filter", WTF::nullopt, handle);
+#endif
         parameters.neSessionManagerExtensionHandle = WTFMove(handle);
     }

trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in

@@ -869 +869 @@
     (require-all
         (extension "com.apple.webkit.extension.mach")
-        (global-name "com.apple.nehelper" "com.apple.nesessionmanager.content-filter")))
+        (global-name
+            "com.apple.nehelper"
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500 || PLATFORM(MACCATALYST)
+            "com.apple.nesessionmanager.content-filter"
+#else
+            "com.apple.nesessionmanager"
+#endif
+        )
+    )
+)
 
 (when (defined? 'syscall-unix)