Fix certificate and keychain installation on Android.

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 82 matching lines @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/compositor_util.h"
 #include "content/public/common/content_descriptors.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_resources.h"
+#include "net/base/mime_util.h"
 #include "net/base/ssl_cert_request_info.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_options.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/plugins/plugin_switches.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/chrome_browser_main_win.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/chrome_browser_main_mac.h"
 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
 #elif defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #elif defined(OS_LINUX)
 #include "chrome/browser/chrome_browser_main_linux.h"
 #elif defined(OS_ANDROID)
 #include "chrome/browser/chrome_browser_main_android.h"
 #include "chrome/common/descriptors_android.h"
+#include "net/android/network_library.h"
 #elif defined(OS_POSIX)
 #include "chrome/browser/chrome_browser_main_posix.h"
 #endif
 
 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID)
 #include "base/linux_util.h"
 #include "chrome/browser/crash_handler_host_linux.h"
 #endif
 
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
@@ skipping 1132 matching lines @@
     // If there is no SSLTabHelper for the given WebContents then we can't
     // show the user a dialog to select a client certificate. So we simply
     // proceed with no client certificate.
     callback.Run(NULL);
     return;
   }
   ssl_tab_helper->ShowClientCertificateRequestDialog(
       network_session, cert_request_info, callback);
 }
 
-void ChromeContentBrowserClient::AddNewCertificate(
+void ChromeContentBrowserClient::AddCertificates(
     net::URLRequest* request,
-    net::X509Certificate* cert,
+    net::CertificateType cert_type,
+    const void* cert_data,
+    size_t cert_size,
     int render_process_id,
     int render_view_id) {
-  // The handler will run the UI and delete itself when it's finished.
-  new SSLAddCertHandler(request, cert, render_process_id, render_view_id);
+#ifdef OS_ANDROID

[Ryan Sleevi, 2012/11/13 19:37:50]

nit: #if defined(OS_ANDROID)

[digit1, 2012/11/15 17:42:14]

Done.

+  // Special case for Android here for several reasons:
+  //
+  // - The SSLAddCertHandler implementation currently only supports
+  //   CERTIFICATE_TYPE_X509_USER_CERT, but not other types, like
+  //   CERTIFICATE_TYPE_PKCS12_KEYCHAIN which are required on this
+  //   platform.
+  //
+  // - Besides, SSLAddCertHandler tries to parse the certificate
+  //   by calling net::CertDatabase::CheckUserCert() which is not
+  //   implemented on Android, mainly because there is no API
+  //   provided by the system to do that properly.
+  //
+  // - The Android CertInstaller activity will check the crypto files

[Ryan Sleevi, 2012/11/13 19:37:50]

nit: "crypto files"

[digit1, 2012/11/15 17:42:14]

Done.

+  //   and display a toast (small fading dialog) to the user if it is
+  //   not valid, so the UI stuff performed by SSLAddCertHandler would

[Ryan Sleevi, 2012/11/13 19:37:50]

nit: s/stuff//

[digit1, 2012/11/15 17:42:14]

Done.

+  //   be redundant.
+  if (cert_size > 0) {
+    // This launches a new activity which will run in a different process.
+    // It handles all user interaction, so no need to do anything in the
+    // browser UI thread here.
+    net::android::StoreCertificate(cert_type, cert_data, cert_size);
+  }
+  // Avoid compiler warnings.
+  (void)render_process_id;
+  (void)render_view_id;

[Ryan Sleevi, 2012/11/13 19:37:50]

I believe we have an ALLOW_UNUSED macro for this. FWIW

[digit1, 2012/11/15 17:42:14]

I believe it only works for local variable declarations. I've separated this in
two different function definitions instead.

+#else
+  // Chromium only supports X509 User certificates on other platforms.
+  // Note that this method should not be called for other certificate
+  // types. See net::GetCertificateTypeFromMimeType().
+  if (cert_type == net::CERTIFICATE_TYPE_X509_USER_CERT) {
+    scoped_refptr<net::X509Certificate> cert;
+    if (cert_data != NULL) {
+        cert = net::X509Certificate::CreateFromBytes(
+            reinterpret_cast<const char*>(cert_data), cert_size);
+    }
+    // NOTE: Passing a NULL cert pointer if |cert_data| was NULL is
+    // intentional here.
+
+    // The handler will run the UI and delete itself when it's finished.
+    new SSLAddCertHandler(request, cert, render_process_id, render_view_id);
+  }
+#endif
 }
 
 content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() {
   return MediaInternals::GetInstance();
 }
 
 void ChromeContentBrowserClient::RequestDesktopNotificationPermission(
     const GURL& source_origin,
     int callback_context,
     int render_process_id,
@@ skipping 555 matching lines @@
     partition_id = extension->id();
   }
 
   // Enforce that IsValidStoragePartitionId() implementation stays in sync.
   DCHECK(IsValidStoragePartitionId(browser_context, partition_id));
   return partition_id;
 }
 
 
 }  // namespace chrome