Changeset 287616 in webkit

Timestamp:

Jan 5, 2022, 10:10:55 AM (5 years ago)

Author:

pvollan@apple.com

Message:

[macCatalyst][GPUP][NetworkProcess] Block WindowServer connections
​https://bugs.webkit.org/show_bug.cgi?id=234432
<rdar://problem/85990387>

Reviewed by Brent Fulgham.

Block WindowServer connections on macCatalyst.

• GPUProcess/mac/GPUProcessMac.mm:

(WebKit::GPUProcess::initializeProcess):

• NetworkProcess/mac/NetworkProcessMac.mm:

(WebKit::NetworkProcess::initializeProcess):

• Shared/Cocoa/AuxiliaryProcessCocoa.mm:

(WebKit::AuxiliaryProcess::setApplicationIsDaemon):

• WebAuthnProcess/mac/WebAuthnProcessMac.mm:

(WebKit::WebAuthnProcess::initializeProcess):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• GPUProcess/mac/GPUProcessMac.mm (modified) (2 diffs)
• NetworkProcess/mac/NetworkProcessMac.mm (modified) (1 diff)
• Shared/Cocoa/AuxiliaryProcessCocoa.mm (modified) (2 diffs)
• WebAuthnProcess/mac/WebAuthnProcessMac.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-01-05  Per Arne Vollan  <pvollan@apple.com>
+
+        [macCatalyst][GPUP][NetworkProcess] Block WindowServer connections
+        https://bugs.webkit.org/show_bug.cgi?id=234432
+        <rdar://problem/85990387>
+
+        Reviewed by Brent Fulgham.
+
+        Block WindowServer connections on macCatalyst.
+
+        * GPUProcess/mac/GPUProcessMac.mm:
+        (WebKit::GPUProcess::initializeProcess):
+        * NetworkProcess/mac/NetworkProcessMac.mm:
+        (WebKit::NetworkProcess::initializeProcess):
+        * Shared/Cocoa/AuxiliaryProcessCocoa.mm:
+        (WebKit::AuxiliaryProcess::setApplicationIsDaemon):
+        * WebAuthnProcess/mac/WebAuthnProcessMac.mm:
+        (WebKit::WebAuthnProcess::initializeProcess):
+
 2022-01-05  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/GPUProcess/mac/GPUProcessMac.mm

@@ -36 +36 @@
 #import <WebCore/ScreenProperties.h>
 #import <pal/spi/cocoa/LaunchServicesSPI.h>
-#import <pal/spi/mac/HIServicesSPI.h>
 #import <sysexits.h>
 #import <wtf/MemoryPressureHandler.h>
@@ -47 +46 @@
 void GPUProcess::initializeProcess(const AuxiliaryProcessInitializationParameters&)
 {
-#if PLATFORM(MAC) && !PLATFORM(MACCATALYST)
-    // Having a window server connection in this process would result in spin logs (<rdar://problem/13239119>).
-    OSStatus error = SetApplicationIsDaemon(true);
-    ASSERT_UNUSED(error, error == noErr);
-#endif
+    setApplicationIsDaemon();
 
 #if ENABLE(LOWER_FORMATREADERBUNDLE_CODESIGNING_REQUIREMENTS)

trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm

@@ -52 +52 @@
 void NetworkProcess::initializeProcess(const AuxiliaryProcessInitializationParameters&)
 {
-#if PLATFORM(MAC) && !PLATFORM(MACCATALYST)
-    // Having a window server connection in this process would result in spin logs (<rdar://problem/13239119>).
-    OSStatus error = SetApplicationIsDaemon(true);
-    ASSERT_UNUSED(error, error == noErr);
-#endif
-
+    setApplicationIsDaemon();
     launchServicesCheckIn();
 }

trunk/Source/WebKit/Shared/Cocoa/AuxiliaryProcessCocoa.mm

@@ -42 +42 @@
 #endif
 
+#if PLATFORM(MAC)
+#import <pal/spi/mac/HIServicesSPI.h>
+#endif
+
 #if HAVE(UPDATE_WEB_ACCESSIBILITY_SETTINGS) && ENABLE(CFPREFS_DIRECT_MODE)
 SOFT_LINK_LIBRARY(libAccessibility)
@@ -214 +218 @@
 #endif // ENABLE(CFPREFS_DIRECT_MODE)
 
+void AuxiliaryProcess::setApplicationIsDaemon()
+{
+#if PLATFORM(MAC)
+    // Having a window server connection in this process would result in spin logs (<rdar://problem/13239119>).
+    OSStatus error = SetApplicationIsDaemon(true);
+    ASSERT_UNUSED(error, error == noErr);
+#elif PLATFORM(MACCATALYST)
+    CGSSetDenyWindowServerConnections(true);
+#endif
+}
+
 } // namespace WebKit

trunk/Source/WebKit/WebAuthnProcess/mac/WebAuthnProcessMac.mm

@@ -45 +45 @@
 void WebAuthnProcess::initializeProcess(const AuxiliaryProcessInitializationParameters&)
 {
-    // Having a window server connection in this process would result in spin logs (<rdar://problem/13239119>).
-    OSStatus error = SetApplicationIsDaemon(true);
-    ASSERT_UNUSED(error, error == noErr);
-
+    setApplicationIsDaemon();
     launchServicesCheckIn();
 }