Changeset 280128 in webkit

Timestamp:

Jul 21, 2021 4:51:18 AM (3 years ago)

Author:

Carlos Garcia Campos

Message:

REGRESSION(r267763): [SOUP] After network process crash, all cookies are lost until browser is restarted
​https://bugs.webkit.org/show_bug.cgi?id=228128

Reviewed by Adrian Perez de Castro.

Cookies configuration is no longer stored to be sent again to the new network process after a crash.

• NetworkProcess/NetworkSessionCreationParameters.cpp:

(WebKit::NetworkSessionCreationParameters::encode const): Encode cookieAcceptPolicy.
(WebKit::NetworkSessionCreationParameters::decode): Decode cookieAcceptPolicy.

• NetworkProcess/NetworkSessionCreationParameters.h: Add cookieAcceptPolicy.
• NetworkProcess/soup/NetworkSessionSoup.cpp:

(WebKit::NetworkSessionSoup::NetworkSessionSoup): Set cookie accept policy on NetworkStorageSession.

• UIProcess/API/glib/WebKitCookieManager.cpp:

(webkit_cookie_manager_set_persistent_storage): Use WebsiteDataStore API to cache the given values.
(webkit_cookie_manager_set_accept_policy): Ditto.

• UIProcess/WebCookieManagerProxy.h:
• UIProcess/WebsiteData/WebsiteDataStore.h:
• UIProcess/WebsiteData/soup/WebsiteDataStoreSoup.cpp:

(WebKit::WebsiteDataStore::platformSetNetworkParameters): Set cached cookie settings to network session parameters.
(WebKit::WebsiteDataStore::setCookiePersistentStorage): Cache the given value and notify the cookie manager.
(WebKit::WebsiteDataStore::setHTTPCookieAcceptPolicy): Ditto.

• UIProcess/soup/WebCookieManagerProxySoup.cpp:

(WebKit::WebCookieManagerProxy::getCookiePersistentStorage const): Deleted.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkSessionCreationParameters.cpp (modified) (3 diffs)
• NetworkProcess/NetworkSessionCreationParameters.h (modified) (2 diffs)
• NetworkProcess/soup/NetworkSessionSoup.cpp (modified) (1 diff)
• UIProcess/API/glib/WebKitCookieManager.cpp (modified) (2 diffs)
• UIProcess/WebCookieManagerProxy.h (modified) (2 diffs)
• UIProcess/WebsiteData/WebsiteDataStore.h (modified) (3 diffs)
• UIProcess/WebsiteData/soup/WebsiteDataStoreSoup.cpp (modified) (2 diffs)
• UIProcess/soup/WebCookieManagerProxySoup.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-07-21  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r267763): [SOUP] After network process crash, all cookies are lost until browser is restarted
+        https://bugs.webkit.org/show_bug.cgi?id=228128
+
+        Reviewed by Adrian Perez de Castro.
+
+        Cookies configuration is no longer stored to be sent again to the new network process after a crash.
+
+        * NetworkProcess/NetworkSessionCreationParameters.cpp:
+        (WebKit::NetworkSessionCreationParameters::encode const): Encode cookieAcceptPolicy.
+        (WebKit::NetworkSessionCreationParameters::decode): Decode cookieAcceptPolicy.
+        * NetworkProcess/NetworkSessionCreationParameters.h: Add cookieAcceptPolicy.
+        * NetworkProcess/soup/NetworkSessionSoup.cpp:
+        (WebKit::NetworkSessionSoup::NetworkSessionSoup): Set cookie accept policy on NetworkStorageSession.
+        * UIProcess/API/glib/WebKitCookieManager.cpp:
+        (webkit_cookie_manager_set_persistent_storage): Use WebsiteDataStore API to cache the given values.
+        (webkit_cookie_manager_set_accept_policy): Ditto.
+        * UIProcess/WebCookieManagerProxy.h:
+        * UIProcess/WebsiteData/WebsiteDataStore.h:
+        * UIProcess/WebsiteData/soup/WebsiteDataStoreSoup.cpp:
+        (WebKit::WebsiteDataStore::platformSetNetworkParameters): Set cached cookie settings to network session parameters.
+        (WebKit::WebsiteDataStore::setCookiePersistentStorage): Cache the given value and notify the cookie manager.
+        (WebKit::WebsiteDataStore::setHTTPCookieAcceptPolicy): Ditto.
+        * UIProcess/soup/WebCookieManagerProxySoup.cpp:
+        (WebKit::WebCookieManagerProxy::getCookiePersistentStorage const): Deleted.
+
 2021-07-20  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp

@@ -65 +65 @@
     encoder << ignoreTLSErrors;
     encoder << proxySettings;
+    encoder << cookieAcceptPolicy;
 #endif
 #if USE(CURL)
@@ -190 +191 @@
     if (!proxySettings)
         return std::nullopt;
+
+    std::optional<WebCore::HTTPCookieAcceptPolicy> cookieAcceptPolicy;
+    decoder >> cookieAcceptPolicy;
+    if (!cookieAcceptPolicy)
+        return std::nullopt;
 #endif
 
@@ -319 +325 @@
         , WTFMove(*ignoreTLSErrors)
         , WTFMove(*proxySettings)
+        , WTFMove(*cookieAcceptPolicy)
 #endif
 #if USE(CURL)

trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h

@@ -34 +34 @@
 #if USE(SOUP)
 #include "SoupCookiePersistentStorageType.h"
+#include <WebCore/HTTPCookieAcceptPolicy.h>
 #include <WebCore/SoupNetworkProxySettings.h>
 #endif
@@ -78 +79 @@
     bool ignoreTLSErrors { false };
     WebCore::SoupNetworkProxySettings proxySettings;
+    WebCore::HTTPCookieAcceptPolicy cookieAcceptPolicy { WebCore::HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain };
 #endif
 #if USE(CURL)

trunk/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp

@@ -47 +47 @@
     auto* storageSession = networkStorageSession();
     ASSERT(storageSession);
+
+    storageSession->setCookieAcceptPolicy(parameters.cookieAcceptPolicy);
 
     setIgnoreTLSErrors(parameters.ignoreTLSErrors);

trunk/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp

@@ -195 +195 @@
         return;
 
-    manager->priv->cookieManager().setCookiePersistentStorage(sessionID, String::fromUTF8(filename), toSoupCookiePersistentStorageType(storage));
+    auto& websiteDataStore = webkitWebsiteDataManagerGetDataStore(manager->priv->dataManager);
+    websiteDataStore.setCookiePersistentStorage(String::fromUTF8(filename), toSoupCookiePersistentStorageType(storage));
 }
 
@@ -213 +214 @@
     g_return_if_fail(WEBKIT_IS_COOKIE_MANAGER(manager));
 
-    manager->priv->cookieManager().setHTTPCookieAcceptPolicy(manager->priv->sessionID(), toHTTPCookieAcceptPolicy(policy), []() { });
+    auto& websiteDataStore = webkitWebsiteDataManagerGetDataStore(manager->priv->dataManager);
+    websiteDataStore.setHTTPCookieAcceptPolicy(toHTTPCookieAcceptPolicy(policy));
 }
 

trunk/Source/WebKit/UIProcess/WebCookieManagerProxy.h

@@ -88 +88 @@
 #if USE(SOUP)
     void setCookiePersistentStorage(PAL::SessionID, const String& storagePath, SoupCookiePersistentStorageType);
-    void getCookiePersistentStorage(PAL::SessionID, String& storagePath, SoupCookiePersistentStorageType&) const;
 #endif
 
@@ -100 +99 @@
 
     WeakPtr<NetworkProcessProxy> m_networkProcess;
-
-#if USE(SOUP)
-    using CookiePersistentStorageMap = HashMap<PAL::SessionID, std::pair<String, SoupCookiePersistentStorageType>>;
-    CookiePersistentStorageMap m_cookiePersistentStorageMap;
-#endif
 };
 

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h

@@ -63 +63 @@
 
 #if USE(SOUP)
+#include "SoupCookiePersistentStorageType.h"
+#include <WebCore/HTTPCookieAcceptPolicy.h>
 #include <WebCore/SoupNetworkProxySettings.h>
 #endif
@@ -291 +293 @@
     void setNetworkProxySettings(WebCore::SoupNetworkProxySettings&&);
     const WebCore::SoupNetworkProxySettings& networkProxySettings() const { return m_networkProxySettings; }
+    void setCookiePersistentStorage(const String&, SoupCookiePersistentStorageType);
+    void setHTTPCookieAcceptPolicy(WebCore::HTTPCookieAcceptPolicy);
 #endif
 
@@ -434 +438 @@
     bool m_ignoreTLSErrors { true };
     WebCore::SoupNetworkProxySettings m_networkProxySettings;
+    String m_cookiePersistentStoragePath;
+    SoupCookiePersistentStorageType m_cookiePersistentStorageType { SoupCookiePersistentStorageType::SQLite };
+    WebCore::HTTPCookieAcceptPolicy m_cookieAcceptPolicy { WebCore::HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain };
 #endif
 

trunk/Source/WebKit/UIProcess/WebsiteData/soup/WebsiteDataStoreSoup.cpp

@@ -42 +42 @@
     networkSessionParameters.ignoreTLSErrors = m_ignoreTLSErrors;
     networkSessionParameters.proxySettings = m_networkProxySettings;
-
-    networkProcess().cookieManager().getCookiePersistentStorage(m_sessionID, networkSessionParameters.cookiePersistentStoragePath, networkSessionParameters.cookiePersistentStorageType);
+    networkSessionParameters.cookiePersistentStoragePath = m_cookiePersistentStoragePath;
+    networkSessionParameters.cookiePersistentStorageType = m_cookiePersistentStorageType;
+    networkSessionParameters.cookieAcceptPolicy = m_cookieAcceptPolicy;
 }
 
@@ -73 +74 @@
 }
 
+void WebsiteDataStore::setCookiePersistentStorage(const String& storagePath, SoupCookiePersistentStorageType storageType)
+{
+    if (m_cookiePersistentStoragePath == storagePath && m_cookiePersistentStorageType == storageType)
+        return;
+
+    m_cookiePersistentStoragePath = storagePath;
+    m_cookiePersistentStorageType = storageType;
+    networkProcess().cookieManager().setCookiePersistentStorage(m_sessionID, m_cookiePersistentStoragePath, m_cookiePersistentStorageType);
+}
+
+void WebsiteDataStore::setHTTPCookieAcceptPolicy(WebCore::HTTPCookieAcceptPolicy policy)
+{
+    if (m_cookieAcceptPolicy == policy)
+        return;
+
+    m_cookieAcceptPolicy = policy;
+    networkProcess().cookieManager().setHTTPCookieAcceptPolicy(m_sessionID, policy, [] { });
+}
+
 } // namespace WebKit

trunk/Source/WebKit/UIProcess/soup/WebCookieManagerProxySoup.cpp

@@ -29 +29 @@
 #include "NetworkProcessProxy.h"
 #include "WebCookieManagerMessages.h"
-#include "WebProcessPool.h"
 
 namespace WebKit {
@@ -39 +38 @@
 }
 
-void WebCookieManagerProxy::getCookiePersistentStorage(PAL::SessionID sessionID, String& storagePath, SoupCookiePersistentStorageType& storageType) const
-{
-    auto pair = m_cookiePersistentStorageMap.get(sessionID);
-    storagePath = pair.first;
-    storageType = pair.second;
-}
-
-}
+} // namespace WebKit