Use per-user nssdb in onc certificate importer

chrome/browser/ui/webui/net_internals/net_internals_ui.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/ui/webui/net_internals/net_internals_ui.h"
 
 #include <algorithm>
 #include <list>
 #include <string>
 #include <utility>
@@ skipping 65 matching lines @@
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/net/onc_utils.h"
 #include "chrome/browser/chromeos/system/syslogs_provider.h"
+#include "chrome/browser/net/nss_context.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/debug_daemon_client.h"
 #include "chromeos/network/onc/onc_certificate_importer_impl.h"
 #include "chromeos/network/onc/onc_utils.h"
 #endif
 #if defined(OS_WIN)
 #include "chrome/browser/net/service_providers_win.h"
 #endif
 
 using base::PassPlatformFile;
@@ skipping 286 matching lines @@
 #if defined(OS_CHROMEOS)
   void OnRefreshSystemLogs(const base::ListValue* list);
   void OnGetSystemLog(const base::ListValue* list);
   void OnImportONCFile(const base::ListValue* list);
   void OnStoreDebugLogs(const base::ListValue* list);
   void OnStoreDebugLogsCompleted(const base::FilePath& log_path,
                                  bool succeeded);
   void OnSetNetworkDebugMode(const base::ListValue* list);
   void OnSetNetworkDebugModeCompleted(const std::string& subsystem,
                                       bool succeeded);
+
+  // Does ONC import once the NSSCertDatabase which should be used for importing

[pneubeck (no reviews), 2014/02/05 11:03:27]

nit: missing commas?  ..., which ... certificates, ...

[tbarzic, 2014/02/06 01:19:42]

yeah, the comment does not make much sense in the state it is :/

+  // certificates is fetched.
+  void ImportONCFileToNSSDB(const std::string& onc_blob,
+                            const std::string& passcode,
+                            net::NSSCertDatabase* nssdb);
 #endif
 
  private:
   class IOThreadImpl;
 
 #if defined(OS_CHROMEOS)
   // Class that is used for getting network related ChromeOS logs.
   // Logs are fetched from ChromeOS libcros on user request, and only when we
   // don't yet have a copy of logs. If a copy is present, we send back data from
   // it, else we save request and answer to it when we get logs from libcros.
@@ skipping 1094 matching lines @@
   syslogs_getter_->DeleteSystemLogs();
   syslogs_getter_->LoadSystemLogs();
 }
 
 void NetInternalsMessageHandler::OnGetSystemLog(
     const base::ListValue* list) {
   DCHECK(syslogs_getter_.get());
   syslogs_getter_->RequestSystemLog(list);
 }
 
-void NetInternalsMessageHandler::OnImportONCFile(
-    const base::ListValue* list) {
-  std::string onc_blob;
-  std::string passcode;
-  if (list->GetSize() != 2 ||
-      !list->GetString(0, &onc_blob) ||
-      !list->GetString(1, &passcode)) {
-    NOTREACHED();
-  }
+void NetInternalsMessageHandler::ImportONCFileToNSSDB(
+    const std::string& onc_blob,
+    const std::string& passcode,
+    net::NSSCertDatabase* nssdb) {
+  std::string error;
+  chromeos::User* user = chromeos::UserManager::Get()->GetUserByProfile(
+      Profile::FromWebUI(web_ui()));
 
-  std::string error;
-  const chromeos::User* user = chromeos::UserManager::Get()->GetActiveUser();
   if (user) {
     onc::ONCSource onc_source = onc::ONC_SOURCE_USER_IMPORT;
 
     base::ListValue network_configs;
     base::DictionaryValue global_network_config;
     base::ListValue certificates;
     if (!chromeos::onc::ParseAndValidateOncForImport(onc_blob,
                                                      onc_source,
                                                      passcode,
                                                      &network_configs,
                                                      &global_network_config,
                                                      &certificates)) {
       error = "Errors occurred during the ONC parsing. ";
     }
 
     chromeos::onc::CertificateImporterImpl cert_importer;
-    if (!cert_importer.ImportCertificates(certificates, onc_source, NULL))
+    if (!cert_importer.ImportCertificates(certificates,
+                                          onc_source,
+                                          nssdb,
+                                          NULL)) {
       error += "Some certificates couldn't be imported. ";
+    }
 
     std::string network_error;
     chromeos::onc::ImportNetworksForUser(user, network_configs, &network_error);
     if (!network_error.empty())
       error += network_error;
   } else {
-    error = "No active user.";
+    error = "User not found.";
   }
 
   LOG_IF(ERROR, !error.empty()) << error;
   SendJavascriptCommand("receivedONCFileParse", new base::StringValue(error));
 }
 
+void NetInternalsMessageHandler::OnImportONCFile(
+    const base::ListValue* list) {
+  std::string onc_blob;
+  std::string passcode;
+  if (list->GetSize() != 2 ||
+      !list->GetString(0, &onc_blob) ||
+      !list->GetString(1, &passcode)) {
+    NOTREACHED();
+  }
+
+  GetNSSCertDatabaseForProfile(
+      Profile::FromWebUI(web_ui()),
+      base::Bind(&NetInternalsMessageHandler::ImportONCFileToNSSDB, AsWeakPtr(),
+                 onc_blob, passcode));
+}
+
 void NetInternalsMessageHandler::OnStoreDebugLogs(const base::ListValue* list) {
   DCHECK(list);
 
   SendJavascriptCommand("receivedStoreDebugLogs",
                         new base::StringValue("Creating log file..."));
   const DownloadPrefs* const prefs =
       DownloadPrefs::FromBrowserContext(Profile::FromWebUI(web_ui()));
   StoreDebugLogs(prefs->DownloadPath(),
       base::Bind(&NetInternalsMessageHandler::OnStoreDebugLogsCompleted,
                  AsWeakPtr()));
@@ skipping 290 matching lines @@
 }
 
 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui)
     : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new NetInternalsMessageHandler());
 
   // Set up the chrome://net-internals/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, CreateNetInternalsHTMLSource());
 }