Title: [254343] trunk/Source/WebKit
Revision
254343
Author
[email protected]
Date
2020-01-10 09:52:55 -0800 (Fri, 10 Jan 2020)

Log 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):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (254342 => 254343)


--- trunk/Source/WebKit/ChangeLog	2020-01-10 17:40:35 UTC (rev 254342)
+++ trunk/Source/WebKit/ChangeLog	2020-01-10 17:52:55 UTC (rev 254343)
@@ -1,3 +1,19 @@
+2020-01-10  Brent Fulgham  <[email protected]>
+
+        [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  <[email protected]>
 
         Remove WebsiteDataStore::setCacheStorageDirectory which has been replaced by WebsiteDataStoreConfiguration::setCacheStorageDirectory

Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (254342 => 254343)


--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2020-01-10 17:40:35 UTC (rev 254342)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2020-01-10 17:52:55 UTC (rev 254343)
@@ -334,7 +334,11 @@
         SandboxExtension::Handle handle;
         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);
     }
 #endif

Modified: trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in (254342 => 254343)


--- trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in	2020-01-10 17:40:35 UTC (rev 254342)
+++ trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in	2020-01-10 17:52:55 UTC (rev 254343)
@@ -868,7 +868,16 @@
 (allow mach-lookup
     (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)
     (deny syscall-unix (with send-signal SIGKILL))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to