Changeset 180892 in webkit

Timestamp:

Mar 2, 2015 12:45:18 PM (9 years ago)

Author:

andersca@apple.com

Message:

WebsiteDataStore should handle deleting cookies
​https://bugs.webkit.org/show_bug.cgi?id=142185

Reviewed by Beth Dakin.

• NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::deleteWebsiteDataForOrigins):
When asked to delete cookies, do so.

• NetworkProcess/NetworkProcess.h:

Update the deleteWebsiteDataForOrigins signature.

• NetworkProcess/NetworkProcess.messages.in:

Add cookieHostNames to DeleteWebsiteDataForOrigins.

• UIProcess/Network/NetworkProcessProxy.cpp:

(WebKit::NetworkProcessProxy::deleteWebsiteDataForOrigins):

• UIProcess/Network/NetworkProcessProxy.h:

Update to take a vector of cookie host names.

• UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::removeData):
Figure out if we need to ask the network process to delete data.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (1 diff)
• NetworkProcess/NetworkProcess.h (modified) (1 diff)
• NetworkProcess/NetworkProcess.messages.in (modified) (1 diff)
• UIProcess/Network/NetworkProcessProxy.cpp (modified) (2 diffs)
• UIProcess/Network/NetworkProcessProxy.h (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataStore.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-02  Anders Carlsson  <andersca@apple.com>
+
+        WebsiteDataStore should handle deleting cookies
+        https://bugs.webkit.org/show_bug.cgi?id=142185
+
+        Reviewed by Beth Dakin.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::deleteWebsiteDataForOrigins):
+        When asked to delete cookies, do so.
+
+        * NetworkProcess/NetworkProcess.h:
+        Update the deleteWebsiteDataForOrigins signature.
+
+        * NetworkProcess/NetworkProcess.messages.in:
+        Add cookieHostNames to DeleteWebsiteDataForOrigins.
+
+        * UIProcess/Network/NetworkProcessProxy.cpp:
+        (WebKit::NetworkProcessProxy::deleteWebsiteDataForOrigins):
+        * UIProcess/Network/NetworkProcessProxy.h:
+        Update to take a vector of cookie host names.
+
+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+        (WebKit::WebsiteDataStore::removeData):
+        Figure out if we need to ask the network process to delete data.
+
 2015-03-02  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp

@@ -345 +345 @@
 }
 
-void NetworkProcess::deleteWebsiteDataForOrigins(SessionID sessionID, uint64_t websiteDataTypes, const Vector<SecurityOriginData>& origins, uint64_t callbackID)
-{
-    // FIXME: Actually delete something.
+void NetworkProcess::deleteWebsiteDataForOrigins(SessionID sessionID, uint64_t websiteDataTypes, const Vector<SecurityOriginData>& origins, const Vector<String>& cookieHostNames, uint64_t callbackID)
+{
+    if (websiteDataTypes & WebsiteDataTypeCookies) {
+        if (auto* networkStorageSession = SessionTracker::session(sessionID)) {
+            for (const auto& cookieHostName : cookieHostNames)
+                deleteCookiesForHostname(*networkStorageSession, cookieHostName);
+        }
+    }
 
     auto completionHandler = [this, callbackID] {

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h

@@ -124 +124 @@
     void fetchWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, uint64_t callbackID);
     void deleteWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
-    void deleteWebsiteDataForOrigins(WebCore::SessionID, uint64_t websiteDataTypes, const Vector<SecurityOriginData>& origins, uint64_t callbackID);
+    void deleteWebsiteDataForOrigins(WebCore::SessionID, uint64_t websiteDataTypes, const Vector<SecurityOriginData>& origins, const Vector<String>& cookieHostNames, uint64_t callbackID);
 
     // FIXME: This should take a session ID so we can identify which disk cache to delete.

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in

@@ -40 +40 @@
     FetchWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, uint64_t callbackID)
     DeleteWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
-    DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, Vector<WebKit::SecurityOriginData> origins, uint64_t callbackID)
+    DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, Vector<WebKit::SecurityOriginData> origins, Vector<String> cookieHostNames, uint64_t callbackID)
 
     DownloadRequest(uint64_t downloadID, WebCore::ResourceRequest request)

trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp

@@ -133 +133 @@
 }
 
-void NetworkProcessProxy::deleteWebsiteDataForOrigins(SessionID sessionID, WebsiteDataTypes dataTypes, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler)
+void NetworkProcessProxy::deleteWebsiteDataForOrigins(SessionID sessionID, WebsiteDataTypes dataTypes, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, const Vector<String>& cookieHostNames, std::function<void ()> completionHandler)
 {
     ASSERT(canSendMessage());
@@ -144 +144 @@
         originData.append(SecurityOriginData::fromSecurityOrigin(*origin));
 
-    send(Messages::WebProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, originData, callbackID), 0);
+    send(Messages::NetworkProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, originData, cookieHostNames, callbackID), 0);
 }
 

trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h

@@ -66 +66 @@
     void fetchWebsiteData(WebCore::SessionID, WebsiteDataTypes, std::function<void (WebsiteData)> completionHandler);
     void deleteWebsiteData(WebCore::SessionID, WebsiteDataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
-    void deleteWebsiteDataForOrigins(WebCore::SessionID, WebsiteDataTypes, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler);
+    void deleteWebsiteDataForOrigins(WebCore::SessionID, WebsiteDataTypes, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, const Vector<String>& cookieHostNames, std::function<void ()> completionHandler);
 
 #if PLATFORM(COCOA)

trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp

@@ -441 +441 @@
     RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator(WTF::move(completionHandler)));
 
+    auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataRemoval(dataTypes, isNonPersistent());
+    if (networkProcessAccessType != ProcessAccessType::None) {
+        HashSet<WebProcessPool*> processPools;
+        for (auto& process : processes())
+            processPools.add(&process->processPool());
+
+        for (auto& processPool : processPools) {
+            switch (networkProcessAccessType) {
+            case ProcessAccessType::OnlyIfLaunched:
+                if (!processPool->networkProcess())
+                    continue;
+                break;
+
+            case ProcessAccessType::Launch:
+                processPool->ensureNetworkProcess();
+                break;
+
+            case ProcessAccessType::None:
+                ASSERT_NOT_REACHED();
+            }
+
+            Vector<String> cookieHostNames;
+            for (const auto& dataRecord : dataRecords) {
+                for (auto& hostName : dataRecord.cookieHostNames)
+                    cookieHostNames.append(hostName);
+            }
+
+            callbackAggregator->addPendingCallback();
+            processPool->networkProcess()->deleteWebsiteDataForOrigins(m_sessionID, dataTypes, origins, cookieHostNames, [callbackAggregator] {
+                callbackAggregator->removePendingCallback();
+            });
+        }
+    }
+
     auto webProcessAccessType = computeWebProcessAccessTypeForDataRemoval(dataTypes, isNonPersistent());
     if (webProcessAccessType != ProcessAccessType::None) {