Title: [265295] trunk/Source/WebKit
Revision
265295
Author
[email protected]
Date
2020-08-05 11:50:31 -0700 (Wed, 05 Aug 2020)

Log Message

[Cocoa] Remove obsolete sandbox extension after r264178
https://bugs.webkit.org/show_bug.cgi?id=215154

Reviewed by Brent Fulgham.

After r264178, the code related to issuing an extension to com.apple.lsd.mapdb is obsolete, and should be removed.

No new tests, covered by existing tests.

* 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::platformInitializeWebProcess):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):
* WebProcess/com.apple.WebProcess.sb.in:

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (265294 => 265295)


--- trunk/Source/WebKit/ChangeLog	2020-08-05 18:48:28 UTC (rev 265294)
+++ trunk/Source/WebKit/ChangeLog	2020-08-05 18:50:31 UTC (rev 265295)
@@ -1,3 +1,25 @@
+2020-08-05  Per Arne Vollan  <[email protected]>
+
+        [Cocoa] Remove obsolete sandbox extension after r264178
+        https://bugs.webkit.org/show_bug.cgi?id=215154
+
+        Reviewed by Brent Fulgham.
+
+        After r264178, the code related to issuing an extension to com.apple.lsd.mapdb is obsolete, and should be removed.
+
+        No new tests, covered by existing tests.
+
+        * 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::platformInitializeWebProcess):
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+        * WebProcess/com.apple.WebProcess.sb.in:
+
 2020-08-05  Wenson Hsieh  <[email protected]>
 
         [iOS] Keyboard shortcuts and arrow key scrolling stop working after navigating via swipe gesture

Modified: trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb (265294 => 265295)


--- trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb	2020-08-05 18:48:28 UTC (rev 265294)
+++ trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb	2020-08-05 18:50:31 UTC (rev 265295)
@@ -960,7 +960,6 @@
             "com.apple.containermanagerd"
             "com.apple.diagnosticd"
             "com.apple.iphone.axserver-systemwide"
-            "com.apple.lsd.mapdb"
             "com.apple.mobileassetd.v2"
             "com.apple.mobilegestalt.xpc"
             "com.apple.nehelper"

Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp (265294 => 265295)


--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp	2020-08-05 18:48:28 UTC (rev 265294)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp	2020-08-05 18:50:31 UTC (rev 265295)
@@ -169,7 +169,6 @@
 #endif
 
 #if PLATFORM(COCOA)
-    encoder << mapDBExtensionHandle;
     encoder << systemHasBattery;
     encoder << systemHasAC;
 #endif
@@ -456,12 +455,6 @@
 #endif
 
 #if PLATFORM(COCOA)
-    Optional<Optional<SandboxExtension::Handle>> mapDBExtensionHandle;
-    decoder >> mapDBExtensionHandle;
-    if (!mapDBExtensionHandle)
-        return false;
-    parameters.mapDBExtensionHandle = WTFMove(*mapDBExtensionHandle);
-
     Optional<bool> systemHasBattery;
     decoder >> systemHasBattery;
     if (!systemHasBattery)

Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.h (265294 => 265295)


--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.h	2020-08-05 18:48:28 UTC (rev 265294)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.h	2020-08-05 18:50:31 UTC (rev 265295)
@@ -213,7 +213,6 @@
 #endif
 
 #if PLATFORM(COCOA)
-    Optional<SandboxExtension::Handle> mapDBExtensionHandle;
     bool systemHasBattery { false };
     bool systemHasAC { false };
 #endif

Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (265294 => 265295)


--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2020-08-05 18:48:28 UTC (rev 265294)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2020-08-05 18:50:31 UTC (rev 265295)
@@ -423,10 +423,6 @@
 #if PLATFORM(COCOA)
     parameters.systemHasBattery = systemHasBattery();
     parameters.systemHasAC = cachedSystemHasAC().valueOr(true);
-
-    SandboxExtension::Handle mapDBHandle;
-    if (SandboxExtension::createHandleForMachLookup("com.apple.lsd.mapdb"_s, WTF::nullopt, mapDBHandle, SandboxExtension::Flags::NoReport))
-        parameters.mapDBExtensionHandle = WTFMove(mapDBHandle);
 #endif
 
     if (requiresContainerManagerAccess()) {

Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (265294 => 265295)


--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2020-08-05 18:48:28 UTC (rev 265294)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2020-08-05 18:50:31 UTC (rev 265295)
@@ -237,24 +237,6 @@
         }
     }
 
-#if HAVE(LSDATABASECONTEXT)
-    // FIXME: Remove this entire section when the selector observeDatabaseChange4WebKit is present
-    auto context = [NSClassFromString(@"LSDatabaseContext") sharedDatabaseContext];
-    if (![context respondsToSelector:@selector(observeDatabaseChange4WebKit:)]) {
-        // Map Launch Services database. This should be done as early as possible, as the mapping will fail
-        // if 'com.apple.lsd.mapdb' is being accessed before this.
-        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));
-            ok = extension->revoke();
-            ASSERT_UNUSED(ok, ok);
-            ASSERT(String(uti.get()) == String(adoptCF(UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, CFSTR("text/html"), 0)).get()));
-        }
-    }
-#endif
 #if !LOG_DISABLED || !RELEASE_LOG_DISABLED
     WebCore::initializeLogChannelsIfNecessary(parameters.webCoreLoggingChannels);
     WebKit::initializeLogChannelsIfNecessary(parameters.webKitLoggingChannels);

Modified: trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in (265294 => 265295)


--- trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in	2020-08-05 18:48:28 UTC (rev 265294)
+++ trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in	2020-08-05 18:50:31 UTC (rev 265295)
@@ -973,7 +973,6 @@
             "com.apple.cfprefsd.daemon"
             "com.apple.containermanagerd"
             "com.apple.tccd"
-            "com.apple.lsd.mapdb"
             "com.apple.BluetoothServices"
 
             ;;; FIXME(207716): The following should be removed when the GPU process is complete
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to