Refactor client cert private key handling.

android_webview/browser/aw_contents_client_bridge.cc

 // Copyright (c) 2013 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 "android_webview/browser/aw_contents_client_bridge.h"
 
 #include <memory>
 #include <utility>
 
 #include "android_webview/browser/aw_contents.h"
 #include "android_webview/common/devtools_instrumentation.h"
 #include "android_webview/grit/components_strings.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
-#include "base/callback_helpers.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/AwContentsClientBridge_jni.h"
 #include "net/cert/x509_certificate.h"
 #include "net/http/http_response_headers.h"
-#include "net/ssl/openssl_client_key_store.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/ssl/ssl_client_cert_type.h"
 #include "net/ssl/ssl_platform_key_android.h"
 #include "net/ssl/ssl_private_key.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::HasException;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
 using base::android::ToJavaArrayOfStrings;
 using content::BrowserThread;
 using content::WebContents;
 using std::vector;
 
 namespace android_webview {
 
 namespace {
 
-// Must be called on the I/O thread to record a client certificate
-// and its private key in the OpenSSLClientKeyStore.
-void RecordClientCertificateKey(net::X509Certificate* client_cert,
-                                scoped_refptr<net::SSLPrivateKey> private_key) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-  net::OpenSSLClientKeyStore::GetInstance()->RecordClientCertPrivateKey(
-      client_cert, std::move(private_key));
-}
-
 const void* const kAwContentsClientBridge = &kAwContentsClientBridge;
 
 // This class is invented so that the UserData registry that we inject the
 // AwContentsClientBridge object does not own and destroy it.
 class UserData : public base::SupportsUserData::Data {
  public:
   static AwContentsClientBridge* GetContents(
       content::WebContents* web_contents) {
     if (!web_contents)
       return NULL;
@@ skipping 55 matching lines @@
 
 AwContentsClientBridge::~AwContentsClientBridge() {
   JNIEnv* env = AttachCurrentThread();
 
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (!obj.is_null()) {
     // Clear the weak reference from the java peer to the native object since
     // it is possible that java object lifetime can exceed the AwContens.
     Java_AwContentsClientBridge_setNativeContentsClientBridge(env, obj, 0);
   }
-
-  for (IDMap<content::ClientCertificateDelegate*>::iterator iter(
-           &pending_client_cert_request_delegates_);
-       !iter.IsAtEnd(); iter.Advance()) {
-    delete iter.GetCurrentValue();
-  }
 }
 
 void AwContentsClientBridge::AllowCertificateError(
     int cert_error,
     net::X509Certificate* cert,
     const GURL& request_url,
     const base::Callback<void(content::CertificateRequestResultType)>& callback,
     bool* cancel_request) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
@@ skipping 36 matching lines @@
   pending_cert_error_callbacks_.Remove(id);
 }
 
 // This method is inspired by SelectClientCertificate() in
 // chrome/browser/ui/android/ssl_client_certificate_request.cc
 void AwContentsClientBridge::SelectClientCertificate(
     net::SSLCertRequestInfo* cert_request_info,
     std::unique_ptr<content::ClientCertificateDelegate> delegate) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  // Add the callback to id map.
-  int request_id =
-      pending_client_cert_request_delegates_.Add(delegate.release());
-  // Make sure callback is run on error.
-  base::ScopedClosureRunner guard(base::Bind(
-      &AwContentsClientBridge::HandleErrorInClientCertificateResponse,
-      base::Unretained(this), request_id));
-
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
 
   // Build the |key_types| JNI parameter, as a String[]
   std::vector<std::string> key_types;
   for (size_t i = 0; i < cert_request_info->cert_key_types.size(); ++i) {
     switch (cert_request_info->cert_key_types[i]) {
       case net::CLIENT_CERT_RSA_SIGN:
@@ skipping 23 matching lines @@
     LOG(ERROR) << "Could not create principals array (byte[][])";
     return;
   }
 
   // Build the |host_name| and |port| JNI parameters, as a String and
   // a jint.
   ScopedJavaLocalRef<jstring> host_name_ref =
       base::android::ConvertUTF8ToJavaString(
           env, cert_request_info->host_and_port.host());
 
+  int request_id =
+      pending_client_cert_request_delegates_.Add(std::move(delegate));
   Java_AwContentsClientBridge_selectClientCertificate(
       env, obj, request_id, key_types_ref, principals_ref, host_name_ref,
       cert_request_info->host_and_port.port());
-
-  // Release the guard.
-  ignore_result(guard.Release());
 }
 
 // This method is inspired by OnSystemRequestCompletion() in
 // chrome/browser/ui/android/ssl_client_certificate_request.cc
 void AwContentsClientBridge::ProvideClientCertificateResponse(
     JNIEnv* env,
     const JavaRef<jobject>& obj,
     int request_id,
     const JavaRef<jobjectArray>& encoded_chain_ref,
     const JavaRef<jobject>& private_key_ref) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  content::ClientCertificateDelegate* delegate =
-      pending_client_cert_request_delegates_.Lookup(request_id);
+  std::unique_ptr<content::ClientCertificateDelegate> delegate =
+      pending_client_cert_request_delegates_.Replace(request_id, nullptr);
+  pending_client_cert_request_delegates_.Remove(request_id);
   DCHECK(delegate);
 
   if (encoded_chain_ref.is_null() || private_key_ref.is_null()) {
     LOG(ERROR) << "No client certificate selected";
-    pending_client_cert_request_delegates_.Remove(request_id);
-    delegate->ContinueWithCertificate(nullptr);
-    delete delegate;
+    delegate->ContinueWithCertificate(nullptr, nullptr);
     return;
   }
 
-  // Make sure callback is run on error.
-  base::ScopedClosureRunner guard(base::Bind(
-      &AwContentsClientBridge::HandleErrorInClientCertificateResponse,
-      base::Unretained(this), request_id));
-
   // Convert the encoded chain to a vector of strings.
   std::vector<std::string> encoded_chain_strings;
   if (!encoded_chain_ref.is_null()) {
     base::android::JavaArrayOfByteArrayToStringVector(
         env, encoded_chain_ref.obj(), &encoded_chain_strings);
   }
 
   std::vector<base::StringPiece> encoded_chain;
   for (size_t i = 0; i < encoded_chain_strings.size(); ++i)
     encoded_chain.push_back(encoded_chain_strings[i]);
 
   // Create the X509Certificate object from the encoded chain.
   scoped_refptr<net::X509Certificate> client_cert(
       net::X509Certificate::CreateFromDERCertChain(encoded_chain));
   if (!client_cert.get()) {
     LOG(ERROR) << "Could not decode client certificate chain";
     return;
   }
 
   // Create an SSLPrivateKey wrapper for the private key JNI reference.
   scoped_refptr<net::SSLPrivateKey> private_key =
       net::WrapJavaPrivateKey(client_cert.get(), private_key_ref);
   if (!private_key) {
     LOG(ERROR) << "Could not create OpenSSL wrapper for private key";
     return;
   }
 
-  // Release the guard and |pending_client_cert_request_delegates_| references
-  // to |delegate|.
-  pending_client_cert_request_delegates_.Remove(request_id);
-  ignore_result(guard.Release());
-
-  // RecordClientCertificateKey() must be called on the I/O thread,
-  // before the delegate is called with the selected certificate on
-  // the UI thread.
-  content::BrowserThread::PostTaskAndReply(
-      content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&RecordClientCertificateKey, base::RetainedRef(client_cert),
-                 base::Passed(&private_key)),
-      base::Bind(&content::ClientCertificateDelegate::ContinueWithCertificate,
-                 base::Owned(delegate), base::RetainedRef(client_cert)));
+  delegate->ContinueWithCertificate(std::move(client_cert),
+                                    std::move(private_key));
 }
 
 void AwContentsClientBridge::RunJavaScriptDialog(
     content::JavaScriptDialogType dialog_type,
     const GURL& origin_url,
     const base::string16& message_text,
     const base::string16& default_prompt_text,
     const content::JavaScriptDialogManager::DialogClosedCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
@@ skipping 232 matching lines @@
   content::JavaScriptDialogManager::DialogClosedCallback* callback =
       pending_js_dialog_callbacks_.Lookup(id);
   if (!callback) {
     LOG(WARNING) << "Unexpected JS dialog cancel. " << id;
     return;
   }
   callback->Run(false, base::string16());
   pending_js_dialog_callbacks_.Remove(id);
 }
 
-// Use to cleanup if there is an error in client certificate response.
-void AwContentsClientBridge::HandleErrorInClientCertificateResponse(
-    int request_id) {
-  content::ClientCertificateDelegate* delegate =
-      pending_client_cert_request_delegates_.Lookup(request_id);
-  pending_client_cert_request_delegates_.Remove(request_id);
-
-  delete delegate;
-}
-
 bool RegisterAwContentsClientBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview