Changeset 267498 in webkit

Timestamp:

Sep 23, 2020, 12:52:03 PM (6 years ago)

Author:

pvollan@apple.com

Message:

[macOS] Issue sandbox extension for the diagnostic daemon
​https://bugs.webkit.org/show_bug.cgi?id=216834
<rdar://problem/58496834>

Reviewed by Brent Fulgham.

• Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::encode const):
(WebKit::WebProcessCreationParameters::decode):

• Shared/WebProcessCreationParameters.h:
• UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::isInternalInstall):
(WebKit::agxCompilerClasses):
(WebKit::diagnosticServices):
(WebKit::WebProcessPool::platformInitializeWebProcess):

• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::platformInitializeWebProcess):

• WebProcess/com.apple.WebProcess.sb.in:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebProcessCreationParameters.cpp (modified) (3 diffs)
• Shared/WebProcessCreationParameters.h (modified) (1 diff)
• UIProcess/Cocoa/WebProcessPoolCocoa.mm (modified) (5 diffs)
• WebProcess/cocoa/WebProcessCocoa.mm (modified) (1 diff)
• WebProcess/com.apple.WebProcess.sb.in (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-09-23  Per Arne Vollan  <pvollan@apple.com>
+
+        [macOS] Issue sandbox extension for the diagnostic daemon
+        https://bugs.webkit.org/show_bug.cgi?id=216834
+        <rdar://problem/58496834>
+
+        Reviewed by Brent Fulgham.
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode const):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::isInternalInstall):
+        (WebKit::agxCompilerClasses):
+        (WebKit::diagnosticServices):
+        (WebKit::WebProcessPool::platformInitializeWebProcess):
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+        * WebProcess/com.apple.WebProcess.sb.in:
+
 2020-09-23  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp

@@ -163 +163 @@
     encoder << mobileGestaltExtensionHandle;
 
+    encoder << diagnosticsExtensionHandles;
 #if PLATFORM(IOS_FAMILY)
-    encoder << diagnosticsExtensionHandles;
     encoder << dynamicMachExtensionHandles;
     encoder << dynamicIOKitExtensionHandles;
@@ -439 +439 @@
     parameters.mobileGestaltExtensionHandle = WTFMove(*mobileGestaltExtensionHandle);
 
-#if PLATFORM(IOS_FAMILY)
     Optional<SandboxExtension::HandleArray> diagnosticsExtensionHandles;
     decoder >> diagnosticsExtensionHandles;
@@ -446 +445 @@
     parameters.diagnosticsExtensionHandles = WTFMove(*diagnosticsExtensionHandles);
 
+#if PLATFORM(IOS_FAMILY)
     Optional<SandboxExtension::HandleArray> dynamicMachExtensionHandles;
     decoder >> dynamicMachExtensionHandles;

trunk/Source/WebKit/Shared/WebProcessCreationParameters.h

@@ -207 +207 @@
     Optional<SandboxExtension::Handle> mobileGestaltExtensionHandle;
 
-#if PLATFORM(IOS_FAMILY)
     SandboxExtension::HandleArray diagnosticsExtensionHandles;
+#if PLATFORM(IOS_FAMILY)
     SandboxExtension::HandleArray dynamicMachExtensionHandles;
     SandboxExtension::HandleArray dynamicIOKitExtensionHandles;

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

@@ -202 +202 @@
 }
 
-#if PLATFORM(IOS_FAMILY)
 static bool isInternalInstall()
 {
+#if PLATFORM(IOS_FAMILY)
     static bool isInternal = MGGetBoolAnswer(kMGQAppleInternalInstallCapability);
+#else
+    static bool isInternal = FileSystem::fileIsDirectory("/AppleInternal", FileSystem::ShouldFollowSymbolicLinks::No);
+#endif
     return isInternal;
 }
-#endif
 
 // FIXME(207716): The following should be removed when the GPU process is complete.
@@ -261 +263 @@
 }
 
-static const Vector<ASCIILiteral>& diagnosticServices()
-{
-    ASSERT(isMainThread());
-    static const auto services = makeNeverDestroyed(Vector<ASCIILiteral> {
-        "com.apple.diagnosticd"_s,
-        "com.apple.osanalytics.osanalyticshelper"_s
-    });
-    return services;
-}
-
 static const Vector<ASCIILiteral>& agxCompilerClasses()
 {
@@ -288 +280 @@
     return iokitClasses;
 }
-
 #endif
 
@@ -302 +293 @@
 }
 #endif
+
+static const Vector<ASCIILiteral>& diagnosticServices()
+{
+    ASSERT(isMainThread());
+    static const auto services = makeNeverDestroyed(Vector<ASCIILiteral> {
+        "com.apple.diagnosticd"_s,
+#if PLATFORM(IOS_FAMILY)
+        "com.apple.osanalytics.osanalyticshelper"_s
+#endif
+    });
+    return services;
+}
+
 
 static bool requiresContainerManagerAccess()
@@ -422 +426 @@
     if (!WebCore::IOSApplication::isMobileSafari())
         parameters.dynamicMachExtensionHandles = SandboxExtension::createHandlesForMachLookup(nonBrowserServices(), WTF::nullopt);
-    
+
+    if (WebCore::deviceHasAGXCompilerService())
+        parameters.dynamicIOKitExtensionHandles = SandboxExtension::createHandlesForIOKitClassExtensions(agxCompilerClasses(), WTF::nullopt);
+#endif
+
     if (isInternalInstall())
         parameters.diagnosticsExtensionHandles = SandboxExtension::createHandlesForMachLookup(diagnosticServices(), WTF::nullopt, SandboxExtension::Flags::NoReport);
 
-    if (WebCore::deviceHasAGXCompilerService())
-        parameters.dynamicIOKitExtensionHandles = SandboxExtension::createHandlesForIOKitClassExtensions(agxCompilerClasses(), WTF::nullopt);
-#endif
-    
-#if PLATFORM(COCOA)
     parameters.systemHasBattery = systemHasBattery();
     parameters.systemHasAC = cachedSystemHasAC().valueOr(true);
-#endif
 
     if (requiresContainerManagerAccess()) {

trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

@@ -312 +312 @@
         SandboxExtension::consumePermanently(*parameters.containerManagerExtensionHandle);
     
+    SandboxExtension::consumePermanently(parameters.diagnosticsExtensionHandles);
 #if PLATFORM(IOS_FAMILY)
-    SandboxExtension::consumePermanently(parameters.diagnosticsExtensionHandles);
     SandboxExtension::consumePermanently(parameters.dynamicMachExtensionHandles);
     SandboxExtension::consumePermanently(parameters.dynamicIOKitExtensionHandles);

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

@@ -1001 +1001 @@
             "com.apple.cfprefsd.daemon"
             "com.apple.containermanagerd"
+            "com.apple.diagnosticd"
             "com.apple.tccd"
             "com.apple.BluetoothServices"