Title: [270986] trunk/Source
Revision
270986
Author
[email protected]
Date
2020-12-18 12:32:02 -0800 (Fri, 18 Dec 2020)

Log Message

SpeechRecognitionRemoteRealtimeMediaSourceManager should not issue sandbox extension for mocked devices
https://bugs.webkit.org/show_bug.cgi?id=219972

Reviewed by Eric Carlson.

Source/WebCore:

* platform/mediastream/CaptureDevice.h:
(WebCore::CaptureDevice::isMockDevice const): Add a member in CaptureDevice to indicate if it's mocked device.
(WebCore::CaptureDevice::setIsMockDevice):
(WebCore::CaptureDevice::encode const):
(WebCore::CaptureDevice::decode):
* platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::toCaptureDevice):

Source/WebKit:

* UIProcess/SpeechRecognitionPermissionManager.cpp:
(WebKit::SpeechRecognitionPermissionManager::startProcessingRequest): We need to sync the preference not only
on when mockCaptureDevicesEnabled is set, but also when it is unset.
* UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp:
(WebKit::SpeechRecognitionRemoteRealtimeMediaSourceManager::addSource): Grant sandbox extensions to web process
when the first source that uses a real device is created.
(WebKit::SpeechRecognitionRemoteRealtimeMediaSourceManager::removeSource): Revoke sandbox extensions from web
process when the last source that uses a real device is delete.
* UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.h:
* UIProcess/SpeechRecognitionServer.cpp: Correct a typo.
(WebKit::SpeechRecognitionServer::SpeechRecognitionServer):
* UIProcess/SpeechRecognitionServer.h: Correct a typo

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (270985 => 270986)


--- trunk/Source/WebCore/ChangeLog	2020-12-18 19:43:08 UTC (rev 270985)
+++ trunk/Source/WebCore/ChangeLog	2020-12-18 20:32:02 UTC (rev 270986)
@@ -1,3 +1,18 @@
+2020-12-18  Sihui Liu  <[email protected]>
+
+        SpeechRecognitionRemoteRealtimeMediaSourceManager should not issue sandbox extension for mocked devices
+        https://bugs.webkit.org/show_bug.cgi?id=219972
+
+        Reviewed by Eric Carlson.
+
+        * platform/mediastream/CaptureDevice.h:
+        (WebCore::CaptureDevice::isMockDevice const): Add a member in CaptureDevice to indicate if it's mocked device.
+        (WebCore::CaptureDevice::setIsMockDevice):
+        (WebCore::CaptureDevice::encode const):
+        (WebCore::CaptureDevice::decode):
+        * platform/mock/MockRealtimeMediaSourceCenter.cpp:
+        (WebCore::toCaptureDevice):
+
 2020-12-18  Julian Gonzalez  <[email protected]>
 
         Crash in DOMSelection::getRangeAt()

Modified: trunk/Source/WebCore/platform/mediastream/CaptureDevice.h (270985 => 270986)


--- trunk/Source/WebCore/platform/mediastream/CaptureDevice.h	2020-12-18 19:43:08 UTC (rev 270985)
+++ trunk/Source/WebCore/platform/mediastream/CaptureDevice.h	2020-12-18 20:32:02 UTC (rev 270986)
@@ -66,6 +66,9 @@
     bool isDefault() const { return m_default; }
     void setIsDefault(bool isDefault) { m_default = isDefault; }
 
+    bool isMockDevice() const { return m_isMockDevice; }
+    void setIsMockDevice(bool isMockDevice) { m_isMockDevice = isMockDevice; }
+
     explicit operator bool() const { return m_type != DeviceType::Unknown; }
 
 #if ENABLE(MEDIA_STREAM)
@@ -78,6 +81,7 @@
         encoder << m_enabled;
         encoder << m_default;
         encoder << m_type;
+        encoder << m_isMockDevice;
     }
 
     template <class Decoder>
@@ -113,9 +117,15 @@
         if (!type)
             return WTF::nullopt;
 
+        Optional<bool> isMockDevice;
+        decoder >> isMockDevice;
+        if (!isMockDevice)
+            return WTF::nullopt;
+
         Optional<CaptureDevice> device = {{ WTFMove(*persistentId), WTFMove(*type), WTFMove(*label), WTFMove(*groupId) }};
         device->setEnabled(*enabled);
         device->setIsDefault(*isDefault);
+        device->setIsMockDevice(*isMockDevice);
         return device;
     }
 #endif
@@ -127,6 +137,7 @@
     String m_groupId;
     bool m_enabled { false };
     bool m_default { false };
+    bool m_isMockDevice { false };
 };
 
 } // namespace WebCore

Modified: trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp (270985 => 270986)


--- trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp	2020-12-18 19:43:08 UTC (rev 270985)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp	2020-12-18 20:32:02 UTC (rev 270986)
@@ -274,6 +274,7 @@
 {
     auto captureDevice = device.captureDevice();
     captureDevice.setEnabled(true);
+    captureDevice.setIsMockDevice(true);
     return captureDevice;
 }
 

Modified: trunk/Source/WebKit/ChangeLog (270985 => 270986)


--- trunk/Source/WebKit/ChangeLog	2020-12-18 19:43:08 UTC (rev 270985)
+++ trunk/Source/WebKit/ChangeLog	2020-12-18 20:32:02 UTC (rev 270986)
@@ -1,3 +1,23 @@
+2020-12-18  Sihui Liu  <[email protected]>
+
+        SpeechRecognitionRemoteRealtimeMediaSourceManager should not issue sandbox extension for mocked devices
+        https://bugs.webkit.org/show_bug.cgi?id=219972
+
+        Reviewed by Eric Carlson.
+
+        * UIProcess/SpeechRecognitionPermissionManager.cpp:
+        (WebKit::SpeechRecognitionPermissionManager::startProcessingRequest): We need to sync the preference not only
+        on when mockCaptureDevicesEnabled is set, but also when it is unset.
+        * UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp:
+        (WebKit::SpeechRecognitionRemoteRealtimeMediaSourceManager::addSource): Grant sandbox extensions to web process
+        when the first source that uses a real device is created.
+        (WebKit::SpeechRecognitionRemoteRealtimeMediaSourceManager::removeSource): Revoke sandbox extensions from web 
+        process when the last source that uses a real device is delete.
+        * UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.h:
+        * UIProcess/SpeechRecognitionServer.cpp: Correct a typo.
+        (WebKit::SpeechRecognitionServer::SpeechRecognitionServer):
+        * UIProcess/SpeechRecognitionServer.h: Correct a typo
+
 2020-12-18  Chris Dumez  <[email protected]>
 
         REGRESSION (r270938): ASSERTION FAILED: !m_renderThread in WebKit::RemoteAudioDestinationProxy::startRenderingThread

Modified: trunk/Source/WebKit/UIProcess/SpeechRecognitionPermissionManager.cpp (270985 => 270986)


--- trunk/Source/WebKit/UIProcess/SpeechRecognitionPermissionManager.cpp	2020-12-18 19:43:08 UTC (rev 270985)
+++ trunk/Source/WebKit/UIProcess/SpeechRecognitionPermissionManager.cpp	2020-12-18 20:32:02 UTC (rev 270986)
@@ -103,8 +103,8 @@
     m_microphoneCheck = computeMicrophoneAccess();
     m_speechRecognitionServiceCheck = computeSpeechRecognitionServiceAccess();
 
+    m_page.syncIfMockDevicesEnabledChanged();
     if (m_page.preferences().mockCaptureDevicesEnabled()) {
-        m_page.syncIfMockDevicesEnabledChanged();
         m_microphoneCheck = CheckResult::Granted;
         m_speechRecognitionServiceCheck = CheckResult::Granted;
     }

Modified: trunk/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp (270985 => 270986)


--- trunk/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp	2020-12-18 19:43:08 UTC (rev 270985)
+++ trunk/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.cpp	2020-12-18 20:32:02 UTC (rev 270986)
@@ -44,14 +44,16 @@
     ASSERT(!m_sources.contains(identifier));
     m_sources.add(identifier, makeWeakPtr(source));
 
-#if ENABLE(SANDBOX_EXTENSIONS) && USE(APPLE_INTERNAL_SDK)
-    if (!m_hasGrantedSandboxExtensions) {
-        SandboxExtension::Handle handleForTCCD;
-        SandboxExtension::createHandleForMachLookup("com.apple.tccd"_s, m_connection->getAuditToken(), handleForTCCD);
-        SandboxExtension::Handle handleForMicrophone;
-        SandboxExtension::createHandleForGenericExtension("com.apple.webkit.microphone"_s, handleForMicrophone);
-        send(Messages::SpeechRecognitionRealtimeMediaSourceManager::GrantSandboxExtensions(handleForTCCD, handleForMicrophone));
-        m_hasGrantedSandboxExtensions = true;
+#if ENABLE(SANDBOX_EXTENSIONS)
+    if (!captureDevice.isMockDevice()) {
+        m_sourcesNeedingSandboxExtension.add(identifier);
+        if (m_sourcesNeedingSandboxExtension.size() == 1) {
+            SandboxExtension::Handle handleForTCCD;
+            SandboxExtension::createHandleForMachLookup("com.apple.tccd"_s, m_connection->getAuditToken(), handleForTCCD);
+            SandboxExtension::Handle handleForMicrophone;
+            SandboxExtension::createHandleForGenericExtension("com.apple.webkit.microphone"_s, handleForMicrophone);
+            send(Messages::SpeechRecognitionRealtimeMediaSourceManager::GrantSandboxExtensions(handleForTCCD, handleForMicrophone));
+        }
     }
 #endif
 
@@ -64,10 +66,10 @@
     ASSERT(m_sources.get(identifier) == &source);
     m_sources.remove(identifier);
 
-#if ENABLE(SANDBOX_EXTENSIONS) && USE(APPLE_INTERNAL_SDK)
-    if (m_sources.isEmpty() && m_hasGrantedSandboxExtensions) {
-        send(Messages::SpeechRecognitionRealtimeMediaSourceManager::RevokeSandboxExtensions());
-        m_hasGrantedSandboxExtensions = false;
+#if ENABLE(SANDBOX_EXTENSIONS)
+    if (m_sourcesNeedingSandboxExtension.remove(identifier)) {
+        if (m_sourcesNeedingSandboxExtension.isEmpty())
+            send(Messages::SpeechRecognitionRealtimeMediaSourceManager::RevokeSandboxExtensions());
     }
 #endif
 

Modified: trunk/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.h (270985 => 270986)


--- trunk/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.h	2020-12-18 19:43:08 UTC (rev 270985)
+++ trunk/Source/WebKit/UIProcess/SpeechRecognitionRemoteRealtimeMediaSourceManager.h	2020-12-18 20:32:02 UTC (rev 270986)
@@ -73,7 +73,7 @@
 
     Ref<IPC::Connection> m_connection;
     HashMap<WebCore::RealtimeMediaSourceIdentifier, WeakPtr<SpeechRecognitionRemoteRealtimeMediaSource>> m_sources;
-    bool m_hasGrantedSandboxExtensions { false };
+    HashSet<WebCore::RealtimeMediaSourceIdentifier> m_sourcesNeedingSandboxExtension;
 };
 
 } // namespace WebKit

Modified: trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.cpp (270985 => 270986)


--- trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.cpp	2020-12-18 19:43:08 UTC (rev 270985)
+++ trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.cpp	2020-12-18 20:32:02 UTC (rev 270986)
@@ -37,7 +37,7 @@
 namespace WebKit {
 
 
-SpeechRecognitionServer::SpeechRecognitionServer(Ref<IPC::Connection>&& connection, SpeechRecognitionServerIdentifier identifier, SpeechRecognitionPermissionChecker&& permissionChecker, SpeechRecognitionCheckIfmockSpeechRecognitionEnabled&& checkIfEnabled
+SpeechRecognitionServer::SpeechRecognitionServer(Ref<IPC::Connection>&& connection, SpeechRecognitionServerIdentifier identifier, SpeechRecognitionPermissionChecker&& permissionChecker, SpeechRecognitionCheckIfMockSpeechRecognitionEnabled&& checkIfEnabled
 #if ENABLE(MEDIA_STREAM)
     , RealtimeMediaSourceCreateFunction&& function
 #endif
@@ -45,7 +45,7 @@
     : m_connection(WTFMove(connection))
     , m_identifier(identifier)
     , m_permissionChecker(WTFMove(permissionChecker))
-    , m_checkIfmockSpeechRecognitionEnabled(WTFMove(checkIfEnabled))
+    , m_checkIfMockSpeechRecognitionEnabled(WTFMove(checkIfEnabled))
 #if ENABLE(MEDIA_STREAM)
     , m_realtimeMediaSourceCreateFunction(WTFMove(function))
 #endif
@@ -125,7 +125,7 @@
         return;
     }
 
-    bool mockDeviceCapturesEnabled = m_checkIfmockSpeechRecognitionEnabled();
+    bool mockDeviceCapturesEnabled = m_checkIfMockSpeechRecognitionEnabled();
     m_recognizer->start(clientIdentifier, sourceOrError.source(), mockDeviceCapturesEnabled, request.lang(), request.continuous(), request.interimResults(), request.maxAlternatives());
 #else
     m_requests.remove(clientIdentifier);

Modified: trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.h (270985 => 270986)


--- trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.h	2020-12-18 19:43:08 UTC (rev 270985)
+++ trunk/Source/WebKit/UIProcess/SpeechRecognitionServer.h	2020-12-18 20:32:02 UTC (rev 270986)
@@ -47,7 +47,7 @@
 
 using SpeechRecognitionServerIdentifier = WebCore::PageIdentifier;
 using SpeechRecognitionPermissionChecker = Function<void(const WebCore::ClientOrigin&, CompletionHandler<void(SpeechRecognitionPermissionDecision)>&&)>;
-using SpeechRecognitionCheckIfmockSpeechRecognitionEnabled = Function<bool()>;
+using SpeechRecognitionCheckIfMockSpeechRecognitionEnabled = Function<bool()>;
 
 class SpeechRecognitionServer : public CanMakeWeakPtr<SpeechRecognitionServer>, public IPC::MessageReceiver, private IPC::MessageSender {
     WTF_MAKE_FAST_ALLOCATED;
@@ -54,9 +54,9 @@
 public:
 #if ENABLE(MEDIA_STREAM)
     using RealtimeMediaSourceCreateFunction = Function<WebCore::CaptureSourceOrError()>;
-    SpeechRecognitionServer(Ref<IPC::Connection>&&, SpeechRecognitionServerIdentifier, SpeechRecognitionPermissionChecker&&, SpeechRecognitionCheckIfmockSpeechRecognitionEnabled&&, RealtimeMediaSourceCreateFunction&&);
+    SpeechRecognitionServer(Ref<IPC::Connection>&&, SpeechRecognitionServerIdentifier, SpeechRecognitionPermissionChecker&&, SpeechRecognitionCheckIfMockSpeechRecognitionEnabled&&, RealtimeMediaSourceCreateFunction&&);
 #else
-    SpeechRecognitionServer(Ref<IPC::Connection>&&, SpeechRecognitionServerIdentifier, SpeechRecognitionPermissionChecker&&, SpeechRecognitionCheckIfmockSpeechRecognitionEnabled&&);
+    SpeechRecognitionServer(Ref<IPC::Connection>&&, SpeechRecognitionServerIdentifier, SpeechRecognitionPermissionChecker&&, SpeechRecognitionCheckIfMockSpeechRecognitionEnabled&&);
 #endif
 
     void start(WebCore::SpeechRecognitionConnectionClientIdentifier, String&& lang, bool continuous, bool interimResults, uint64_t maxAlternatives, WebCore::ClientOrigin&&);
@@ -82,7 +82,7 @@
     HashMap<WebCore::SpeechRecognitionConnectionClientIdentifier, std::unique_ptr<WebCore::SpeechRecognitionRequest>> m_requests;
     SpeechRecognitionPermissionChecker m_permissionChecker;
     std::unique_ptr<WebCore::SpeechRecognizer> m_recognizer;
-    SpeechRecognitionCheckIfmockSpeechRecognitionEnabled m_checkIfmockSpeechRecognitionEnabled;
+    SpeechRecognitionCheckIfMockSpeechRecognitionEnabled m_checkIfMockSpeechRecognitionEnabled;
     bool m_isResetting { false };
 
 #if ENABLE(MEDIA_STREAM)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to