[macOS] Issue sandbox extension for icon service when attachment element is enabled

https://bugs.webkit.org/show_bug.cgi?id=217483
<rdar://problem/70099680>

Reviewed by Brent Fulgham.

This has previously been done on iOS, and should be done on macOS as well.

* 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::WebPageProxy::creationParameters):
* UIProcess/WebProcessProxy.h:
* WebProcess/WebPage/WebPage.cpp:
* WebProcess/com.apple.WebProcess.sb.in:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@268270 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Author: [email protected]

Source/WebKit/ChangeLog

@@ -1,3 +1,27 @@
+2020-10-09  Per Arne Vollan  <[email protected]>
+
+        [macOS] Issue sandbox extension for icon service when attachment element is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=217483
+        <rdar://problem/70099680>
+
+        Reviewed by Brent Fulgham.
+
+        This has previously been done on iOS, and should be done on macOS as well.
+
+        * 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::WebPageProxy::creationParameters):
+        * UIProcess/WebProcessProxy.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        * WebProcess/com.apple.WebProcess.sb.in:
+
 2020-10-09  Alex Christensen  <[email protected]>
 
         Merge DownloadProxy::DidReceiveResponse and DownloadProxy::DecideDestinationWithSuggestedFilename into one message

Source/WebKit/Shared/WebPageCreationParameters.cpp

@@ -94,6 +94,9 @@ void WebPageCreationParameters::encode(IPC::Encoder& encoder) const
     encoder << viewportConfigurationMinimumEffectiveDeviceWidth;
     encoder << viewportConfigurationViewSize;
     encoder << overrideViewportArguments;
+#endif
+
+#if ENABLE(ATTACHMENT_ELEMENT)
     encoder << frontboardExtensionHandle;
     encoder << iconServicesExtensionHandle;
 #endif
@@ -322,7 +325,9 @@ Optional<WebPageCreationParameters> WebPageCreationParameters::decode(IPC::Decod
     if (!overrideViewportArguments)
         return WTF::nullopt;
     parameters.overrideViewportArguments = WTFMove(*overrideViewportArguments);
+#endif
 
+#if ENABLE(ATTACHMENT_ELEMENT)
     Optional<Optional<SandboxExtension::Handle>> frontboardExtensionHandle;
     decoder >> frontboardExtensionHandle;
     if (!frontboardExtensionHandle)

Source/WebKit/Shared/WebPageCreationParameters.h

@@ -156,6 +156,8 @@ struct WebPageCreationParameters {
     double viewportConfigurationMinimumEffectiveDeviceWidth;
     WebCore::FloatSize viewportConfigurationViewSize;
     Optional<WebCore::ViewportArguments> overrideViewportArguments;
+#endif
+#if ENABLE(ATTACHMENT_ELEMENT)
     Optional<SandboxExtension::Handle> frontboardExtensionHandle;
     Optional<SandboxExtension::Handle> iconServicesExtensionHandle;
 #endif

Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -7923,11 +7923,13 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
     parameters.themeName = pageClient().themeName();
 #endif
 
-#if ENABLE(ATTACHMENT_ELEMENT) && PLATFORM(IOS_FAMILY)
+#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);
         m_process->setHasIssuedAttachmentElementRelatedSandboxExtensions();

Source/WebKit/UIProcess/WebProcessProxy.h

@@ -361,7 +361,7 @@ class WebProcessProxy : public AuxiliaryProcessProxy, public ResponsivenessTimer
     UserMediaCaptureManagerProxy* userMediaCaptureManagerProxy() { return m_userMediaCaptureManagerProxy.get(); }
 #endif
 
-#if ENABLE(ATTACHMENT_ELEMENT) && PLATFORM(IOS_FAMILY)
+#if ENABLE(ATTACHMENT_ELEMENT)
     bool hasIssuedAttachmentElementRelatedSandboxExtensions() const { return m_hasIssuedAttachmentElementRelatedSandboxExtensions; }
     void setHasIssuedAttachmentElementRelatedSandboxExtensions() { m_hasIssuedAttachmentElementRelatedSandboxExtensions = true; }
 #endif
@@ -581,7 +581,7 @@ class WebProcessProxy : public AuxiliaryProcessProxy, public ResponsivenessTimer
 
     bool m_hasCommittedAnyProvisionalLoads { false };
     bool m_isPrewarmed;
-#if ENABLE(ATTACHMENT_ELEMENT) && PLATFORM(IOS_FAMILY)
+#if ENABLE(ATTACHMENT_ELEMENT)
     bool m_hasIssuedAttachmentElementRelatedSandboxExtensions { false };
 #endif
 #if PLATFORM(COCOA)

Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -571,7 +571,7 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters)
     if (!parameters.crossOriginAccessControlCheckEnabled)
         CrossOriginAccessControlCheckDisabler::singleton().setCrossOriginAccessControlCheckEnabled(false);
 
-#if ENABLE(ATTACHMENT_ELEMENT) && PLATFORM(IOS_FAMILY)
+#if ENABLE(ATTACHMENT_ELEMENT)
     if (parameters.frontboardExtensionHandle)
         SandboxExtension::consumePermanently(*parameters.frontboardExtensionHandle);
     if (parameters.iconServicesExtensionHandle)

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

@@ -998,6 +998,7 @@
             "com.apple.cfprefsd.daemon"
             "com.apple.containermanagerd"
             "com.apple.diagnosticd"
+            "com.apple.iconservices"
             "com.apple.tccd"
             "com.apple.BluetoothServices"