<!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>[167850] 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/167850">167850</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-04-26 19:48:19 -0700 (Sat, 26 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Local files should not be allowed to read pasteboard data during drag
https://bugs.webkit.org/show_bug.cgi?id=131767
Reviewed by Sam Weinig.
Source/WebCore:
Test: fast/files/local-file-drag-security.html
* page/DragController.cpp:
(WebCore::DragController::dragExited):
(WebCore::DragController::tryDHTMLDrag):
Make an old Dashboard quirk really Dashboard only.
LayoutTests:
* fast/files/local-file-drag-security-expected.txt: Added.
* fast/files/local-file-drag-security.html: Added.
* platform/wk2/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformwk2TestExpectations">trunk/LayoutTests/platform/wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageDragControllercpp">trunk/Source/WebCore/page/DragController.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastfileslocalfiledragsecurityexpectedtxt">trunk/LayoutTests/fast/files/local-file-drag-security-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastfileslocalfiledragsecurityhtml">trunk/LayoutTests/fast/files/local-file-drag-security.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167849 => 167850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-27 02:43:31 UTC (rev 167849)
+++ trunk/LayoutTests/ChangeLog 2014-04-27 02:48:19 UTC (rev 167850)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-04-26 Alexey Proskuryakov <ap@apple.com>
+
+ Local files should not be allowed to read pasteboard data during drag
+ https://bugs.webkit.org/show_bug.cgi?id=131767
+
+ Reviewed by Sam Weinig.
+
+ * fast/files/local-file-drag-security-expected.txt: Added.
+ * fast/files/local-file-drag-security.html: Added.
+ * platform/wk2/TestExpectations:
+
</ins><span class="cx"> 2014-04-24 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r164133): Selection doesn't paint when scrolling some pages
</span></span></pre></div>
<a id="trunkLayoutTestsfastfileslocalfiledragsecurityexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/files/local-file-drag-security-expected.txt (0 => 167850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/files/local-file-drag-security-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/files/local-file-drag-security-expected.txt 2014-04-27 02:48:19 UTC (rev 167850)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+Test that files are not accessible while dragging. To test manually, drop an HTML file on the box below.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS event.dataTransfer.files.length is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastfileslocalfiledragsecurityhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/files/local-file-drag-security.html (0 => 167850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/files/local-file-drag-security.html (rev 0)
+++ trunk/LayoutTests/fast/files/local-file-drag-security.html 2014-04-27 02:48:19 UTC (rev 167850)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+<!DOCTYPE html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+#dropTarget { text-align: center; display: table-cell; vertical-align: middle }
+#dropTarget {width: 256px; height: 256px; border: 1px dashed}
+</style>
+</head>
+<body>
+<div id=description></div>
+<div id=dropTarget webkitdropzone="move file:text/html"></div>
+<div id=console></div>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+description("Test that files are not accessible while dragging. To test manually, drop an HTML file on the box below.");
+jsTestIsAsync = true;
+
+window.onload = function()
+{
+ var dropTarget = document.getElementById("dropTarget");
+
+ dropTarget.addEventListener("dragover", ondragover, true);
+ dropTarget.addEventListener("drop", ondrop, true);
+
+ if (!window.eventSender)
+ return;
+
+ var endX = dropTarget.offsetLeft + dropTarget.offsetWidth / 2;
+ var endY = dropTarget.offsetTop + dropTarget.offsetHeight / 2
+
+ eventSender.beginDragWithFiles(["resources/file-reader-real.html"]);
+ eventSender.mouseMoveTo(endX, endY);
+ eventSender.mouseUp();
+
+ document.body.removeChild(dropTarget);
+ finishJSTest();
+}
+
+function ondragover(event)
+{
+ shouldBe("event.dataTransfer.files.length", "0");
+}
+
+function ondrop(event)
+{
+ event.preventDefault();
+}
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wk2/TestExpectations (167849 => 167850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/TestExpectations 2014-04-27 02:43:31 UTC (rev 167849)
+++ trunk/LayoutTests/platform/wk2/TestExpectations 2014-04-27 02:48:19 UTC (rev 167850)
</span><span class="lines">@@ -660,6 +660,7 @@
</span><span class="cx"> fast/files/file-reader-abort.html
</span><span class="cx"> fast/files/file-reader-directory-crash.html
</span><span class="cx"> fast/files/file-reader-event-listener.html
</span><ins>+fast/files/local-file-drag-security.html
</ins><span class="cx"> fast/files/null-origin-string.html
</span><span class="cx"> fast/files/read-blob-async.html
</span><span class="cx"> fast/files/read-file-async.html
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167849 => 167850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-27 02:43:31 UTC (rev 167849)
+++ trunk/Source/WebCore/ChangeLog 2014-04-27 02:48:19 UTC (rev 167850)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-04-26 Alexey Proskuryakov <ap@apple.com>
+
+ Local files should not be allowed to read pasteboard data during drag
+ https://bugs.webkit.org/show_bug.cgi?id=131767
+
+ Reviewed by Sam Weinig.
+
+ Test: fast/files/local-file-drag-security.html
+
+ * page/DragController.cpp:
+ (WebCore::DragController::dragExited):
+ (WebCore::DragController::tryDHTMLDrag):
+ Make an old Dashboard quirk really Dashboard only.
+
</ins><span class="cx"> 2014-04-24 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r164133): Selection doesn't paint when scrolling some pages
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (167849 => 167850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2014-04-27 02:43:31 UTC (rev 167849)
+++ trunk/Source/WebCore/page/DragController.cpp 2014-04-27 02:48:19 UTC (rev 167850)
</span><span class="lines">@@ -181,7 +181,12 @@
</span><span class="cx"> void DragController::dragExited(DragData& dragData)
</span><span class="cx"> {
</span><span class="cx"> if (RefPtr<FrameView> v = m_page.mainFrame().view()) {
</span><del>- DataTransferAccessPolicy policy = (!m_documentUnderMouse || m_documentUnderMouse->securityOrigin()->isLocal()) ? DataTransferAccessPolicy::Readable : DataTransferAccessPolicy::TypesReadable;
</del><ins>+#if ENABLE(DASHBOARD_SUPPORT)
+ DataTransferAccessPolicy policy = (m_page.mainFrame().settings().usesDashboardBackwardCompatibilityMode() && (!m_documentUnderMouse || m_documentUnderMouse->securityOrigin()->isLocal())) ?
+ DataTransferAccessPolicy::Readable : DataTransferAccessPolicy::TypesReadable;
+#else
+ DataTransferAccessPolicy policy = DataTransferAccessPolicy::TypesReadable;
+#endif
</ins><span class="cx"> RefPtr<DataTransfer> dataTransfer = DataTransfer::createForDragAndDrop(policy, dragData);
</span><span class="cx"> dataTransfer->setSourceOperation(dragData.draggingSourceOperationMask());
</span><span class="cx"> m_page.mainFrame().eventHandler().cancelDragAndDrop(createMouseEvent(dragData), dataTransfer.get());
</span><span class="lines">@@ -587,7 +592,12 @@
</span><span class="cx"> if (!viewProtector)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- DataTransferAccessPolicy policy = m_documentUnderMouse->securityOrigin()->isLocal() ? DataTransferAccessPolicy::Readable : DataTransferAccessPolicy::TypesReadable;
</del><ins>+#if ENABLE(DASHBOARD_SUPPORT)
+ DataTransferAccessPolicy policy = (mainFrame->settings().usesDashboardBackwardCompatibilityMode() && m_documentUnderMouse->securityOrigin()->isLocal()) ?
+ DataTransferAccessPolicy::Readable : DataTransferAccessPolicy::TypesReadable;
+#else
+ DataTransferAccessPolicy policy = DataTransferAccessPolicy::TypesReadable;
+#endif
</ins><span class="cx"> RefPtr<DataTransfer> dataTransfer = DataTransfer::createForDragAndDrop(policy, dragData);
</span><span class="cx"> DragOperation srcOpMask = dragData.draggingSourceOperationMask();
</span><span class="cx"> dataTransfer->setSourceOperation(srcOpMask);
</span></span></pre>
</div>
</div>
</body>
</html>