Changeset 265139 in webkit

Timestamp:

Jul 31, 2020 7:03:35 AM (4 years ago)

Author:

pvollan@apple.com

Message:

[iOS] Issue a temporary extension to the MobileGestalt daemon when the MobileGestalt cache is invalid
​https://bugs.webkit.org/show_bug.cgi?id=214965

Reviewed by Geoffrey Garen.

Source/WebCore/PAL:

Declare MobileGestalt queestion identifier.

• pal/spi/ios/MobileGestaltSPI.h:

Source/WebKit:

When the MobileGestalt cache is invalid, some MG queries will fail in the WebContent process, since it has no access to the daemon.
This can be fixed by issuing a temporary extension to the daemon, and having the WebContent process query all relevant MG values
while holding the extension. This will bring the values into the in-memory cache, which will be valid after the extension to the
daemon has been revoked. We will still attempt to rebuild the MG cache if invalid, but since we now have a workaround for when the
cache is invalid, we can do this on a secondary thread to avoid blocking the main thread. We also only attempt to rebuild once now,
instead of every time a WebContent process is started. Additionally, add IOKit property read access to "platform-name", since that
is needed by a MG query.

No new tests, since testing this depends on having an invalid cache, which is rare, and non-trivial to enforce in the test
environment.

• 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::WebProcessPool::platformInitialize):
(WebKit::WebProcessPool::platformInitializeWebProcess):

• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::platformInitializeWebProcess):

Location:

trunk/Source

Files:

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

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2020-07-31  Per Arne Vollan  <pvollan@apple.com>
+
+        [iOS] Issue a temporary extension to the MobileGestalt daemon when the MobileGestalt cache is invalid
+        https://bugs.webkit.org/show_bug.cgi?id=214965
+
+        Reviewed by Geoffrey Garen.
+
+        Declare MobileGestalt queestion identifier.
+
+        * pal/spi/ios/MobileGestaltSPI.h:
+
 2020-07-30  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/ios/MobileGestaltSPI.h

@@ -46 +46 @@
 static const CFStringRef kMGQDeviceClassNumber = CFSTR("DeviceClassNumber");
 static const CFStringRef kMGQHasExtendedColorDisplay = CFSTR("HasExtendedColorDisplay");
+static const CFStringRef kMGQDeviceCornerRadius = CFSTR("DeviceCornerRadius");
 
 typedef enum {

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-07-31  Per Arne Vollan  <pvollan@apple.com>
+
+        [iOS] Issue a temporary extension to the MobileGestalt daemon when the MobileGestalt cache is invalid
+        https://bugs.webkit.org/show_bug.cgi?id=214965
+
+        Reviewed by Geoffrey Garen.
+
+        When the MobileGestalt cache is invalid, some MG queries will fail in the WebContent process, since it has no access to the daemon.
+        This can be fixed by issuing a temporary extension to the daemon, and having the WebContent process query all relevant MG values
+        while holding the extension. This will bring the values into the in-memory cache, which will be valid after the extension to the
+        daemon has been revoked. We will still attempt to rebuild the MG cache if invalid, but since we now have a workaround for when the
+        cache is invalid, we can do this on a secondary thread to avoid blocking the main thread. We also only attempt to rebuild once now,
+        instead of every time a WebContent process is started. Additionally, add IOKit property read access to "platform-name", since that
+        is needed by a MG query.
+
+        No new tests, since testing this depends on having an invalid cache, which is rare, and non-trivial to enforce in the test
+        environment.
+
+        * 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::WebProcessPool::platformInitialize):
+        (WebKit::WebProcessPool::platformInitializeWebProcess):
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
 2020-07-31  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -888 +888 @@
     (iokit-property "udid-version") ;; <rdar://problem/52903475>
     (iokit-property "ui-pip") ;; <rdar://problem/48867037>
+    (iokit-property "platform-name")
 )
 
@@ -947 +948 @@
 )
 
+(deny mach-lookup (with telemetry-backtrace)
+    (global-name "com.apple.mobilegestalt.xpc")
+)
+
 (allow mach-lookup
     (require-all
@@ -958 +963 @@
             "com.apple.lsd.mapdb"
             "com.apple.mobileassetd.v2"
+            "com.apple.mobilegestalt.xpc"
             "com.apple.nehelper"
             "com.apple.nesessionmanager.content-filter"

trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp

@@ -161 +161 @@
 
     encoder << containerManagerExtensionHandle;
-    
+    encoder << mobileGestaltExtensionHandle;
+
 #if PLATFORM(IOS_FAMILY)
     encoder << diagnosticsExtensionHandles;
@@ -429 +430 @@
     parameters.containerManagerExtensionHandle = WTFMove(*containerManagerExtensionHandle);
 
+    Optional<Optional<SandboxExtension::Handle>> mobileGestaltExtensionHandle;
+    decoder >> mobileGestaltExtensionHandle;
+    if (!mobileGestaltExtensionHandle)
+        return false;
+    parameters.mobileGestaltExtensionHandle = WTFMove(*mobileGestaltExtensionHandle);
+
 #if PLATFORM(IOS_FAMILY)
     Optional<SandboxExtension::HandleArray> diagnosticsExtensionHandles;

trunk/Source/WebKit/Shared/WebProcessCreationParameters.h

@@ -205 +205 @@
 
     Optional<SandboxExtension::Handle> containerManagerExtensionHandle;
+    Optional<SandboxExtension::Handle> mobileGestaltExtensionHandle;
 
 #if PLATFORM(IOS_FAMILY)

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

@@ -166 +166 @@
 
     setLegacyCustomProtocolManagerClient(makeUnique<LegacyCustomProtocolManagerClient>());
+
+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
+    if (!_MGCacheValid()) {
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+            [adoptNS([[objc_getClass("MobileGestaltHelperProxy") alloc] init]) proxyRebuildCache];
+        });
+    }
+#endif
 }
 
@@ -448 +456 @@
 
 #if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
-    if (!_MGCacheValid())
-        [adoptNS([[objc_getClass("MobileGestaltHelperProxy") alloc] init]) proxyRebuildCache];
+    if (!_MGCacheValid()) {
+        SandboxExtension::Handle handle;
+        SandboxExtension::createHandleForMachLookup("com.apple.mobilegestalt.xpc"_s, WTF::nullopt, handle);
+        parameters.mobileGestaltExtensionHandle = WTFMove(handle);
+    }
 #endif
 

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

@@ -110 +110 @@
 #import <UIKit/UIAccessibility.h>
 #import <pal/spi/ios/GraphicsServicesSPI.h>
+#import <pal/spi/ios/MobileGestaltSPI.h>
 #endif
 
@@ -203 +204 @@
 void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
 {
+    if (parameters.mobileGestaltExtensionHandle) {
+        if (auto extension = SandboxExtension::create(WTFMove(*parameters.mobileGestaltExtensionHandle))) {
+            bool ok = extension->consume();
+            ASSERT_UNUSED(ok, ok);
+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
+            MGGetFloat32Answer(kMGQMainScreenScale, 0);
+            MGGetSInt32Answer(kMGQMainScreenPitch, 0);
+            MGGetSInt32Answer(kMGQMainScreenClass, MGScreenClassPad2);
+            MGGetBoolAnswer(kMGQAppleInternalInstallCapability);
+            MGGetBoolAnswer(kMGQiPadCapability);
+            auto deviceName = adoptCF(MGCopyAnswer(kMGQDeviceName, nullptr));
+            MGGetSInt32Answer(kMGQDeviceClassNumber, MGDeviceClassInvalid);
+            MGGetBoolAnswer(kMGQHasExtendedColorDisplay);
+            MGGetFloat32Answer(kMGQDeviceCornerRadius, 0);
+#endif
+            ok = extension->revoke();
+            ASSERT_UNUSED(ok, ok);
+        }
+    }
+
 #if HAVE(LSDATABASECONTEXT)
     // FIXME: Remove this entire section when the selector observeDatabaseChange4WebKit is present