Changeset 160355 in webkit

Timestamp:

Dec 10, 2013 4:21:03 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[WK2][SOUP] initialise the Network Process with ignoreTLSErrors
​https://bugs.webkit.org/show_bug.cgi?id=125490

ResourceHandleSoup in the Network Process and is not initialised with
a policy on ignoring TLS errors. This simply requires that the
appropriate message is created for the Network Process and the
parameter created for initialisation.

Patch by Brian Holt <​brian.holt@samsung.com> on 2013-12-10
Reviewed by Gustavo Noronha Silva.

• NetworkProcess/NetworkProcess.h:
• NetworkProcess/NetworkProcess.messages.in:
• NetworkProcess/soup/NetworkProcessSoup.cpp:

(WebKit::NetworkProcess::platformInitializeNetworkProcess):
(WebKit::NetworkProcess::setIgnoreTLSErrors):

• Shared/Network/NetworkProcessCreationParameters.cpp:

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

• Shared/Network/NetworkProcessCreationParameters.h:
• UIProcess/gtk/WebContextGtk.cpp:

(WebKit::WebContext::platformInitializeWebProcess):

• UIProcess/soup/WebContextSoup.cpp:

(WebKit::WebContext::platformInitializeNetworkProcess):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.h (modified) (1 diff)
• NetworkProcess/NetworkProcess.messages.in (modified) (1 diff)
• NetworkProcess/soup/NetworkProcessSoup.cpp (modified) (2 diffs)
• Shared/Network/NetworkProcessCreationParameters.cpp (modified) (2 diffs)
• Shared/Network/NetworkProcessCreationParameters.h (modified) (1 diff)
• UIProcess/gtk/WebContextGtk.cpp (modified) (1 diff)
• UIProcess/soup/WebContextSoup.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-10  Brian Holt  <brian.holt@samsung.com>
+
+        [WK2][SOUP] initialise the Network Process with ignoreTLSErrors
+        https://bugs.webkit.org/show_bug.cgi?id=125490
+
+        ResourceHandleSoup in the Network Process and is not initialised with
+        a policy on ignoring TLS errors.  This simply requires that the
+        appropriate message is created for the Network Process and the
+        parameter created for initialisation.
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * NetworkProcess/NetworkProcess.h:
+        * NetworkProcess/NetworkProcess.messages.in:
+        * NetworkProcess/soup/NetworkProcessSoup.cpp:
+        (WebKit::NetworkProcess::platformInitializeNetworkProcess):
+        (WebKit::NetworkProcess::setIgnoreTLSErrors):
+        * Shared/Network/NetworkProcessCreationParameters.cpp:
+        (WebKit::NetworkProcessCreationParameters::encode):
+        (WebKit::NetworkProcessCreationParameters::decode):
+        * Shared/Network/NetworkProcessCreationParameters.h:
+        * UIProcess/gtk/WebContextGtk.cpp:
+        (WebKit::WebContext::platformInitializeWebProcess):
+        * UIProcess/soup/WebContextSoup.cpp:
+        (WebKit::WebContext::platformInitializeNetworkProcess):
+
 2013-12-09  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h

@@ -109 +109 @@
     void clearCacheForAllOrigins(uint32_t cachesToClear);
 
+#if USE(SOUP)
+    void setIgnoreTLSErrors(bool);
+#endif
+
     // Platform Helpers
     void platformSetCacheModel(CacheModel);

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

@@ -30 +30 @@
     CreateNetworkConnectionToWebProcess()
 
+#if USE(SOUP)
+    SetIgnoreTLSErrors(bool ignoreTLSErrors)
+#endif
+
     EnsurePrivateBrowsingSession()
     DestroyPrivateBrowsingSession()

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

@@ -79 +79 @@
     soup_session_add_feature(WebCore::ResourceHandle::defaultSession(), SOUP_SESSION_FEATURE(soupCache.get()));
     soup_cache_load(soupCache.get());
+
+    setIgnoreTLSErrors(parameters.ignoreTLSErrors);
 }
 
@@ -105 +107 @@
 }
 
+void NetworkProcess::setIgnoreTLSErrors(bool ignoreTLSErrors)
+{
+    ResourceHandle::setIgnoreSSLErrors(ignoreTLSErrors);
+}
+
 void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo&, const String&)
 {

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

@@ -55 +55 @@
     encoder << httpsProxy;
 #endif
+#if USE(SOUP)
+    encoder << ignoreTLSErrors;
+#endif
 }
 
@@ -88 +91 @@
 #endif
 
+#if USE(SOUP)
+    if (!decoder.decode(result.ignoreTLSErrors))
+        return false;
+#endif
+
     return true;
 }

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

@@ -68 +68 @@
     String httpsProxy;
 #endif
+
+#if USE(SOUP)
+    bool ignoreTLSErrors;
+#endif
 };
 

trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp

@@ -98 +98 @@
     supplement<WebCookieManagerProxy>()->getCookiePersistentStorage(parameters.cookiePersistentStoragePath, parameters.cookiePersistentStorageType);
     parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
-    parameters.ignoreTLSErrors = m_ignoreTLSErrors;
     parameters.shouldTrackVisitedLinks = true;
 #if ENABLE(NETWORK_PROCESS)
     parameters.usesNetworkProcess = true;
+#else
+    parameters.ignoreTLSErrors = m_ignoreTLSErrors;
 #endif
 }

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

@@ -32 +32 @@
 namespace WebKit {
 
-void WebContext::platformInitializeNetworkProcess(NetworkProcessCreationParameters&)
+void WebContext::platformInitializeNetworkProcess(NetworkProcessCreationParameters& parameters)
 {
+    parameters.ignoreTLSErrors = m_ignoreTLSErrors;
 }