Changeset 268492 in webkit

Timestamp:

Oct 14, 2020 3:19:18 PM (4 years ago)

Author:

pvollan@apple.com

Message:

[macOS] Issue sandbox extension to additional icon service when attachment element is enabled.
​https://bugs.webkit.org/show_bug.cgi?id=217706
<rdar://problem/70291100>

Reviewed by Brent Fulgham.

Issue sandbox extension to 'com.apple.iconservices.store' when attachment element is enabled on macOS.

• Shared/WebPageCreationParameters.cpp:

(WebKit::WebPageCreationParameters::encode const):
(WebKit::WebPageCreationParameters::decode):

• Shared/WebPageCreationParameters.h:
• Shared/WebProcessCreationParameters.cpp:

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

• Shared/WebProcessCreationParameters.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::attachmentElementServices):
(WebKit::WebPageProxy::creationParameters):

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

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebPageCreationParameters.cpp (modified) (2 diffs)
• Shared/WebPageCreationParameters.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (2 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/com.apple.WebProcess.sb.in (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-10-14  Per Arne Vollan  <pvollan@apple.com>
+
+        [macOS] Issue sandbox extension to additional icon service when attachment element is enabled.
+        https://bugs.webkit.org/show_bug.cgi?id=217706
+        <rdar://problem/70291100>
+
+        Reviewed by Brent Fulgham.
+
+        Issue sandbox extension to 'com.apple.iconservices.store' when attachment element is enabled on macOS.
+
+        * Shared/WebPageCreationParameters.cpp:
+        (WebKit::WebPageCreationParameters::encode const):
+        (WebKit::WebPageCreationParameters::decode):
+        * Shared/WebPageCreationParameters.h:
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode const):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::attachmentElementServices):
+        (WebKit::WebPageProxy::creationParameters):
+        * WebProcess/WebPage/WebPage.cpp:
+        * WebProcess/com.apple.WebProcess.sb.in:
+
 2020-10-14  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp

@@ -98 +98 @@
 
 #if ENABLE(ATTACHMENT_ELEMENT)
-    encoder << frontboardExtensionHandle;
-    encoder << iconServicesExtensionHandle;
+    encoder << attachmentElementExtensionHandles;
 #endif
 
@@ -329 +328 @@
 
 #if ENABLE(ATTACHMENT_ELEMENT)
-    Optional<Optional<SandboxExtension::Handle>> frontboardExtensionHandle;
-    decoder >> frontboardExtensionHandle;
-    if (!frontboardExtensionHandle)
-        return WTF::nullopt;
-    parameters.frontboardExtensionHandle = WTFMove(*frontboardExtensionHandle);
-
-    Optional<Optional<SandboxExtension::Handle>> iconServicesExtensionHandle;
-    decoder >> iconServicesExtensionHandle;
-    if (!iconServicesExtensionHandle)
-        return WTF::nullopt;
-    parameters.iconServicesExtensionHandle = WTFMove(*iconServicesExtensionHandle);
+    Optional<Optional<SandboxExtension::HandleArray>> attachmentElementExtensionHandles;
+    decoder >> attachmentElementExtensionHandles;
+    if (!attachmentElementExtensionHandles)
+        return WTF::nullopt;
+    parameters.attachmentElementExtensionHandles = WTFMove(*attachmentElementExtensionHandles);
 #endif
 

trunk/Source/WebKit/Shared/WebPageCreationParameters.h

@@ -159 +159 @@
 #endif
 #if ENABLE(ATTACHMENT_ELEMENT)
-    Optional<SandboxExtension::Handle> frontboardExtensionHandle;
-    Optional<SandboxExtension::Handle> iconServicesExtensionHandle;
+    Optional<SandboxExtension::HandleArray> attachmentElementExtensionHandles;
 #endif
 #if PLATFORM(IOS_FAMILY)

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -7655 +7655 @@
 }
 
+#if ENABLE(ATTACHMENT_ELEMENT) && PLATFORM(COCOA)
+static const Vector<ASCIILiteral>& attachmentElementServices()
+{
+    static const auto services = makeNeverDestroyed(Vector<ASCIILiteral> {
+#if PLATFORM(IOS_FAMILY)
+        "com.apple.frontboard.systemappservices"_s,
+#endif
+        "com.apple.iconservices"_s,
+#if PLATFORM(MAC)
+        "com.apple.iconservices.store"_s,
+#endif
+    });
+    return services;
+}
+#endif
+
 WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr<API::WebsitePolicies>&& websitePolicies)
 {
@@ -7822 +7838 @@
 #if ENABLE(ATTACHMENT_ELEMENT) && PLATFORM(COCOA)
     if (m_preferences->attachmentElementEnabled() && !m_process->hasIssuedAttachmentElementRelatedSandboxExtensions()) {
-        SandboxExtension::Handle handle;
-#if PLATFORM(IOS_FAMILY)
-        SandboxExtension::createHandleForMachLookup("com.apple.frontboard.systemappservices"_s, WTF::nullopt, handle);
-        parameters.frontboardExtensionHandle = WTFMove(handle);
-#endif
-        SandboxExtension::createHandleForMachLookup("com.apple.iconservices"_s, WTF::nullopt, handle);
-        parameters.iconServicesExtensionHandle = WTFMove(handle);
+        parameters.attachmentElementExtensionHandles = SandboxExtension::createHandlesForMachLookup(attachmentElementServices(), WTF::nullopt);
         m_process->setHasIssuedAttachmentElementRelatedSandboxExtensions();
     }

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -572 +572 @@
 
 #if ENABLE(ATTACHMENT_ELEMENT)
-    if (parameters.frontboardExtensionHandle)
-        SandboxExtension::consumePermanently(*parameters.frontboardExtensionHandle);
-    if (parameters.iconServicesExtensionHandle)
-        SandboxExtension::consumePermanently(*parameters.iconServicesExtensionHandle);
+    if (parameters.attachmentElementExtensionHandles)
+        SandboxExtension::consumePermanently(*parameters.attachmentElementExtensionHandles);
 #endif
 

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

@@ -1000 +1000 @@
             "com.apple.diagnosticd"
             "com.apple.iconservices"
+            "com.apple.iconservices.store"
             "com.apple.tccd"
             "com.apple.BluetoothServices"