<!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>[211429] 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/211429">211429</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2017-01-31 03:41:07 -0800 (Tue, 31 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EME] InitDataRegistry should use base64url encoding and decoding for keyids
https://bugs.webkit.org/show_bug.cgi?id=167592
Reviewed by Jer Noble.
Source/WebCore:
In InitDataRegistry, WTF::base64URLEncode() and WTF::base64URLDecode() should
be used to encode and decode the 'keyids' initialization data format, as
required by the relevant specification.
https://w3c.github.io/encrypted-media/format-registry/initdata/keyids.html#format
Relevant test case was added to media/encrypted-media/mock-MediaKeySession-generateRequest.html.
* Modules/encryptedmedia/InitDataRegistry.cpp:
(WebCore::extractKeyIDsKeyids):
(WebCore::sanitizeKeyids):
LayoutTests:
* media/encrypted-media/mock-MediaKeySession-generateRequest-expected.txt:
* media/encrypted-media/mock-MediaKeySession-generateRequest.html: Include a test case
that passes an init data JSON to generateRequest() that fails to decode when using the
plain base64 decoding algorithm. The test passes when base64url encoding and decoding
are used in InitDataRegistry.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediaencryptedmediamockMediaKeySessiongenerateRequestexpectedtxt">trunk/LayoutTests/media/encrypted-media/mock-MediaKeySession-generateRequest-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediaencryptedmediamockMediaKeySessiongenerateRequesthtml">trunk/LayoutTests/media/encrypted-media/mock-MediaKeySession-generateRequest.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaInitDataRegistrycpp">trunk/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211428 => 211429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-31 11:26:14 UTC (rev 211428)
+++ trunk/LayoutTests/ChangeLog 2017-01-31 11:41:07 UTC (rev 211429)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-01-31 Zan Dobersek <zdobersek@igalia.com>
+
+ [EME] InitDataRegistry should use base64url encoding and decoding for keyids
+ https://bugs.webkit.org/show_bug.cgi?id=167592
+
+ Reviewed by Jer Noble.
+
+ * media/encrypted-media/mock-MediaKeySession-generateRequest-expected.txt:
+ * media/encrypted-media/mock-MediaKeySession-generateRequest.html: Include a test case
+ that passes an init data JSON to generateRequest() that fails to decode when using the
+ plain base64 decoding algorithm. The test passes when base64url encoding and decoding
+ are used in InitDataRegistry.
+
</ins><span class="cx"> 2017-01-31 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Sierra WK1] LayoutTest media/modern-media-controls/placard-support/placard-support-pip.html is a flaky crash
</span></span></pre></div>
<a id="trunkLayoutTestsmediaencryptedmediamockMediaKeySessiongenerateRequestexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/encrypted-media/mock-MediaKeySession-generateRequest-expected.txt (211428 => 211429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/encrypted-media/mock-MediaKeySession-generateRequest-expected.txt 2017-01-31 11:26:14 UTC (rev 211428)
+++ trunk/LayoutTests/media/encrypted-media/mock-MediaKeySession-generateRequest-expected.txt 2017-01-31 11:41:07 UTC (rev 211429)
</span><span class="lines">@@ -37,5 +37,11 @@
</span><span class="cx"> RUN(mediaKeySession = mediaKeys.createSession("temporary"))
</span><span class="cx"> RUN(promise = mediaKeySession.generateRequest("keyids", stringToUInt8Array(kids)))
</span><span class="cx"> Promise resolved OK
</span><ins>+
+initData is encoded in base64url.
+RUN(kids = JSON.stringify({ kids: [ "ig2FRSEF1BU1j-qPaObBkQ"] }))
+RUN(mediaKeySession = mediaKeys.createSession("temporary"))
+RUN(promise = mediaKeySession.generateRequest("keyids", stringToUInt8Array(kids)))
+Promise resolved OK
</ins><span class="cx"> END OF TEST
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediaencryptedmediamockMediaKeySessiongenerateRequesthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/encrypted-media/mock-MediaKeySession-generateRequest.html (211428 => 211429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/encrypted-media/mock-MediaKeySession-generateRequest.html 2017-01-31 11:26:14 UTC (rev 211428)
+++ trunk/LayoutTests/media/encrypted-media/mock-MediaKeySession-generateRequest.html 2017-01-31 11:41:07 UTC (rev 211429)
</span><span class="lines">@@ -101,6 +101,14 @@
</span><span class="cx"> run('promise = mediaKeySession.generateRequest("keyids", stringToUInt8Array(kids))');
</span><span class="cx"> shouldResolve(promise).then(next, next);
</span><span class="cx"> },
</span><ins>+
+ function() {
+ consoleWrite('initData is encoded in base64url.')
+ run('kids = JSON.stringify({ kids: [ "ig2FRSEF1BU1j-qPaObBkQ"] })');
+ run('mediaKeySession = mediaKeys.createSession("temporary")');
+ run('promise = mediaKeySession.generateRequest("keyids", stringToUInt8Array(kids))');
+ shouldResolve(promise).then(next, next);
+ },
</ins><span class="cx"> ];
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211428 => 211429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-31 11:26:14 UTC (rev 211428)
+++ trunk/Source/WebCore/ChangeLog 2017-01-31 11:41:07 UTC (rev 211429)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-01-31 Zan Dobersek <zdobersek@igalia.com>
+
+ [EME] InitDataRegistry should use base64url encoding and decoding for keyids
+ https://bugs.webkit.org/show_bug.cgi?id=167592
+
+ Reviewed by Jer Noble.
+
+ In InitDataRegistry, WTF::base64URLEncode() and WTF::base64URLDecode() should
+ be used to encode and decode the 'keyids' initialization data format, as
+ required by the relevant specification.
+ https://w3c.github.io/encrypted-media/format-registry/initdata/keyids.html#format
+
+ Relevant test case was added to media/encrypted-media/mock-MediaKeySession-generateRequest.html.
+
+ * Modules/encryptedmedia/InitDataRegistry.cpp:
+ (WebCore::extractKeyIDsKeyids):
+ (WebCore::sanitizeKeyids):
+
</ins><span class="cx"> 2017-01-31 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Performance Timeline: Add serializer to PerformanceEntry
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaInitDataRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.cpp (211428 => 211429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.cpp 2017-01-31 11:26:14 UTC (rev 211428)
+++ trunk/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.cpp 2017-01-31 11:41:07 UTC (rev 211429)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> Vector<char> keyIDData;
</span><del>- if (!WTF::base64Decode(keyID, { keyIDData }))
</del><ins>+ if (!WTF::base64URLDecode(keyID, { keyIDData }))
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> Ref<SharedBuffer> keyIDBuffer = SharedBuffer::adoptVector(keyIDData);
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> auto object = InspectorObject::create();
</span><span class="cx"> auto kidsArray = InspectorArray::create();
</span><span class="cx"> for (auto& buffer : keyIDBuffer)
</span><del>- kidsArray->pushString(base64Encode(buffer->data(), buffer->size()));
</del><ins>+ kidsArray->pushString(WTF::base64URLEncode(buffer->data(), buffer->size()));
</ins><span class="cx"> object->setArray("kids", WTFMove(kidsArray));
</span><span class="cx">
</span><span class="cx"> CString jsonData = object->toJSONString().utf8();
</span></span></pre>
</div>
</div>
</body>
</html>