Changeset 255457 in webkit

Timestamp:

Jan 30, 2020 2:13:23 PM (4 years ago)

Author:

pvollan@apple.com

Message:

[iOS] Issue mach sandbox extension to the frontboard and icon service when the attachment element is enabled
​https://bugs.webkit.org/show_bug.cgi?id=205443
Source/WebCore:

Reviewed by Brent Fulgham.

Get focus ring color in the UI process since getting this color will communicate with the frontboard daemon.

Test: fast/sandbox/ios/focus-ring-color.html

• rendering/RenderTheme.h:
• rendering/RenderThemeIOS.h:
• rendering/RenderThemeIOS.mm:

(WebCore::cachedFocusRingColor):
(WebCore::RenderThemeIOS::platformFocusRingColor const):
(WebCore::RenderThemeIOS::setFocusRingColor):

• testing/Internals.cpp:

(WebCore::Internals::focusRingColor):

• testing/Internals.h:
• testing/Internals.idl:

Source/WebKit:

<rdar://problem/58074291>

Reviewed by Brent Fulgham.

When support for the html attachment element is enabled, issue a mach lookup extension to the frontboard and icon service
for the WebContent process, since these daemons are being contacted when icons for attachments are being queried. Also,
retrieve the focus ring color in the UI process, since getting this color requires access to the frontboard daemon.

Test: fast/sandbox/ios/sandbox-mach-lookup-attachment-element.html

• 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):

LayoutTests:

Reviewed by Brent Fulgham.

• fast/sandbox/ios/focus-ring-color-expected.txt: Added.
• fast/sandbox/ios/focus-ring-color.html: Added.
• fast/sandbox/ios/sandbox-mach-lookup-attachment-element-expected.txt: Added.
• fast/sandbox/ios/sandbox-mach-lookup-attachment-element.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/sandbox/ios/focus-ring-color-expected.txt (added)
• LayoutTests/fast/sandbox/ios/focus-ring-color.html (added)
• LayoutTests/fast/sandbox/ios/sandbox-mach-lookup-attachment-element-expected.txt (added)
• LayoutTests/fast/sandbox/ios/sandbox-mach-lookup-attachment-element.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderTheme.h (modified) (1 diff)
• Source/WebCore/rendering/RenderThemeIOS.h (modified) (1 diff)
• Source/WebCore/rendering/RenderThemeIOS.mm (modified) (2 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb (modified) (1 diff)
• Source/WebKit/Shared/WebPageCreationParameters.cpp (modified) (2 diffs)
• Source/WebKit/Shared/WebPageCreationParameters.h (modified) (1 diff)
• Source/WebKit/Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• Source/WebKit/Shared/WebProcessCreationParameters.h (modified) (1 diff)
• Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (modified) (1 diff)
• Source/WebKit/UIProcess/WebPageProxy.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/WebProcessProxy.h (modified) (2 diffs)
• Source/WebKit/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-01-30  Per Arne Vollan  <pvollan@apple.com>
+
+        [iOS] Issue mach sandbox extension to the frontboard and icon service when the attachment element is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=205443
+
+        Reviewed by Brent Fulgham.
+
+        * fast/sandbox/ios/focus-ring-color-expected.txt: Added.
+        * fast/sandbox/ios/focus-ring-color.html: Added.
+        * fast/sandbox/ios/sandbox-mach-lookup-attachment-element-expected.txt: Added.
+        * fast/sandbox/ios/sandbox-mach-lookup-attachment-element.html: Added.
+
 2020-01-30  Alexey Shvayka  <shvaikalesh@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-30  Per Arne Vollan  <pvollan@apple.com>
+
+        [iOS] Issue mach sandbox extension to the frontboard and icon service when the attachment element is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=205443
+
+        Reviewed by Brent Fulgham.
+
+        Get focus ring color in the UI process since getting this color will communicate with the frontboard daemon.
+
+        Test: fast/sandbox/ios/focus-ring-color.html
+
+        * rendering/RenderTheme.h:
+        * rendering/RenderThemeIOS.h:
+        * rendering/RenderThemeIOS.mm:
+        (WebCore::cachedFocusRingColor):
+        (WebCore::RenderThemeIOS::platformFocusRingColor const):
+        (WebCore::RenderThemeIOS::setFocusRingColor):
+        * testing/Internals.cpp:
+        (WebCore::Internals::focusRingColor):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2020-01-30  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Source/WebCore/rendering/RenderTheme.h

@@ -161 +161 @@
     virtual Color disabledTextColor(const Color& textColor, const Color& backgroundColor) const;
 
-    Color focusRingColor(OptionSet<StyleColor::Options>) const;
+    WTF_EXPORT Color focusRingColor(OptionSet<StyleColor::Options>) const;
     virtual Color platformFocusRingColor(OptionSet<StyleColor::Options>) const { return Color(0, 0, 0); }
     static void setCustomFocusRingColor(const Color&);

trunk/Source/WebCore/rendering/RenderThemeIOS.h

@@ -65 +65 @@
     WEBCORE_EXPORT static const CSSValueToSystemColorMap& cssValueToSystemColorMap();
     WEBCORE_EXPORT static void setCSSValueToSystemColorMap(CSSValueToSystemColorMap&&);
-    
+
+    WEBCORE_EXPORT static void setFocusRingColor(const Color&);
+
 protected:
     LengthBox popupInternalPaddingBox(const RenderStyle&) const override;

trunk/Source/WebCore/rendering/RenderThemeIOS.mm

@@ -1131 +1131 @@
 }
 
+static Optional<Color>& cachedFocusRingColor()
+{
+    static NeverDestroyed<Optional<Color>> color;
+    return color;
+}
+
 #if ENABLE(FULL_KEYBOARD_ACCESS)
 Color RenderThemeIOS::platformFocusRingColor(OptionSet<StyleColor::Options>) const
 {
+    if (cachedFocusRingColor().hasValue())
+        return *cachedFocusRingColor();
+
     // FIXME: Should be using -keyboardFocusIndicatorColor. For now, work around <rdar://problem/50838886>.
     return colorFromUIColor([PAL::getUIColorClass() systemBlueColor]);
@@ -1539 +1548 @@
 }
 
+void RenderThemeIOS::setFocusRingColor(const Color& color)
+{
+    cachedFocusRingColor() = color;
+}
+
 Color RenderThemeIOS::systemColor(CSSValueID cssValueID, OptionSet<StyleColor::Options> options) const
 {

trunk/Source/WebCore/testing/Internals.cpp

@@ -5456 +5456 @@
 }
 
+String Internals::focusRingColor()
+{
+    OptionSet<StyleColor::Options> options;
+    return RenderTheme::singleton().focusRingColor(options).cssText();
+}
+
 } // namespace WebCore

trunk/Source/WebCore/testing/Internals.h

@@ -934 +934 @@
     String mediaMIMETypeForExtension(const String& extension);
 
+    String focusRingColor();
+
 private:
     explicit Internals(Document&);

trunk/Source/WebCore/testing/Internals.idl

@@ -837 +837 @@
     
     DOMString systemColorForCSSValue(DOMString cssValue, boolean useDarkModeAppearance, boolean useElevatedUserInterfaceLevel);
+    DOMString focusRingColor();
 
     boolean systemHasBattery();

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-01-30  Per Arne Vollan  <pvollan@apple.com>
+
+        [iOS] Issue mach sandbox extension to the frontboard and icon service when the attachment element is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=205443
+        <rdar://problem/58074291>
+
+        Reviewed by Brent Fulgham.
+
+        When support for the html attachment element is enabled, issue a mach lookup extension to the frontboard and icon service
+        for the WebContent process, since these daemons are being contacted when icons for attachments are being queried. Also,
+        retrieve the focus ring color in the UI process, since getting this color requires access to the frontboard daemon.
+
+        Test: fast/sandbox/ios/sandbox-mach-lookup-attachment-element.html
+
+        * 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):
+
 2020-01-30  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -920 +920 @@
     (require-all
         (extension "com.apple.webkit.extension.mach")
-        (global-name "com.apple.iphone.axserver-systemwide" "com.apple.tccd" "com.apple.nehelper" "com.apple.nesessionmanager.content-filter" "com.apple.uikit.viewservice.com.apple.WebContentFilter.remoteUI" "com.apple.diagnosticd" "com.apple.lsd.open" "com.apple.mobileassetd" "com.apple.mobileassetd.v2")))
+        (global-name "com.apple.iphone.axserver-systemwide" "com.apple.tccd" "com.apple.nehelper" "com.apple.nesessionmanager.content-filter" "com.apple.uikit.viewservice.com.apple.WebContentFilter.remoteUI" "com.apple.diagnosticd" "com.apple.lsd.open" "com.apple.mobileassetd" "com.apple.mobileassetd.v2" "com.apple.frontboard.systemappservices" "com.apple.iconservices")))
 
 (allow mach-lookup

trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp

@@ -93 +93 @@
     encoder << viewportConfigurationViewSize;
     encoder << overrideViewportArguments;
+    encoder << frontboardExtensionHandle;
+    encoder << iconServicesExtensionHandle;
 #endif
 
@@ -300 +302 @@
         return WTF::nullopt;
     parameters.overrideViewportArguments = WTFMove(*overrideViewportArguments);
+
+    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);
 #endif
 

trunk/Source/WebKit/Shared/WebPageCreationParameters.h

@@ -153 +153 @@
     WebCore::FloatSize viewportConfigurationViewSize;
     Optional<WebCore::ViewportArguments> overrideViewportArguments;
+    Optional<SandboxExtension::Handle> frontboardExtensionHandle;
+    Optional<SandboxExtension::Handle> iconServicesExtensionHandle;
 #endif
 #if PLATFORM(IOS_FAMILY)

trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp

@@ -174 +174 @@
     encoder << currentUserInterfaceIdiomIsPad;
     encoder << cssValueToSystemColorMap;
+    encoder << focusRingColor;
 #endif
 }
@@ -459 +460 @@
         return false;
     parameters.cssValueToSystemColorMap = WTFMove(*cssValueToSystemColorMap);
+
+    Optional<WebCore::Color> focusRingColor;
+    decoder >> focusRingColor;
+    if (!focusRingColor)
+        return false;
+    parameters.focusRingColor = WTFMove(*focusRingColor);
 #endif
 

trunk/Source/WebKit/Shared/WebProcessCreationParameters.h

@@ -216 +216 @@
     bool currentUserInterfaceIdiomIsPad { false };
     WebCore::RenderThemeIOS::CSSValueToSystemColorMap cssValueToSystemColorMap;
+    WebCore::Color focusRingColor;
 #endif
 };

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

@@ -361 +361 @@
     parameters.currentUserInterfaceIdiomIsPad = currentUserInterfaceIdiomIsPad();
     parameters.cssValueToSystemColorMap = RenderThemeIOS::cssValueToSystemColorMap();
+    parameters.focusRingColor = RenderTheme::singleton().focusRingColor(OptionSet<StyleColor::Options>());
 #endif
 }

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -7652 +7652 @@
 #endif
 
+#if ENABLE(ATTACHMENT_ELEMENT) && PLATFORM(IOS_FAMILY)
+    if (m_preferences->attachmentElementEnabled() && !m_process->hasIssuedAttachmentElementRelatedSandboxExtensions()) {
+        SandboxExtension::Handle handle;
+        SandboxExtension::createHandleForMachLookup("com.apple.frontboard.systemappservices", WTF::nullopt, handle);
+        parameters.frontboardExtensionHandle = WTFMove(handle);
+        SandboxExtension::createHandleForMachLookup("com.apple.iconservices", WTF::nullopt, handle);
+        parameters.iconServicesExtensionHandle = WTFMove(handle);
+        m_process->setHasIssuedAttachmentElementRelatedSandboxExtensions();
+    }
+#endif
+
     return parameters;
 }

trunk/Source/WebKit/UIProcess/WebProcessProxy.h

@@ -355 +355 @@
 #endif
 
+#if ENABLE(ATTACHMENT_ELEMENT) && PLATFORM(IOS_FAMILY)
+    bool hasIssuedAttachmentElementRelatedSandboxExtensions() const { return m_hasIssuedAttachmentElementRelatedSandboxExtensions; }
+    void setHasIssuedAttachmentElementRelatedSandboxExtensions() { m_hasIssuedAttachmentElementRelatedSandboxExtensions = true; }
+#endif
+
 protected:
     WebProcessProxy(WebProcessPool&, WebsiteDataStore*, IsPrewarmed);
@@ -533 +538 @@
     bool m_isPrewarmed;
     bool m_hasAudibleWebPage { false };
+#if ENABLE(ATTACHMENT_ELEMENT) && PLATFORM(IOS_FAMILY)
+    bool m_hasIssuedAttachmentElementRelatedSandboxExtensions { false };
+#endif
 
 #if PLATFORM(WATCHOS)

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

@@ -527 +527 @@
     pageConfiguration.corsDisablingPatterns = WTFMove(parameters.corsDisablingPatterns);
 
+#if ENABLE(ATTACHMENT_ELEMENT) && PLATFORM(IOS_FAMILY)
+    if (parameters.frontboardExtensionHandle)
+        SandboxExtension::consumePermanently(*parameters.frontboardExtensionHandle);
+    if (parameters.iconServicesExtensionHandle)
+        SandboxExtension::consumePermanently(*parameters.iconServicesExtensionHandle);
+#endif
+
     m_page = makeUnique<Page>(WTFMove(pageConfiguration));
 

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

@@ -268 +268 @@
 #if PLATFORM(IOS_FAMILY)
     RenderThemeIOS::setCSSValueToSystemColorMap(WTFMove(parameters.cssValueToSystemColorMap));
+    RenderThemeIOS::setFocusRingColor(parameters.focusRingColor);
 #endif
 }