<!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>[175040] releases/WebKitGTK/webkit-2.4</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/175040">175040</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-22 03:20:46 -0700 (Wed, 22 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174394">r174394</a> - [SOUP] TLS errors should take precedence over HTTP authentication
https://bugs.webkit.org/show_bug.cgi?id=137300
Reviewed by Sergio Villar Senin.
Source/WebCore:
Handle TLS errors in got-headers callback to make sure it happens
before starting the authentication process.
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::handleUnignoredTLSErrors): Refactored to receive the
soup message.
(WebCore::gotHeadersCallback): Return early and cancel the request in case of TLS errors.
(WebCore::sendRequestCallback): Do not handle TLS errors here, the request should have already been
cancelled at this point in case of TLS errors.
Tools:
Add a test case to check that authenticate signal is not emitted
in case of TLS errors, and the load fails instead.
* TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp:
(webViewAuthenticationCallback):
(testTLSErrorsHTTPAuth):
(httpsServerCallback):
(beforeAll):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformnetworksoupResourceHandleSoupcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsChangeLog">releases/WebKitGTK/webkit-2.4/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestSSLcpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (175039 => 175040)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-10-22 10:17:15 UTC (rev 175039)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-10-22 10:20:46 UTC (rev 175040)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-10-07 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] TLS errors should take precedence over HTTP authentication
+ https://bugs.webkit.org/show_bug.cgi?id=137300
+
+ Reviewed by Sergio Villar Senin.
+
+ Handle TLS errors in got-headers callback to make sure it happens
+ before starting the authentication process.
+
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::handleUnignoredTLSErrors): Refactored to receive the
+ soup message.
+ (WebCore::gotHeadersCallback): Return early and cancel the request in case of TLS errors.
+ (WebCore::sendRequestCallback): Do not handle TLS errors here, the request should have already been
+ cancelled at this point in case of TLS errors.
+
</ins><span class="cx"> 2014-10-05 Lorenzo Tilve <ltilve@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Fix build when DRAG_SUPPORT is disabled
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (175039 => 175040)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-10-22 10:17:15 UTC (rev 175039)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-10-22 10:20:46 UTC (rev 175040)
</span><span class="lines">@@ -305,12 +305,42 @@
</span><span class="cx"> return httpStatusCode == SOUP_STATUS_PROXY_AUTHENTICATION_REQUIRED || httpStatusCode == SOUP_STATUS_UNAUTHORIZED;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool handleUnignoredTLSErrors(ResourceHandle* handle, SoupMessage* message)
+{
+ if (gIgnoreSSLErrors)
+ return false;
+
+ GTlsCertificate* certificate = nullptr;
+ GTlsCertificateFlags tlsErrors = static_cast<GTlsCertificateFlags>(0);
+ soup_message_get_https_status(message, &certificate, &tlsErrors);
+ if (!tlsErrors)
+ return false;
+
+ String lowercaseHostURL = handle->firstRequest().url().host().lower();
+ if (allowsAnyHTTPSCertificateHosts().contains(lowercaseHostURL))
+ return false;
+
+ // We aren't ignoring errors globally, but the user may have already decided to accept this certificate.
+ auto it = clientCertificates().find(lowercaseHostURL);
+ if (it != clientCertificates().end() && it->value.contains(certificate))
+ return false;
+
+ ResourceHandleInternal* d = handle->getInternal();
+ handle->client()->didFail(handle, ResourceError::tlsError(d->m_soupRequest.get(), tlsErrors, certificate));
+ return true;
+}
+
</ins><span class="cx"> static void gotHeadersCallback(SoupMessage* message, gpointer data)
</span><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><ins>+ if (handleUnignoredTLSErrors(handle, message)) {
+ handle->cancel();
+ return;
+ }
+
</ins><span class="cx"> ResourceHandleInternal* d = handle->getInternal();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_TIMING)
</span><span class="lines">@@ -576,27 +606,6 @@
</span><span class="cx"> handle->deref();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool handleUnignoredTLSErrors(ResourceHandle* handle)
-{
- ResourceHandleInternal* d = handle->getInternal();
- const ResourceResponse& response = d->m_response;
-
- if (!response.soupMessageTLSErrors() || gIgnoreSSLErrors)
- return false;
-
- String lowercaseHostURL = handle->firstRequest().url().host().lower();
- if (allowsAnyHTTPSCertificateHosts().contains(lowercaseHostURL))
- return false;
-
- // We aren't ignoring errors globally, but the user may have already decided to accept this certificate.
- CertificatesMap::iterator i = clientCertificates().find(lowercaseHostURL);
- if (i != clientCertificates().end() && i->value.contains(response.soupMessageCertificate()))
- return false;
-
- handle->client()->didFail(handle, ResourceError::tlsError(d->m_soupRequest.get(), response.soupMessageTLSErrors(), response.soupMessageCertificate()));
- return true;
-}
-
</del><span class="cx"> size_t ResourceHandle::currentStreamPosition() const
</span><span class="cx"> {
</span><span class="cx"> GInputStream* baseStream = d->m_inputStream.get();
</span><span class="lines">@@ -683,11 +692,6 @@
</span><span class="cx"> }
</span><span class="cx"> d->m_response.updateFromSoupMessage(soupMessage);
</span><span class="cx">
</span><del>- if (handleUnignoredTLSErrors(handle.get())) {
- cleanupSoupRequestOperation(handle.get());
- return;
- }
-
</del><span class="cx"> if (SOUP_STATUS_IS_REDIRECTION(soupMessage->status_code) && shouldRedirect(handle.get())) {
</span><span class="cx"> d->m_inputStream = inputStream;
</span><span class="cx"> g_input_stream_skip_async(d->m_inputStream.get(), gDefaultReadBufferSize, G_PRIORITY_DEFAULT,
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/ChangeLog (175039 => 175040)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2014-10-22 10:17:15 UTC (rev 175039)
+++ releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2014-10-22 10:20:46 UTC (rev 175040)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-10-07 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] TLS errors should take precedence over HTTP authentication
+ https://bugs.webkit.org/show_bug.cgi?id=137300
+
+ Reviewed by Sergio Villar Senin.
+
+ Add a test case to check that authenticate signal is not emitted
+ in case of TLS errors, and the load fails instead.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp:
+ (webViewAuthenticationCallback):
+ (testTLSErrorsHTTPAuth):
+ (httpsServerCallback):
+ (beforeAll):
+
</ins><span class="cx"> 2014-10-21 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Test TestWebKitAPI/WebKit2Gtk/TestInspectorServer fails
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestSSLcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp (175039 => 175040)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp 2014-10-22 10:17:15 UTC (rev 175039)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp 2014-10-22 10:20:46 UTC (rev 175040)
</span><span class="lines">@@ -144,6 +144,24 @@
</span><span class="cx"> g_assert(!test->m_loadEvents.contains(LoadTrackingTest::LoadCommitted));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static gboolean webViewAuthenticationCallback(WebKitWebView*, WebKitAuthenticationRequest* request)
+{
+ g_assert_not_reached();
+ return TRUE;
+}
+
+
+static void testTLSErrorsHTTPAuth(SSLTest* test, gconstpointer)
+{
+ webkit_web_context_set_tls_errors_policy(webkit_web_view_get_context(test->m_webView), WEBKIT_TLS_ERRORS_POLICY_FAIL);
+ g_signal_connect(test->m_webView, "authenticate", G_CALLBACK(webViewAuthenticationCallback), NULL);
+ test->loadURI(kHttpsServer->getURIForPath("/auth").data());
+ test->waitUntilLoadFinished();
+ g_assert(test->m_loadFailed);
+ g_assert(test->m_loadEvents.contains(LoadTrackingTest::ProvisionalLoadFailed));
+ g_assert(!test->m_loadEvents.contains(LoadTrackingTest::LoadCommitted));
+}
+
</ins><span class="cx"> class TLSErrorsTest: public SSLTest {
</span><span class="cx"> public:
</span><span class="cx"> MAKE_GLIB_TEST_FIXTURE(TLSErrorsTest);
</span><span class="lines">@@ -246,6 +264,9 @@
</span><span class="cx"> } else if (g_str_equal(path, "/redirect")) {
</span><span class="cx"> soup_message_set_status(message, SOUP_STATUS_MOVED_PERMANENTLY);
</span><span class="cx"> soup_message_headers_append(message->response_headers, "Location", kHttpServer->getURIForPath("/test-image").data());
</span><ins>+ } else if (g_str_equal(path, "/auth")) {
+ soup_message_set_status(message, SOUP_STATUS_UNAUTHORIZED);
+ soup_message_headers_append(message->response_headers, "WWW-Authenticate", "Basic realm=\"HTTPS auth\"");
</ins><span class="cx"> } else
</span><span class="cx"> soup_message_set_status(message, SOUP_STATUS_NOT_FOUND);
</span><span class="cx"> }
</span><span class="lines">@@ -294,6 +315,7 @@
</span><span class="cx"> // done in the tls-permission-request test.
</span><span class="cx"> SSLTest::add("WebKitWebView", "tls-errors-policy", testTLSErrorsPolicy);
</span><span class="cx"> SSLTest::add("WebKitWebView", "tls-errors-redirect-to-http", testTLSErrorsRedirect);
</span><ins>+ SSLTest::add("WebKitWebView", "tls-http-auth", testTLSErrorsHTTPAuth);
</ins><span class="cx"> TLSErrorsTest::add("WebKitWebView", "load-failed-with-tls-errors", testLoadFailedWithTLSErrors);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>