Changeset 274213 in webkit

Timestamp:

Mar 10, 2021, 6:57:46 AM (6 years ago)

Author:

youenn@apple.com

Message:

Do not send sandbox extensions to WebProcess if capture happens in GPUProcess
​https://bugs.webkit.org/show_bug.cgi?id=222961

Reviewed by Eric Carlson.

In case capture does not happen in WebProcess, we do not need to send the tccd sandbox extension.
Ditto for camera/microphone sandbox extensions if capture happens in GPUProcess.
Manually tested.

• UIProcess/UserMediaPermissionRequestManagerProxy.cpp:

(WebKit::c):
(WebKit::UserMediaPermissionRequestManagerProxy::finishGrantingRequest):

• UIProcess/UserMediaProcessManager.cpp:

(WebKit::UserMediaProcessManager::willCreateMediaStream):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/UserMediaPermissionRequestManagerProxy.cpp (modified) (2 diffs)
• UIProcess/UserMediaProcessManager.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-03-10  Youenn Fablet  <youenn@apple.com>
+
+        Do not send sandbox extensions to WebProcess if capture happens in GPUProcess
+        https://bugs.webkit.org/show_bug.cgi?id=222961
+
+        Reviewed by Eric Carlson.
+
+        In case capture does not happen in WebProcess, we do not need to send the tccd sandbox extension.
+        Ditto for camera/microphone sandbox extensions if capture happens in GPUProcess.
+        Manually tested.
+
+        * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+        (WebKit::c):
+        (WebKit::UserMediaPermissionRequestManagerProxy::finishGrantingRequest):
+        * UIProcess/UserMediaProcessManager.cpp:
+        (WebKit::UserMediaProcessManager::willCreateMediaStream):
+
 2021-03-10  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp

@@ -261 +261 @@
 
 #if ENABLE(MEDIA_STREAM)
+static bool doesPageNeedTCCD(const WebPageProxy& page)
+{
+    return (!page.preferences().captureAudioInGPUProcessEnabled() && !page.preferences().captureAudioInUIProcessEnabled()) || !page.preferences().captureVideoInGPUProcessEnabled();
+}
+
 void UserMediaPermissionRequestManagerProxy::finishGrantingRequest(UserMediaPermissionRequestProxy& request)
 {
@@ -286 +291 @@
         SandboxExtension::Handle handle;
 #if PLATFORM(COCOA)
-        if (!m_hasCreatedSandboxExtensionForTCCD) {
+        if (!m_hasCreatedSandboxExtensionForTCCD && doesPageNeedTCCD(m_page)) {
             SandboxExtension::createHandleForMachLookup("com.apple.tccd"_s, m_page.process().connection()->getAuditToken(), handle);
             m_hasCreatedSandboxExtensionForTCCD = true;

trunk/Source/WebKit/UIProcess/UserMediaProcessManager.cpp

@@ -84 +84 @@
     size_t extensionCount = 0;
 
-    bool needsAudioSandboxExtension = withAudio && !process.hasAudioCaptureExtension() && !proxy.page().preferences().captureAudioInUIProcessEnabled();
+    bool needsAudioSandboxExtension = withAudio && !process.hasAudioCaptureExtension() && !proxy.page().preferences().captureAudioInUIProcessEnabled() && !proxy.page().preferences().captureAudioInGPUProcessEnabled();
     if (needsAudioSandboxExtension)
         extensionCount++;
 
-    bool needsVideoSandboxExtension = withVideo && !process.hasVideoCaptureExtension() && !proxy.page().preferences().captureVideoInUIProcessEnabled();
+    bool needsVideoSandboxExtension = withVideo && !process.hasVideoCaptureExtension() && !proxy.page().preferences().captureVideoInUIProcessEnabled() && !proxy.page().preferences().captureVideoInGPUProcessEnabled();
     if (needsVideoSandboxExtension)
         extensionCount++;