<!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>[176794] 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/176794">176794</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-04 08:35:29 -0800 (Thu, 04 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a way to delete local storage origins modified after a given date
https://bugs.webkit.org/show_bug.cgi?id=139249
Reviewed by Tim Horton.
Also change LocalStorageDatabaseTracker to hold on to WTF::Optional time_t values
instead of treating missing values as zero.
* UIProcess/LocalStorageDetails.h:
* UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
(WebKit::fileCreationTime):
(WebKit::fileModificationTime):
(WebKit::LocalStorageDatabaseTracker::deleteDatabasesModifiedSince):
(WebKit::LocalStorageDatabaseTracker::details):
* UIProcess/Storage/LocalStorageDatabaseTracker.h:
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::deleteLocalStorageOriginsModifiedSince):
* UIProcess/Storage/StorageManager.h:
* UIProcess/WebKeyValueStorageManager.cpp:
(WebKit::didGetStorageDetailsByOrigin):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLocalStorageDetailsh">trunk/Source/WebKit2/UIProcess/LocalStorageDetails.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackercpp">trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackerh">trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagercpp">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagerh">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebKeyValueStorageManagercpp">trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176793 => 176794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-04 16:35:23 UTC (rev 176793)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-04 16:35:29 UTC (rev 176794)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-12-03 Anders Carlsson <andersca@apple.com>
+
+ Add a way to delete local storage origins modified after a given date
+ https://bugs.webkit.org/show_bug.cgi?id=139249
+
+ Reviewed by Tim Horton.
+
+ Also change LocalStorageDatabaseTracker to hold on to WTF::Optional time_t values
+ instead of treating missing values as zero.
+
+ * UIProcess/LocalStorageDetails.h:
+ * UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
+ (WebKit::fileCreationTime):
+ (WebKit::fileModificationTime):
+ (WebKit::LocalStorageDatabaseTracker::deleteDatabasesModifiedSince):
+ (WebKit::LocalStorageDatabaseTracker::details):
+ * UIProcess/Storage/LocalStorageDatabaseTracker.h:
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::deleteLocalStorageOriginsModifiedSince):
+ * UIProcess/Storage/StorageManager.h:
+ * UIProcess/WebKeyValueStorageManager.cpp:
+ (WebKit::didGetStorageDetailsByOrigin):
+
</ins><span class="cx"> 2014-12-04 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL][WK2] Add ewk API to allow accepting a specific TLS certificate for a specific host
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLocalStorageDetailsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/LocalStorageDetails.h (176793 => 176794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/LocalStorageDetails.h 2014-12-04 16:35:23 UTC (rev 176793)
+++ trunk/Source/WebKit2/UIProcess/LocalStorageDetails.h 2014-12-04 16:35:29 UTC (rev 176794)
</span><span class="lines">@@ -26,14 +26,15 @@
</span><span class="cx"> #ifndef LocalStorageDetails_h
</span><span class="cx"> #define LocalStorageDetails_h
</span><span class="cx">
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> struct LocalStorageDetails {
</span><span class="cx"> String originIdentifier;
</span><del>- double creationTime;
- double modificationTime;
</del><ins>+ Optional<time_t> creationTime;
+ Optional<time_t> modificationTime;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp (176793 => 176794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2014-12-04 16:35:23 UTC (rev 176793)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2014-12-04 16:35:29 UTC (rev 176794)
</span><span class="lines">@@ -125,6 +125,39 @@
</span><span class="cx"> deleteEmptyDirectory(m_localStorageDirectory);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static Optional<time_t> fileCreationTime(const String& filePath)
+{
+ time_t time;
+ return getFileCreationTime(filePath, time) ? time : Nullopt;
+}
+
+static Optional<time_t> fileModificationTime(const String& filePath)
+{
+ time_t time;
+ return getFileModificationTime(filePath, time) ? time : Nullopt;
+}
+
+Vector<RefPtr<SecurityOrigin>> LocalStorageDatabaseTracker::deleteDatabasesModifiedSince(time_t time)
+{
+ Vector<RefPtr<SecurityOrigin>> deletedDatabaseOrigins;
+
+ for (const String& origin : m_origins) {
+ String filePath = pathForDatabaseWithOriginIdentifier(origin);
+
+ auto modificationTime = fileModificationTime(filePath);
+ if (!modificationTime)
+ continue;
+
+ if (modificationTime.value() >= time) {
+ removeDatabaseWithOriginIdentifier(origin);
+
+ deletedDatabaseOrigins.append(SecurityOrigin::createFromDatabaseIdentifier(origin));
+ }
+ }
+
+ return deletedDatabaseOrigins;
+}
+
</ins><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> LocalStorageDatabaseTracker::origins() const
</span><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<SecurityOrigin>> origins;
</span><span class="lines">@@ -143,12 +176,11 @@
</span><span class="cx">
</span><span class="cx"> for (const String& origin : m_origins) {
</span><span class="cx"> String filePath = pathForDatabaseWithOriginIdentifier(origin);
</span><del>- time_t time;
</del><span class="cx">
</span><span class="cx"> LocalStorageDetails details;
</span><span class="cx"> details.originIdentifier = origin.isolatedCopy();
</span><del>- details.creationTime = getFileCreationTime(filePath, time) ? time : 0;
- details.modificationTime = getFileModificationTime(filePath, time) ? time : 0;
</del><ins>+ details.creationTime = fileCreationTime(filePath);
+ details.modificationTime = fileModificationTime(filePath);
</ins><span class="cx"> result.uncheckedAppend(details);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h (176793 => 176794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h 2014-12-04 16:35:23 UTC (rev 176793)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h 2014-12-04 16:35:29 UTC (rev 176794)
</span><span class="lines">@@ -55,6 +55,9 @@
</span><span class="cx"> void deleteDatabaseWithOrigin(WebCore::SecurityOrigin*);
</span><span class="cx"> void deleteAllDatabases();
</span><span class="cx">
</span><ins>+ // Returns a vector of the origins whose databases have been deleted.
+ Vector<RefPtr<WebCore::SecurityOrigin>> deleteDatabasesModifiedSince(time_t);
+
</ins><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> origins() const;
</span><span class="cx"> Vector<LocalStorageDetails> details();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (176793 => 176794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2014-12-04 16:35:23 UTC (rev 176793)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2014-12-04 16:35:29 UTC (rev 176794)
</span><span class="lines">@@ -438,6 +438,22 @@
</span><span class="cx"> m_queue->dispatch(bind(&StorageManager::deleteAllEntriesInternal, this));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void StorageManager::deleteLocalStorageOriginsModifiedSince(time_t time, std::function<void ()> completionHandler)
+{
+ RefPtr<StorageManager> storageManager(this);
+
+ m_queue->dispatch([storageManager, time, completionHandler] {
+ auto deletedOrigins = storageManager->m_localStorageDatabaseTracker->deleteDatabasesModifiedSince(time);
+
+ for (const auto& origin : deletedOrigins) {
+ for (auto& localStorageNamespace : storageManager->m_localStorageNamespaces.values())
+ localStorageNamespace->clearStorageAreasMatchingOrigin(origin.get());
+ }
+
+ RunLoop::main().dispatch(completionHandler);
+ });
+}
+
</ins><span class="cx"> void StorageManager::createLocalStorageMap(IPC::Connection* connection, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData& securityOriginData)
</span><span class="cx"> {
</span><span class="cx"> std::pair<RefPtr<IPC::Connection>, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (176793 => 176794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2014-12-04 16:35:23 UTC (rev 176793)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2014-12-04 16:35:29 UTC (rev 176794)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define StorageManager_h
</span><span class="cx">
</span><span class="cx"> #include "Connection.h"
</span><ins>+#include <chrono>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="lines">@@ -66,6 +67,8 @@
</span><span class="cx"> void deleteEntriesForOrigin(const WebCore::SecurityOrigin&);
</span><span class="cx"> void deleteAllEntries();
</span><span class="cx">
</span><ins>+ void deleteLocalStorageOriginsModifiedSince(time_t, std::function<void ()> completionHandler);
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit StorageManager(const String& localStorageDirectory);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebKeyValueStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp (176793 => 176794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp 2014-12-04 16:35:23 UTC (rev 176793)
+++ trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp 2014-12-04 16:35:29 UTC (rev 176794)
</span><span class="lines">@@ -118,9 +118,9 @@
</span><span class="cx">
</span><span class="cx"> detailsMap.set(WebKeyValueStorageManager::originKey(), origin);
</span><span class="cx"> if (originDetails.creationTime)
</span><del>- detailsMap.set(WebKeyValueStorageManager::creationTimeKey(), API::Double::create(originDetails.creationTime));
</del><ins>+ detailsMap.set(WebKeyValueStorageManager::creationTimeKey(), API::Double::create(originDetails.creationTime.valueOr(0)));
</ins><span class="cx"> if (originDetails.modificationTime)
</span><del>- detailsMap.set(WebKeyValueStorageManager::modificationTimeKey(), API::Double::create(originDetails.modificationTime));
</del><ins>+ detailsMap.set(WebKeyValueStorageManager::modificationTimeKey(), API::Double::create(originDetails.modificationTime.valueOr(0)));
</ins><span class="cx">
</span><span class="cx"> result.uncheckedAppend(ImmutableDictionary::create(WTF::move(detailsMap)));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>