<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213283] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213283">213283</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-02 08:24:30 -0800 (Thu, 02 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC] Activate ICE candidate privacy policy
https://bugs.webkit.org/show_bug.cgi?id=168975
Patch by Youenn Fablet <youenn@apple.com> on 2017-03-02
Reviewed by Alex Christensen.
Source/WebCore:
Test: webrtc/datachannel/filter-ice-candidate.html
* testing/Internals.cpp:
(WebCore::Internals::Internals): Disabling ICE candidate filtering by default for rwt.
(WebCore::Internals::setICECandidateFiltering):
* testing/Internals.h:
* testing/Internals.idl:
Source/WebKit/mac:
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(-[WebPreferences enumeratingAllNetworkInterfacesEnabled]):
(-[WebPreferences setEnumeratingAllNetworkInterfacesEnabled:]):
(-[WebPreferences iceCandidateFilteringEnabled]):
(-[WebPreferences setIceCandidateFilteringEnabled:]):
* WebView/WebPreferencesPrivate.h:
Source/WebKit2:
Disabling network enumeration by default.
Enabling ICE candidate filtering by default.
Chaning ICE candidate filtering according userMediaAccess policy:
- If access is denied, filtering is on.
- If access is granted, filtering is off.
* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::encode):
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageCreationParameters.h:
* Shared/WebPreferencesDefinitions.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetICECandidateFilteringEnabled):
(WKPreferencesGetICECandidateFilteringEnabled):
(WKPreferencesSetEnumeratingAllNetworkInterfacesEnabled):
(WKPreferencesGetEnumeratingAllNetworkInterfacesEnabled):
* UIProcess/API/C/WKPreferencesRefPrivate.h:
* UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
(WebKit::toWebCore):
(WebKit::UserMediaPermissionRequestManagerProxy::userMediaAccessWasGranted):
* UIProcess/UserMediaProcessManager.cpp:
(WebKit::UserMediaProcessManager::willCreateMediaStream):
(WebKit::UserMediaProcessManager::endedCaptureSession):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::creationParameters):
* WebProcess/WebPage/WebPage.cpp:
LayoutTests:
* webrtc/datachannel/filter-ice-candidate-expected.txt: Added.
* webrtc/datachannel/filter-ice-candidate.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParameterscpp">trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParametersh">trunk/Source/WebKit2/Shared/WebPageCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencescpp">trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserMediaPermissionRequestManagerProxycpp">trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserMediaProcessManagercpp">trunk/Source/WebKit2/UIProcess/UserMediaProcessManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestswebrtcdatachannelfiltericecandidateexpectedtxt">trunk/LayoutTests/webrtc/datachannel/filter-ice-candidate-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebrtcdatachannelfiltericecandidatehtml">trunk/LayoutTests/webrtc/datachannel/filter-ice-candidate.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/LayoutTests/ChangeLog 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2017-03-02 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><ins>+ [WebRTC] Activate ICE candidate privacy policy
+ https://bugs.webkit.org/show_bug.cgi?id=168975
+
+ Reviewed by Alex Christensen.
+
+ * webrtc/datachannel/filter-ice-candidate-expected.txt: Added.
+ * webrtc/datachannel/filter-ice-candidate.html: Added.
+
+2017-03-02 Youenn Fablet <youenn@apple.com>
+
</ins><span class="cx"> Activate some new webrtc tests
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=168850
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcdatachannelfiltericecandidateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webrtc/datachannel/filter-ice-candidate-expected.txt (0 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/datachannel/filter-ice-candidate-expected.txt (rev 0)
+++ trunk/LayoutTests/webrtc/datachannel/filter-ice-candidate-expected.txt 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+
+PASS Gathering ICE candidates from a data channel peer connection with ICE candidate filtering off
+PASS Gathering ICE candidates from a data channel peer connection with ICE candidate filtering on
+
</ins></span></pre></div>
<a id="trunkLayoutTestswebrtcdatachannelfiltericecandidatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webrtc/datachannel/filter-ice-candidate.html (0 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/datachannel/filter-ice-candidate.html (rev 0)
+++ trunk/LayoutTests/webrtc/datachannel/filter-ice-candidate.html 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>Testing ICE candidate filtering when using data channel</title>
+ <script src="../../resources/testharness.js"></script>
+ <script src="../../resources/testharnessreport.js"></script>
+ </head>
+ <body>
+ <script>
+promise_test(function() {
+ return new Promise((resolve, reject) => {
+ var counter = 0;
+ if (window.internals) {
+ internals.useMockRTCPeerConnectionFactory("OneRealPeerConnection");
+ internals.setICECandidateFiltering(false);
+ }
+ var pc = new RTCPeerConnection();
+ pc.createDataChannel('sendDataChannel');
+ pc.onicecandidate = (event) => {
+ if (event.candidate) {
+ counter++;
+ return;
+ }
+ if (counter !== 0)
+ resolve();
+ else
+ reject("Host candidates should be found");
+ if (window.internals)
+ internals.setICECandidateFiltering(true);
+ resolve();
+ };
+ pc.createOffer().then((offer) => { pc.setLocalDescription(offer); });
+ })
+}, "Gathering ICE candidates from a data channel peer connection with ICE candidate filtering off");
+
+promise_test(function() {
+ return new Promise((resolve, reject) => {
+ if (window.internals)
+ internals.useMockRTCPeerConnectionFactory("OneRealPeerConnection");
+ var counter = 0;
+ if (window.internals)
+ internals.useMockRTCPeerConnectionFactory("OneRealPeerConnection");
+ var pc = new RTCPeerConnection();
+ pc.createDataChannel('sendDataChannel');
+ pc.onicecandidate = (event) => {
+ if (event.candidate) {
+ counter++;
+ return;
+ }
+ if (counter === 0)
+ resolve();
+ else
+ reject("No candidate should be found");
+ };
+ pc.createOffer().then((offer) => { pc.setLocalDescription(offer); });
+ });
+}, "Gathering ICE candidates from a data channel peer connection with ICE candidate filtering on");
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/Source/WebCore/ChangeLog 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-02 Youenn Fablet <youenn@apple.com>
+
+ [WebRTC] Activate ICE candidate privacy policy
+ https://bugs.webkit.org/show_bug.cgi?id=168975
+
+ Reviewed by Alex Christensen.
+
+ Test: webrtc/datachannel/filter-ice-candidate.html
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::Internals): Disabling ICE candidate filtering by default for rwt.
+ (WebCore::Internals::setICECandidateFiltering):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2017-03-02 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] UIClient may not be notified of capture state change when leaving a page
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/Source/WebCore/testing/Internals.cpp 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -460,7 +460,13 @@
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx"> enableMockMediaEndpoint();
</span><span class="cx"> useMockRTCPeerConnectionFactory(String());
</span><ins>+#if USE(LIBWEBRTC)
+ if (document.page()) {
+ document.page()->libWebRTCProvider().enableEnumeratingAllNetworkInterfaces();
+ document.page()->rtcController().disableICECandidateFiltering();
+ }
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> if (document.page())
</span><span class="lines">@@ -1166,6 +1172,19 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Internals::setICECandidateFiltering(bool enabled)
+{
+ Document* document = contextDocument();
+ auto* page = document->page();
+ if (!page)
+ return;
+ auto& rtcController = page->rtcController();
+ if (enabled)
+ rtcController.enableICECandidateFiltering();
+ else
+ rtcController.disableICECandidateFiltering();
+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/Source/WebCore/testing/Internals.h 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -398,6 +398,7 @@
</span><span class="cx"> void enableMockMediaEndpoint();
</span><span class="cx"> void emulateRTCPeerConnectionPlatformEvent(RTCPeerConnection&, const String& action);
</span><span class="cx"> void useMockRTCPeerConnectionFactory(const String&);
</span><ins>+ void setICECandidateFiltering(bool);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> String getImageSourceURL(Element&);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/Source/WebCore/testing/Internals.idl 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -441,8 +441,10 @@
</span><span class="cx"> [Conditional=WIRELESS_PLAYBACK_TARGET] void setMockMediaPlaybackTargetPickerEnabled(boolean enabled);
</span><span class="cx"> [Conditional=WIRELESS_PLAYBACK_TARGET, MayThrowException] void setMockMediaPlaybackTargetPickerState(DOMString deviceName, DOMString deviceState);
</span><span class="cx"> [Conditional=MEDIA_STREAM] void setMockMediaCaptureDevicesEnabled(boolean enabled);
</span><ins>+
</ins><span class="cx"> [Conditional=WEB_RTC] void emulateRTCPeerConnectionPlatformEvent(RTCPeerConnection connection, DOMString action);
</span><span class="cx"> [Conditional=WEB_RTC] void useMockRTCPeerConnectionFactory(DOMString testCase);
</span><ins>+ [Conditional=WEB_RTC] void setICECandidateFiltering(boolean enabled);
</ins><span class="cx">
</span><span class="cx"> [Conditional=VIDEO] void simulateSystemSleep();
</span><span class="cx"> [Conditional=VIDEO] void simulateSystemWake();
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-02 Youenn Fablet <youenn@apple.com>
+
+ [WebRTC] Activate ICE candidate privacy policy
+ https://bugs.webkit.org/show_bug.cgi?id=168975
+
+ Reviewed by Alex Christensen.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (-[WebPreferences enumeratingAllNetworkInterfacesEnabled]):
+ (-[WebPreferences setEnumeratingAllNetworkInterfacesEnabled:]):
+ (-[WebPreferences iceCandidateFilteringEnabled]):
+ (-[WebPreferences setIceCandidateFilteringEnabled:]):
+ * WebView/WebPreferencesPrivate.h:
+
</ins><span class="cx"> 2017-03-01 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r213259.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -221,6 +221,8 @@
</span><span class="cx"> #define WebKitEnableInheritURIQueryComponentPreferenceKey @"WebKitEnableInheritURIQueryComponent"
</span><span class="cx"> #define WebKitMediaDataLoadsAutomaticallyPreferenceKey @"WebKitMediaDataLoadsAutomatically"
</span><span class="cx"> #define WebKitMockCaptureDevicesEnabledPreferenceKey @"WebKitMockCaptureDevicesEnabled"
</span><ins>+#define WebKitEnumeratingAllNetworkInterfacesEnabledPreferenceKey @"WebKitEnumeratingAllNetworkInterfacesEnabled"
+#define WebKitICECandidateFilteringEnabledPreferenceKey @"WebKitICECandidateFilteringEnabled"
</ins><span class="cx"> #define WebKitMediaCaptureRequiresSecureConnectionPreferenceKey @"WebKitMediaCaptureRequiresSecureConnection"
</span><span class="cx"> #define WebKitAttachmentElementEnabledPreferenceKey @"WebKitAttachmentElementEnabled"
</span><span class="cx"> #define WebKitIntersectionObserverEnabledPreferenceKey @"WebKitIntersectionObserverEnabled"
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -2834,6 +2834,26 @@
</span><span class="cx"> [self _setBoolValue:flag forKey:WebKitMockCaptureDevicesEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)enumeratingAllNetworkInterfacesEnabled
+{
+ return [self _boolValueForKey:WebKitEnumeratingAllNetworkInterfacesEnabledPreferenceKey];
+}
+
+- (void)setEnumeratingAllNetworkInterfacesEnabled:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey:WebKitEnumeratingAllNetworkInterfacesEnabledPreferenceKey];
+}
+
+- (BOOL)iceCandidateFilteringEnabled
+{
+ return [self _boolValueForKey:WebKitICECandidateFilteringEnabledPreferenceKey];
+}
+
+- (void)setIceCandidateFilteringEnabled:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey:WebKitICECandidateFilteringEnabledPreferenceKey];
+}
+
</ins><span class="cx"> - (BOOL)mediaCaptureRequiresSecureConnection
</span><span class="cx"> {
</span><span class="cx"> return [self _boolValueForKey:WebKitMediaCaptureRequiresSecureConnectionPreferenceKey];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -496,6 +496,12 @@
</span><span class="cx"> - (void)setMockCaptureDevicesEnabled:(BOOL)flag;
</span><span class="cx"> - (BOOL)mockCaptureDevicesEnabled;
</span><span class="cx">
</span><ins>+- (void)setEnumeratingAllNetworkInterfacesEnabled:(BOOL)flag;
+- (BOOL)enumeratingAllNetworkInterfacesEnabled;
+
+- (void)setIceCandidateFilteringEnabled:(BOOL)flag;
+- (BOOL)iceCandidateFilteringEnabled;
+
</ins><span class="cx"> - (void)setMediaCaptureRequiresSecureConnection:(BOOL)flag;
</span><span class="cx"> - (BOOL)mediaCaptureRequiresSecureConnection;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2017-03-02 Youenn Fablet <youenn@apple.com>
+
+ [WebRTC] Activate ICE candidate privacy policy
+ https://bugs.webkit.org/show_bug.cgi?id=168975
+
+ Reviewed by Alex Christensen.
+
+ Disabling network enumeration by default.
+ Enabling ICE candidate filtering by default.
+ Chaning ICE candidate filtering according userMediaAccess policy:
+ - If access is denied, filtering is on.
+ - If access is granted, filtering is off.
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetICECandidateFilteringEnabled):
+ (WKPreferencesGetICECandidateFilteringEnabled):
+ (WKPreferencesSetEnumeratingAllNetworkInterfacesEnabled):
+ (WKPreferencesGetEnumeratingAllNetworkInterfacesEnabled):
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+ (WebKit::toWebCore):
+ (WebKit::UserMediaPermissionRequestManagerProxy::userMediaAccessWasGranted):
+ * UIProcess/UserMediaProcessManager.cpp:
+ (WebKit::UserMediaProcessManager::willCreateMediaStream):
+ (WebKit::UserMediaProcessManager::endedCaptureSession):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::creationParameters):
+ * WebProcess/WebPage/WebPage.cpp:
+
</ins><span class="cx"> 2017-03-02 Tomas Popela <tpopela@redhat.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Keyboard menu key should show context menu
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -94,9 +94,9 @@
</span><span class="cx"> encoder.encodeEnum(observedLayoutMilestones);
</span><span class="cx"> encoder << overrideContentSecurityPolicy;
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><del>- encoder << disableICECandidateFiltering;
</del><ins>+ encoder << iceCandidateFilteringEnabled;
</ins><span class="cx"> #if USE(LIBWEBRTC)
</span><del>- encoder << enableEnumeratingAllNetworkInterfaces;
</del><ins>+ encoder << enumeratingAllNetworkInterfacesEnabled;
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -222,10 +222,10 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><del>- if (!decoder.decode(parameters.disableICECandidateFiltering))
</del><ins>+ if (!decoder.decode(parameters.iceCandidateFilteringEnabled))
</ins><span class="cx"> return false;
</span><span class="cx"> #if USE(LIBWEBRTC)
</span><del>- if (!decoder.decode(parameters.enableEnumeratingAllNetworkInterfaces))
</del><ins>+ if (!decoder.decode(parameters.enumeratingAllNetworkInterfacesEnabled))
</ins><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.h (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -147,9 +147,9 @@
</span><span class="cx"> String overrideContentSecurityPolicy;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><del>- bool disableICECandidateFiltering { false };
</del><ins>+ bool iceCandidateFilteringEnabled { true };
</ins><span class="cx"> #if USE(LIBWEBRTC)
</span><del>- bool enableEnumeratingAllNetworkInterfaces { false };
</del><ins>+ bool enumeratingAllNetworkInterfacesEnabled { false };
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -225,6 +225,8 @@
</span><span class="cx"> macro(HTTPEquivEnabled, httpEquivEnabled, Bool, bool, true, "", "") \
</span><span class="cx"> macro(MockCaptureDevicesEnabled, mockCaptureDevicesEnabled, Bool, bool, false, "", "") \
</span><span class="cx"> macro(MediaCaptureRequiresSecureConnection, mediaCaptureRequiresSecureConnection, Bool, bool, true, "", "") \
</span><ins>+ macro(EnumeratingAllNetworkInterfacesEnabled, enumeratingAllNetworkInterfacesEnabled, Bool, bool, false, "", "") \
+ macro(ICECandidateFilteringEnabled, iceCandidateFilteringEnabled, Bool, bool, true, "", "") \
</ins><span class="cx"> macro(ShadowDOMEnabled, shadowDOMEnabled, Bool, bool, true, "Shadow DOM", "HTML Shadow DOM prototype") \
</span><span class="cx"> macro(FetchAPIEnabled, fetchAPIEnabled, Bool, bool, true, "", "") \
</span><span class="cx"> macro(DownloadAttributeEnabled, downloadAttributeEnabled, Bool, bool, true, "", "") \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -1541,6 +1541,26 @@
</span><span class="cx"> return toImpl(preferencesRef)->mockCaptureDevicesEnabled();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKPreferencesSetICECandidateFilteringEnabled(WKPreferencesRef preferencesRef, bool enabled)
+{
+ toImpl(preferencesRef)->setICECandidateFilteringEnabled(enabled);
+}
+
+bool WKPreferencesGetICECandidateFilteringEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->iceCandidateFilteringEnabled();
+}
+
+void WKPreferencesSetEnumeratingAllNetworkInterfacesEnabled(WKPreferencesRef preferencesRef, bool enabled)
+{
+ toImpl(preferencesRef)->setEnumeratingAllNetworkInterfacesEnabled(enabled);
+}
+
+bool WKPreferencesGetEnumeratingAllNetworkInterfacesEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->enumeratingAllNetworkInterfacesEnabled();
+}
+
</ins><span class="cx"> void WKPreferencesSetMediaCaptureRequiresSecureConnection(WKPreferencesRef preferencesRef, bool enabled)
</span><span class="cx"> {
</span><span class="cx"> toImpl(preferencesRef)->setMediaCaptureRequiresSecureConnection(enabled);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -422,6 +422,14 @@
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetMockCaptureDevicesEnabled(WKPreferencesRef);
</span><span class="cx">
</span><span class="cx"> // Defaults to true.
</span><ins>+WK_EXPORT void WKPreferencesSetICECandidateFilteringEnabled(WKPreferencesRef, bool);
+WK_EXPORT bool WKPreferencesGetICECandidateFilteringEnabled(WKPreferencesRef);
+
+// Defaults to false.
+WK_EXPORT void WKPreferencesSetEnumeratingAllNetworkInterfacesEnabled(WKPreferencesRef, bool);
+WK_EXPORT bool WKPreferencesGetEnumeratingAllNetworkInterfacesEnabled(WKPreferencesRef);
+
+// Defaults to true.
</ins><span class="cx"> WK_EXPORT void WKPreferencesSetMediaCaptureRequiresSecureConnection(WKPreferencesRef, bool);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetMediaCaptureRequiresSecureConnection(WKPreferencesRef);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserMediaPermissionRequestManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> return static_cast<uint64_t>(UserMediaRequest::MediaAccessDenialReason::OtherFailure);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return static_cast<uint64_t>(UserMediaRequest::MediaAccessDenialReason::OtherFailure);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserMediaProcessManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserMediaProcessManager.cpp (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserMediaProcessManager.cpp 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/Source/WebKit2/UIProcess/UserMediaProcessManager.cpp 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -128,6 +128,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned currentExtensions = state.sandboxExtensionsGranted();
</span><ins>+
+#if ENABLE(WEB_RTC) && USE(LIBWEBRTC)
+ if (currentExtensions == ProcessState::SandboxExtensionsGranted::None && (withAudio || withVideo))
+ proxy.page().process().send(Messages::WebPage::DisableICECandidateFiltering(), proxy.page().pageID());
+#endif
+
</ins><span class="cx"> if (!(requiredExtensions & currentExtensions)) {
</span><span class="cx"> SandboxExtension::HandleArray handles;
</span><span class="cx"> handles.allocate(extensionCount);
</span><span class="lines">@@ -192,6 +198,11 @@
</span><span class="cx"> if (params.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+#if ENABLE(WEB_RTC) && USE(LIBWEBRTC)
+ if (currentExtensions == ProcessState::SandboxExtensionsGranted::None && proxy.page().preferences().iceCandidateFilteringEnabled())
+ proxy.page().process().send(Messages::WebPage::EnableICECandidateFiltering(), proxy.page().pageID());
+#endif
+
</ins><span class="cx"> state.setSandboxExtensionsGranted(currentExtensions);
</span><span class="cx"> proxy.page().process().send(Messages::WebPage::RevokeUserMediaDeviceSandboxExtensions(params), proxy.page().pageID());
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -5571,11 +5571,9 @@
</span><span class="cx"> parameters.overrideContentSecurityPolicy = m_overrideContentSecurityPolicy;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><del>- // FIXME: We should tie ICE filtering with getUserMedia permission.
- parameters.disableICECandidateFiltering = true;
</del><ins>+ parameters.iceCandidateFilteringEnabled = m_preferences->iceCandidateFilteringEnabled();
</ins><span class="cx"> #if USE(LIBWEBRTC)
</span><del>- // FIXME: Turn down network interface enumeration by default.
- parameters.enableEnumeratingAllNetworkInterfaces = true;
</del><ins>+ parameters.enumeratingAllNetworkInterfacesEnabled = m_preferences->enumeratingAllNetworkInterfacesEnabled();
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (213282 => 213283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-03-02 16:05:53 UTC (rev 213282)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-03-02 16:24:30 UTC (rev 213283)
</span><span class="lines">@@ -553,10 +553,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><del>- if (parameters.disableICECandidateFiltering)
</del><ins>+ if (!parameters.iceCandidateFilteringEnabled)
</ins><span class="cx"> disableICECandidateFiltering();
</span><span class="cx"> #if USE(LIBWEBRTC)
</span><del>- if (parameters.enableEnumeratingAllNetworkInterfaces)
</del><ins>+ if (parameters.enumeratingAllNetworkInterfacesEnabled)
</ins><span class="cx"> enableEnumeratingAllNetworkInterfaces();
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>