Changeset 258894 in webkit

Timestamp:

Mar 23, 2020 6:31:38 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, reverting r258891.
​https://bugs.webkit.org/show_bug.cgi?id=209459

Introduced layout test failures (Requested by perarne on
#webkit).

Reverted changeset:

"[Cocoa] Deny access to database mapping service"
​https://bugs.webkit.org/show_bug.cgi?id=209339
​https://trac.webkit.org/changeset/258891

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/sandbox/ios/sandbox-mach-lookup-expected.txt (modified) (1 diff)
• LayoutTests/fast/sandbox/ios/sandbox-mach-lookup.html (modified) (1 diff)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/PlatformUse.h (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb (modified) (2 diffs)
• Source/WebKit/Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• Source/WebKit/Shared/WebProcessCreationParameters.h (modified) (1 diff)
• Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (modified) (2 diffs)
• Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (modified) (2 diffs)
• Source/WebKit/WebProcess/com.apple.WebProcess.sb.in (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-03-23  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r258891.
+        https://bugs.webkit.org/show_bug.cgi?id=209459
+
+        Introduced layout test failures (Requested by perarne on
+        #webkit).
+
+        Reverted changeset:
+
+        "[Cocoa] Deny access to database mapping service"
+        https://bugs.webkit.org/show_bug.cgi?id=209339
+        https://trac.webkit.org/changeset/258891
+
 2020-03-23  David Kilzer  <ddkilzer@apple.com>
 

trunk/LayoutTests/fast/sandbox/ios/sandbox-mach-lookup-expected.txt

@@ -26 +26 @@
 PASS internals.hasSandboxMachLookupAccessToGlobalName("com.apple.WebKit.WebContent", "com.apple.mobileassetd.v2") is false
 PASS internals.hasSandboxMachLookupAccessToGlobalName("com.apple.WebKit.WebContent", "com.apple.iconservices") is false
-PASS internals.hasSandboxMachLookupAccessToGlobalName("com.apple.WebKit.WebContent", "com.apple.lsd.mapdb") is false

trunk/LayoutTests/fast/sandbox/ios/sandbox-mach-lookup.html

@@ -29 +29 @@
     shouldBeFalse("internals.hasSandboxMachLookupAccessToGlobalName(\"com.apple.WebKit.WebContent\", \"com.apple.mobileassetd.v2\")");
     shouldBeFalse("internals.hasSandboxMachLookupAccessToGlobalName(\"com.apple.WebKit.WebContent\", \"com.apple.iconservices\")");
-    shouldBeFalse("internals.hasSandboxMachLookupAccessToGlobalName(\"com.apple.WebKit.WebContent\", \"com.apple.lsd.mapdb\")");
 }
 </script>

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-03-23  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r258891.
+        https://bugs.webkit.org/show_bug.cgi?id=209459
+
+        Introduced layout test failures (Requested by perarne on
+        #webkit).
+
+        Reverted changeset:
+
+        "[Cocoa] Deny access to database mapping service"
+        https://bugs.webkit.org/show_bug.cgi?id=209339
+        https://trac.webkit.org/changeset/258891
+
 2020-03-23  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WTF/wtf/PlatformUse.h

@@ -322 +322 @@
 #endif
 
-#define USE_UTTYPE_SWIZZLER 0
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000
+#define USE_UTTYPE_SWIZZLER 1
+#endif

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-03-23  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r258891.
+        https://bugs.webkit.org/show_bug.cgi?id=209459
+
+        Introduced layout test failures (Requested by perarne on
+        #webkit).
+
+        Reverted changeset:
+
+        "[Cocoa] Deny access to database mapping service"
+        https://bugs.webkit.org/show_bug.cgi?id=209339
+        https://trac.webkit.org/changeset/258891
+
 2020-03-23  Per Arne Vollan  <pvollan@apple.com>
 

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

@@ -538 +538 @@
 )
 
-(deny mach-lookup (with telemetry-backtrace)
+(deny mach-lookup (with telemetry)
     (global-name "com.apple.distributed_notifications@1v3"))
 
@@ -544 +544 @@
        (ipc-posix-name-prefix "apple.cfprefs."))
  
-(deny mach-lookup (with telemetry-backtrace)
+(allow mach-lookup (with telemetry-backtrace)
     (global-name "com.apple.lsd.mapdb"))
 

trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp

@@ -170 +170 @@
     encoder << neHelperExtensionHandle;
     encoder << neSessionManagerExtensionHandle;
-    encoder << mapDBExtensionHandle;
     encoder << systemHasBattery;
     encoder << mimeTypesMap;
@@ -458 +457 @@
     parameters.neSessionManagerExtensionHandle = WTFMove(*neSessionManagerExtensionHandle);
 
-    Optional<Optional<SandboxExtension::Handle>> mapDBExtensionHandle;
-    decoder >> mapDBExtensionHandle;
-    if (!mapDBExtensionHandle)
-        return false;
-    parameters.mapDBExtensionHandle = WTFMove(*mapDBExtensionHandle);
-
     Optional<bool> systemHasBattery;
     decoder >> systemHasBattery;

trunk/Source/WebKit/Shared/WebProcessCreationParameters.h

@@ -214 +214 @@
     Optional<SandboxExtension::Handle> neHelperExtensionHandle;
     Optional<SandboxExtension::Handle> neSessionManagerExtensionHandle;
-    Optional<SandboxExtension::Handle> mapDBExtensionHandle;
     bool systemHasBattery { false };
     Optional<HashMap<String, Vector<String>, ASCIICaseInsensitiveHash>> mimeTypesMap;

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

@@ -381 +381 @@
         static const char* services[] = {
             "com.apple.lsd.open",
+            "com.apple.lsd.mapdb",
             "com.apple.mobileassetd",
             "com.apple.iconservices",
@@ -415 +416 @@
     parameters.mimeTypesMap = commonMimeTypesMap();
     parameters.mapUTIFromMIMEType = createUTIFromMIMETypeMap();
-
-    SandboxExtension::Handle mapDBHandle;
-    SandboxExtension::createHandleForMachLookup("com.apple.lsd.mapdb", WTF::nullopt, mapDBHandle, SandboxExtension::Flags::NoReport);
-    parameters.mapDBExtensionHandle = WTFMove(mapDBHandle);
 #endif
     

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

@@ -105 +105 @@
 #import "UserInterfaceIdiom.h"
 #import "WKAccessibilityWebPageObjectIOS.h"
-#import <MobileCoreServices/MobileCoreServices.h>
 #import <UIKit/UIAccessibility.h>
 #import <WebCore/UTTypeRecordSwizzler.h>
@@ -276 +275 @@
         SandboxExtension::consumePermanently(*parameters.neSessionManagerExtensionHandle);
     NetworkExtensionContentFilter::setHasConsumedSandboxExtensions(parameters.neHelperExtensionHandle.hasValue() && parameters.neSessionManagerExtensionHandle.hasValue());
-
-    if (parameters.mapDBExtensionHandle) {
-        auto extension = SandboxExtension::create(WTFMove(*parameters.mapDBExtensionHandle));
-        bool ok = extension->consume();
-        ASSERT_UNUSED(ok, ok);
-        // Perform API calls which will communicate with the database mapping service, and map the database.
-        auto uti = adoptCF(UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, CFSTR("text/html"), 0));
-        auto mimeType = adoptCF(UTTypeCopyPreferredTagWithClass(CFSTR("public.png"), kUTTagClassMIMEType));
-        ok = extension->revoke();
-        ASSERT_UNUSED(ok, ok);
-    }
-
     setSystemHasBattery(parameters.systemHasBattery);
 

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

@@ -680 +680 @@
     (global-name "com.apple.cfprefsd.daemon")
     (global-name "com.apple.coreservices.launchservicesd")
+    (global-name "com.apple.lsd.mapdb")
     (global-name "com.apple.trustd.agent")
 )
@@ -887 +888 @@
             "com.apple.cfprefsd.daemon"
             "com.apple.tccd"
-            "com.apple.lsd.mapdb"
 
             ;;; FIXME(207716): The following should be removed when the GPU process is complete