<!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>[172523] 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/172523">172523</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2014-08-13 10:24:34 -0700 (Wed, 13 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media document sends incorrect referer header
https://bugs.webkit.org/show_bug.cgi?id=135839
Reviewed by Jer Noble.
Source/WebCore:
Test: http/tests/media/media-document-referer.html
* html/MediaDocument.cpp:
(WebCore::MediaDocumentParser::MediaDocumentParser): Stash referrer.
(WebCore::MediaDocumentParser::createDocumentStructure): Set outgoing referrer.
(WebCore::MediaDocument::MediaDocument): Stash referrer.
* html/MediaDocument.h:
LayoutTests:
* http/tests/media/media-document-referer-expected.txt: Added.
* http/tests/media/media-document-referer.html: Added.
* http/tests/media/resources/video-referer-check-referer.php: Take expected referer as a
parameter instead of hard coding it.
* http/tests/media/video-referer.html: Pass referer to loader script.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsmediaresourcesvideoreferercheckrefererphp">trunk/LayoutTests/http/tests/media/resources/video-referer-check-referer.php</a></li>
<li><a href="#trunkLayoutTestshttptestsmediavideorefererhtml">trunk/LayoutTests/http/tests/media/video-referer.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaDocumentcpp">trunk/Source/WebCore/html/MediaDocument.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaDocumenth">trunk/Source/WebCore/html/MediaDocument.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsmediamediadocumentrefererexpectedtxt">trunk/LayoutTests/http/tests/media/media-document-referer-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsmediamediadocumentrefererhtml">trunk/LayoutTests/http/tests/media/media-document-referer.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172522 => 172523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-08-13 15:45:03 UTC (rev 172522)
+++ trunk/LayoutTests/ChangeLog 2014-08-13 17:24:34 UTC (rev 172523)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-08-13 Eric Carlson <eric.carlson@apple.com>
+
+ Media document sends incorrect referer header
+ https://bugs.webkit.org/show_bug.cgi?id=135839
+
+ Reviewed by Jer Noble.
+
+ * http/tests/media/media-document-referer-expected.txt: Added.
+ * http/tests/media/media-document-referer.html: Added.
+ * http/tests/media/resources/video-referer-check-referer.php: Take expected referer as a
+ parameter instead of hard coding it.
+ * http/tests/media/video-referer.html: Pass referer to loader script.
+
</ins><span class="cx"> 2014-08-13 Mihnea Ovidenie <mihnea@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSSRegions] Move scrolling tests under fast/regions/scrolling
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediamediadocumentrefererexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/media-document-referer-expected.txt (0 => 172523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/media-document-referer-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/media/media-document-referer-expected.txt 2014-08-13 17:24:34 UTC (rev 172523)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+Tests that a media document has correct referer header.
+
+video loaded, referer was correct! OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmediamediadocumentrefererhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/media-document-referer.html (0 => 172523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/media-document-referer.html (rev 0)
+++ trunk/LayoutTests/http/tests/media/media-document-referer.html 2014-08-13 17:24:34 UTC (rev 172523)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<html>
+ <head>
+ <script src=../../media-resources/video-test.js></script>
+ <script src=../../media-resources/media-file.js></script>
+ <script>
+ var counter = 0;
+ var frame;
+
+ function videoTest()
+ {
+ var video = frame.contentDocument.getElementsByTagName('video')[0];
+
+ if (video.error) {
+ failTest("video failed to load, referer was incorrect.");
+ return;
+ }
+
+ if (video.readyState >= HTMLMediaElement.HAVE_METADATA) {
+ logResult(true, "video loaded, referer was correct!");
+ endTest();
+ return;
+ }
+
+ if (++counter >= 10) {
+ failTest("TIMEOUT: video failed to load without an error.");
+ return;
+ }
+
+ setTimeout(videoTest, 100);
+ }
+
+ function loadMediaDocument()
+ {
+ var movie = findMediaFile('video', 'test');
+ var type = mimeTypeForExtension(movie.split('.').pop());
+ frame = document.createElement('iframe');
+
+ frame.width = "100%";
+ frame.height = "100%";
+ frame.onload = videoTest;
+ frame.src = 'http://127.0.0.1:8000/media/resources/video-referer-check-referer.php?referer=media-document-referer.html&name=' + movie + '&type=' + type;
+ document.body.appendChild(frame);
+ }
+ </script>
+ </head>
+ <body onload="loadMediaDocument()">
+ Tests that a media document has correct referer header.<br/>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmediaresourcesvideoreferercheckrefererphp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/media/resources/video-referer-check-referer.php (172522 => 172523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/resources/video-referer-check-referer.php 2014-08-13 15:45:03 UTC (rev 172522)
+++ trunk/LayoutTests/http/tests/media/resources/video-referer-check-referer.php 2014-08-13 17:24:34 UTC (rev 172523)
</span><span class="lines">@@ -1,7 +1,8 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>- $refer = $_SERVER["HTTP_REFERER"];
- if (!isset($refer) || stripos($refer, "video-referer.html") === false)
</del><ins>+ $requiredReferer = $_GET["referer"];
+ $referHeader = $_SERVER["HTTP_REFERER"];
+ if (!isset($referHeader) || stripos($referHeader, $requiredReferer) === false)
</ins><span class="cx"> die;
</span><span class="cx">
</span><span class="cx"> $fileName = $_GET["name"];
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediavideorefererhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/media/video-referer.html (172522 => 172523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/video-referer.html 2014-08-13 15:45:03 UTC (rev 172522)
+++ trunk/LayoutTests/http/tests/media/video-referer.html 2014-08-13 17:24:34 UTC (rev 172523)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> frame.height = 0;
</span><span class="cx"> frame.addEventListener('load', function () {
</span><span class="cx"> source = document.getElementById('source');
</span><del>- source.src = 'http://127.0.0.1:8000/media/resources/video-referer-check-referer.php?name=' + movie + '&type=' + type;
</del><ins>+ source.src = 'http://127.0.0.1:8000/media/resources/video-referer-check-referer.php?referer=video-referer.html&name=' + movie + '&type=' + type;
</ins><span class="cx"> source.type = type;
</span><span class="cx">
</span><span class="cx"> waitForEventAndFail('error');
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172522 => 172523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-13 15:45:03 UTC (rev 172522)
+++ trunk/Source/WebCore/ChangeLog 2014-08-13 17:24:34 UTC (rev 172523)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-08-13 Eric Carlson <eric.carlson@apple.com>
+
+ Media document sends incorrect referer header
+ https://bugs.webkit.org/show_bug.cgi?id=135839
+
+ Reviewed by Jer Noble.
+
+ Test: http/tests/media/media-document-referer.html
+
+ * html/MediaDocument.cpp:
+ (WebCore::MediaDocumentParser::MediaDocumentParser): Stash referrer.
+ (WebCore::MediaDocumentParser::createDocumentStructure): Set outgoing referrer.
+ (WebCore::MediaDocument::MediaDocument): Stash referrer.
+ * html/MediaDocument.h:
+
</ins><span class="cx"> 2014-08-13 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't recurse into non-rendered subtrees when computing style
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaDocument.cpp (172522 => 172523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaDocument.cpp 2014-08-13 15:45:03 UTC (rev 172522)
+++ trunk/Source/WebCore/html/MediaDocument.cpp 2014-08-13 17:24:34 UTC (rev 172523)
</span><span class="lines">@@ -58,10 +58,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- MediaDocumentParser(Document& document)
</del><ins>+ MediaDocumentParser(MediaDocument& document)
</ins><span class="cx"> : RawDataDocumentParser(document)
</span><span class="cx"> , m_mediaElement(0)
</span><span class="cx"> {
</span><ins>+ m_outgoingReferrer = document.outgoingReferrer();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual void appendBytes(DocumentWriter&, const char*, size_t) override;
</span><span class="lines">@@ -69,6 +70,7 @@
</span><span class="cx"> void createDocumentStructure();
</span><span class="cx">
</span><span class="cx"> HTMLMediaElement* m_mediaElement;
</span><ins>+ String m_outgoingReferrer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> void MediaDocumentParser::createDocumentStructure()
</span><span class="lines">@@ -124,6 +126,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> frame->loader().activeDocumentLoader()->setMainResourceDataBufferingPolicy(DoNotBufferData);
</span><ins>+ frame->loader().setOutgoingReferrer(frame->document()->completeURL(m_outgoingReferrer));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaDocumentParser::appendBytes(DocumentWriter&, const char*, size_t)
</span><span class="lines">@@ -141,6 +144,8 @@
</span><span class="cx"> {
</span><span class="cx"> setCompatibilityMode(DocumentCompatibilityMode::QuirksMode);
</span><span class="cx"> lockCompatibilityMode();
</span><ins>+ if (frame)
+ m_outgoingReferrer = frame->loader().outgoingReferrer();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaDocument::~MediaDocument()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaDocument.h (172522 => 172523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaDocument.h 2014-08-13 15:45:03 UTC (rev 172522)
+++ trunk/Source/WebCore/html/MediaDocument.h 2014-08-13 17:24:34 UTC (rev 172523)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> virtual ~MediaDocument();
</span><span class="cx">
</span><span class="cx"> void mediaElementSawUnsupportedTracks();
</span><ins>+ String outgoingReferrer() const { return m_outgoingReferrer; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> MediaDocument(Frame*, const URL&);
</span><span class="lines">@@ -52,6 +53,7 @@
</span><span class="cx"> void replaceMediaElementTimerFired(Timer<MediaDocument>&);
</span><span class="cx">
</span><span class="cx"> Timer<MediaDocument> m_replaceMediaElementTimer;
</span><ins>+ String m_outgoingReferrer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline bool isMediaDocument(const Document& document) { return document.isMediaDocument(); }
</span></span></pre>
</div>
</div>
</body>
</html>