<!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>[185513] trunk/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/185513">185513</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-06-12 10:43:31 -0700 (Fri, 12 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Network Cache: Use SHA1 for header checksum
https://bugs.webkit.org/show_bug.cgi?id=145928
Reviewed by Chris Dumez.
Use SHA1 everywhere for consistency and robustness.
* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::bodyPathForKey):
(WebKit::NetworkCache::RecordMetaData::RecordMetaData):
(WebKit::NetworkCache::decodeRecordMetaData):
(WebKit::NetworkCache::decodeRecordHeader):
(WebKit::NetworkCache::encodeRecordMetaData):
(WebKit::NetworkCache::Storage::encodeRecord):
(WebKit::NetworkCache::hashData): Deleted.
This was the last user of 32 bit hashes in cache code.
* NetworkProcess/cache/NetworkCacheStorage.h:
Also bump the cache version number as recent changes have changed the format.
Old caches would transition fine but this makes it easier to identify which version user has.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185512 => 185513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-12 17:10:07 UTC (rev 185512)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-12 17:43:31 UTC (rev 185513)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-06-12 Antti Koivisto <antti@apple.com>
+
+ Network Cache: Use SHA1 for header checksum
+ https://bugs.webkit.org/show_bug.cgi?id=145928
+
+ Reviewed by Chris Dumez.
+
+ Use SHA1 everywhere for consistency and robustness.
+
+ * NetworkProcess/cache/NetworkCacheStorage.cpp:
+ (WebKit::NetworkCache::Storage::bodyPathForKey):
+ (WebKit::NetworkCache::RecordMetaData::RecordMetaData):
+ (WebKit::NetworkCache::decodeRecordMetaData):
+ (WebKit::NetworkCache::decodeRecordHeader):
+ (WebKit::NetworkCache::encodeRecordMetaData):
+ (WebKit::NetworkCache::Storage::encodeRecord):
+ (WebKit::NetworkCache::hashData): Deleted.
+
+ This was the last user of 32 bit hashes in cache code.
+
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+
+ Also bump the cache version number as recent changes have changed the format.
+ Old caches would transition fine but this makes it easier to identify which version user has.
+
</ins><span class="cx"> 2015-06-12 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] Video with reflection crashes WebKit and Safari
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (185512 => 185513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-06-12 17:10:07 UTC (rev 185512)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-06-12 17:43:31 UTC (rev 185513)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "NetworkCacheCoders.h"
</span><span class="cx"> #include "NetworkCacheFileSystem.h"
</span><span class="cx"> #include "NetworkCacheIOChannel.h"
</span><del>-#include <wtf/PageBlock.h>
</del><span class="cx"> #include <wtf/RandomNumber.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -272,16 +271,6 @@
</span><span class="cx"> return bodyPathForRecordPath(recordPathForKey(key));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static unsigned hashData(const Data& data)
-{
- StringHasher hasher;
- data.apply([&hasher](const uint8_t* data, size_t size) {
- hasher.addCharacters(data, size);
- return true;
- });
- return hasher.hash();
-}
-
</del><span class="cx"> struct RecordMetaData {
</span><span class="cx"> RecordMetaData() { }
</span><span class="cx"> explicit RecordMetaData(const Key& key)
</span><span class="lines">@@ -293,12 +282,14 @@
</span><span class="cx"> Key key;
</span><span class="cx"> // FIXME: Add encoder/decoder for time_point.
</span><span class="cx"> std::chrono::milliseconds epochRelativeTimeStamp;
</span><del>- unsigned headerChecksum;
- uint64_t headerOffset;
</del><ins>+ SHA1::Digest headerHash;
</ins><span class="cx"> uint64_t headerSize;
</span><span class="cx"> SHA1::Digest bodyHash;
</span><span class="cx"> uint64_t bodySize;
</span><span class="cx"> bool isBodyInline;
</span><ins>+
+ // Not encoded as a field. Header starts immediately after meta data.
+ uint64_t headerOffset;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static bool decodeRecordMetaData(RecordMetaData& metaData, const Data& fileData)
</span><span class="lines">@@ -312,7 +303,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(metaData.epochRelativeTimeStamp))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(metaData.headerChecksum))
</del><ins>+ if (!decoder.decode(metaData.headerHash))
</ins><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(metaData.headerSize))
</span><span class="cx"> return false;
</span><span class="lines">@@ -344,7 +335,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> headerData = fileData.subrange(metaData.headerOffset, metaData.headerSize);
</span><del>- if (metaData.headerChecksum != hashData(headerData)) {
</del><ins>+ if (metaData.headerHash != computeSHA1(headerData)) {
</ins><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) header checksum mismatch");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -394,7 +385,7 @@
</span><span class="cx"> encoder << metaData.cacheStorageVersion;
</span><span class="cx"> encoder << metaData.key;
</span><span class="cx"> encoder << metaData.epochRelativeTimeStamp;
</span><del>- encoder << metaData.headerChecksum;
</del><ins>+ encoder << metaData.headerHash;
</ins><span class="cx"> encoder << metaData.headerSize;
</span><span class="cx"> encoder << metaData.bodyHash;
</span><span class="cx"> encoder << metaData.bodySize;
</span><span class="lines">@@ -436,7 +427,7 @@
</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.headerChecksum = hashData(record.header);
</del><ins>+ metaData.headerHash = computeSHA1(record.header);
</ins><span class="cx"> metaData.headerSize = record.header.size();
</span><span class="cx"> metaData.bodyHash = blob ? blob.value().hash : computeSHA1(record.body);
</span><span class="cx"> metaData.bodySize = record.body.size();
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (185512 => 185513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-06-12 17:10:07 UTC (rev 185512)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-06-12 17:43:31 UTC (rev 185513)
</span><span class="lines">@@ -84,7 +84,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 = 3;
</del><ins>+ static const unsigned version = 4;
</ins><span class="cx">
</span><span class="cx"> String basePath() const;
</span><span class="cx"> String versionPath() const;
</span></span></pre>
</div>
</div>
</body>
</html>