<!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>[285838] 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/285838">285838</a></dd>
<dt>Author</dt> <dd>Takashi.Komori@sony.com</dd>
<dt>Date</dt> <dd>2021-11-15 14:44:13 -0800 (Mon, 15 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Curl] Security information sometimes do not appear in inspector network tab
https://bugs.webkit.org/show_bug.cgi?id=232971

Reviewed by Fujii Hironori.

Get certificate information from SSL context when CurlSSLVerifier is empty.

No tests yet.

* platform/network/curl/CertificateInfo.h:
* platform/network/curl/CurlContext.cpp:
(WebCore:: const):
(WebCore::CurlHandle::addExtraNetworkLoadMetrics):
(WebCore::CurlHandle::certificateInfo const):
* platform/network/curl/CurlContext.h:
* platform/network/curl/OpenSSLHelper.cpp:
(OpenSSL::StackOfX509::StackOfX509):
(OpenSSL::StackOfX509::~StackOfX509):
(OpenSSL::pemDataFromCtx):
(OpenSSL::createCertificateInfo):
* platform/network/curl/OpenSSLHelper.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCertificateInfoh">trunk/Source/WebCore/platform/network/curl/CertificateInfo.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCurlContextcpp">trunk/Source/WebCore/platform/network/curl/CurlContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCurlContexth">trunk/Source/WebCore/platform/network/curl/CurlContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlOpenSSLHelpercpp">trunk/Source/WebCore/platform/network/curl/OpenSSLHelper.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlOpenSSLHelperh">trunk/Source/WebCore/platform/network/curl/OpenSSLHelper.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (285837 => 285838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-11-15 22:41:10 UTC (rev 285837)
+++ trunk/Source/WebCore/ChangeLog      2021-11-15 22:44:13 UTC (rev 285838)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2021-11-15  Takashi Komori  <Takashi.Komori@sony.com>
+
+        [Curl] Security information sometimes do not appear in inspector network tab
+        https://bugs.webkit.org/show_bug.cgi?id=232971
+
+        Reviewed by Fujii Hironori.
+
+        Get certificate information from SSL context when CurlSSLVerifier is empty.
+
+        No tests yet.
+
+        * platform/network/curl/CertificateInfo.h:
+        * platform/network/curl/CurlContext.cpp:
+        (WebCore:: const):
+        (WebCore::CurlHandle::addExtraNetworkLoadMetrics):
+        (WebCore::CurlHandle::certificateInfo const):
+        * platform/network/curl/CurlContext.h:
+        * platform/network/curl/OpenSSLHelper.cpp:
+        (OpenSSL::StackOfX509::StackOfX509):
+        (OpenSSL::StackOfX509::~StackOfX509):
+        (OpenSSL::pemDataFromCtx):
+        (OpenSSL::createCertificateInfo):
+        * platform/network/curl/OpenSSLHelper.h:
+
</ins><span class="cx"> 2021-11-15  Kiet Ho  <tho22@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add helper to add CSS property with implicit default
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCertificateInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CertificateInfo.h (285837 => 285838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CertificateInfo.h     2021-11-15 22:41:10 UTC (rev 285837)
+++ trunk/Source/WebCore/platform/network/curl/CertificateInfo.h        2021-11-15 22:44:13 UTC (rev 285838)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> class CertificateInfo {
</span><ins>+    WTF_MAKE_FAST_ALLOCATED;
</ins><span class="cx"> public:
</span><span class="cx">     using Certificate = Vector<uint8_t>;
</span><span class="cx">     using CertificateChain = Vector<Certificate>;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCurlContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CurlContext.cpp (285837 => 285838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CurlContext.cpp       2021-11-15 22:41:10 UTC (rev 285837)
+++ trunk/Source/WebCore/platform/network/curl/CurlContext.cpp  2021-11-15 22:44:13 UTC (rev 285838)
</span><span class="lines">@@ -776,6 +776,20 @@
</span><span class="cx">     return version;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+std::optional<SSL*> CurlHandle::sslConnection() const
+{
+    curl_tlssessioninfo* info = nullptr;
+
+    auto errorCode = curl_easy_getinfo(m_handle, CURLINFO_TLS_SSL_PTR, &info);
+    if (errorCode != CURLE_OK)
+        return std::nullopt;
+
+    if (!info || info->backend != CURLSSLBACKEND_OPENSSL || !info->internals)
+        return std::nullopt;
+
+    return static_cast<SSL*>(info->internals);
+}
+
</ins><span class="cx"> std::optional<NetworkLoadMetrics> CurlHandle::getNetworkLoadMetrics(MonotonicTime startTime)
</span><span class="cx"> {
</span><span class="cx">     double nameLookup = 0.0;
</span><span class="lines">@@ -871,18 +885,10 @@
</span><span class="cx"> 
</span><span class="cx">     auto additionalMetrics = AdditionalNetworkLoadMetricsForWebInspector::create();
</span><span class="cx">     if (!m_tlsConnectionInfo) {
</span><del>-        curl_tlssessioninfo* info = nullptr;
-
-        errorCode = curl_easy_getinfo(m_handle, CURLINFO_TLS_SSL_PTR, &info);
-        if (errorCode != CURLE_OK)
-            return;
-
-        if (info && info->backend == CURLSSLBACKEND_OPENSSL && info->internals) {
-            auto ssl = static_cast<SSL*>(info->internals);
-
</del><ins>+        if (auto ssl = sslConnection()) {
</ins><span class="cx">             m_tlsConnectionInfo = makeUnique<TLSConnectionInfo>();
</span><del>-            m_tlsConnectionInfo->protocol = OpenSSL::tlsVersion(ssl);
-            m_tlsConnectionInfo->cipher = OpenSSL::tlsCipherName(ssl);
</del><ins>+            m_tlsConnectionInfo->protocol = OpenSSL::tlsVersion(*ssl);
+            m_tlsConnectionInfo->cipher = OpenSSL::tlsCipherName(*ssl);
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -906,10 +912,21 @@
</span><span class="cx"> 
</span><span class="cx"> std::optional<CertificateInfo> CurlHandle::certificateInfo() const
</span><span class="cx"> {
</span><del>-    if (!m_sslVerifier)
-        return std::nullopt;
</del><ins>+    if (m_sslVerifier && !m_sslVerifier->certificateInfo().isEmpty())
+        return m_sslVerifier->certificateInfo();
</ins><span class="cx"> 
</span><del>-    return m_sslVerifier->certificateInfo();
</del><ins>+    // If you use an existing HTTP/2 connection, SSLVerifier does not exist.
+    if (m_certificateInfo)
+        return *m_certificateInfo;
+
+    if (auto ssl = sslConnection()) {
+        if (auto certificateInfo = OpenSSL::createCertificateInfo(*ssl)) {
+            m_certificateInfo = WTFMove(certificateInfo);
+            return *m_certificateInfo;
+        }
+    }
+
+    return std::nullopt;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> long long CurlHandle::maxCurlOffT()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCurlContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CurlContext.h (285837 => 285838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CurlContext.h 2021-11-15 22:41:10 UTC (rev 285837)
+++ trunk/Source/WebCore/platform/network/curl/CurlContext.h    2021-11-15 22:44:13 UTC (rev 285838)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><ins>+#include "CertificateInfo.h"
</ins><span class="cx"> #include "CurlProxySettings.h"
</span><span class="cx"> #include "CurlSSLHandle.h"
</span><span class="cx"> 
</span><span class="lines">@@ -330,6 +331,8 @@
</span><span class="cx">     static CURLcode willSetupSslCtxCallback(CURL*, void* sslCtx, void* userData);
</span><span class="cx">     CURLcode willSetupSslCtx(void* sslCtx);
</span><span class="cx"> 
</span><ins>+    std::optional<SSL*> sslConnection() const;
+
</ins><span class="cx">     CURL* m_handle { nullptr };
</span><span class="cx">     char m_errorBuffer[CURL_ERROR_SIZE] { };
</span><span class="cx"> 
</span><span class="lines">@@ -338,6 +341,7 @@
</span><span class="cx"> 
</span><span class="cx">     std::unique_ptr<CurlSSLVerifier> m_sslVerifier;
</span><span class="cx">     std::unique_ptr<TLSConnectionInfo> m_tlsConnectionInfo;
</span><ins>+    mutable std::unique_ptr<CertificateInfo> m_certificateInfo;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlOpenSSLHelpercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/OpenSSLHelper.cpp (285837 => 285838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/OpenSSLHelper.cpp     2021-11-15 22:41:10 UTC (rev 285837)
+++ trunk/Source/WebCore/platform/network/curl/OpenSSLHelper.cpp        2021-11-15 22:44:13 UTC (rev 285838)
</span><span class="lines">@@ -67,14 +67,21 @@
</span><span class="cx"> 
</span><span class="cx"> class StackOfX509 {
</span><span class="cx"> public:
</span><ins>+    StackOfX509(STACK_OF(X509)* certs)
+        : m_certs { certs }
+        , m_owner { false }
+    {
+    }
+
</ins><span class="cx">     StackOfX509(X509_STORE_CTX* ctx)
</span><span class="cx">         : m_certs { X509_STORE_CTX_get1_chain(ctx) }
</span><ins>+        , m_owner { true }
</ins><span class="cx">     {
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     ~StackOfX509()
</span><span class="cx">     {
</span><del>-        if (m_certs)
</del><ins>+        if (m_certs && m_owner)
</ins><span class="cx">             sk_X509_pop_free(m_certs, X509_free);
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -82,7 +89,8 @@
</span><span class="cx">     X509* item(int i) { return sk_X509_value(m_certs, i); }
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    STACK_OF(X509)* m_certs { nullptr };
</del><ins>+    STACK_OF(X509)* m_certs;
+    bool m_owner;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> class BIO {
</span><span class="lines">@@ -141,10 +149,9 @@
</span><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-static Vector<WebCore::CertificateInfo::Certificate> pemDataFromCtx(X509_STORE_CTX* ctx)
</del><ins>+static Vector<WebCore::CertificateInfo::Certificate> pemDataFromCtx(StackOfX509&& certs)
</ins><span class="cx"> {
</span><span class="cx">     Vector<WebCore::CertificateInfo::Certificate> result;
</span><del>-    StackOfX509 certs { ctx };
</del><span class="cx"> 
</span><span class="cx">     for (int i = 0; i < certs.count(); i++) {
</span><span class="cx">         BIO bio(certs.item(i));
</span><span class="lines">@@ -158,12 +165,22 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+std::unique_ptr<WebCore::CertificateInfo> createCertificateInfo(SSL* ssl)
+{
+    if (!ssl)
+        return nullptr;
+
+    auto certChain = SSL_get_peer_cert_chain(ssl);
+
+    return makeUnique<WebCore::CertificateInfo>(X509_V_OK, pemDataFromCtx(StackOfX509(certChain)));
+}
+
</ins><span class="cx"> std::optional<WebCore::CertificateInfo> createCertificateInfo(X509_STORE_CTX* ctx)
</span><span class="cx"> {
</span><span class="cx">     if (!ctx)
</span><span class="cx">         return std::nullopt;
</span><span class="cx"> 
</span><del>-    return WebCore::CertificateInfo(X509_STORE_CTX_get_error(ctx), pemDataFromCtx(ctx));
</del><ins>+    return WebCore::CertificateInfo(X509_STORE_CTX_get_error(ctx), pemDataFromCtx(StackOfX509(ctx)));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static String toString(const ASN1_STRING* name)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlOpenSSLHelperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/OpenSSLHelper.h (285837 => 285838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/OpenSSLHelper.h       2021-11-15 22:41:10 UTC (rev 285837)
+++ trunk/Source/WebCore/platform/network/curl/OpenSSLHelper.h  2021-11-15 22:44:13 UTC (rev 285838)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace OpenSSL {
</span><span class="cx"> 
</span><ins>+std::unique_ptr<WebCore::CertificateInfo> createCertificateInfo(SSL*);
</ins><span class="cx"> std::optional<WebCore::CertificateInfo> createCertificateInfo(X509_STORE_CTX*);
</span><span class="cx"> std::optional<WebCore::CertificateSummary> createSummaryInfo(const Vector<uint8_t>& pem);
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>