Changeset 271294 in webkit

Timestamp:

Jan 8, 2021 7:22:28 AM (19 months ago)

Author:

youenn@apple.com

Message:

Service Worker is no longer inspectable
​https://bugs.webkit.org/show_bug.cgi?id=220406
<rdar://problem/72883757>

Reviewed by Per Arne Vollan.

We were sending the sandbox extension later when enabling remote inspector.
But this is not soon enough for inspecting service workers.
For that reason, send the sandbox extension at process init time based on whether develop menu is on or not.

Manually tested by validating that Develop Menu can list running service workers.

• Shared/WebProcessCreationParameters.cpp:

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

• Shared/WebProcessCreationParameters.h:
• UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::WebProcessPool::platformInitializeWebProcess):

• UIProcess/Cocoa/WebProcessProxyCocoa.mm:

(WebKit::WebProcessProxy::shouldEnableRemoteInspector):
(WebKit::WebProcessProxy::enableRemoteInspectorIfNeeded):

• UIProcess/WebProcessProxy.h:
• WebProcess/WebProcess.h:
• WebProcess/WebProcess.messages.in:
• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::platformInitializeWebProcess):
(WebKit::WebProcess::enableRemoteWebInspector):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• Shared/WebProcessCreationParameters.h (modified) (1 diff)
• UIProcess/Cocoa/WebProcessPoolCocoa.mm (modified) (1 diff)
• UIProcess/Cocoa/WebProcessProxyCocoa.mm (modified) (1 diff)
• UIProcess/WebProcessProxy.h (modified) (1 diff)
• WebProcess/WebProcess.h (modified) (1 diff)
• WebProcess/WebProcess.messages.in (modified) (1 diff)
• WebProcess/cocoa/WebProcessCocoa.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-08  Youenn Fablet  <youenn@apple.com>
+
+        Service Worker is no longer inspectable
+        https://bugs.webkit.org/show_bug.cgi?id=220406
+        <rdar://problem/72883757>
+
+        Reviewed by Per Arne Vollan.
+
+        We were sending the sandbox extension later when enabling remote inspector.
+        But this is not soon enough for inspecting service workers.
+        For that reason, send the sandbox extension at process init time based on whether develop menu is on or not.
+
+        Manually tested by validating that Develop Menu can list running service workers.
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode const):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::WebProcessPool::platformInitializeWebProcess):
+        * UIProcess/Cocoa/WebProcessProxyCocoa.mm:
+        (WebKit::WebProcessProxy::shouldEnableRemoteInspector):
+        (WebKit::WebProcessProxy::enableRemoteInspectorIfNeeded):
+        * UIProcess/WebProcessProxy.h:
+        * WebProcess/WebProcess.h:
+        * WebProcess/WebProcess.messages.in:
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+        (WebKit::WebProcess::enableRemoteWebInspector):
+
 2021-01-08  Chris Lord  <clord@igalia.com>
 

trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp

@@ -57 +57 @@
     encoder << containerTemporaryDirectoryExtensionHandle;
 #endif
+#if PLATFORM(COCOA) && ENABLE(REMOTE_INSPECTOR)
+    encoder << enableRemoteWebInspectorExtensionHandle;
+#endif
     encoder << webCoreLoggingChannels;
     encoder << webKitLoggingChannels;
@@ -237 +240 @@
 
 #endif
+#if PLATFORM(COCOA) && ENABLE(REMOTE_INSPECTOR)
+    Optional<SandboxExtension::Handle> enableRemoteWebInspectorExtensionHandle;
+    decoder >> enableRemoteWebInspectorExtensionHandle;
+    if (!enableRemoteWebInspectorExtensionHandle)
+        return false;
+    parameters.enableRemoteWebInspectorExtensionHandle = WTFMove(*enableRemoteWebInspectorExtensionHandle);
+#endif
+
     if (!decoder.decode(parameters.webCoreLoggingChannels))
         return false;

trunk/Source/WebKit/Shared/WebProcessCreationParameters.h

@@ -83 +83 @@
     SandboxExtension::Handle containerTemporaryDirectoryExtensionHandle;
 #endif
+#if PLATFORM(COCOA) && ENABLE(REMOTE_INSPECTOR)
+    SandboxExtension::Handle enableRemoteWebInspectorExtensionHandle;
+#endif
 #if ENABLE(MEDIA_STREAM)
     SandboxExtension::Handle audioCaptureExtensionHandle;

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

@@ -333 +333 @@
         SandboxExtension::createHandleWithoutResolvingPath(m_resolvedPaths.containerTemporaryDirectory, SandboxExtension::Type::ReadWrite, parameters.containerTemporaryDirectoryExtensionHandle);
 #endif
+#if PLATFORM(COCOA) && ENABLE(REMOTE_INSPECTOR)
+    if (WebProcessProxy::shouldEnableRemoteInspector()) {
+        SandboxExtension::Handle enableRemoteWebInspectorExtensionHandle;
+        if (SandboxExtension::createHandleForMachLookup("com.apple.webinspector"_s, WTF::nullopt, enableRemoteWebInspectorExtensionHandle))
+            parameters.enableRemoteWebInspectorExtensionHandle = WTFMove(enableRemoteWebInspectorExtensionHandle);
+    }
+#endif
 
     parameters.fontAllowList = m_fontAllowList;

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

@@ -210 +210 @@
 
 #if ENABLE(REMOTE_INSPECTOR)
+bool WebProcessProxy::shouldEnableRemoteInspector()
+{
+#if PLATFORM(IOS_FAMILY)
+    return CFPreferencesGetAppIntegerValue(WIRRemoteInspectorEnabledKey, WIRRemoteInspectorDomainName, nullptr);
+#else
+    return CFPreferencesGetAppIntegerValue(CFSTR("ShowDevelopMenu"), CFSTR("com.apple.Safari.SandboxBroker"), nullptr);
+#endif
+}
+
 void WebProcessProxy::enableRemoteInspectorIfNeeded()
 {
-#if PLATFORM(IOS_FAMILY)
-    if (!CFPreferencesGetAppIntegerValue(WIRRemoteInspectorEnabledKey, WIRRemoteInspectorDomainName, nullptr))
-        return;
-#else
-    if (!CFPreferencesGetAppIntegerValue(CFSTR("ShowDevelopMenu"), CFSTR("com.apple.Safari.SandboxBroker"), nullptr))
-        return;
-#endif
-    SandboxExtension::Handle handle;
-    auto auditToken = connection() ? connection()->getAuditToken() : WTF::nullopt;
-    if (SandboxExtension::createHandleForMachLookup("com.apple.webinspector"_s, auditToken, handle))
-        send(Messages::WebProcess::EnableRemoteWebInspector(handle), 0);
+    if (!shouldEnableRemoteInspector())
+        return;
+    send(Messages::WebProcess::EnableRemoteWebInspector(), 0);
 }
 #endif

trunk/Source/WebKit/UIProcess/WebProcessProxy.h

@@ -408 +408 @@
     void pageIsBecomingInvisible(WebCore::PageIdentifier);
 
+#if PLATFORM(COCOA) && ENABLE(REMOTE_INSPECTOR)
+    static bool shouldEnableRemoteInspector();
+#endif
+
 protected:
     WebProcessProxy(WebProcessPool&, WebsiteDataStore*, IsPrewarmed);

trunk/Source/WebKit/WebProcess/WebProcess.h

@@ -319 +319 @@
     void setMediaMIMETypes(const Vector<String>);
 #if ENABLE(REMOTE_INSPECTOR)
-    void enableRemoteWebInspector(const SandboxExtension::Handle&);
+    void enableRemoteWebInspector();
 #endif
     void unblockServicesRequiredByAccessibility(const SandboxExtension::HandleArray&);

trunk/Source/WebKit/WebProcess/WebProcess.messages.in

@@ -134 +134 @@
     SetMediaMIMETypes(Vector<String> types)
 #if ENABLE(REMOTE_INSPECTOR)
-    EnableRemoteWebInspector(WebKit::SandboxExtension::Handle handle);
+    EnableRemoteWebInspector();
 #endif
 #endif

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

@@ -261 +261 @@
     SandboxExtension::consumePermanently(parameters.containerTemporaryDirectoryExtensionHandle);
 #endif
+#if PLATFORM(COCOA) && ENABLE(REMOTE_INSPECTOR)
+    if (SandboxExtension::consumePermanently(parameters.enableRemoteWebInspectorExtensionHandle))
+        Inspector::RemoteInspector::setNeedMachSandboxExtension(false);
+#endif
 #endif
 
@@ -992 +996 @@
 
 #if ENABLE(REMOTE_INSPECTOR)
-void WebProcess::enableRemoteWebInspector(const SandboxExtension::Handle& handle)
-{
-    SandboxExtension::consumePermanently(handle);
-    Inspector::RemoteInspector::setNeedMachSandboxExtension(false);
+void WebProcess::enableRemoteWebInspector()
+{
     Inspector::RemoteInspector::singleton();
 }