Changeset 161112 in webkit

Timestamp:

Dec 28, 2013 2:18:06 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[WK2][SOUP] Fix handling of cookies when network process is enabled
​https://bugs.webkit.org/show_bug.cgi?id=125576

Patch by Kwang Yul Seo <​skyul@company100.net> on 2013-12-28
Reviewed by Carlos Garcia Campos.

Initialize the network process with cookie accept policy, persistent
storage path and type. Use
WebContext::sendToNetworkingProcessRelaunchingIfNecessary instead of
WebContext::sendToAllProcessesRelaunchingThemIfNecessary to send
SetCookiePersistentStorage message.

• NetworkProcess/soup/NetworkProcessSoup.cpp:

(WebKit::NetworkProcess::platformInitializeNetworkProcess):

• Shared/Network/NetworkProcessCreationParameters.cpp:

(WebKit::NetworkProcessCreationParameters::encode):
(WebKit::NetworkProcessCreationParameters::decode):

• Shared/Network/NetworkProcessCreationParameters.h:
• UIProcess/soup/WebContextSoup.cpp:

(WebKit::WebContext::platformInitializeNetworkProcess):

• UIProcess/soup/WebCookieManagerProxySoup.cpp:

(WebKit::WebCookieManagerProxy::setCookiePersistentStorage):

• WebProcess/soup/WebProcessSoup.cpp:

(WebKit::WebProcess::platformInitializeWebProcess):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/soup/NetworkProcessSoup.cpp (modified) (2 diffs)
• Shared/Network/NetworkProcessCreationParameters.cpp (modified) (2 diffs)
• Shared/Network/NetworkProcessCreationParameters.h (modified) (2 diffs)
• UIProcess/soup/WebContextSoup.cpp (modified) (2 diffs)
• UIProcess/soup/WebCookieManagerProxySoup.cpp (modified) (1 diff)
• WebProcess/soup/WebProcessSoup.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-28  Kwang Yul Seo  <skyul@company100.net>
+
+        [WK2][SOUP] Fix handling of cookies when network process is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=125576
+
+        Reviewed by Carlos Garcia Campos.
+
+        Initialize the network process with cookie accept policy, persistent
+        storage path and type. Use
+        WebContext::sendToNetworkingProcessRelaunchingIfNecessary instead of
+        WebContext::sendToAllProcessesRelaunchingThemIfNecessary to send
+        SetCookiePersistentStorage message.
+
+        * NetworkProcess/soup/NetworkProcessSoup.cpp:
+        (WebKit::NetworkProcess::platformInitializeNetworkProcess):
+        * Shared/Network/NetworkProcessCreationParameters.cpp:
+        (WebKit::NetworkProcessCreationParameters::encode):
+        (WebKit::NetworkProcessCreationParameters::decode):
+        * Shared/Network/NetworkProcessCreationParameters.h:
+        * UIProcess/soup/WebContextSoup.cpp:
+        (WebKit::WebContext::platformInitializeNetworkProcess):
+        * UIProcess/soup/WebCookieManagerProxySoup.cpp:
+        (WebKit::WebCookieManagerProxy::setCookiePersistentStorage):
+        * WebProcess/soup/WebProcessSoup.cpp:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
 2013-12-27  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp

@@ -32 +32 @@
 #include "NetworkProcessCreationParameters.h"
 #include "ResourceCachesToClear.h"
+#include "WebCookieManager.h"
 #include <WebCore/FileSystem.h>
 #include <WebCore/NotImplemented.h>
@@ -80 +81 @@
     soup_session_add_feature(WebCore::ResourceHandle::defaultSession(), SOUP_SESSION_FEATURE(soupCache.get()));
     soup_cache_load(soupCache.get());
+
+    if (!parameters.cookiePersistentStoragePath.isEmpty()) {
+        supplement<WebCookieManager>()->setCookiePersistentStorage(parameters.cookiePersistentStoragePath,
+            parameters.cookiePersistentStorageType);
+    }
+    supplement<WebCookieManager>()->setHTTPCookieAcceptPolicy(parameters.cookieAcceptPolicy);
 
     setIgnoreTLSErrors(parameters.ignoreTLSErrors);

trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp

@@ -56 +56 @@
 #endif
 #if USE(SOUP)
+    encoder << cookiePersistentStoragePath;
+    encoder << cookiePersistentStorageType;
+    encoder.encodeEnum(cookieAcceptPolicy);
     encoder << ignoreTLSErrors;
 #endif
@@ -92 +95 @@
 
 #if USE(SOUP)
+    if (!decoder.decode(result.cookiePersistentStoragePath))
+        return false;
+    if (!decoder.decode(result.cookiePersistentStorageType))
+        return false;
+    if (!decoder.decodeEnum(result.cookieAcceptPolicy))
+        return false;
     if (!decoder.decode(result.ignoreTLSErrors))
         return false;

trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h

@@ -33 +33 @@
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
+
+#if USE(SOUP)
+#include "HTTPCookieAcceptPolicy.h"
+#endif
 
 namespace CoreIPC {
@@ -70 +74 @@
 
 #if USE(SOUP)
+    String cookiePersistentStoragePath;
+    uint32_t cookiePersistentStorageType;
+    HTTPCookieAcceptPolicy cookieAcceptPolicy;
     bool ignoreTLSErrors;
 #endif

trunk/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp

@@ -29 +29 @@
 
 #include "NetworkProcessCreationParameters.h"
+#include "WebCookieManagerProxy.h"
 
 namespace WebKit {
@@ -34 +35 @@
 void WebContext::platformInitializeNetworkProcess(NetworkProcessCreationParameters& parameters)
 {
+    supplement<WebCookieManagerProxy>()->getCookiePersistentStorage(parameters.cookiePersistentStoragePath, parameters.cookiePersistentStorageType);
+    parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
     parameters.ignoreTLSErrors = m_ignoreTLSErrors;
 }

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

@@ -34 +34 @@
 void WebCookieManagerProxy::setCookiePersistentStorage(const String& storagePath, uint32_t storageType)
 {
-    context()->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebCookieManager::SetCookiePersistentStorage(storagePath, storageType));
+    context()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::SetCookiePersistentStorage(storagePath, storageType));
 
     m_cookiePersistentStoragePath = storagePath;

trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp

@@ -206 +206 @@
         soup_session_add_feature(WebCore::ResourceHandle::defaultSession(), SOUP_SESSION_FEATURE(soupCache.get()));
         soup_cache_load(soupCache.get());
+
+        if (!parameters.cookiePersistentStoragePath.isEmpty()) {
+            supplement<WebCookieManager>()->setCookiePersistentStorage(parameters.cookiePersistentStoragePath,
+                parameters.cookiePersistentStorageType);
+        }
+        supplement<WebCookieManager>()->setHTTPCookieAcceptPolicy(parameters.cookieAcceptPolicy);
 #if ENABLE(NETWORK_PROCESS)
     }
@@ -215 +221 @@
         supplement<WebSoupRequestManager>()->registerURIScheme(parameters.urlSchemesRegistered[i]);
 
-    if (!parameters.cookiePersistentStoragePath.isEmpty()) {
-        supplement<WebCookieManager>()->setCookiePersistentStorage(parameters.cookiePersistentStoragePath,
-            parameters.cookiePersistentStorageType);
-    }
-    supplement<WebCookieManager>()->setHTTPCookieAcceptPolicy(parameters.cookieAcceptPolicy);
-
     setIgnoreTLSErrors(parameters.ignoreTLSErrors);