Attachment 361453 Details for Bug 192670 – Patch

[patch] Patch

bug-192670-20190207145440.patch (text/plain), 5.22 KB, created by Per Arne Vollan on 2019-02-07 14:54:41 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Per Arne Vollan

Created: 2019-02-07 14:54:41 PST

Size: 5.22 KB

patch

obsolete

>Index: Source/WTF/ChangeLog
>===================================================================
>--- Source/WTF/ChangeLog	(revision 241144)
>+++ Source/WTF/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2019-02-07  Per Arne Vollan  <pvollan@apple.com>
>+
>+        [macOS] Block coreservicesd in sandbox.
>+        https://bugs.webkit.org/show_bug.cgi?id=192670
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add HAVE_CSCHECKFIXDISABLE define.
>+
>+        * wtf/Platform.h:
>+
> 2019-02-05  Keith Rollin  <krollin@apple.com>
> 
>         Enable the automatic checking and regenerations of .xcfilelists during builds
>Index: Source/WTF/wtf/Platform.h
>===================================================================
>--- Source/WTF/wtf/Platform.h	(revision 241144)
>+++ Source/WTF/wtf/Platform.h	(working copy)
>@@ -1494,3 +1494,7 @@
> #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
> #define HAVE_CFNETWORK_NEGOTIATED_SSL_PROTOCOL_CIPHER 1
> #endif
>+
>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
>+#define HAVE_CSCHECKFIXDISABLE 1
>+#endif
>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 241144)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,23 @@
>+2019-02-07  Per Arne Vollan  <pvollan@apple.com>
>+
>+        [macOS] Block coreservicesd in sandbox.
>+        https://bugs.webkit.org/show_bug.cgi?id=192670
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        We should block CoreServices in newer versions of macOS. In order to achieve this we need to avoid calling
>+        _RegisterApplication before entering the sandbox, since this call will open up a connection to CoreServices.
>+        The call to _RegisterApplication is moved to ChildProcess::updateProcessName, since it is needed to
>+        successfully update the process name. The call to ChildProcess::updateProcessName is made after entering
>+        the sandbox.
>+
>+        * Shared/AuxiliaryProcess.cpp:
>+        (WebKit::AuxiliaryProcess::initialize):
>+        * WebProcess/cocoa/WebProcessCocoa.mm:
>+        (WebKit::WebProcess::initializeProcessName):
>+        (WebKit::WebProcess::platformInitializeProcess):
>+        * WebProcess/com.apple.WebProcess.sb.in:
>+
> 2019-02-07  Brent Fulgham  <bfulgham@apple.com>
> 
>         Permit additional IOKit Properties needed by Media PlugIns on older Mac Hardware
>Index: Source/WebKit/Shared/AuxiliaryProcess.cpp
>===================================================================
>--- Source/WebKit/Shared/AuxiliaryProcess.cpp	(revision 241144)
>+++ Source/WebKit/Shared/AuxiliaryProcess.cpp	(working copy)
>@@ -70,11 +70,12 @@ void AuxiliaryProcess::initialize(const 
> #endif
> 
>     initializeProcess(parameters);
>-    initializeProcessName(parameters);
> 
>     SandboxInitializationParameters sandboxParameters;
>     initializeSandbox(parameters, sandboxParameters);
> 
>+    initializeProcessName(parameters);
>+
>     // In WebKit2, only the UI process should ever be generating non-default PAL::SessionIDs.
>     PAL::SessionID::enableGenerationProtection();
> 
>Index: Source/WebKit/WebProcess/com.apple.WebProcess.sb.in
>===================================================================
>--- Source/WebKit/WebProcess/com.apple.WebProcess.sb.in	(revision 241144)
>+++ Source/WebKit/WebProcess/com.apple.WebProcess.sb.in	(working copy)
>@@ -643,8 +643,12 @@
> 
> ;; CoreFoundation. We don't import com.apple.corefoundation.sb, because it allows unnecessary access to pasteboard.
> (allow mach-lookup
>-    (global-name-regex #"^com.apple.distributed_notifications")                                                       
>-    (global-name "com.apple.CoreServices.coreservicesd"))
>+    (global-name-regex #"^com.apple.distributed_notifications")
>+#if !HAVE(CSCHECKFIXDISABLE)
>+    (global-name "com.apple.CoreServices.coreservicesd")
>+#endif
>+)
>+
> (allow file-read-data
>     (literal "/dev/autofs_nowait")) ; Used by CF to circumvent automount triggers
> (allow ipc-posix-shm
>Index: Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
>===================================================================
>--- Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	(revision 241144)
>+++ Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	(working copy)
>@@ -101,6 +101,10 @@
> #import <os/state_private.h>
> #endif
> 
>+#if HAVE(CSCHECKFIXDISABLE)
>+extern "C" void _CSCheckFixDisable();
>+#endif
>+
> namespace WebKit {
> using namespace WebCore;
> 
>@@ -211,6 +215,13 @@ void WebProcess::platformInitializeWebPr
> void WebProcess::initializeProcessName(const AuxiliaryProcessInitializationParameters&)
> {
> #if PLATFORM(MAC)
>+#if HAVE(CSCHECKFIXDISABLE)
>+    // _CSCheckFixDisable() needs to be called before checking in with Launch Services.
>+    _CSCheckFixDisable();
>+#endif
>+    // This is necessary so that we are able to set the process' display name.
>+    _RegisterApplication(nullptr, nullptr);
>+
>     updateProcessName();
> #endif
> }
>@@ -360,10 +371,6 @@ void WebProcess::platformInitializeProce
>     CGSShutdownServerConnections();
> 
>     SwitchingGPUClient::setSingleton(WebSwitchingGPUClient::singleton());
>-
>-    // This is necessary so that we are able to set the process' display name.
>-    _RegisterApplication(nullptr, nullptr);
>-
> #else
> 
>     if (![NSApp isRunning]) {

Actions: View | Formatted Diff | Diff

Attachments on bug 192670: 357240 | 359277 | 359280 | 361411 | 361431 | 361433 | 361453