<!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>[210739] branches/safari-603-branch/Source/WebKit2</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/210739">210739</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-13 11:18:30 -0800 (Fri, 13 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Roll out <a href="http://trac.webkit.org/projects/webkit/changeset/209189">r209189</a> via <a href="http://trac.webkit.org/projects/webkit/changeset/210726">r210726</a>. rdar://problem/29428877</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebKit2ChangeLog">branches/safari-603-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCachecpp">branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheh">branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCache.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheBlobStoragecpp">branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheBlobStorageh">branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheDatacpp">branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheDatah">branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheKeycpp">branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheKeyh">branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagercpp">branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp">branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheStorageh">branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (210738 => 210739)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-13 19:18:25 UTC (rev 210738)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-13 19:18:30 UTC (rev 210739)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2017-01-13 Matthew Hanson <matthew_hanson@apple.com>
+
+ Rollout r210726. rdar://problem/29428877
+
</ins><span class="cx"> 2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r209189. rdar://problem/29428877
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (210738 => 210739)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2017-01-13 19:18:25 UTC (rev 210738)
+++ branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2017-01-13 19:18:30 UTC (rev 210739)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> m_storage->setCapacity(maximumSize);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Key makeCacheKey(const WebCore::ResourceRequest& request)
</del><ins>+Key Cache::makeCacheKey(const WebCore::ResourceRequest& request)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> String partition = request.cachePartition();
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> // FIXME: This implements minimal Range header disk cache support. We don't parse
</span><span class="cx"> // ranges so only the same exact range request will be served from the cache.
</span><span class="cx"> String range = request.httpHeaderField(WebCore::HTTPHeaderName::Range);
</span><del>- return { partition, resourceType(), range, request.url().string() };
</del><ins>+ return { partition, resourceType(), range, request.url().string(), m_storage->salt() };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool cachePolicyAllowsExpired(WebCore::ResourceRequestCachePolicy policy)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (210738 => 210739)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2017-01-13 19:18:25 UTC (rev 210738)
+++ branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2017-01-13 19:18:30 UTC (rev 210739)
</span><span class="lines">@@ -129,6 +129,8 @@
</span><span class="cx"> Cache() = default;
</span><span class="cx"> ~Cache() = delete;
</span><span class="cx">
</span><ins>+ Key makeCacheKey(const WebCore::ResourceRequest&);
+
</ins><span class="cx"> String dumpFilePath() const;
</span><span class="cx"> void deleteDumpFile();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheBlobStoragecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.cpp (210738 => 210739)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.cpp 2017-01-13 19:18:25 UTC (rev 210738)
+++ branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.cpp 2017-01-13 19:18:30 UTC (rev 210739)
</span><span class="lines">@@ -40,8 +40,9 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> namespace NetworkCache {
</span><span class="cx">
</span><del>-BlobStorage::BlobStorage(const String& blobDirectoryPath)
</del><ins>+BlobStorage::BlobStorage(const String& blobDirectoryPath, Salt salt)
</ins><span class="cx"> : m_blobDirectoryPath(blobDirectoryPath)
</span><ins>+ , m_salt(salt)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -85,7 +86,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!RunLoop::isMain());
</span><span class="cx">
</span><del>- auto hash = computeSHA1(data);
</del><ins>+ auto hash = computeSHA1(data, m_salt);
</ins><span class="cx"> if (data.isEmpty())
</span><span class="cx"> return { data, hash };
</span><span class="cx">
</span><span class="lines">@@ -123,7 +124,7 @@
</span><span class="cx"> auto linkPath = WebCore::fileSystemRepresentation(path);
</span><span class="cx"> auto data = mapFile(linkPath.data());
</span><span class="cx">
</span><del>- return { data, computeSHA1(data) };
</del><ins>+ return { data, computeSHA1(data, m_salt) };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlobStorage::remove(const String& path)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheBlobStorageh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.h (210738 => 210739)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.h 2017-01-13 19:18:25 UTC (rev 210738)
+++ branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.h 2017-01-13 19:18:30 UTC (rev 210739)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> class BlobStorage {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(BlobStorage);
</span><span class="cx"> public:
</span><del>- BlobStorage(const String& blobDirectoryPath);
</del><ins>+ BlobStorage(const String& blobDirectoryPath, Salt);
</ins><span class="cx">
</span><span class="cx"> struct Blob {
</span><span class="cx"> Data data;
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> String blobPathForHash(const SHA1::Digest&) const;
</span><span class="cx">
</span><span class="cx"> const String m_blobDirectoryPath;
</span><ins>+ const Salt m_salt;
</ins><span class="cx">
</span><span class="cx"> std::atomic<size_t> m_approximateSize { 0 };
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheDatacpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.cpp (210738 => 210739)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.cpp 2017-01-13 19:18:25 UTC (rev 210738)
+++ branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.cpp 2017-01-13 19:18:30 UTC (rev 210739)
</span><span class="lines">@@ -28,9 +28,11 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx">
</span><ins>+#include <WebCore/FileSystem.h>
</ins><span class="cx"> #include <fcntl.h>
</span><span class="cx"> #include <sys/mman.h>
</span><span class="cx"> #include <sys/stat.h>
</span><ins>+#include <wtf/CryptographicallyRandomNumber.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> namespace NetworkCache {
</span><span class="lines">@@ -103,13 +105,15 @@
</span><span class="cx"> return Data::adoptMap(map, size, fd);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SHA1::Digest computeSHA1(const Data& data)
</del><ins>+SHA1::Digest computeSHA1(const Data& data, const Salt& salt)
</ins><span class="cx"> {
</span><span class="cx"> SHA1 sha1;
</span><ins>+ sha1.addBytes(salt.data(), salt.size());
</ins><span class="cx"> data.apply([&sha1](const uint8_t* data, size_t size) {
</span><span class="cx"> sha1.addBytes(data, size);
</span><span class="cx"> return true;
</span><span class="cx"> });
</span><ins>+
</ins><span class="cx"> SHA1::Digest digest;
</span><span class="cx"> sha1.computeHash(digest);
</span><span class="cx"> return digest;
</span><span class="lines">@@ -124,6 +128,35 @@
</span><span class="cx"> return !memcmp(a.data(), b.data(), a.size());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static Salt makeSalt()
+{
+ Salt salt;
+ static_assert(salt.size() == 8, "Salt size");
+ *reinterpret_cast<uint32_t*>(&salt[0]) = cryptographicallyRandomNumber();
+ *reinterpret_cast<uint32_t*>(&salt[4]) = cryptographicallyRandomNumber();
+ return salt;
+}
+
+std::optional<Salt> readOrMakeSalt(const String& path)
+{
+ auto cpath = WebCore::fileSystemRepresentation(path);
+ auto fd = open(cpath.data(), O_RDONLY, 0);
+ Salt salt;
+ auto bytesRead = read(fd, salt.data(), salt.size());
+ close(fd);
+ if (bytesRead != salt.size()) {
+ salt = makeSalt();
+
+ unlink(cpath.data());
+ fd = open(cpath.data(), O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
+ bool success = write(fd, salt.data(), salt.size()) == salt.size();
+ close(fd);
+ if (!success)
+ return { };
+ }
+ return salt;
+}
+
</ins><span class="cx"> } // namespace NetworkCache
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheDatah"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h (210738 => 210739)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h 2017-01-13 19:18:25 UTC (rev 210738)
+++ branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h 2017-01-13 19:18:30 UTC (rev 210739)
</span><span class="lines">@@ -156,8 +156,12 @@
</span><span class="cx"> bool bytesEqual(const Data&, const Data&);
</span><span class="cx"> Data adoptAndMapFile(int fd, size_t offset, size_t);
</span><span class="cx"> Data mapFile(const char* path);
</span><del>-SHA1::Digest computeSHA1(const Data&);
</del><span class="cx">
</span><ins>+using Salt = std::array<uint8_t, 8>;
+
+std::optional<Salt> readOrMakeSalt(const String& path);
+SHA1::Digest computeSHA1(const Data&, const Salt&);
+
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheKeycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp (210738 => 210739)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp 2017-01-13 19:18:25 UTC (rev 210738)
+++ branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp 2017-01-13 19:18:30 UTC (rev 210739)
</span><span class="lines">@@ -37,12 +37,6 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> namespace NetworkCache {
</span><span class="cx">
</span><del>-static const String& noPartitionString()
-{
- static NeverDestroyed<String> noPartition(ASCIILiteral("No partition"));
- return noPartition;
-}
-
</del><span class="cx"> Key::Key(const Key& o)
</span><span class="cx"> : m_partition(o.m_partition.isolatedCopy())
</span><span class="cx"> , m_type(o.m_type.isolatedCopy())
</span><span class="lines">@@ -49,15 +43,17 @@
</span><span class="cx"> , m_identifier(o.m_identifier.isolatedCopy())
</span><span class="cx"> , m_range(o.m_range.isolatedCopy())
</span><span class="cx"> , m_hash(o.m_hash)
</span><ins>+ , m_partitionHash(o.m_partitionHash)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Key::Key(const String& partition, const String& type, const String& range, const String& identifier)
- : m_partition(partition.isEmpty() ? noPartitionString() : partition)
</del><ins>+Key::Key(const String& partition, const String& type, const String& range, const String& identifier, const Salt& salt)
+ : m_partition(partition)
</ins><span class="cx"> , m_type(type)
</span><span class="cx"> , m_identifier(identifier)
</span><span class="cx"> , m_range(range)
</span><del>- , m_hash(computeHash())
</del><ins>+ , m_hash(computeHash(salt))
+ , m_partitionHash(computePartitionHash(salt))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -66,11 +62,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Key::hasPartition() const
-{
- return m_partition != noPartitionString();
-}
-
</del><span class="cx"> Key& Key::operator=(const Key& other)
</span><span class="cx"> {
</span><span class="cx"> m_partition = other.m_partition.isolatedCopy();
</span><span class="lines">@@ -98,25 +89,40 @@
</span><span class="cx"> sha1.addBytes(reinterpret_cast<const uint8_t*>(cString.data()), cString.length() + 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Key::HashType Key::computeHash() const
</del><ins>+Key::HashType Key::computeHash(const Salt& salt) const
</ins><span class="cx"> {
</span><span class="cx"> // We don't really need a cryptographic hash. The key is always verified against the entry header.
</span><span class="cx"> // SHA1 just happens to be suitably sized, fast and available.
</span><span class="cx"> SHA1 sha1;
</span><ins>+ sha1.addBytes(salt.data(), salt.size());
+
</ins><span class="cx"> hashString(sha1, m_partition);
</span><span class="cx"> hashString(sha1, m_type);
</span><span class="cx"> hashString(sha1, m_identifier);
</span><span class="cx"> hashString(sha1, m_range);
</span><ins>+
</ins><span class="cx"> SHA1::Digest hash;
</span><span class="cx"> sha1.computeHash(hash);
</span><span class="cx"> return hash;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String Key::hashAsString() const
</del><ins>+Key::HashType Key::computePartitionHash(const Salt& salt) const
</ins><span class="cx"> {
</span><ins>+ SHA1 sha1;
+ sha1.addBytes(salt.data(), salt.size());
+
+ hashString(sha1, m_partition);
+
+ SHA1::Digest hash;
+ sha1.computeHash(hash);
+ return hash;
+}
+
+String Key::hashAsString(const HashType& hash)
+{
</ins><span class="cx"> StringBuilder builder;
</span><span class="cx"> builder.reserveCapacity(hashStringLength());
</span><del>- for (auto byte : m_hash) {
</del><ins>+ for (auto byte : hash) {
</ins><span class="cx"> builder.append(upperNibbleToASCIIHexDigit(byte));
</span><span class="cx"> builder.append(lowerNibbleToASCIIHexDigit(byte));
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheKeyh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h (210738 => 210739)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h 2017-01-13 19:18:25 UTC (rev 210738)
+++ branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h 2017-01-13 19:18:30 UTC (rev 210739)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx">
</span><ins>+#include "NetworkCacheData.h"
</ins><span class="cx"> #include <wtf/SHA1.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -44,7 +45,7 @@
</span><span class="cx"> Key() { }
</span><span class="cx"> Key(const Key&);
</span><span class="cx"> Key(Key&&) = default;
</span><del>- Key(const String& partition, const String& type, const String& range, const String& identifier);
</del><ins>+ Key(const String& partition, const String& type, const String& range, const String& identifier, const Salt&);
</ins><span class="cx">
</span><span class="cx"> Key& operator=(const Key&);
</span><span class="cx"> Key& operator=(Key&&) = default;
</span><span class="lines">@@ -54,18 +55,19 @@
</span><span class="cx">
</span><span class="cx"> bool isNull() const { return m_identifier.isNull(); }
</span><span class="cx">
</span><del>- bool hasPartition() const;
</del><span class="cx"> const String& partition() const { return m_partition; }
</span><span class="cx"> const String& identifier() const { return m_identifier; }
</span><span class="cx"> const String& type() const { return m_type; }
</span><span class="cx"> const String& range() const { return m_range; }
</span><span class="cx">
</span><del>- HashType hash() const { return m_hash; }
</del><ins>+ const HashType& hash() const { return m_hash; }
+ const HashType& partitionHash() const { return m_partitionHash; }
</ins><span class="cx">
</span><span class="cx"> static bool stringToHash(const String&, HashType&);
</span><span class="cx">
</span><span class="cx"> static size_t hashStringLength() { return 2 * sizeof(m_hash); }
</span><del>- String hashAsString() const;
</del><ins>+ String hashAsString() const { return hashAsString(m_hash); }
+ String partitionHashAsString() const { return hashAsString(m_partitionHash); }
</ins><span class="cx">
</span><span class="cx"> void encode(Encoder&) const;
</span><span class="cx"> static bool decode(Decoder&, Key&);
</span><span class="lines">@@ -74,7 +76,9 @@
</span><span class="cx"> bool operator!=(const Key& other) const { return !(*this == other); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- HashType computeHash() const;
</del><ins>+ static String hashAsString(const HashType&);
+ HashType computeHash(const Salt&) const;
+ HashType computePartitionHash(const Salt&) const;
</ins><span class="cx">
</span><span class="cx"> String m_partition;
</span><span class="cx"> String m_type;
</span><span class="lines">@@ -81,6 +85,7 @@
</span><span class="cx"> String m_identifier;
</span><span class="cx"> String m_range;
</span><span class="cx"> HashType m_hash;
</span><ins>+ HashType m_partitionHash;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp (210738 => 210739)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2017-01-13 19:18:25 UTC (rev 210738)
+++ branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2017-01-13 19:18:30 UTC (rev 210739)
</span><span class="lines">@@ -79,9 +79,9 @@
</span><span class="cx"> return resource;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline Key makeSubresourcesKey(const Key& resourceKey)
</del><ins>+static inline Key makeSubresourcesKey(const Key& resourceKey, const Salt& salt)
</ins><span class="cx"> {
</span><del>- return Key(resourceKey.partition(), subresourcesType(), resourceKey.range(), resourceKey.identifier());
</del><ins>+ return Key(resourceKey.partition(), subresourcesType(), resourceKey.range(), resourceKey.identifier(), salt);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline ResourceRequest constructRevalidationRequest(const Entry& entry, const SubresourceInfo& subResourceInfo)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> revalidationRequest.setHTTPHeaderFields(subResourceInfo.requestHeaders());
</span><span class="cx"> revalidationRequest.setFirstPartyForCookies(subResourceInfo.firstPartyForCookies());
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><del>- if (entry.key().hasPartition())
</del><ins>+ if (!entry.key().partition().isEmpty())
</ins><span class="cx"> revalidationRequest.setCachePartition(entry.key().partition());
</span><span class="cx"> #endif
</span><span class="cx"> ASSERT_WITH_MESSAGE(entry.key().range().isEmpty(), "range is not supported");
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> m_existingEntry->updateSubresourceLoads(m_subresourceLoads);
</span><span class="cx"> m_storage.store(m_existingEntry->encodeAsStorageRecord(), [](const Data&) { });
</span><span class="cx"> } else {
</span><del>- SubresourcesEntry entry(makeSubresourcesKey(m_mainResourceKey), m_subresourceLoads);
</del><ins>+ SubresourcesEntry entry(makeSubresourcesKey(m_mainResourceKey, m_storage.salt()), m_subresourceLoads);
</ins><span class="cx"> m_storage.store(entry.encodeAsStorageRecord(), [](const Data&) { });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -521,7 +521,7 @@
</span><span class="cx"> void SpeculativeLoadManager::retrieveSubresourcesEntry(const Key& storageKey, std::function<void (std::unique_ptr<SubresourcesEntry>)>&& completionHandler)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(storageKey.type() == "Resource");
</span><del>- auto subresourcesStorageKey = makeSubresourcesKey(storageKey);
</del><ins>+ auto subresourcesStorageKey = makeSubresourcesKey(storageKey, m_storage.salt());
</ins><span class="cx"> m_storage.retrieve(subresourcesStorageKey, static_cast<unsigned>(ResourceLoadPriority::Medium), [completionHandler = WTFMove(completionHandler)](auto record) {
</span><span class="cx"> if (!record) {
</span><span class="cx"> completionHandler(nullptr);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (210738 => 210739)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2017-01-13 19:18:25 UTC (rev 210738)
+++ branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2017-01-13 19:18:30 UTC (rev 210739)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> namespace NetworkCache {
</span><span class="cx">
</span><ins>+static const char saltFileName[] = "salt";
</ins><span class="cx"> static const char versionDirectoryPrefix[] = "Version ";
</span><span class="cx"> static const char recordsDirectoryName[] = "Records";
</span><span class="cx"> static const char blobsDirectoryName[] = "Blobs";
</span><span class="lines">@@ -127,15 +128,6 @@
</span><span class="cx"> unsigned activeCount { 0 };
</span><span class="cx"> };
</span><span class="cx">
</span><del>-std::unique_ptr<Storage> Storage::open(const String& cachePath)
-{
- ASSERT(RunLoop::isMain());
-
- if (!WebCore::makeAllDirectories(cachePath))
- return nullptr;
- return std::unique_ptr<Storage>(new Storage(cachePath));
-}
-
</del><span class="cx"> static String makeVersionedDirectoryPath(const String& baseDirectoryPath)
</span><span class="cx"> {
</span><span class="cx"> String versionSubdirectory = versionDirectoryPrefix + String::number(Storage::version);
</span><span class="lines">@@ -152,13 +144,30 @@
</span><span class="cx"> return WebCore::pathByAppendingComponent(makeVersionedDirectoryPath(baseDirectoryPath), blobsDirectoryName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void traverseRecordsFiles(const String& recordsPath, const String& expectedType, const std::function<void (const String& fileName, const String& hashString, const String& type, bool isBlob, const String& recordDirectoryPath)>& function)
</del><ins>+static String makeSaltFilePath(const String& baseDirectoryPath)
</ins><span class="cx"> {
</span><del>- traverseDirectory(recordsPath, [&recordsPath, &function, &expectedType](const String& partitionName, DirectoryEntryType entryType) {
</del><ins>+ return WebCore::pathByAppendingComponent(makeVersionedDirectoryPath(baseDirectoryPath), saltFileName);
+}
+
+std::unique_ptr<Storage> Storage::open(const String& cachePath)
+{
+ ASSERT(RunLoop::isMain());
+
+ if (!WebCore::makeAllDirectories(makeVersionedDirectoryPath(cachePath)))
+ return nullptr;
+ auto salt = readOrMakeSalt(makeSaltFilePath(cachePath));
+ if (!salt)
+ return nullptr;
+ return std::unique_ptr<Storage>(new Storage(cachePath, *salt));
+}
+
+void traverseRecordsFiles(const String& recordsPath, const String& expectedType, const RecordFileTraverseFunction& function)
+{
+ traverseDirectory(recordsPath, [&](const String& partitionName, DirectoryEntryType entryType) {
</ins><span class="cx"> if (entryType != DirectoryEntryType::Directory)
</span><span class="cx"> return;
</span><span class="cx"> String partitionPath = WebCore::pathByAppendingComponent(recordsPath, partitionName);
</span><del>- traverseDirectory(partitionPath, [&function, &partitionPath, &expectedType](const String& actualType, DirectoryEntryType entryType) {
</del><ins>+ traverseDirectory(partitionPath, [&](const String& actualType, DirectoryEntryType entryType) {
</ins><span class="cx"> if (entryType != DirectoryEntryType::Directory)
</span><span class="cx"> return;
</span><span class="cx"> if (!expectedType.isEmpty() && expectedType != actualType)
</span><span class="lines">@@ -198,15 +207,16 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Storage::Storage(const String& baseDirectoryPath)
</del><ins>+Storage::Storage(const String& baseDirectoryPath, Salt salt)
</ins><span class="cx"> : m_basePath(baseDirectoryPath)
</span><span class="cx"> , m_recordsPath(makeRecordsDirectoryPath(baseDirectoryPath))
</span><ins>+ , m_salt(salt)
</ins><span class="cx"> , m_readOperationTimeoutTimer(*this, &Storage::cancelAllReadOperations)
</span><span class="cx"> , m_writeOperationDispatchTimer(*this, &Storage::dispatchPendingWriteOperations)
</span><span class="cx"> , m_ioQueue(WorkQueue::create("com.apple.WebKit.Cache.Storage", WorkQueue::Type::Concurrent))
</span><span class="cx"> , m_backgroundIOQueue(WorkQueue::create("com.apple.WebKit.Cache.Storage.background", WorkQueue::Type::Concurrent, WorkQueue::QOS::Background))
</span><span class="cx"> , m_serialBackgroundIOQueue(WorkQueue::create("com.apple.WebKit.Cache.Storage.serialBackground", WorkQueue::Type::Serial, WorkQueue::QOS::Background))
</span><del>- , m_blobStorage(makeBlobDirectoryPath(baseDirectoryPath))
</del><ins>+ , m_blobStorage(makeBlobDirectoryPath(baseDirectoryPath), m_salt)
</ins><span class="cx"> {
</span><span class="cx"> deleteOldVersions();
</span><span class="cx"> synchronize();
</span><span class="lines">@@ -326,9 +336,8 @@
</span><span class="cx">
</span><span class="cx"> String Storage::recordDirectoryPathForKey(const Key& key) const
</span><span class="cx"> {
</span><del>- ASSERT(!key.partition().isEmpty());
</del><span class="cx"> ASSERT(!key.type().isEmpty());
</span><del>- return WebCore::pathByAppendingComponent(WebCore::pathByAppendingComponent(recordsPath(), key.partition()), key.type());
</del><ins>+ return WebCore::pathByAppendingComponent(WebCore::pathByAppendingComponent(recordsPath(), key.partitionHashAsString()), key.type());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String Storage::recordPathForKey(const Key& key) const
</span><span class="lines">@@ -397,7 +406,7 @@
</span><span class="cx"> return success;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool decodeRecordHeader(const Data& fileData, RecordMetaData& metaData, Data& headerData)
</del><ins>+static bool decodeRecordHeader(const Data& fileData, RecordMetaData& metaData, Data& headerData, const Salt& salt)
</ins><span class="cx"> {
</span><span class="cx"> if (!decodeRecordMetaData(metaData, fileData)) {
</span><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) meta data decode failure");
</span><span class="lines">@@ -410,7 +419,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> headerData = fileData.subrange(metaData.headerOffset, metaData.headerSize);
</span><del>- if (metaData.headerHash != computeSHA1(headerData)) {
</del><ins>+ if (metaData.headerHash != computeSHA1(headerData, salt)) {
</ins><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) header checksum mismatch");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -423,7 +432,7 @@
</span><span class="cx">
</span><span class="cx"> RecordMetaData metaData;
</span><span class="cx"> Data headerData;
</span><del>- if (!decodeRecordHeader(recordData, metaData, headerData))
</del><ins>+ if (!decodeRecordHeader(recordData, metaData, headerData, m_salt))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (metaData.key != readOperation.key)
</span><span class="lines">@@ -440,7 +449,7 @@
</span><span class="cx"> if (bodyOffset + metaData.bodySize != recordData.size())
</span><span class="cx"> return;
</span><span class="cx"> bodyData = recordData.subrange(bodyOffset, metaData.bodySize);
</span><del>- if (metaData.bodyHash != computeSHA1(bodyData))
</del><ins>+ if (metaData.bodyHash != computeSHA1(bodyData, m_salt))
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -502,9 +511,9 @@
</span><span class="cx">
</span><span class="cx"> RecordMetaData metaData(record.key);
</span><span class="cx"> metaData.epochRelativeTimeStamp = std::chrono::duration_cast<std::chrono::milliseconds>(record.timeStamp.time_since_epoch());
</span><del>- metaData.headerHash = computeSHA1(record.header);
</del><ins>+ metaData.headerHash = computeSHA1(record.header, m_salt);
</ins><span class="cx"> metaData.headerSize = record.header.size();
</span><del>- metaData.bodyHash = blob ? blob.value().hash : computeSHA1(record.body);
</del><ins>+ metaData.bodyHash = blob ? blob.value().hash : computeSHA1(record.body, m_salt);
</ins><span class="cx"> metaData.bodySize = record.body.size();
</span><span class="cx"> metaData.isBodyInline = !blob;
</span><span class="cx">
</span><span class="lines">@@ -823,7 +832,7 @@
</span><span class="cx"> channel->read(0, std::numeric_limits<size_t>::max(), nullptr, [this, &traverseOperation, worth, bodyShareCount](Data& fileData, int) {
</span><span class="cx"> RecordMetaData metaData;
</span><span class="cx"> Data headerData;
</span><del>- if (decodeRecordHeader(fileData, metaData, headerData)) {
</del><ins>+ if (decodeRecordHeader(fileData, metaData, headerData, m_salt)) {
</ins><span class="cx"> Record record {
</span><span class="cx"> metaData.key,
</span><span class="cx"> std::chrono::system_clock::time_point(metaData.epochRelativeTimeStamp),
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (210738 => 210739)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2017-01-13 19:18:25 UTC (rev 210738)
+++ branches/safari-603-branch/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2017-01-13 19:18:30 UTC (rev 210739)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> size_t capacity() const { return m_capacity; }
</span><span class="cx"> size_t approximateSize() const;
</span><span class="cx">
</span><del>- static const unsigned version = 10;
</del><ins>+ static const unsigned version = 11;
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> /// Allow the last stable version of the cache to co-exist with the latest development one.
</span><span class="cx"> static const unsigned lastStableVersion = 9;
</span><span class="lines">@@ -97,10 +97,12 @@
</span><span class="cx"> String versionPath() const;
</span><span class="cx"> String recordsPath() const;
</span><span class="cx">
</span><ins>+ const Salt& salt() const { return m_salt; }
+
</ins><span class="cx"> ~Storage();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Storage(const String& directoryPath);
</del><ins>+ Storage(const String& directoryPath, Salt);
</ins><span class="cx">
</span><span class="cx"> String recordDirectoryPathForKey(const Key&) const;
</span><span class="cx"> String recordPathForKey(const Key&) const;
</span><span class="lines">@@ -141,6 +143,8 @@
</span><span class="cx"> const String m_basePath;
</span><span class="cx"> const String m_recordsPath;
</span><span class="cx">
</span><ins>+ const Salt m_salt;
+
</ins><span class="cx"> size_t m_capacity { std::numeric_limits<size_t>::max() };
</span><span class="cx"> size_t m_approximateRecordsSize { 0 };
</span><span class="cx">
</span><span class="lines">@@ -175,7 +179,8 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove, used by NetworkCacheStatistics only.
</span><del>-void traverseRecordsFiles(const String& recordsPath, const String& type, const std::function<void (const String& fileName, const String& hashString, const String& type, bool isBodyBlob, const String& recordDirectoryPath)>&);
</del><ins>+using RecordFileTraverseFunction = std::function<void (const String& fileName, const String& hashString, const String& type, bool isBlob, const String& recordDirectoryPath)>;
+void traverseRecordsFiles(const String& recordsPath, const String& type, const RecordFileTraverseFunction&);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>