Changeset 82776 in webkit

Timestamp:

Apr 2, 2011 3:00:19 PM (13 years ago)

Author:

jeffm@apple.com

Message:

2011-04-02 Jeff Miller <​jeffm@apple.com>

Reviewed by Dan Bernstein.

WebKit2: Specify the certificate store in WKBundleSetClientCertificate()
​https://bugs.webkit.org/show_bug.cgi?id=57707

Include the name of the system certificate store that the client certificate came from in WKBundleSetClientCertificate().

The PCCERT_CONTEXT for the client certificate we create from the message from the UI process doesn't contain enough information to actually use it in a request, we need to get the real certificate from the certificate store (which is typically the "MY" store).

• WebProcess/InjectedBundle/API/c/win/WKBundlePrivateWin.cpp: (WKBundleSetClientCertificate): Add certificateSystemStoreName to parameters.
• WebProcess/InjectedBundle/API/c/win/WKBundlePrivateWin.h: Add certificateSystemStoreName to WKBundleSetClientCertificate() parameters.
• WebProcess/InjectedBundle/InjectedBundle.h: Add certificateSystemStoreName to setClientCertificate() parameters.
• WebProcess/InjectedBundle/win/InjectedBundleWin.cpp: (WebKit::InjectedBundle::setClientCertificate): Read the real certificate from the certificate store.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/API/c/win/WKBundlePrivateWin.cpp (modified) (1 diff)
• WebProcess/InjectedBundle/API/c/win/WKBundlePrivateWin.h (modified) (1 diff)
• WebProcess/InjectedBundle/InjectedBundle.h (modified) (1 diff)
• WebProcess/InjectedBundle/win/InjectedBundleWin.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-02  Jeff Miller  <jeffm@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        WebKit2: Specify the certificate store in WKBundleSetClientCertificate()
+        https://bugs.webkit.org/show_bug.cgi?id=57707
+
+        Include the name of the system certificate store that the client certificate came from in WKBundleSetClientCertificate().
+
+        The PCCERT_CONTEXT for the client certificate we create from the message from the UI process doesn't contain enough information to actually use it in a request, we need to get the real certificate from the certificate store (which is typically the "MY" store).
+
+        * WebProcess/InjectedBundle/API/c/win/WKBundlePrivateWin.cpp:
+        (WKBundleSetClientCertificate): Add certificateSystemStoreName to parameters.
+        * WebProcess/InjectedBundle/API/c/win/WKBundlePrivateWin.h: Add certificateSystemStoreName to WKBundleSetClientCertificate() parameters.
+        * WebProcess/InjectedBundle/InjectedBundle.h: Add certificateSystemStoreName to setClientCertificate() parameters.
+        * WebProcess/InjectedBundle/win/InjectedBundleWin.cpp:
+        (WebKit::InjectedBundle::setClientCertificate): Read the real certificate from the certificate store.
+
 2011-04-02  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/win/WKBundlePrivateWin.cpp

@@ -38 +38 @@
 }
 
-void WKBundleSetClientCertificate(WKBundleRef bundleRef, WKStringRef host, WKCertificateInfoRef certificateInfoRef)
+void WKBundleSetClientCertificate(WKBundleRef bundleRef, WKStringRef host, WKStringRef certificateSystemStoreName, WKCertificateInfoRef certificateInfoRef)
 {
-    toImpl(bundleRef)->setClientCertificate(toWTFString(host), toImpl(certificateInfoRef));
+    toImpl(bundleRef)->setClientCertificate(toWTFString(host), toWTFString(certificateSystemStoreName), toImpl(certificateInfoRef));
 }

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/win/WKBundlePrivateWin.h

@@ -34 +34 @@
 
 WK_EXPORT void WKBundleSetHostAllowsAnyHTTPSCertificate(WKBundleRef bundle, WKStringRef host);
-WK_EXPORT void WKBundleSetClientCertificate(WKBundleRef bundle, WKStringRef host, WKCertificateInfoRef certificateInfo);
+WK_EXPORT void WKBundleSetClientCertificate(WKBundleRef bundle, WKStringRef host, WKStringRef certificateSystemStoreName, WKCertificateInfoRef certificateInfo);
 
 #ifdef __cplusplus

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h

@@ -83 +83 @@
 #if PLATFORM(WIN)
     void setHostAllowsAnyHTTPSCertificate(const String&);
-    void setClientCertificate(const String&, const WebCertificateInfo*);
+    void setClientCertificate(const String& host, const String& certificateSystemStoreName, const WebCertificateInfo*);
 #endif
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/win/InjectedBundleWin.cpp

@@ -32 +32 @@
 #include <WebCore/ResourceHandle.h>
 #include <WebCore/SimpleFontData.h>
+#include <wtf/text/CString.h>
 
 #include <windows.h>
@@ -100 +101 @@
 }
 
-void InjectedBundle::setClientCertificate(const String& host, const WebCertificateInfo* certificateInfo)
+void InjectedBundle::setClientCertificate(const String& host, const String& certificateSystemStoreName, const WebCertificateInfo* certificateInfo)
 {
 #if USE(CFNETWORK)
-    ASSERT(certificateInfo);
+    ASSERT_ARG(certificateInfo, certificateInfo);
     if (!certificateInfo)
         return;
@@ -112 +113 @@
         return;
     
-    ResourceHandle::setClientCertificate(host, WebCore::copyCertificateToData(certificateChain.first()).get());
+    ASSERT_ARG(certificateSystemStoreName, !certificateSystemStoreName.isEmpty());
+    if (certificateSystemStoreName.isEmpty())
+        return;
+    
+    // The PCCERT_CONTEXT in the WebCertificateInfo we created using the message from the UI process doesn't contain enough information
+    // to actually use it in a request, we need to get the real certificate from the certificate store (which is typically the "MY" store).
+    String mutableCertificateSystemStoreName = certificateSystemStoreName;
+    HCERTSTORE certStore = ::CertOpenSystemStore(0, mutableCertificateSystemStoreName.charactersWithNullTermination());
+    if (!certStore) {
+        LOG_ERROR("Could not open system certificate store %s", certificateSystemStoreName.ascii().data());
+        return;
+    }
+    
+    PCCERT_CONTEXT realCert = ::CertFindCertificateInStore(certStore, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0, CERT_FIND_EXISTING, certificateChain.first(), 0);
+    if (!realCert) {
+        LOG_ERROR("Could not find certificate in system certificate store");
+        return;
+    }
+
+    ResourceHandle::setClientCertificate(host, WebCore::copyCertificateToData(realCert).get());
+    CertFreeCertificateContext(realCert);
+
+    // We can't close certStore here, since the certificate is still in use.
 #endif
 }