<!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>[202628] 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/202628">202628</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-29 10:36:33 -0700 (Wed, 29 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebRTC: ice-char can not contain '=' characters for credentials
https://bugs.webkit.org/show_bug.cgi?id=159207
Patch by Alejandro G. Castro <alex@igalia.com> on 2016-06-29
Reviewed by Eric Carlson.
Source/WebCore:
Avoid a general calculation to get a base64 without padding which
was wrong in the randomString function. Because each parameter
using the function requires a different setup depending of the
specification and this is not a general API, it is a better
solution to calculate and store the sizes we want to use, comment
them and test them, considering we use base64 to generate the
strings we just need to avoid padding.
Existing test modified to match the correct behavior.
* Modules/mediastream/MediaEndpointPeerConnection.cpp:
(WebCore::randomString): Now the size is the one passed.
(WebCore::MediaEndpointPeerConnection::MediaEndpointPeerConnection):
Used different valid values following the sdp parser in each case.
LayoutTests:
Modified the parser to make the regexp similar to the one we have
in WebCore.
* fast/mediastream/resources/sdp-utils.js:
(printComparableSessionDescription):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamresourcessdputilsjs">trunk/LayoutTests/fast/mediastream/resources/sdp-utils.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202627 => 202628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-29 16:53:25 UTC (rev 202627)
+++ trunk/LayoutTests/ChangeLog 2016-06-29 17:36:33 UTC (rev 202628)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-06-29 Alejandro G. Castro <alex@igalia.com>
+
+ WebRTC: ice-char can not contain '=' characters for credentials
+ https://bugs.webkit.org/show_bug.cgi?id=159207
+
+ Reviewed by Eric Carlson.
+
+ Modified the parser to make the regexp similar to the one we have
+ in WebCore.
+
+ * fast/mediastream/resources/sdp-utils.js:
+ (printComparableSessionDescription):
+
</ins><span class="cx"> 2016-06-29 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when 'input' event handler for input[type=color] changes the input type
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamresourcessdputilsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/resources/sdp-utils.js (202627 => 202628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/resources/sdp-utils.js 2016-06-29 16:53:25 UTC (rev 202627)
+++ trunk/LayoutTests/fast/mediastream/resources/sdp-utils.js 2016-06-29 17:36:33 UTC (rev 202628)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> "mid": "^a=mid:([!#$%&'*+-.\\w]*).*$",
</span><span class="cx"> "msid": "^a=(ssrc:\\d+ )?msid:([\\w+/\\-=]+) +([\\w+/\\-=]+).*$",
</span><span class="cx"> "iceufrag": "^a=ice-ufrag:([\\w+/]*).*$",
</span><del>- "icepwd": "^a=ice-pwd:([\\w+/]*=*).*$",
</del><ins>+ "icepwd": "^a=ice-pwd:([\\w+/]*).*$",
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> var mdescIndex = -1;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202627 => 202628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-29 16:53:25 UTC (rev 202627)
+++ trunk/Source/WebCore/ChangeLog 2016-06-29 17:36:33 UTC (rev 202628)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-06-29 Alejandro G. Castro <alex@igalia.com>
+
+ WebRTC: ice-char can not contain '=' characters for credentials
+ https://bugs.webkit.org/show_bug.cgi?id=159207
+
+ Reviewed by Eric Carlson.
+
+ Avoid a general calculation to get a base64 without padding which
+ was wrong in the randomString function. Because each parameter
+ using the function requires a different setup depending of the
+ specification and this is not a general API, it is a better
+ solution to calculate and store the sizes we want to use, comment
+ them and test them, considering we use base64 to generate the
+ strings we just need to avoid padding.
+
+ Existing test modified to match the correct behavior.
+
+ * Modules/mediastream/MediaEndpointPeerConnection.cpp:
+ (WebCore::randomString): Now the size is the one passed.
+ (WebCore::MediaEndpointPeerConnection::MediaEndpointPeerConnection):
+ Used different valid values following the sdp parser in each case.
+
</ins><span class="cx"> 2016-06-29 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when 'input' event handler for input[type=color] changes the input type
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp (202627 => 202628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2016-06-29 16:53:25 UTC (rev 202627)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2016-06-29 17:36:33 UTC (rev 202628)
</span><span class="lines">@@ -53,6 +53,13 @@
</span><span class="cx"> using namespace PeerConnection;
</span><span class="cx"> using namespace PeerConnectionStates;
</span><span class="cx">
</span><ins>+// We use base64 to generate the random strings so we need a size that avoids padding to get ice-chars.
+static const size_t cnameSize = 18;
+// Size range from 4 to 256 ice-chars defined in RFC 5245.
+static const size_t iceUfragSize = 6;
+// Size range from 22 to 256 ice-chars defined in RFC 5245.
+static const size_t icePasswordSize = 24;
+
</ins><span class="cx"> static std::unique_ptr<PeerConnectionBackend> createMediaEndpointPeerConnection(PeerConnectionBackendClient* client)
</span><span class="cx"> {
</span><span class="cx"> return std::unique_ptr<PeerConnectionBackend>(new MediaEndpointPeerConnection(client));
</span><span class="lines">@@ -60,9 +67,8 @@
</span><span class="cx">
</span><span class="cx"> CreatePeerConnectionBackend PeerConnectionBackend::create = createMediaEndpointPeerConnection;
</span><span class="cx">
</span><del>-static String randomString(size_t length)
</del><ins>+static String randomString(size_t size)
</ins><span class="cx"> {
</span><del>- const size_t size = ceil(length * 3 / 4);
</del><span class="cx"> unsigned char randomValues[size];
</span><span class="cx"> cryptographicallyRandomValues(randomValues, size);
</span><span class="cx"> return base64Encode(randomValues, size);
</span><span class="lines">@@ -72,9 +78,9 @@
</span><span class="cx"> : m_client(client)
</span><span class="cx"> , m_mediaEndpoint(MediaEndpoint::create(*this))
</span><span class="cx"> , m_sdpProcessor(std::unique_ptr<SDPProcessor>(new SDPProcessor(m_client->scriptExecutionContext())))
</span><del>- , m_cname(randomString(16))
- , m_iceUfrag(randomString(4))
- , m_icePassword(randomString(22))
</del><ins>+ , m_cname(randomString(cnameSize))
+ , m_iceUfrag(randomString(iceUfragSize))
+ , m_icePassword(randomString(icePasswordSize))
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_mediaEndpoint);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>