<!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>[212073] branches/safari-603-branch</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/212073">212073</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-09 22:37:31 -0800 (Thu, 09 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211763">r211763</a>. rdar://problem/30380075</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCorepageSecurityOrigincpp">branches/safari-603-branch/Source/WebCore/page/SecurityOrigin.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformFileSystemcpp">branches/safari-603-branch/Source/WebCore/platform/FileSystem.cpp</a></li>
<li><a href="#branchessafari603branchToolsChangeLog">branches/safari-603-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari603branchToolsTestWebKitAPITestsWebCoreFileSystemcpp">branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebCore/FileSystem.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212072 => 212073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog        2017-02-10 06:37:27 UTC (rev 212072)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog        2017-02-10 06:37:31 UTC (rev 212073)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211763. rdar://problem/30380075
+
+ 2017-02-06 Brent Fulgham <bfulgham@apple.com>
+
+ Correct File Path Handling in SecurityOrigin and FileSystem
+ https://bugs.webkit.org/show_bug.cgi?id=167894
+ <rdar://problem/30380080>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Roll out the URL decoding being done in the FileSystem class (added in Bug 167894), and instead ensure that
+ SecurityOrigin properly handles file URLs, and only passes valid file strings to the FileSystem interface.
+
+ Tested by FileSystemTests and SecurityOriginTests in TestWebKitAPI.
+
+ * page/SecurityOrigin.cpp:
+ (WebCore::SecurityOrigin::SecurityOrigin): Initialize m_filePath using the url's fileSystemPath, not
+ the %-encoded 'path' property.
+ (WebCore::SecurityOrigin::canDisplay): Pass the 'fileSystemPath' to 'filesHaveSameVolume', rather than
+ the %-encoded 'path' property.
+ * page/SecurityOrigin.h:
+ * platform/FileSystem.cpp:
+ (WebCore::filesHaveSameVolume): Do not use 'decodeURLEscapeSequences' in 'filesHaveSameVolume'.
+
+2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211382. rdar://problem/29738514
</span><span class="cx">
</span><span class="cx"> 2017-01-30 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepageSecurityOrigincpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/page/SecurityOrigin.cpp (212072 => 212073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/page/SecurityOrigin.cpp        2017-02-10 06:37:27 UTC (rev 212072)
+++ branches/safari-603-branch/Source/WebCore/page/SecurityOrigin.cpp        2017-02-10 06:37:31 UTC (rev 212073)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> m_canLoadLocalResources = isLocal();
</span><span class="cx">
</span><span class="cx"> if (m_canLoadLocalResources)
</span><del>- m_filePath = url.path(); // In case enforceFilePathSeparation() is called.
</del><ins>+ m_filePath = url.fileSystemPath(); // In case enforceFilePathSeparation() is called.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SecurityOrigin::SecurityOrigin()
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- if (m_protocol == "file" && url.isLocalFile() && !filesHaveSameVolume(m_filePath, url.path()))
</del><ins>+ if (m_protocol == "file" && url.isLocalFile() && !filesHaveSameVolume(m_filePath, url.fileSystemPath()))
</ins><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformFileSystemcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/FileSystem.cpp (212072 => 212073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/FileSystem.cpp        2017-02-10 06:37:27 UTC (rev 212072)
+++ branches/safari-603-branch/Source/WebCore/platform/FileSystem.cpp        2017-02-10 06:37:31 UTC (rev 212073)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #include "FileSystem.h"
</span><span class="cx">
</span><span class="cx"> #include "ScopeGuard.h"
</span><del>-#include "URL.h"
</del><span class="cx"> #include <wtf/HexNumber.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="lines">@@ -237,8 +236,8 @@
</span><span class="cx">
</span><span class="cx"> bool filesHaveSameVolume(const String& fileA, const String& fileB)
</span><span class="cx"> {
</span><del>- auto fsRepFileA = fileSystemRepresentation(decodeURLEscapeSequences(fileA));
- auto fsRepFileB = fileSystemRepresentation(decodeURLEscapeSequences(fileB));
</del><ins>+ auto fsRepFileA = fileSystemRepresentation(fileA);
+ auto fsRepFileB = fileSystemRepresentation(fileB);
</ins><span class="cx">
</span><span class="cx"> if (fsRepFileA.isNull() || fsRepFileB.isNull())
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="branchessafari603branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/ChangeLog (212072 => 212073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/ChangeLog        2017-02-10 06:37:27 UTC (rev 212072)
+++ branches/safari-603-branch/Tools/ChangeLog        2017-02-10 06:37:31 UTC (rev 212073)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211763. rdar://problem/30380075
+
+ 2017-02-06 Brent Fulgham <bfulgham@apple.com>
+
+ Correct File Path Handling in SecurityOrigin and FileSystem
+ https://bugs.webkit.org/show_bug.cgi?id=167894
+ <rdar://problem/30380080>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * TestWebKitAPI/Tests/WebCore/FileSystem.cpp: Don't encode the temporary files,
+ and perform same-volume checks using filesystem-compatible paths.
+ * TestWebKitAPI/Tests/WebCore/SecurityOrigin.cpp: Create SecurityOrigins from
+ filesystem paths, and perform validation of same-volume checks.
+ (TestWebKitAPI::SecurityOriginTest::tempFilePath): Added.
+ (TestWebKitAPI::SecurityOriginTest::spaceContainingFilePath): Added.
+ (TestWebKitAPI::SecurityOriginTest::bangContainingFilePath): Added.
+ (TestWebKitAPI::SecurityOriginTest::quoteContainingFilePath): Added.
+
+2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211382. rdar://problem/29738514
</span><span class="cx">
</span><span class="cx"> 2017-01-30 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchToolsTestWebKitAPITestsWebCoreFileSystemcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebCore/FileSystem.cpp (212072 => 212073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebCore/FileSystem.cpp        2017-02-10 06:37:27 UTC (rev 212072)
+++ branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebCore/FileSystem.cpp        2017-02-10 06:37:31 UTC (rev 212073)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "Test.h"
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><del>-#include <WebCore/URL.h>
</del><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/StringExtras.h>
</span><span class="cx">
</span><span class="lines">@@ -54,15 +53,15 @@
</span><span class="cx"> m_tempEmptyFilePath = openTemporaryFile("tempEmptyTestFile", handle);
</span><span class="cx"> closeFile(handle);
</span><span class="cx">
</span><del>- m_spaceContainingFilePath = encodeWithURLEscapeSequences(openTemporaryFile("temp Empty Test File", handle));
</del><ins>+ m_spaceContainingFilePath = openTemporaryFile("temp Empty Test File", handle);
</ins><span class="cx"> closeFile(handle);
</span><span class="cx">
</span><del>- m_bangContainingFilePath = encodeWithURLEscapeSequences(openTemporaryFile("temp!Empty!Test!File", handle));
</del><ins>+ m_bangContainingFilePath = openTemporaryFile("temp!Empty!Test!File", handle);
</ins><span class="cx"> closeFile(handle);
</span><span class="cx">
</span><del>- m_quoteContainingFilePath = encodeWithURLEscapeSequences(openTemporaryFile("temp\"Empty\"TestFile", handle));
</del><ins>+ m_quoteContainingFilePath = openTemporaryFile("temp\"Empty\"TestFile", handle);
</ins><span class="cx"> closeFile(handle);
</span><del>-}
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> void TearDown() override
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>