diff options
author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-27 05:11:41 +0000 |
---|---|---|
committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-27 05:11:41 +0000 |
commit | ce2b62264e87a736b81f6fad85bf97dfc0f253b1 (patch) | |
tree | d1d4e7855a35d32a0cf83a07fb6932bece688098 /chrome/browser/ssl | |
parent | 00692e2b916b5509bc9b18682b952e3ceb72dfb8 (diff) | |
download | chromium_src-ce2b62264e87a736b81f6fad85bf97dfc0f253b1.zip chromium_src-ce2b62264e87a736b81f6fad85bf97dfc0f253b1.tar.gz chromium_src-ce2b62264e87a736b81f6fad85bf97dfc0f253b1.tar.bz2 |
A first implementation of the SSL client auth UI.This uses the Windows API that prompts the user for a cert.R=wtcBUG=http://crbug.com/318TEST=Visit a site that requires client auth. A dialog to select a certificate should be shown. Try selecting no cert. Try again this time select a cert.
Review URL: http://codereview.chromium.org/147233
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
-rw-r--r-- | chrome/browser/ssl/ssl_client_auth_handler.cc | 100 | ||||
-rw-r--r-- | chrome/browser/ssl/ssl_client_auth_handler.h | 60 |
2 files changed, 160 insertions, 0 deletions
diff --git a/chrome/browser/ssl/ssl_client_auth_handler.cc b/chrome/browser/ssl/ssl_client_auth_handler.cc new file mode 100644 index 0000000..c986885 --- /dev/null +++ b/chrome/browser/ssl/ssl_client_auth_handler.cc @@ -0,0 +1,100 @@ +// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/ssl/ssl_client_auth_handler.h" + +#if defined (OS_WIN) +#include <cryptuiapi.h> +#pragma comment(lib, "cryptui.lib") +#endif + +#include "app/l10n_util.h" +#include "base/message_loop.h" +#include "base/string_util.h" +#include "chrome/browser/browser_list.h" +#include "chrome/browser/browser.h" +#include "chrome/browser/browser_window.h" +#include "grit/generated_resources.h" +#include "net/url_request/url_request.h" + +SSLClientAuthHandler::SSLClientAuthHandler( + URLRequest* request, + net::SSLCertRequestInfo* cert_request_info, + MessageLoop* io_loop, + MessageLoop* ui_loop) + : request_(request), + cert_request_info_(cert_request_info), + io_loop_(io_loop), + ui_loop_(ui_loop) { + // Keep us alive until a cert is selected. + AddRef(); +} + +SSLClientAuthHandler::~SSLClientAuthHandler() { +} + +void SSLClientAuthHandler::OnRequestCancelled() { + request_ = NULL; +} + +void SSLClientAuthHandler::SelectCertificate() { + // Let's move the request to the UI thread. + ui_loop_->PostTask(FROM_HERE, NewRunnableMethod(this, + &SSLClientAuthHandler::DoSelectCertificate)); +} + +void SSLClientAuthHandler::DoSelectCertificate() { + net::X509Certificate* cert = NULL; +#if defined(OS_WIN) + // TODO(jcampan): replace this with our own cert selection dialog. + // CryptUIDlgSelectCertificateFromStore is blocking (but still processes + // Windows messages), which is scary. + HCERTSTORE client_certs = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, NULL, + 0, NULL); + BOOL ok; + for (size_t i = 0; i < cert_request_info_->client_certs.size(); ++i) { + PCCERT_CONTEXT cc = cert_request_info_->client_certs[i]->os_cert_handle(); + ok = CertAddCertificateContextToStore(client_certs, cc, + CERT_STORE_ADD_ALWAYS, NULL); + DCHECK(ok); + } + + HWND browser_hwnd = NULL; + Browser* browser = BrowserList::GetLastActive(); + if (browser) + browser_hwnd = browser->window()->GetNativeHandle(); + + std::wstring title = l10n_util::GetString(IDS_CLIENT_CERT_DIALOG_TITLE); + std::wstring text = l10n_util::GetStringF( + IDS_CLIENT_CERT_DIALOG_TEXT, + ASCIIToWide(cert_request_info_->host_and_port)); + PCCERT_CONTEXT cert_context = CryptUIDlgSelectCertificateFromStore( + client_certs, browser_hwnd, title.c_str(), text.c_str(), 0, 0, NULL); + + if (cert_context) { + cert = net::X509Certificate::CreateFromHandle( + cert_context, + net::X509Certificate::SOURCE_LONE_CERT_IMPORT); + } + + ok = CertCloseStore(client_certs, CERT_CLOSE_STORE_CHECK_FLAG); + DCHECK(ok); +#else + NOTIMPLEMENTED(); +#endif + + // Notify the IO thread that we have selected a cert. + io_loop_->PostTask(FROM_HERE, NewRunnableMethod(this, + &SSLClientAuthHandler::CertificateSelected, cert)); +} + +void SSLClientAuthHandler::CertificateSelected(net::X509Certificate* cert) { + // request_ could have been NULLed if the request was cancelled while the user + // was choosing a cert. + if (request_) + request_->ContinueWithCertificate(cert); + + // We are done. + Release(); +} diff --git a/chrome/browser/ssl/ssl_client_auth_handler.h b/chrome/browser/ssl/ssl_client_auth_handler.h new file mode 100644 index 0000000..77b8aed --- /dev/null +++ b/chrome/browser/ssl/ssl_client_auth_handler.h @@ -0,0 +1,60 @@ +// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_SSL_SSL_CLIENT_AUTH_HANDLER_H +#define CHROME_BROWSER_SSL_SSL_CLIENT_AUTH_HANDLER_H + +#include "base/basictypes.h" +#include "base/ref_counted.h" +#include "net/base/ssl_cert_request_info.h" + +namespace net { +class X509Certificate; +} +class MessageLoop; +class URLRequest; + +// This class handles the approval and selection of a certificate for SSL client +// authentication by the user. +// It is self-owned and deletes itself when the UI reports the user selection or +// when the URLRequest is cancelled. +class SSLClientAuthHandler : public base::RefCounted<SSLClientAuthHandler> { + public: + SSLClientAuthHandler(URLRequest* request, + net::SSLCertRequestInfo* cert_request_info, + MessageLoop* io_loop, + MessageLoop* ui_loop); + ~SSLClientAuthHandler(); + + // Asks the user to select a certificate and resumes the URL request with that + // certificate. + // Should only be called on the IO thread. + void SelectCertificate(); + + // Invoked when the request associated with this handler is cancelled. + // Should only be called on the IO thread. + void OnRequestCancelled(); + + private: + // Asks the user for a cert. + // Called on the UI thread. + void DoSelectCertificate(); + + // Notifies that the user has selected a cert. + // Called on the IO thread. + void CertificateSelected(net::X509Certificate* cert); + + // The URLRequest that triggered this client auth. + URLRequest* request_; + + // The certs to choose from. + scoped_refptr<net::SSLCertRequestInfo> cert_request_info_; + + MessageLoop* io_loop_; + MessageLoop* ui_loop_; + + DISALLOW_COPY_AND_ASSIGN(SSLClientAuthHandler); +}; + +#endif // CHROME_BROWSER_SSL_SSL_CLIENT_AUTH_HANDLER_H |