Changeset 226804 in webkit

Timestamp:

Jan 11, 2018 1:54:23 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

RTCController should disable ICE candidate filtering in case of getUserMedia based on the RTCPerrConnection origin
​https://bugs.webkit.org/show_bug.cgi?id=180851

Patch by Youenn Fablet <​youenn@apple.com> on 2018-01-11
Reviewed by Eric Carlson.

Source/WebCore:

Test: http/wpt/webrtc/third-party-frame-ice-candidate-filtering.html

RTCController now stores all the client origins (top+frame origins) of frames that got access to camera/microphone access.
For any such client origin, PeerConnection objects ICE candidate filtering is disabled.
ICE candidate filtering is reset whenever navigating/reloading the page.

• Modules/mediastream/RTCController.cpp:

(WebCore::RTCController::reset):
(WebCore::matchDocumentOrigin):
(WebCore::RTCController::shouldDisableICECandidateFiltering):
(WebCore::RTCController::add):
(WebCore::RTCController::disableICECandidateFilteringForAllOrigins):
(WebCore::RTCController::disableICECandidateFiltering):
(WebCore::RTCController::enableICECandidateFiltering):

• Modules/mediastream/RTCController.h:
• Modules/mediastream/RTCPeerConnection.cpp:

(WebCore::RTCPeerConnection::create):

• Modules/mediastream/UserMediaRequest.cpp:

(WebCore::UserMediaRequest::allow):

• page/Page.cpp:

(WebCore::Page::disableICECandidateFiltering):

• testing/Internals.cpp:

(WebCore::Internals::setICECandidateFiltering):

LayoutTests:

• http/wpt/webrtc/resources/third-party-frame-ice-candidate-filtering-iframe.html: Added.
• http/wpt/webrtc/third-party-frame-ice-candidate-filtering-expected.txt: Added.
• http/wpt/webrtc/third-party-frame-ice-candidate-filtering.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/wpt/webrtc (added)
• LayoutTests/http/wpt/webrtc/resources (added)
• LayoutTests/http/wpt/webrtc/resources/third-party-frame-ice-candidate-filtering-iframe.html (added)
• LayoutTests/http/wpt/webrtc/third-party-frame-ice-candidate-filtering-expected.txt (added)
• LayoutTests/http/wpt/webrtc/third-party-frame-ice-candidate-filtering.html (added)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCController.cpp (modified) (4 diffs)
• Source/WebCore/Modules/mediastream/RTCController.h (modified) (2 diffs)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (modified) (1 diff)
• Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (modified) (1 diff)
• Source/WebCore/page/Page.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-01-11  Youenn Fablet  <youenn@apple.com>
+
+        RTCController should disable ICE candidate filtering in case of getUserMedia based on the RTCPerrConnection origin
+        https://bugs.webkit.org/show_bug.cgi?id=180851
+
+        Reviewed by Eric Carlson.
+
+        * http/wpt/webrtc/resources/third-party-frame-ice-candidate-filtering-iframe.html: Added.
+        * http/wpt/webrtc/third-party-frame-ice-candidate-filtering-expected.txt: Added.
+        * http/wpt/webrtc/third-party-frame-ice-candidate-filtering.html: Added.
+
 2018-01-11  Ali Juma  <ajuma@chromium.org>
 

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -131 +131 @@
 webrtc [ Skip ]
 http/tests/webrtc [ Skip ]
+http/wpt/webrtc [ Skip ]
 webrtc/datachannel [ Pass ]
 webrtc/datachannel/bufferedAmountLowThreshold.html [ Pass Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-11  Youenn Fablet  <youenn@apple.com>
+
+        RTCController should disable ICE candidate filtering in case of getUserMedia based on the RTCPerrConnection origin
+        https://bugs.webkit.org/show_bug.cgi?id=180851
+
+        Reviewed by Eric Carlson.
+
+        Test: http/wpt/webrtc/third-party-frame-ice-candidate-filtering.html
+
+        RTCController now stores all the client origins (top+frame origins) of frames that got access to camera/microphone access.
+        For any such client origin, PeerConnection objects ICE candidate filtering is disabled.
+        ICE candidate filtering is reset whenever navigating/reloading the page.
+
+        * Modules/mediastream/RTCController.cpp:
+        (WebCore::RTCController::reset):
+        (WebCore::matchDocumentOrigin):
+        (WebCore::RTCController::shouldDisableICECandidateFiltering):
+        (WebCore::RTCController::add):
+        (WebCore::RTCController::disableICECandidateFilteringForAllOrigins):
+        (WebCore::RTCController::disableICECandidateFiltering):
+        (WebCore::RTCController::enableICECandidateFiltering):
+        * Modules/mediastream/RTCController.h:
+        * Modules/mediastream/RTCPeerConnection.cpp:
+        (WebCore::RTCPeerConnection::create):
+        * Modules/mediastream/UserMediaRequest.cpp:
+        (WebCore::UserMediaRequest::allow):
+        * page/Page.cpp:
+        (WebCore::Page::disableICECandidateFiltering):
+        * testing/Internals.cpp:
+        (WebCore::Internals::setICECandidateFiltering):
+
 2018-01-11  Ali Juma  <ajuma@chromium.org>
 

trunk/Source/WebCore/Modules/mediastream/RTCController.cpp

@@ -45 +45 @@
         connection.clearController();
     m_peerConnections.clear();
+    m_filteringDisabledOrigins.clear();
 }
 
@@ -54 +55 @@
 }
 
+static inline bool matchDocumentOrigin(Document& document, SecurityOrigin& topOrigin, SecurityOrigin& clientOrigin)
+{
+    if (originsMatch(topOrigin, document.securityOrigin()))
+        return true;
+    return originsMatch(topOrigin, document.topOrigin()) && originsMatch(clientOrigin, document.securityOrigin());
+}
+
+bool RTCController::shouldDisableICECandidateFiltering(Document& document)
+{
+    if (!m_shouldFilterICECandidates)
+        return true;
+    return notFound != m_filteringDisabledOrigins.findMatching([&] (const auto& origin) {
+        return matchDocumentOrigin(document, origin.topOrigin, origin.clientOrigin);
+    });
+}
+
 void RTCController::add(RTCPeerConnection& connection)
 {
     m_peerConnections.append(connection);
-    if (!m_shouldFilterICECandidates)
+    if (shouldDisableICECandidateFiltering(downcast<Document>(*connection.scriptExecutionContext())))
         connection.disableICECandidateFiltering();
 }
 
-void RTCController::disableICECandidateFiltering()
+void RTCController::disableICECandidateFilteringForAllOrigins()
 {
     if (!LibWebRTCProvider::webRTCAvailable())
@@ -71 +88 @@
 }
 
+void RTCController::disableICECandidateFilteringForDocument(Document& document)
+{
+    if (!LibWebRTCProvider::webRTCAvailable())
+        return;
+
+    m_filteringDisabledOrigins.append(PeerConnectionOrigin { document.topOrigin(), document.securityOrigin() });
+    for (RTCPeerConnection& connection : m_peerConnections) {
+        if (auto* peerConnectionDocument = downcast<Document>(connection.scriptExecutionContext())) {
+            if (matchDocumentOrigin(*peerConnectionDocument, document.topOrigin(), document.securityOrigin()))
+                connection.disableICECandidateFiltering();
+        }
+    }
+}
+
 void RTCController::enableICECandidateFiltering()
 {
@@ -76 +107 @@
         return;
 
+    m_filteringDisabledOrigins.clear();
     m_shouldFilterICECandidates = true;
     for (RTCPeerConnection& connection : m_peerConnections)

trunk/Source/WebCore/Modules/mediastream/RTCController.h

@@ -25 +25 @@
 #pragma once
 
+#include "SecurityOrigin.h"
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
+class Document;
 class RTCPeerConnection;
 
@@ -43 +45 @@
     void remove(RTCPeerConnection&);
 
-    WEBCORE_EXPORT void disableICECandidateFiltering();
+    WEBCORE_EXPORT void disableICECandidateFilteringForAllOrigins();
+    WEBCORE_EXPORT void disableICECandidateFilteringForDocument(Document&);
     WEBCORE_EXPORT void enableICECandidateFiltering();
 
 private:
+
+    bool shouldDisableICECandidateFiltering(Document&);
+
+    struct PeerConnectionOrigin {
+        Ref<SecurityOrigin> topOrigin;
+        Ref<SecurityOrigin> clientOrigin;
+    };
+    Vector<PeerConnectionOrigin> m_filteringDisabledOrigins;
     Vector<std::reference_wrapper<RTCPeerConnection>> m_peerConnections;
     bool m_shouldFilterICECandidates { true };

trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp

@@ -70 +70 @@
     if (!peerConnection->isClosed()) {
         peerConnection->setPendingActivity(peerConnection.ptr());
-
-        // ICE candidate filtering can only be disabled for connections from documents that have the same origin as the top document,
-        // or if the page was set to disable it.
-        auto& document = downcast<Document>(context);
-        auto* page = document.page();
-        if (page && (!page->shouldEnableICECandidateFilteringByDefault() || document.origin() == document.topDocument().origin()))
+        if (auto* page = downcast<Document>(context).page())
             peerConnection->registerToController(page->rtcController());
     }

trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp

@@ -252 +252 @@
 
 #if ENABLE(WEB_RTC)
-    auto* page = downcast<Document>(*m_scriptExecutionContext).page();
-    if (page)
-        page->rtcController().disableICECandidateFiltering();
+    auto& document = downcast<Document>(*m_scriptExecutionContext);
+    if (auto* page = document.page())
+        page->rtcController().disableICECandidateFilteringForDocument(document);
 #endif
 }

trunk/Source/WebCore/page/Page.cpp

@@ -2331 +2331 @@
     m_shouldEnableICECandidateFilteringByDefault = false;
 #if ENABLE(WEB_RTC)
-    m_rtcController.disableICECandidateFiltering();
+    m_rtcController.disableICECandidateFilteringForAllOrigins();
 #endif
 }

trunk/Source/WebCore/testing/Internals.cpp

@@ -1317 +1317 @@
         rtcController.enableICECandidateFiltering();
     else
-        rtcController.disableICECandidateFiltering();
+        rtcController.disableICECandidateFilteringForAllOrigins();
 }