<!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>[181074] trunk</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/181074">181074</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-05 02:38:30 -0800 (Thu, 05 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SOUP] Check TLS errors as soon as they are set in the SoupMessage
https://bugs.webkit.org/show_bug.cgi?id=142244
Reviewed by Sergio Villar Senin.
Source/WebCore:
Connect to the notify::tls-errors signal of SoupMessage to cancel
the load earlier in case of TLS failure, preventing any private
data from being sent to the server before the TLS errors are checked.
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::tlsErrorsChangedCallback):
(WebCore::gotHeadersCallback):
(WebCore::createSoupMessageForHandleAndRequest):
Tools:
Check that the SSL server doesn't process any request in case of
TLS errors when the policy is set to FAIL.
* TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp:
(testTLSErrorsPolicy):
(testTLSErrorsRedirect):
(testTLSErrorsHTTPAuth):
(testLoadFailedWithTLSErrors):
(testSubresourceLoadFailedWithTLSErrors):
(httpsServerCallback):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestSSLcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181073 => 181074)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-05 09:27:21 UTC (rev 181073)
+++ trunk/Source/WebCore/ChangeLog 2015-03-05 10:38:30 UTC (rev 181074)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-03-05 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] Check TLS errors as soon as they are set in the SoupMessage
+ https://bugs.webkit.org/show_bug.cgi?id=142244
+
+ Reviewed by Sergio Villar Senin.
+
+ Connect to the notify::tls-errors signal of SoupMessage to cancel
+ the load earlier in case of TLS failure, preventing any private
+ data from being sent to the server before the TLS errors are checked.
+
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::tlsErrorsChangedCallback):
+ (WebCore::gotHeadersCallback):
+ (WebCore::createSoupMessageForHandleAndRequest):
+
</ins><span class="cx"> 2015-03-05 Grzegorz Czajkowski <g.czajkowski@samsung.com>
</span><span class="cx">
</span><span class="cx"> TextCheckingParagraph::isEmpty() is sufficient to check whether paragraph is empty
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (181073 => 181074)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2015-03-05 09:27:21 UTC (rev 181073)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2015-03-05 10:38:30 UTC (rev 181074)
</span><span class="lines">@@ -330,16 +330,21 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void gotHeadersCallback(SoupMessage* message, gpointer data)
</del><ins>+static void tlsErrorsChangedCallback(SoupMessage* message, GParamSpec*, gpointer data)
</ins><span class="cx"> {
</span><span class="cx"> ResourceHandle* handle = static_cast<ResourceHandle*>(data);
</span><span class="cx"> if (!handle || handle->cancelledOrClientless())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (handleUnignoredTLSErrors(handle, message)) {
</del><ins>+ if (handleUnignoredTLSErrors(handle, message))
</ins><span class="cx"> handle->cancel();
</span><ins>+}
+
+static void gotHeadersCallback(SoupMessage* message, gpointer data)
+{
+ ResourceHandle* handle = static_cast<ResourceHandle*>(data);
+ if (!handle || handle->cancelledOrClientless())
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> ResourceHandleInternal* d = handle->getInternal();
</span><span class="cx">
</span><span class="lines">@@ -934,6 +939,7 @@
</span><span class="cx"> && (!request.httpBody() || request.httpBody()->isEmpty()))
</span><span class="cx"> soup_message_headers_set_content_length(soupMessage->request_headers, 0);
</span><span class="cx">
</span><ins>+ g_signal_connect(d->m_soupMessage.get(), "notify::tls-errors", G_CALLBACK(tlsErrorsChangedCallback), handle);
</ins><span class="cx"> g_signal_connect(d->m_soupMessage.get(), "got-headers", G_CALLBACK(gotHeadersCallback), handle);
</span><span class="cx"> g_signal_connect(d->m_soupMessage.get(), "wrote-body-data", G_CALLBACK(wroteBodyDataCallback), handle);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (181073 => 181074)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-03-05 09:27:21 UTC (rev 181073)
+++ trunk/Tools/ChangeLog 2015-03-05 10:38:30 UTC (rev 181074)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-03-05 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] Check TLS errors as soon as they are set in the SoupMessage
+ https://bugs.webkit.org/show_bug.cgi?id=142244
+
+ Reviewed by Sergio Villar Senin.
+
+ Check that the SSL server doesn't process any request in case of
+ TLS errors when the policy is set to FAIL.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp:
+ (testTLSErrorsPolicy):
+ (testTLSErrorsRedirect):
+ (testTLSErrorsHTTPAuth):
+ (testLoadFailedWithTLSErrors):
+ (testSubresourceLoadFailedWithTLSErrors):
+ (httpsServerCallback):
+
</ins><span class="cx"> 2015-03-05 Pawel Forysiuk <p.forysiuk@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] REGRESSION (r178685): ASSERTION FAILED: !parameters.mediaKeyStorageDirectory.isEmpty()
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestSSLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp (181073 => 181074)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp 2015-03-05 09:27:21 UTC (rev 181073)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp 2015-03-05 10:38:30 UTC (rev 181074)
</span><span class="lines">@@ -129,16 +129,21 @@
</span><span class="cx"> webkit_web_context_set_tls_errors_policy(context, originalPolicy);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool assertIfSSLRequestProcessed = false;
+
</ins><span class="cx"> static void testTLSErrorsPolicy(SSLTest* test, gconstpointer)
</span><span class="cx"> {
</span><span class="cx"> WebKitWebContext* context = webkit_web_view_get_context(test->m_webView);
</span><span class="cx"> // TLS errors are treated as transport failures by default.
</span><span class="cx"> g_assert(webkit_web_context_get_tls_errors_policy(context) == WEBKIT_TLS_ERRORS_POLICY_FAIL);
</span><ins>+
+ assertIfSSLRequestProcessed = true;
</ins><span class="cx"> test->loadURI(kHttpsServer->getURIForPath("/").data());
</span><span class="cx"> test->waitUntilLoadFinished();
</span><span class="cx"> g_assert(test->m_loadFailed);
</span><span class="cx"> g_assert(test->m_loadEvents.contains(LoadTrackingTest::ProvisionalLoadFailed));
</span><span class="cx"> g_assert(!test->m_loadEvents.contains(LoadTrackingTest::LoadCommitted));
</span><ins>+ assertIfSSLRequestProcessed = false;
</ins><span class="cx">
</span><span class="cx"> webkit_web_context_set_tls_errors_policy(context, WEBKIT_TLS_ERRORS_POLICY_IGNORE);
</span><span class="cx"> g_assert(webkit_web_context_get_tls_errors_policy(context) == WEBKIT_TLS_ERRORS_POLICY_IGNORE);
</span><span class="lines">@@ -158,11 +163,13 @@
</span><span class="cx"> WebKitTLSErrorsPolicy originalPolicy = webkit_web_context_get_tls_errors_policy(context);
</span><span class="cx"> webkit_web_context_set_tls_errors_policy(context, WEBKIT_TLS_ERRORS_POLICY_FAIL);
</span><span class="cx">
</span><ins>+ assertIfSSLRequestProcessed = true;
</ins><span class="cx"> test->loadURI(kHttpsServer->getURIForPath("/redirect").data());
</span><span class="cx"> test->waitUntilLoadFinished();
</span><span class="cx"> g_assert(test->m_loadFailed);
</span><span class="cx"> g_assert(test->m_loadEvents.contains(LoadTrackingTest::ProvisionalLoadFailed));
</span><span class="cx"> g_assert(!test->m_loadEvents.contains(LoadTrackingTest::LoadCommitted));
</span><ins>+ assertIfSSLRequestProcessed = false;
</ins><span class="cx">
</span><span class="cx"> webkit_web_context_set_tls_errors_policy(context, originalPolicy);
</span><span class="cx"> }
</span><span class="lines">@@ -180,12 +187,14 @@
</span><span class="cx"> WebKitTLSErrorsPolicy originalPolicy = webkit_web_context_get_tls_errors_policy(context);
</span><span class="cx"> webkit_web_context_set_tls_errors_policy(context, WEBKIT_TLS_ERRORS_POLICY_FAIL);
</span><span class="cx">
</span><ins>+ assertIfSSLRequestProcessed = true;
</ins><span class="cx"> g_signal_connect(test->m_webView, "authenticate", G_CALLBACK(webViewAuthenticationCallback), NULL);
</span><span class="cx"> test->loadURI(kHttpsServer->getURIForPath("/auth").data());
</span><span class="cx"> test->waitUntilLoadFinished();
</span><span class="cx"> g_assert(test->m_loadFailed);
</span><span class="cx"> g_assert(test->m_loadEvents.contains(LoadTrackingTest::ProvisionalLoadFailed));
</span><span class="cx"> g_assert(!test->m_loadEvents.contains(LoadTrackingTest::LoadCommitted));
</span><ins>+ assertIfSSLRequestProcessed = false;
</ins><span class="cx">
</span><span class="cx"> webkit_web_context_set_tls_errors_policy(context, originalPolicy);
</span><span class="cx"> }
</span><span class="lines">@@ -235,6 +244,7 @@
</span><span class="cx"> WebKitTLSErrorsPolicy originalPolicy = webkit_web_context_get_tls_errors_policy(context);
</span><span class="cx"> webkit_web_context_set_tls_errors_policy(context, WEBKIT_TLS_ERRORS_POLICY_FAIL);
</span><span class="cx">
</span><ins>+ assertIfSSLRequestProcessed = true;
</ins><span class="cx"> // The load-failed-with-tls-errors signal should be emitted when there is a TLS failure.
</span><span class="cx"> test->loadURI(kHttpsServer->getURIForPath("/test-tls/").data());
</span><span class="cx"> test->waitUntilLoadFinished();
</span><span class="lines">@@ -244,6 +254,7 @@
</span><span class="cx"> g_assert_cmpint(test->m_loadEvents[0], ==, LoadTrackingTest::ProvisionalLoadStarted);
</span><span class="cx"> g_assert_cmpint(test->m_loadEvents[1], ==, LoadTrackingTest::LoadFailedWithTLSErrors);
</span><span class="cx"> g_assert_cmpint(test->m_loadEvents[2], ==, LoadTrackingTest::LoadFinished);
</span><ins>+ assertIfSSLRequestProcessed = false;
</ins><span class="cx">
</span><span class="cx"> // Test allowing an exception for this certificate on this host.
</span><span class="cx"> webkit_web_context_allow_tls_certificate_for_host(context, test->certificate(), test->host());
</span><span class="lines">@@ -318,10 +329,12 @@
</span><span class="cx"> WebKitWebContext* context = webkit_web_view_get_context(test->m_webView);
</span><span class="cx"> webkit_web_context_set_tls_errors_policy(context, WEBKIT_TLS_ERRORS_POLICY_FAIL);
</span><span class="cx">
</span><ins>+ assertIfSSLRequestProcessed = true;
</ins><span class="cx"> test->loadURI(kHttpServer->getURIForPath("/").data());
</span><span class="cx"> test->waitUntilSubresourceLoadFail();
</span><span class="cx"> g_assert(G_IS_TLS_CERTIFICATE(test->m_certificate.get()));
</span><span class="cx"> g_assert_cmpuint(test->m_tlsErrors, ==, G_TLS_CERTIFICATE_UNKNOWN_CA);
</span><ins>+ assertIfSSLRequestProcessed = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void httpsServerCallback(SoupServer* server, SoupMessage* message, const char* path, GHashTable*, SoupClientContext*, gpointer)
</span><span class="lines">@@ -331,6 +344,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ g_assert(!assertIfSSLRequestProcessed);
+
</ins><span class="cx"> if (g_str_equal(path, "/")) {
</span><span class="cx"> soup_message_set_status(message, SOUP_STATUS_OK);
</span><span class="cx"> soup_message_body_append(message->response_body, SOUP_MEMORY_STATIC, indexHTML, strlen(indexHTML));
</span></span></pre>
</div>
</div>
</body>
</html>