Resolve certificate references in ONC by PEM.

chrome/browser/chromeos/options/vpn_config_view.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/chromeos/options/vpn_config_view.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 295 matching lines @@
   if (service_path_.empty()) {
     NetworkLibrary::VPNConfigData config_data;
     switch (provider_type_) {
       case PROVIDER_TYPE_L2TP_IPSEC_PSK:
         config_data.psk = GetPSKPassphrase();
         config_data.username = GetUsername();
         config_data.user_passphrase = GetUserPassphrase();
         config_data.group_name = GetGroupName();
         break;
       case PROVIDER_TYPE_L2TP_IPSEC_USER_CERT: {
-        config_data.server_ca_cert_nss_nickname = GetServerCACertNssNickname();
+        config_data.server_ca_cert_pem = GetServerCACertPEM();
         config_data.client_cert_pkcs11_id = GetUserCertID();
         config_data.username = GetUsername();
         config_data.user_passphrase = GetUserPassphrase();
         config_data.group_name = GetGroupName();
         break;
       }
       case PROVIDER_TYPE_OPEN_VPN:
-        config_data.server_ca_cert_nss_nickname = GetServerCACertNssNickname();
+        config_data.server_ca_cert_pem = GetServerCACertPEM();
         config_data.client_cert_pkcs11_id = GetUserCertID();
         config_data.username = GetUsername();
         config_data.user_passphrase = GetUserPassphrase();
         config_data.otp = GetOTP();
         break;
       case PROVIDER_TYPE_MAX:
         break;
     }
     config_data.save_credentials = GetSaveCredentials();
     cros->ConnectToUnconfiguredVirtualNetwork(
@@ skipping 79 matching lines @@
 }
 
 const std::string VPNConfigView::GetGroupName() const {
   return GetTextFromField(group_name_textfield_, false);
 }
 
 const std::string VPNConfigView::GetOTP() const {
   return GetTextFromField(otp_textfield_, true);
 }
 
-const std::string VPNConfigView::GetServerCACertNssNickname() const {
+const std::string VPNConfigView::GetServerCACertPEM() const {
   int index = server_ca_cert_combobox_ ?
       server_ca_cert_combobox_->selected_index() : 0;
   if (index == 0) {
     // First item is "Default".
     return std::string();
   } else {
     int cert_index = index - 1;
-    return CertLibrary::Get()->GetCertNicknameAt(
+    return CertLibrary::Get()->GetCertPEMAt(
         CertLibrary::CERT_TYPE_SERVER_CA, cert_index);
   }
 }
 
 const std::string VPNConfigView::GetUserCertID() const {
   if (!HaveUserCerts()) {
     return std::string();  // "None installed"
   } else {
     // Certificates are listed in the order they appear in the model.
     int index = user_cert_combobox_ ? user_cert_combobox_->selected_index() : 0;
     return CertLibrary::Get()->GetCertPkcs11IdAt(
         CertLibrary::CERT_TYPE_USER, index);
   }
 }
 
 bool VPNConfigView::GetSaveCredentials() const {
   return save_credentials_checkbox_->checked();
 }
 
 void VPNConfigView::Init(VirtualNetwork* vpn) {
   if (vpn) {
     ProviderType type = vpn->provider_type();
     std::string type_dict_name = ProviderTypeToONCDictKey(type);
-    ParseVPNUIProperty(&ca_cert_ui_data_, vpn, type_dict_name,
-                       onc::vpn::kServerCARef);
-    ParseVPNUIProperty(&psk_passphrase_ui_data_, vpn, type_dict_name,
-                       onc::vpn::kPSK);
+
+    if (type == PROVIDER_TYPE_L2TP_IPSEC_PSK) {
+      ParseVPNUIProperty(&ca_cert_ui_data_, vpn, type_dict_name,
+                         onc::ipsec::kServerCARef);
+      ParseVPNUIProperty(&psk_passphrase_ui_data_, vpn, type_dict_name,
+                         onc::ipsec::kPSK);
+      ParseVPNUIProperty(&group_name_ui_data_, vpn, type_dict_name,
+                         onc::ipsec::kGroup);
+    } else { // OpenVPN
+      ParseVPNUIProperty(&ca_cert_ui_data_, vpn, type_dict_name,
+                         onc::openvpn::kServerCARef);
+    }
     ParseVPNUIProperty(&user_cert_ui_data_, vpn, type_dict_name,
                        onc::vpn::kClientCertRef);
-    ParseVPNUIProperty(&group_name_ui_data_, vpn, type_dict_name,
-                       onc::vpn::kGroup);
 
     const std::string credentials_dict_name(
         type == PROVIDER_TYPE_L2TP_IPSEC_PSK ?
             onc::vpn::kL2TP : type_dict_name);
     ParseVPNUIProperty(&username_ui_data_, vpn, credentials_dict_name,
                        onc::vpn::kUsername);
     ParseVPNUIProperty(&user_passphrase_ui_data_, vpn, credentials_dict_name,
                        onc::vpn::kPassword);
     ParseVPNUIProperty(&save_credentials_ui_data_, vpn, credentials_dict_name,
                        onc::vpn::kSaveCredentials);
@@ skipping 237 matching lines @@
 void VPNConfigView::Refresh() {
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
 
   UpdateControls();
 
   // Set certificate combo boxes.
   VirtualNetwork* vpn = cros->FindVirtualNetworkByPath(service_path_);
   if (server_ca_cert_combobox_) {
     server_ca_cert_combobox_->ModelChanged();
     if (enable_server_ca_cert_ &&
-        (vpn && !vpn->ca_cert_nss().empty())) {
+        (vpn && !vpn->ca_cert_pem().empty())) {
       // Select the current server CA certificate in the combobox.
-      int cert_index = CertLibrary::Get()->GetCertIndexByNickname(
-          CertLibrary::CERT_TYPE_SERVER_CA, vpn->ca_cert_nss());
+      int cert_index = CertLibrary::Get()->GetCertIndexByPEM(
+          CertLibrary::CERT_TYPE_SERVER_CA, vpn->ca_cert_pem());
       if (cert_index >= 0) {
         // Skip item for "Default"
         server_ca_cert_combobox_->SetSelectedIndex(1 + cert_index);
       } else {
         server_ca_cert_combobox_->SetSelectedIndex(0);
       }
     } else {
       server_ca_cert_combobox_->SetSelectedIndex(0);
     }
   }
@@ skipping 167 matching lines @@
 
   property_ui_data->ParseOncProperty(
       network->ui_data().onc_source(), onc,
       base::StringPrintf("%s.%s.%s",
                          onc::network_config::kVPN,
                          dict_key.c_str(),
                          key.c_str()));
 }
 
 }  // namespace chromeos