Changeset 258728 in webkit

Timestamp:

Mar 19, 2020 2:18:56 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

[Curl] Add an API returns description of verification errors.
​https://bugs.webkit.org/show_bug.cgi?id=208913

Patch by Takashi Komori <​Takashi.Komori@sony.com> on 2020-03-19
Reviewed by Fujii Hironori.

WKCertificateInfoCopyVerificationErrorDescription returns the description of SSL verification error as human readable string.
Browser can display more precise error information with this API.

API Test: Curl.CertificateAPI

Source/WebCore:

• platform/network/curl/CertificateInfo.h:
• platform/network/curl/CertificateInfoCurl.cpp:

(WebCore::CertificateInfo::verificationErrorDescription const):

Source/WebKit:

• Shared/API/c/curl/WKCertificateInfoCurl.cpp:

(WKCertificateInfoCopyVerificationErrorDescription):

• Shared/API/c/curl/WKCertificateInfoCurl.h:

Tools:

• MiniBrowser/win/Common.cpp:

(askServerTrustEvaluation):

• MiniBrowser/win/Common.h:
• MiniBrowser/win/WebKitBrowserWindow.cpp:

(createPEMString):
(WebKitBrowserWindow::canTrustServerCertificate):

• TestWebKitAPI/Tests/WebKit/curl/Certificates.cpp:

(TestWebKitAPI::Curl::TEST):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/curl/CertificateInfo.h (modified) (1 diff)
• Source/WebCore/platform/network/curl/CertificateInfoCurl.cpp (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Shared/API/c/curl/WKCertificateInfoCurl.cpp (modified) (1 diff)
• Source/WebKit/Shared/API/c/curl/WKCertificateInfoCurl.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/MiniBrowser/win/Common.cpp (modified) (3 diffs)
• Tools/MiniBrowser/win/Common.h (modified) (1 diff)
• Tools/MiniBrowser/win/WebKitBrowserWindow.cpp (modified) (3 diffs)
• Tools/TestWebKitAPI/Tests/WebKit/curl/Certificates.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-19  Takashi Komori  <Takashi.Komori@sony.com>
+
+        [Curl] Add an API returns description of verification errors.
+        https://bugs.webkit.org/show_bug.cgi?id=208913
+
+        Reviewed by Fujii Hironori.
+
+        WKCertificateInfoCopyVerificationErrorDescription returns the description of SSL verification error as human readable string.
+        Browser can display more precise error information with this API.
+
+        API Test: Curl.CertificateAPI
+
+        * platform/network/curl/CertificateInfo.h:
+        * platform/network/curl/CertificateInfoCurl.cpp:
+        (WebCore::CertificateInfo::verificationErrorDescription const):
+
 2020-03-19  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/platform/network/curl/CertificateInfo.h

@@ -46 +46 @@
 
     int verificationError() const { return m_verificationError; }
+    WEBCORE_EXPORT String verificationErrorDescription() const;
     const Vector<Certificate>& certificateChain() const { return m_certificateChain; }
 

trunk/Source/WebCore/platform/network/curl/CertificateInfoCurl.cpp

@@ -27 +27 @@
 #include "CertificateInfo.h"
 
+#if USE(CURL)
+
 #include "OpenSSLHelper.h"
+#include <openssl/ssl.h>
 #include <wtf/CrossThreadCopier.h>
-
-#if USE(CURL)
 
 namespace WebCore {
@@ -43 +44 @@
 {
     return { m_verificationError, crossThreadCopy(m_certificateChain) };
+}
+
+String CertificateInfo::verificationErrorDescription() const
+{
+    return X509_verify_cert_error_string(m_verificationError);
 }
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-03-19  Takashi Komori  <Takashi.Komori@sony.com>
+
+        [Curl] Add an API returns description of verification errors.
+        https://bugs.webkit.org/show_bug.cgi?id=208913
+
+        Reviewed by Fujii Hironori.
+
+        WKCertificateInfoCopyVerificationErrorDescription returns the description of SSL verification error as human readable string.
+        Browser can display more precise error information with this API.
+
+        API Test: Curl.CertificateAPI
+
+        * Shared/API/c/curl/WKCertificateInfoCurl.cpp:
+        (WKCertificateInfoCopyVerificationErrorDescription):
+        * Shared/API/c/curl/WKCertificateInfoCurl.h:
+
 2020-03-19  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/Shared/API/c/curl/WKCertificateInfoCurl.cpp

@@ -57 +57 @@
 }
 
+WKStringRef WKCertificateInfoCopyVerificationErrorDescription(WKCertificateInfoRef certificateInfoRef)
+{
+    return WebKit::toCopiedAPI(WebKit::toImpl(certificateInfoRef)->certificateInfo().verificationErrorDescription());
+}
+
 size_t WKCertificateInfoGetCertificateChainSize(WKCertificateInfoRef certificateInfoRef)
 {

trunk/Source/WebKit/Shared/API/c/curl/WKCertificateInfoCurl.h

@@ -35 +35 @@
 
 WK_EXPORT int WKCertificateInfoGetVerificationError(WKCertificateInfoRef);
+WK_EXPORT WKStringRef WKCertificateInfoCopyVerificationErrorDescription(WKCertificateInfoRef);
 WK_EXPORT size_t WKCertificateInfoGetCertificateChainSize(WKCertificateInfoRef);
 WK_EXPORT WKDataRef WKCertificateInfoCopyCertificateAtIndex(WKCertificateInfoRef, size_t);

trunk/Tools/ChangeLog

@@ +1 @@
+2020-03-19  Takashi Komori  <Takashi.Komori@sony.com>
+
+        [Curl] Add an API returns description of verification errors.
+        https://bugs.webkit.org/show_bug.cgi?id=208913
+
+        Reviewed by Fujii Hironori.
+
+        WKCertificateInfoCopyVerificationErrorDescription returns the description of SSL verification error as human readable string.
+        Browser can display more precise error information with this API.
+
+        API Test: Curl.CertificateAPI
+
+        * MiniBrowser/win/Common.cpp:
+        (askServerTrustEvaluation):
+        * MiniBrowser/win/Common.h:
+        * MiniBrowser/win/WebKitBrowserWindow.cpp:
+        (createPEMString):
+        (WebKitBrowserWindow::canTrustServerCertificate):
+        * TestWebKitAPI/Tests/WebKit/curl/Certificates.cpp:
+        (TestWebKitAPI::Curl::TEST):
+
 2020-03-19  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/MiniBrowser/win/Common.cpp

@@ -233 +233 @@
 }
 
-bool askServerTrustEvaluation(HWND hwnd, const std::wstring& pems)
+bool askServerTrustEvaluation(HWND hwnd, const std::wstring& text)
 {
     class ServerTrustEvaluationDialog : public Dialog {
     public:
-        ServerTrustEvaluationDialog(const std::wstring& pems)
-            : m_pems { pems }
+        ServerTrustEvaluationDialog(const std::wstring& text)
+            : m_text { text }
         {
             SendMessage(GetDlgItem(this->hDlg(), IDC_SERVER_TRUST_TEXT), WM_SETFONT, (WPARAM)GetStockObject(ANSI_FIXED_FONT), TRUE);
@@ -244 +244 @@
 
     protected:
-        std::wstring m_pems;
+        std::wstring m_text;
 
         void setup()
         {
-            setText(IDC_SERVER_TRUST_TEXT, m_pems);
+            setText(IDC_SERVER_TRUST_TEXT, m_text);
         }
 
@@ -257 +257 @@
     };
 
-    ServerTrustEvaluationDialog dialog { pems };
+    ServerTrustEvaluationDialog dialog { text };
     return dialog.run(hInst, hwnd, IDD_SERVER_TRUST);
 }

trunk/Tools/MiniBrowser/win/Common.h

@@ -69 +69 @@
 bool askProxySettings(HWND, ProxySettings&);
 
-bool askServerTrustEvaluation(HWND, const std::wstring& pems);
+bool askServerTrustEvaluation(HWND, const std::wstring& text);
 std::wstring replaceString(std::wstring src, const std::wstring& oldValue, const std::wstring& newValue);
 

trunk/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp

@@ -65 +65 @@
 }
 
-std::wstring createPEMString(WKProtectionSpaceRef protectionSpace)
-{
-    auto certificateInfo = WKProtectionSpaceCopyCertificateInfo(protectionSpace);
+std::wstring createPEMString(WKCertificateInfoRef certificateInfo)
+{
     auto chainSize = WKCertificateInfoGetCertificateChainSize(certificateInfo);
 
@@ -368 +367 @@
 {
     auto host = createString(adoptWK(WKProtectionSpaceCopyHost(protectionSpace)).get());
-    auto pem = createPEMString(protectionSpace);
+    auto certificateInfo = adoptWK(WKProtectionSpaceCopyCertificateInfo(protectionSpace));
+    auto verificationError = WKCertificateInfoGetVerificationError(certificateInfo.get());
+    auto description = createString(adoptWK(WKCertificateInfoCopyVerificationErrorDescription(certificateInfo.get())).get());
+    auto pem = createPEMString(certificateInfo.get());
 
     auto it = m_acceptedServerTrustCerts.find(host);
@@ -374 +376 @@
         return true;
 
-    if (askServerTrustEvaluation(hwnd(), pem)) {
+    std::wstring textString = L"[HOST] " + host + L"\r\n";
+    textString.append(L"[ERROR] " + std::to_wstring(verificationError) + L"\r\n");
+    textString.append(L"[DESCRIPTION] " + description + L"\r\n");
+    textString.append(pem);
+
+    if (askServerTrustEvaluation(hwnd(), textString)) {
         m_acceptedServerTrustCerts.emplace(host, pem);
         return true;

trunk/Tools/TestWebKitAPI/Tests/WebKit/curl/Certificates.cpp

@@ -90 +90 @@
     auto size = WKCertificateInfoGetCertificateChainSize(certificateInfo.get());
     ASSERT_EQ(size, 2);
-    ASSERT_TRUE(isSamePEM(WKCertificateInfoCopyCertificateAtIndex(certificateInfo.get(), 0), PEM1));
-    ASSERT_TRUE(isSamePEM(WKCertificateInfoCopyCertificateAtIndex(certificateInfo.get(), 1), PEM2));
+    ASSERT_EQ(WKCertificateInfoGetVerificationError(certificateInfo.get()), 0);
+    ASSERT_TRUE(WKStringIsEqualToUTF8CString(adoptWK(WKCertificateInfoCopyVerificationErrorDescription(certificateInfo.get())).get(), "ok"));
+    ASSERT_TRUE(isSamePEM(adoptWK(WKCertificateInfoCopyCertificateAtIndex(certificateInfo.get(), 0)).get(), PEM1));
+    ASSERT_TRUE(isSamePEM(adoptWK(WKCertificateInfoCopyCertificateAtIndex(certificateInfo.get(), 1)).get(), PEM2));
 }