<!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>[162530] trunk/Source/WebCore</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/162530">162530</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-22 10:20:20 -0800 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[curl] Improve detecting and handling of SSL client certificate
https://bugs.webkit.org/show_bug.cgi?id=125006
Patch by Robert Sipka <sipka@inf.u-szeged.hu> on 2014-01-22
Reviewed by Brent Fulgham.
Add client certificate handling.
* platform/network/ResourceHandle.h:
* platform/network/curl/ResourceError.h:
(WebCore::ResourceError::hasSSLConnectError):
* platform/network/curl/ResourceHandleCurl.cpp:
(WebCore::ResourceHandle::setClientCertificateInfo):
* platform/network/curl/ResourceHandleManager.cpp:
(WebCore::ResourceHandleManager::initializeHandle):
* platform/network/curl/SSLHandle.cpp:
(WebCore::addAllowedClientCertificate):
(WebCore::setSSLClientCertificate):
* platform/network/curl/SSLHandle.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleh">trunk/Source/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlResourceErrorh">trunk/Source/WebCore/platform/network/curl/ResourceError.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlResourceHandleCurlcpp">trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlResourceHandleManagercpp">trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlSSLHandlecpp">trunk/Source/WebCore/platform/network/curl/SSLHandle.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlSSLHandleh">trunk/Source/WebCore/platform/network/curl/SSLHandle.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162529 => 162530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-01-22 18:16:42 UTC (rev 162529)
+++ trunk/Source/WebCore/ChangeLog        2014-01-22 18:20:20 UTC (rev 162530)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-01-22 Robert Sipka <sipka@inf.u-szeged.hu>
+
+ [curl] Improve detecting and handling of SSL client certificate
+ https://bugs.webkit.org/show_bug.cgi?id=125006
+
+ Reviewed by Brent Fulgham.
+
+ Add client certificate handling.
+
+ * platform/network/ResourceHandle.h:
+ * platform/network/curl/ResourceError.h:
+ (WebCore::ResourceError::hasSSLConnectError):
+ * platform/network/curl/ResourceHandleCurl.cpp:
+ (WebCore::ResourceHandle::setClientCertificateInfo):
+ * platform/network/curl/ResourceHandleManager.cpp:
+ (WebCore::ResourceHandleManager::initializeHandle):
+ * platform/network/curl/SSLHandle.cpp:
+ (WebCore::addAllowedClientCertificate):
+ (WebCore::setSSLClientCertificate):
+ * platform/network/curl/SSLHandle.h:
+
</ins><span class="cx"> 2014-01-22 Mihai Maerean <mmaerean@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Regions] layerOwner in RenderNamedFlowFragment cannot return null
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (162529 => 162530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.h        2014-01-22 18:16:42 UTC (rev 162529)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h        2014-01-22 18:20:20 UTC (rev 162530)
</span><span class="lines">@@ -152,6 +152,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN) && USE(CURL)
</span><span class="cx"> static void setHostAllowsAnyHTTPSCertificate(const String&);
</span><ins>+ static void setClientCertificateInfo(const String&, const String&, const String&);
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(WIN) && USE(CURL) && USE(CF)
</span><span class="cx"> static void setClientCertificate(const String& host, CFDataRef);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlResourceErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/ResourceError.h (162529 => 162530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/ResourceError.h        2014-01-22 18:16:42 UTC (rev 162529)
+++ trunk/Source/WebCore/platform/network/curl/ResourceError.h        2014-01-22 18:20:20 UTC (rev 162530)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define ResourceError_h
</span><span class="cx">
</span><span class="cx"> #include "ResourceErrorBase.h"
</span><ins>+#include <curl/curl.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -44,6 +45,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned sslErrors() const { return m_sslErrors; }
</span><span class="cx"> void setSSLErrors(unsigned sslVerifyResult) { m_sslErrors = sslVerifyResult; }
</span><ins>+ bool hasSSLConnectError() const { return errorCode() == CURLE_SSL_CONNECT_ERROR; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> unsigned m_sslErrors;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlResourceHandleCurlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp (162529 => 162530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp        2014-01-22 18:16:42 UTC (rev 162529)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp        2014-01-22 18:20:20 UTC (rev 162530)
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx">
</span><span class="cx"> #include "CachedResourceLoader.h"
</span><span class="cx"> #include "CredentialStorage.h"
</span><ins>+#include "FileSystem.h"
+#include "Logging.h"
</ins><span class="cx"> #include "NetworkingContext.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include "ResourceHandleInternal.h"
</span><span class="lines">@@ -121,6 +123,14 @@
</span><span class="cx"> allowsAnyHTTPSCertificateHosts(host.lower());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ResourceHandle::setClientCertificateInfo(const String& host, const String& certificate, const String& key)
+{
+ if (fileExists(certificate))
+ addAllowedClientCertificate(host, certificate, key);
+ else
+ LOG(Network, "Invalid client certificate file: %s!\n", certificate.latin1().data());
+}
+
</ins><span class="cx"> #if PLATFORM(WIN) && USE(CF)
</span><span class="cx"> // FIXME: The CFDataRef will need to be something else when
</span><span class="cx"> // building without
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlResourceHandleManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (162529 => 162530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp        2014-01-22 18:16:42 UTC (rev 162529)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp        2014-01-22 18:20:20 UTC (rev 162530)
</span><span class="lines">@@ -962,6 +962,7 @@
</span><span class="cx"> curl_easy_setopt(d->m_handle, CURLOPT_DNS_CACHE_TIMEOUT, 60 * 5); // 5 minutes
</span><span class="cx"> curl_easy_setopt(d->m_handle, CURLOPT_PROTOCOLS, allowedProtocols);
</span><span class="cx"> curl_easy_setopt(d->m_handle, CURLOPT_REDIR_PROTOCOLS, allowedProtocols);
</span><ins>+ setSSLClientCertificate(job);
</ins><span class="cx">
</span><span class="cx"> if (ignoreSSLErrors)
</span><span class="cx"> curl_easy_setopt(d->m_handle, CURLOPT_SSL_VERIFYPEER, false);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlSSLHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/SSLHandle.cpp (162529 => 162530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/SSLHandle.cpp        2014-01-22 18:16:42 UTC (rev 162529)
+++ trunk/Source/WebCore/platform/network/curl/SSLHandle.cpp        2014-01-22 18:20:20 UTC (rev 162530)
</span><span class="lines">@@ -33,10 +33,13 @@
</span><span class="cx"> #include <openssl/ssl.h>
</span><span class="cx"> #include <openssl/x509_vfy.h>
</span><span class="cx"> #include <wtf/ListHashSet.h>
</span><ins>+#include <wtf/text/CString.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+typedef std::tuple<WTF::String, WTF::String> clientCertificate;
</ins><span class="cx"> static HashMap<String, ListHashSet<String>> allowedHosts;
</span><ins>+static HashMap<String, clientCertificate> allowedClientHosts;
</ins><span class="cx">
</span><span class="cx"> void allowsAnyHTTPSCertificateHosts(const String& host)
</span><span class="cx"> {
</span><span class="lines">@@ -44,6 +47,26 @@
</span><span class="cx"> allowedHosts.set(host, certificates);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void addAllowedClientCertificate(const String& host, const String& certificate, const String& key)
+{
+ clientCertificate clientInfo(certificate, key);
+ allowedClientHosts.set(host.lower(), clientInfo);
+}
+
+void setSSLClientCertificate(ResourceHandle* handle)
+{
+ String host = handle->firstRequest().url().host();
+ HashMap<String, clientCertificate>::iterator it = allowedClientHosts.find(host.lower());
+ if (it == allowedClientHosts.end())
+ return;
+
+ ResourceHandleInternal* d = handle->getInternal();
+ clientCertificate clientInfo = it->value;
+ curl_easy_setopt(d->m_handle, CURLOPT_SSLCERT, std::get<0>(clientInfo).utf8().data());
+ curl_easy_setopt(d->m_handle, CURLOPT_SSLCERTTYPE, "P12");
+ curl_easy_setopt(d->m_handle, CURLOPT_SSLCERTPASSWD, std::get<1>(clientInfo).utf8().data());
+}
+
</ins><span class="cx"> bool sslIgnoreHTTPSCertificate(const String& host, const ListHashSet<String>& certificates)
</span><span class="cx"> {
</span><span class="cx"> HashMap<String, ListHashSet<String>>::iterator it = allowedHosts.find(host);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlSSLHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/SSLHandle.h (162529 => 162530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/SSLHandle.h        2014-01-22 18:16:42 UTC (rev 162529)
+++ trunk/Source/WebCore/platform/network/curl/SSLHandle.h        2014-01-22 18:20:20 UTC (rev 162530)
</span><span class="lines">@@ -43,9 +43,11 @@
</span><span class="cx"> } SSLCertificateFlags;
</span><span class="cx">
</span><span class="cx">
</span><ins>+void addAllowedClientCertificate(const String&, const String&, const String&);
</ins><span class="cx"> void allowsAnyHTTPSCertificateHosts(const String&);
</span><span class="cx"> bool sslIgnoreHTTPSCertificate(const String&, const String&);
</span><span class="cx"> void setSSLVerifyOptions(ResourceHandle*);
</span><ins>+void setSSLClientCertificate(ResourceHandle*);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>