<!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>[237643] 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/237643">237643</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2018-10-31 10:26:49 -0700 (Wed, 31 Oct 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>[MediaStream] Don't reveal device IDs until the user has granted permission to capture
https://bugs.webkit.org/show_bug.cgi?id=191112
<rdar://problem/45699932>

Reviewed by Youenn Fablet.

Source/WebCore:

No new tests, existing tests updated.

* Modules/mediastream/MediaDevicesRequest.cpp:
(WebCore::MediaDevicesRequest::start): Don't reveal device ID or group ID until the user
has granted permssion to capture.

LayoutTests:

* TestExpectations: Skip http/tests/media/media-stream/enumerate-devices-source-id-persistent.html
and http/tests/media/media-stream/enumerate-devices-source-id.html for now, they don't make sense
with these changes and will be updated to pass in a future patch.
* fast/mediastream/MediaStreamTrack-getCapabilities.html:
* fast/mediastream/get-user-media-device-id-expected.txt:
* fast/mediastream/get-user-media-device-id.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamTrackgetCapabilitieshtml">trunk/LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamgetusermediadeviceidexpectedtxt">trunk/LayoutTests/fast/mediastream/get-user-media-device-id-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamgetusermediadeviceidhtml">trunk/LayoutTests/fast/mediastream/get-user-media-device-id.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaDevicesRequestcpp">trunk/Source/WebCore/Modules/mediastream/MediaDevicesRequest.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (237642 => 237643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2018-10-31 17:19:27 UTC (rev 237642)
+++ trunk/LayoutTests/ChangeLog 2018-10-31 17:26:49 UTC (rev 237643)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2018-10-31  Eric Carlson  <eric.carlson@apple.com>
+
+        [MediaStream] Don't reveal device IDs until the user has granted permission to capture
+        https://bugs.webkit.org/show_bug.cgi?id=191112
+        <rdar://problem/45699932>
+
+        Reviewed by Youenn Fablet.
+
+        * TestExpectations: Skip http/tests/media/media-stream/enumerate-devices-source-id-persistent.html
+        and http/tests/media/media-stream/enumerate-devices-source-id.html for now, they don't make sense
+        with these changes and will be updated to pass in a future patch.
+        * fast/mediastream/MediaStreamTrack-getCapabilities.html:
+        * fast/mediastream/get-user-media-device-id-expected.txt:
+        * fast/mediastream/get-user-media-device-id.html:
+
</ins><span class="cx"> 2018-10-31  YUHAN WU  <yuhan_wu@apple.com>
</span><span class="cx"> 
</span><span class="cx">         MediaRecorder should fire dataavailable event when all tracks are ended and stop() is called
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (237642 => 237643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations       2018-10-31 17:19:27 UTC (rev 237642)
+++ trunk/LayoutTests/TestExpectations  2018-10-31 17:26:49 UTC (rev 237643)
</span><span class="lines">@@ -2904,3 +2904,7 @@
</span><span class="cx"> fast/mediacapturefromelement/CanvasCaptureMediaStream-imagebitmaprenderingcontext.html [ Skip ]
</span><span class="cx"> fast/mediacapturefromelement/CanvasCaptureMediaStream-framerate-0.html [ Skip ]
</span><span class="cx"> fast/mediacapturefromelement/CanvasCaptureMediaStream-capture-out-of-DOM-element.html [ Skip ]
</span><ins>+
+# FIXME: The behavior of navigator.mediaDevices.enumerateDevices is in flux, skip these tests for now.
+http/tests/media/media-stream/enumerate-devices-source-id-persistent.html [ Skip ]
+http/tests/media/media-stream/enumerate-devices-source-id.html [ Skip ]
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamTrackgetCapabilitieshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities.html (237642 => 237643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities.html 2018-10-31 17:19:27 UTC (rev 237642)
+++ trunk/LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities.html    2018-10-31 17:26:49 UTC (rev 237643)
</span><span class="lines">@@ -2,11 +2,13 @@
</span><span class="cx"> <html>
</span><span class="cx">     <head>
</span><span class="cx">         <script src="../../resources/js-test-pre.js"></script>
</span><del>-        <script src="./resources/getUserMedia-helper.js"></script>
</del><span class="cx">         <script>
</span><span class="cx">             var mediaStream;
</span><span class="cx">             var devices;
</span><span class="cx"> 
</span><ins>+            if (window.testRunner)
+                testRunner.setUserMediaPermission(true);
+
</ins><span class="cx">             function limitPrecision(value, precision)
</span><span class="cx">             {
</span><span class="cx">                 if (typeof value === "string")
</span><span class="lines">@@ -80,16 +82,16 @@
</span><span class="cx">                 finishJSTest();
</span><span class="cx">             }
</span><span class="cx"> 
</span><del>-            function start()
</del><ins>+            async function start()
</ins><span class="cx">             {
</span><span class="cx">                 description("Tests MediaStreamTrack.getCapabilities.");
</span><del>-                navigator.mediaDevices.enumerateDevices().then(deviceInfoArray => {
-                    devices = deviceInfoArray;
-                    getUserMedia("allow", {audio:true, video:true}, gotStream);
-                }, e => {
-                    testFailed('enumerateDevices failed:' + e);
-                    finishJSTest();
-                });
</del><ins>+
+                mediaStream = await navigator.mediaDevices.getUserMedia({ audio:true, video:true });
+                devices = await navigator.mediaDevices.enumerateDevices();
+
+                listTrackProperties(mediaStream.getVideoTracks()[0]);
+                listTrackProperties(mediaStream.getAudioTracks()[0]);
+                finishJSTest();
</ins><span class="cx">             }
</span><span class="cx"> 
</span><span class="cx">             window.jsTestIsAsync = true;
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamgetusermediadeviceidexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/get-user-media-device-id-expected.txt (237642 => 237643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/get-user-media-device-id-expected.txt 2018-10-31 17:19:27 UTC (rev 237642)
+++ trunk/LayoutTests/fast/mediastream/get-user-media-device-id-expected.txt    2018-10-31 17:26:49 UTC (rev 237643)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> 
</span><ins>+PASS Device IDs should be empty initially 
</ins><span class="cx"> PASS Collect device IDs 
</span><span class="cx"> PASS Pass device IDs as exact constraints 
</span><span class="cx"> PASS Pass device IDs as optional constraints 
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamgetusermediadeviceidhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/get-user-media-device-id.html (237642 => 237643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/get-user-media-device-id.html 2018-10-31 17:19:27 UTC (rev 237642)
+++ trunk/LayoutTests/fast/mediastream/get-user-media-device-id.html    2018-10-31 17:26:49 UTC (rev 237643)
</span><span class="lines">@@ -15,12 +15,23 @@
</span><span class="cx">         return navigator.mediaDevices.enumerateDevices()
</span><span class="cx">             .then((devices) => {
</span><span class="cx">                 devices.forEach((device) => {
</span><ins>+                    assert_true(device.deviceId.length == 0 , "device.deviceId is empty before permission to capture");
+                });
+            });
+    }, "Device IDs should be empty initially");
+    
+    promise_test((test) => {
+        return navigator.mediaDevices.getUserMedia({ audio:true, video:true })
+            .then((stream) => {
+                return navigator.mediaDevices.enumerateDevices();
+            }).then(devices => {
+                devices.forEach((device) => {
</ins><span class="cx">                     let kind = device.kind == "audioinput" ? "audio" : "video";
</span><span class="cx">                     deviceIds.push({ type: kind, id : device.deviceId});
</span><span class="cx">                 });
</span><span class="cx">             });
</span><span class="cx">     }, "Collect device IDs");
</span><del>-    
</del><ins>+
</ins><span class="cx">     let constraints = { };
</span><span class="cx"> 
</span><span class="cx">     promise_test((test) => {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (237642 => 237643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-10-31 17:19:27 UTC (rev 237642)
+++ trunk/Source/WebCore/ChangeLog      2018-10-31 17:26:49 UTC (rev 237643)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2018-10-31  Eric Carlson  <eric.carlson@apple.com>
+
+        [MediaStream] Don't reveal device IDs until the user has granted permission to capture
+        https://bugs.webkit.org/show_bug.cgi?id=191112
+        <rdar://problem/45699932>
+
+        Reviewed by Youenn Fablet.
+
+        No new tests, existing tests updated.
+
+        * Modules/mediastream/MediaDevicesRequest.cpp:
+        (WebCore::MediaDevicesRequest::start): Don't reveal device ID or group ID until the user 
+        has granted permssion to capture.
+
</ins><span class="cx"> 2018-10-31  YUHAN WU  <yuhan_wu@apple.com>
</span><span class="cx"> 
</span><span class="cx">         MediaRecorder should fire dataavailable event when all tracks are ended and stop() is called
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaDevicesRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaDevicesRequest.cpp (237642 => 237643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaDevicesRequest.cpp 2018-10-31 17:19:27 UTC (rev 237642)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDevicesRequest.cpp    2018-10-31 17:26:49 UTC (rev 237643)
</span><span class="lines">@@ -115,21 +115,24 @@
</span><span class="cx">         document.setDeviceIDHashSalt(deviceIdentifierHashSalt);
</span><span class="cx"> 
</span><span class="cx">         Vector<Ref<MediaDeviceInfo>> devices;
</span><ins>+        bool revealIdsAndLabels = originHasPersistentAccess || document.hasHadCaptureMediaStreamTrack();
</ins><span class="cx">         for (auto& deviceInfo : captureDevices) {
</span><span class="cx">             auto label = emptyString();
</span><del>-            if (originHasPersistentAccess || document.hasHadCaptureMediaStreamTrack())
</del><ins>+            auto id = emptyString();
+            auto groupId = emptyString();
+            if (revealIdsAndLabels) {
</ins><span class="cx">                 label = deviceInfo.label();
</span><ins>+                id = RealtimeMediaSourceCenter::singleton().hashStringWithSalt(deviceInfo.persistentId(), deviceIdentifierHashSalt);
+                if (id.isEmpty())
+                    continue;
+                groupId = RealtimeMediaSourceCenter::singleton().hashStringWithSalt(deviceInfo.groupId(), deviceIdentifierHashSalt);
+            }
</ins><span class="cx"> 
</span><del>-            auto id = RealtimeMediaSourceCenter::singleton().hashStringWithSalt(deviceInfo.persistentId(), deviceIdentifierHashSalt);
-            if (id.isEmpty())
-                continue;
-
-            auto groupId = RealtimeMediaSourceCenter::singleton().hashStringWithSalt(deviceInfo.groupId(), deviceIdentifierHashSalt);
</del><span class="cx">             auto deviceType = deviceInfo.type() == CaptureDevice::DeviceType::Microphone ? MediaDeviceInfo::Kind::Audioinput : MediaDeviceInfo::Kind::Videoinput;
</span><span class="cx">             devices.append(MediaDeviceInfo::create(scriptExecutionContext(), label, id, groupId, deviceType));
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (!originHasPersistentAccess && !document.hasHadCaptureMediaStreamTrack())
</del><ins>+        if (!revealIdsAndLabels)
</ins><span class="cx">             filterDeviceList(devices);
</span><span class="cx"> 
</span><span class="cx">         callOnMainThread([protectedThis = makeRef(*this), devices = WTFMove(devices)]() mutable {
</span></span></pre>
</div>
</div>

</body>
</html>