<!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>[202579] 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/202579">202579</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-06-28 11:25:27 -0700 (Tue, 28 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cross-domain video loads do not prompt for authorization.
https://bugs.webkit.org/show_bug.cgi?id=159195
<rdar://problem/26234612>
Reviewed by Brent Fulgham.
Source/WebCore:
Test: http/tests/media/video-auth.html (modified)
We should prompt for authorization when a cross-origin <video> is embedded
in a web page.
* loader/MediaResourceLoader.cpp:
(WebCore::MediaResourceLoader::requestResource):
LayoutTests:
Add a cross-origin authorization sub-test.
* http/tests/media/video-auth.html:
* http/tests/media/video-auth-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsmediavideoauthexpectedtxt">trunk/LayoutTests/http/tests/media/video-auth-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsmediavideoauthhtml">trunk/LayoutTests/http/tests/media/video-auth.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderMediaResourceLoadercpp">trunk/Source/WebCore/loader/MediaResourceLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202578 => 202579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-28 18:20:42 UTC (rev 202578)
+++ trunk/LayoutTests/ChangeLog 2016-06-28 18:25:27 UTC (rev 202579)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-06-28 Jer Noble <jer.noble@apple.com>
+
+ Cross-domain video loads do not prompt for authorization.
+ https://bugs.webkit.org/show_bug.cgi?id=159195
+ <rdar://problem/26234612>
+
+ Reviewed by Brent Fulgham.
+
+ Add a cross-origin authorization sub-test.
+
+ * http/tests/media/video-auth.html:
+ * http/tests/media/video-auth-expected.txt:
+
</ins><span class="cx"> 2016-06-28 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking fast/multicol/fixed-stack.html as failing on ios-simulator
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediavideoauthexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/media/video-auth-expected.txt (202578 => 202579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/video-auth-expected.txt 2016-06-28 18:20:42 UTC (rev 202578)
+++ trunk/LayoutTests/http/tests/media/video-auth-expected.txt 2016-06-28 18:25:27 UTC (rev 202579)
</span><span class="lines">@@ -1,6 +1,10 @@
</span><span class="cx"> http://127.0.0.1:8000/media/resources/video-auth.php?name=test.mp4&type=video/mp4 - didReceiveAuthenticationChallenge - Responding with username:password
</span><ins>+http://localhost:8000/media/resources/video-auth.php?name=test.mp4&type=video/mp4 - didReceiveAuthenticationChallenge - Responding with username:password
</ins><span class="cx">
</span><del>-Tests that the media player sends authorization credentials when requesting a media file.
</del><ins>+Tests that the media player sends authorization credentials when requesting a media file.
+Testing same domain (127.0.0.1)
</ins><span class="cx"> EVENT(canplay)
</span><ins>+Testing cross domain (localhost)
+EVENT(canplay)
</ins><span class="cx"> END OF TEST
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediavideoauthhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/media/video-auth.html (202578 => 202579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/video-auth.html 2016-06-28 18:20:42 UTC (rev 202578)
+++ trunk/LayoutTests/http/tests/media/video-auth.html 2016-06-28 18:25:27 UTC (rev 202579)
</span><span class="lines">@@ -10,35 +10,51 @@
</span><span class="cx"> testRunner.setAuthenticationPassword("password");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function loadMediaFrame()
</del><ins>+ var tests;
+ var media = findMediaFile('video', 'test');
+ var type = mimeTypeForExtension(media.split('.').pop());
+
+ function startTests()
</ins><span class="cx"> {
</span><span class="cx"> findMediaElement();
</span><ins>+ waitForEventAndFail('error');
+ waitForEvent('canplay', runNextTest);
</ins><span class="cx">
</span><del>- var movie = findMediaFile('video', 'test');
- var type = mimeTypeForExtension(movie.split('.').pop());
- var frame = document.createElement('iframe');
- frame.width = 0;
- frame.height = 0;
- frame.addEventListener('load', function () {
- source = document.getElementById('source');
- source.src = 'http://127.0.0.1:8000/media/resources/video-auth.php?name=' + movie + '&type=' + type;
- source.type = type;
-
- waitForEventAndFail('error');
- waitForEventAndEnd('canplay');
- video.load();
- });
-
- frame.src = "data:text/html,<b>test</b>";
- document.body.appendChild(frame);
</del><ins>+ tests = [
+ testSameDomain,
+ testCrossDomain,
+ ];
+
+ runNextTest();
</ins><span class="cx"> }
</span><ins>+
+ function runNextTest()
+ {
+ var test = tests.shift();
+ if (test)
+ test();
+ else
+ endTest();
+ }
+
+ function testSameDomain()
+ {
+ consoleWrite('Testing same domain (127.0.0.1)');
+ video.src = 'http://127.0.0.1:8000/media/resources/video-auth.php?name=' + media + '&type=' + type;
+ video.load();
+ }
+
+ function testCrossDomain()
+ {
+ consoleWrite('Testing cross domain (localhost)');
+ video.src = 'http://localhost:8000/media/resources/video-auth.php?name=' + media + '&type=' + type;
+ video.load();
+ }
</ins><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx">
</span><del>- <body onload="loadMediaFrame()">
- <video id="video">
- <source id="source">
- </video>
</del><ins>+ <body onload="startTests()">
+ <video></video>
</ins><span class="cx"> <br>
</span><span class="cx"> Tests that the media player sends authorization credentials when requesting a media file.
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202578 => 202579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-28 18:20:42 UTC (rev 202578)
+++ trunk/Source/WebCore/ChangeLog 2016-06-28 18:25:27 UTC (rev 202579)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-06-27 Jer Noble <jer.noble@apple.com>
+
+ Cross-domain video loads do not prompt for authorization.
+ https://bugs.webkit.org/show_bug.cgi?id=159195
+ <rdar://problem/26234612>
+
+ Reviewed by Brent Fulgham.
+
+ Test: http/tests/media/video-auth.html (modified)
+
+ We should prompt for authorization when a cross-origin <video> is embedded
+ in a web page.
+
+ * loader/MediaResourceLoader.cpp:
+ (WebCore::MediaResourceLoader::requestResource):
+
</ins><span class="cx"> 2016-06-28 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r201471): FormClient.textFieldDidEndEditing is no longer called when a text field is removed
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderMediaResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/MediaResourceLoader.cpp (202578 => 202579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/MediaResourceLoader.cpp 2016-06-28 18:20:42 UTC (rev 202578)
+++ trunk/Source/WebCore/loader/MediaResourceLoader.cpp 2016-06-28 18:25:27 UTC (rev 202579)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Skip Content Security Policy check if the element that inititated this request
</span><span class="cx"> // is in a user-agent shadow tree. See <https://bugs.webkit.org/show_bug.cgi?id=155505>.
</span><del>- CachedResourceRequest cacheRequest(updatedRequest, ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, bufferingPolicy, allowCredentials, DoNotAskClientForCrossOriginCredentials, ClientDidNotRequestCredentials, DoSecurityCheck, corsPolicy, DoNotIncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, cachingPolicy));
</del><ins>+ CachedResourceRequest cacheRequest(updatedRequest, ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, bufferingPolicy, allowCredentials, AskClientForAllCredentials, ClientDidNotRequestCredentials, DoSecurityCheck, corsPolicy, DoNotIncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, cachingPolicy));
</ins><span class="cx">
</span><span class="cx"> if (!m_crossOriginMode.isNull())
</span><span class="cx"> updateRequestForAccessControl(cacheRequest.mutableResourceRequest(), m_document->securityOrigin(), allowCredentials);
</span></span></pre>
</div>
</div>
</body>
</html>