Refactor client cert private key handling.

chrome/browser/chromeos/net/client_cert_store_chromeos_unittest.cc

 // Copyright 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 "chrome/browser/chromeos/net/client_cert_store_chromeos.h"
 
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/certificate_provider/certificate_provider.h"
 #include "crypto/scoped_test_nss_db.h"
 #include "net/cert/x509_certificate.h"
+#include "net/ssl/client_cert_identity_test_util.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/test_data_directory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 
 namespace {
 
 // "CN=B CA" - DER encoded DN of the issuer of client_1.pem
@@ skipping 35 matching lines @@
     not_allowed_cert_ = cert;
   }
 
  private:
   bool init_finished_;
   bool init_called_ = false;
   base::Closure pending_callback_;
   scoped_refptr<net::X509Certificate> not_allowed_cert_;
 };
 
-void SaveCertsAndQuitCallback(net::CertificateList* out_certs,
-                              base::Closure quit_closure,
-                              net::CertificateList in_certs) {
-  *out_certs = std::move(in_certs);
+void SaveIdentitiesAndQuitCallback(net::ClientCertIdentityList* out_identities,
+                                   base::Closure quit_closure,
+                                   net::ClientCertIdentityList in_identities) {
+  *out_identities = std::move(in_identities);
   quit_closure.Run();
 }
 
 }  // namespace
 
 class ClientCertStoreChromeOSTest : public ::testing::Test {
  public:
   ClientCertStoreChromeOSTest() : message_loop_(new base::MessageLoopForIO()) {}
 
   scoped_refptr<net::X509Certificate> ImportCertToSlot(
@@ skipping 21 matching lines @@
       ClientCertStoreChromeOS::PasswordDelegateFactory());
 
   scoped_refptr<net::X509Certificate> cert_1(
       ImportCertToSlot("client_1.pem", "client_1.pk8", test_db.slot()));
   ASSERT_TRUE(cert_1.get());
 
   // Request any client certificate, which is expected to match client_1.
   scoped_refptr<net::SSLCertRequestInfo> request_all(
       new net::SSLCertRequestInfo());
 
-  net::CertificateList selected_certs;
+  net::ClientCertIdentityList selected_identities;
   base::RunLoop run_loop;
-  store.GetClientCerts(*request_all,
-                       base::Bind(SaveCertsAndQuitCallback, &selected_certs,
-                                  run_loop.QuitClosure()));
+  store.GetClientCerts(
+      *request_all, base::Bind(SaveIdentitiesAndQuitCallback,
+                               &selected_identities, run_loop.QuitClosure()));
 
   {
     base::RunLoop run_loop_inner;
     run_loop_inner.RunUntilIdle();
     // GetClientCerts should wait for the initialization of the filter to
     // finish.
-    ASSERT_EQ(0u, selected_certs.size());
+    ASSERT_EQ(0u, selected_identities.size());
     EXPECT_TRUE(cert_filter->init_called());
   }
   cert_filter->FinishInit();
   run_loop.Run();
 
-  ASSERT_EQ(1u, selected_certs.size());
+  ASSERT_EQ(1u, selected_identities.size());
 }
 
 // Ensure that cert requests, that are started after the filter was initialized,
 // will succeed.
 TEST_F(ClientCertStoreChromeOSTest, RequestsAfterNSSInitSucceed) {
   crypto::ScopedTestNSSDB test_db;
   ASSERT_TRUE(test_db.is_open());
 
   ClientCertStoreChromeOS store(
       nullptr,  // no additional provider
       base::WrapUnique(new TestCertFilter(true /* init synchronously */)),
       ClientCertStoreChromeOS::PasswordDelegateFactory());
 
   scoped_refptr<net::X509Certificate> cert_1(
       ImportCertToSlot("client_1.pem", "client_1.pk8", test_db.slot()));
   ASSERT_TRUE(cert_1.get());
 
   scoped_refptr<net::SSLCertRequestInfo> request_all(
       new net::SSLCertRequestInfo());
 
   base::RunLoop run_loop;
-  net::CertificateList selected_certs;
-  store.GetClientCerts(*request_all,
-                       base::Bind(SaveCertsAndQuitCallback, &selected_certs,
-                                  run_loop.QuitClosure()));
+  net::ClientCertIdentityList selected_identities;
+  store.GetClientCerts(
+      *request_all, base::Bind(SaveIdentitiesAndQuitCallback,
+                               &selected_identities, run_loop.QuitClosure()));
   run_loop.Run();
 
-  ASSERT_EQ(1u, selected_certs.size());
+  ASSERT_EQ(1u, selected_identities.size());
 }
 
 TEST_F(ClientCertStoreChromeOSTest, Filter) {
   crypto::ScopedTestNSSDB test_db;
   ASSERT_TRUE(test_db.is_open());
 
   TestCertFilter* cert_filter =
       new TestCertFilter(true /* init synchronously */);
   ClientCertStoreChromeOS store(
       nullptr /* no additional provider */, base::WrapUnique(cert_filter),
       ClientCertStoreChromeOS::PasswordDelegateFactory());
 
   scoped_refptr<net::X509Certificate> cert_1(
       ImportCertToSlot("client_1.pem", "client_1.pk8", test_db.slot()));
   ASSERT_TRUE(cert_1.get());
   scoped_refptr<net::X509Certificate> cert_2(
       ImportCertToSlot("client_2.pem", "client_2.pk8", test_db.slot()));
   ASSERT_TRUE(cert_2.get());
 
   scoped_refptr<net::SSLCertRequestInfo> request_all(
       new net::SSLCertRequestInfo());
 
   {
     base::RunLoop run_loop;
     cert_filter->SetNotAllowedCert(cert_2);
-    net::CertificateList selected_certs;
-    store.GetClientCerts(*request_all,
-                         base::Bind(SaveCertsAndQuitCallback, &selected_certs,
-                                    run_loop.QuitClosure()));
+    net::ClientCertIdentityList selected_identities;
+    store.GetClientCerts(
+        *request_all, base::Bind(SaveIdentitiesAndQuitCallback,
+                                 &selected_identities, run_loop.QuitClosure()));
     run_loop.Run();
 
-    ASSERT_EQ(1u, selected_certs.size());
-    EXPECT_TRUE(cert_1->Equals(selected_certs[0].get()));
+    ASSERT_EQ(1u, selected_identities.size());
+    EXPECT_TRUE(cert_1->Equals(selected_identities[0]->certificate()));
   }
 
   {
     base::RunLoop run_loop;
     cert_filter->SetNotAllowedCert(cert_1);
-    net::CertificateList selected_certs;
-    store.GetClientCerts(*request_all,
-                         base::Bind(SaveCertsAndQuitCallback, &selected_certs,
-                                    run_loop.QuitClosure()));
+    net::ClientCertIdentityList selected_identities;
+    store.GetClientCerts(
+        *request_all, base::Bind(SaveIdentitiesAndQuitCallback,
+                                 &selected_identities, run_loop.QuitClosure()));
     run_loop.Run();
 
-    ASSERT_EQ(1u, selected_certs.size());
-    EXPECT_TRUE(cert_2->Equals(selected_certs[0].get()));
+    ASSERT_EQ(1u, selected_identities.size());
+    EXPECT_TRUE(cert_2->Equals(selected_identities[0]->certificate()));
   }
 }
 
 // Ensure that the delegation of the request matching to the base class is
 // functional.
 TEST_F(ClientCertStoreChromeOSTest, CertRequestMatching) {
   crypto::ScopedTestNSSDB test_db;
   ASSERT_TRUE(test_db.is_open());
 
   TestCertFilter* cert_filter =
@@ skipping 10 matching lines @@
       ImportCertToSlot("client_2.pem", "client_2.pk8", test_db.slot()));
   ASSERT_TRUE(cert_2.get());
 
   std::vector<std::string> authority_1(
       1, std::string(reinterpret_cast<const char*>(kAuthority1DN),
                      sizeof(kAuthority1DN)));
   scoped_refptr<net::SSLCertRequestInfo> request(new net::SSLCertRequestInfo());
   request->cert_authorities = authority_1;
 
   base::RunLoop run_loop;
-  net::CertificateList selected_certs;
-  store.GetClientCerts(*request,
-                       base::Bind(SaveCertsAndQuitCallback, &selected_certs,
-                                  run_loop.QuitClosure()));
+  net::ClientCertIdentityList selected_identities;
+  store.GetClientCerts(
+      *request, base::Bind(SaveIdentitiesAndQuitCallback, &selected_identities,
+                           run_loop.QuitClosure()));
   run_loop.Run();
 
-  ASSERT_EQ(1u, selected_certs.size());
-  EXPECT_TRUE(cert_1->Equals(selected_certs[0].get()));
+  ASSERT_EQ(1u, selected_identities.size());
+  EXPECT_TRUE(cert_1->Equals(selected_identities[0]->certificate()));
 }
 
 }  // namespace chromeos