Changeset 253127 in webkit

Timestamp:

Dec 4, 2019 4:07:39 PM (4 years ago)

Author:

pvollan@apple.com

Message:

[iOS] The UI process should issue mach sandbox extension to "com.apple.AGXCompilerService"
​https://bugs.webkit.org/show_bug.cgi?id=203915

Reviewed by Brent Fulgham.

Only a few iPad models need access to "com.apple.AGXCompilerService” in the WebContent process.
The UI process should issue this mach extension for these iPad models.

• Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb:
• Shared/WebProcessCreationParameters.cpp:

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

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

(WebKit::deviceHasAGXCompilerService):
(WebKit::WebProcessPool::platformInitializeWebProcess):

• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::platformInitializeWebProcess):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb (modified) (2 diffs)
• Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• Shared/WebProcessCreationParameters.h (modified) (1 diff)
• UIProcess/Cocoa/WebProcessPoolCocoa.mm (modified) (3 diffs)
• WebProcess/cocoa/WebProcessCocoa.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-12-04  Per Arne Vollan  <pvollan@apple.com>
+
+        [iOS] The UI process should issue mach sandbox extension to "com.apple.AGXCompilerService"
+        https://bugs.webkit.org/show_bug.cgi?id=203915
+
+        Reviewed by Brent Fulgham.
+
+        Only a few iPad models need access to "com.apple.AGXCompilerService” in the WebContent process.
+        The UI process should issue this mach extension for these iPad models.
+ 
+        * Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb:
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode const):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::deviceHasAGXCompilerService):
+        (WebKit::WebProcessPool::platformInitializeWebProcess):
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
 2019-12-04  Kate Cheney  <katherine_cheney@apple.com>
 

trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb

@@ -286 +286 @@
            (sysctl-name #"kern.bootsessionuuid"))
 
+    (allow mach-lookup (with report) (with telemetry)
+        (xpc-service-name-prefix "com.apple.AGXCompilerService"))
+
     (allow mach-lookup
-       (xpc-service-name-prefix "com.apple.AGXCompilerService")
        ;; <rdar://problem/47268166>
        (xpc-service-name "com.apple.MTLCompilerService"))
@@ -965 +967 @@
     (require-all
         (extension "com.apple.webkit.extension.mach")
-        (global-name "com.apple.iphone.axserver-systemwide" "com.apple.tccd")))
+        (global-name "com.apple.iphone.axserver-systemwide" "com.apple.tccd" "com.apple.AGXCompilerService")))
 
 (media-capture-support)

trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp

@@ -159 +159 @@
 
     encoder << websiteDataStoreParameters;
+    
+#if PLATFORM(IOS)
+    encoder << compilerServiceExtensionHandle;
+#endif
 }
 
@@ -389 +393 @@
     parameters.websiteDataStoreParameters = WTFMove(*websiteDataStoreParameters);
 
+#if PLATFORM(IOS)
+    Optional<Optional<SandboxExtension::Handle>> compilerServiceExtensionHandle;
+    decoder >> compilerServiceExtensionHandle;
+    if (!compilerServiceExtensionHandle)
+        return false;
+    parameters.compilerServiceExtensionHandle = WTFMove(*compilerServiceExtensionHandle);
+#endif
+
     return true;
 }

trunk/Source/WebKit/Shared/WebProcessCreationParameters.h

@@ -197 +197 @@
 
     Optional<WebProcessDataStoreParameters> websiteDataStoreParameters;
+    
+#if PLATFORM(IOS)
+    Optional<SandboxExtension::Handle> compilerServiceExtensionHandle;
+#endif
 };
 

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

@@ -69 +69 @@
 #endif
 
+#if PLATFORM(IOS)
+#import <sys/utsname.h>
+#endif
+
 NSString *WebServiceWorkerRegistrationDirectoryDefaultsKey = @"WebServiceWorkerRegistrationDirectory";
 NSString *WebKitLocalCacheDefaultsKey = @"WebKitLocalCache";
@@ -167 +171 @@
 #endif
 }
+
+#if PLATFORM(IOS)
+static bool deviceHasAGXCompilerService()
+{
+    static bool deviceHasAGXCompilerService = false;
+    static std::once_flag flag;
+    std::call_once(
+        flag,
+        [] () {
+            struct utsname systemInfo;
+            if (uname(&systemInfo))
+                return;
+            const char* machine = systemInfo.machine;
+            if (!strcmp(machine, "iPad5,1") || !strcmp(machine, "iPad5,2") || !strcmp(machine, "iPad5,3") || !strcmp(machine, "iPad5,4"))
+                deviceHasAGXCompilerService = true;
+        });
+    return deviceHasAGXCompilerService;
+}
+#endif
 
 void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process, WebProcessCreationParameters& parameters)
@@ -264 +287 @@
     parameters.screenProperties = WTFMove(screenProperties);
     parameters.useOverlayScrollbars = ([NSScroller preferredScrollerStyle] == NSScrollerStyleOverlay);
+#endif
+    
+#if PLATFORM(IOS)
+    if (deviceHasAGXCompilerService()) {
+        SandboxExtension::Handle compilerServiceExtensionHandle;
+        SandboxExtension::createHandleForMachLookup("com.apple.AGXCompilerService", WTF::nullopt, compilerServiceExtensionHandle);
+        parameters.compilerServiceExtensionHandle = WTFMove(compilerServiceExtensionHandle);
+    }
 #endif
 }

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

@@ -222 +222 @@
 #endif
 #endif
+    
+#if PLATFORM(IOS)
+    if (parameters.compilerServiceExtensionHandle)
+        SandboxExtension::consumePermanently(*parameters.compilerServiceExtensionHandle);
+#endif
 }