CrOS - Add certificate support to VPN UI.

chrome/browser/chromeos/options/vpn_config_view.cc

 // Copyright (c) 2011 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/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ skipping 91 matching lines @@
           x509_certificate_model::GetCertNameOrNickname(cert->os_cert_handle());
       return UTF8ToUTF16(name);
     }
     return string16();
   }
 
   bool HaveCerts() {
     return !user_certs_.empty();
   }
 
+  // Gets PKCS#11 certificate ID, or empty string on failure.
   std::string GetCertID(int index) {
     if (0 <= index && index < static_cast<int>(user_certs_.size())) {
-      // TODO(jamescook): Return the proper ID for flimflam, perhaps PKCS#11?
-      return "/tmp/ca.pem";
+      net::X509Certificate* cert = user_certs_[index].get();
+      net::X509Certificate::OSCertHandle cert_handle = cert->os_cert_handle();
+      return x509_certificate_model::GetPkcs11Id(cert_handle);

[Charlie Lee, 2011/05/20 21:44:46]

easier to just inline cert->os_cert_handle()

     }
     return std::string();
   }
 
  private:
   net::CertificateList user_certs_;
   DISALLOW_COPY_AND_ASSIGN(UserCertComboboxModel);
 };
 
 VPNConfigView::VPNConfigView(NetworkConfigView* parent, VirtualNetwork* vpn)
@@ skipping 15 matching lines @@
 
 string16 VPNConfigView::GetTitle() {
   return l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_ADD_VPN);
 }
 
 bool VPNConfigView::CanLogin() {
   // TODO(stevenjb): min kMinPassphraseLen length?
   if (service_path_.empty() &&
       (GetService().empty() || GetServer().empty()))
     return false;
-  if (UserCertRequired() && GetUserCertID().empty())
+  if (UserCertRequired() && !HaveUserCerts())
     return false;
   if (GetUsername().empty())
     return false;
   return true;
 }
 
 void VPNConfigView::UpdateErrorLabel() {
   std::string error_msg;
-  if (UserCertRequired() && GetUserCertID().empty())
+  if (UserCertRequired() && !HaveUserCerts())
     error_msg = l10n_util::GetStringUTF8(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_PLEASE_INSTALL_USER_CERT);
   if (!service_path_.empty()) {
     // TODO(kuan): differentiate between bad psk and user passphrases.
     NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
     VirtualNetwork* vpn = cros->FindVirtualNetworkByPath(service_path_);
     if (vpn && vpn->failed()) {
       if (vpn->error() == ERROR_BAD_PASSPHRASE) {
         error_msg = l10n_util::GetStringUTF8(
             IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_BAD_PASSPHRASE);
       } else {
         error_msg = vpn->GetErrorString();
       }
     }
   }
   if (!error_msg.empty()) {
     error_label_->SetText(UTF8ToWide(error_msg));
     error_label_->SetVisible(true);
   } else {
     error_label_->SetVisible(false);
   }
 }
 
 bool VPNConfigView::UserCertRequired() const {
   return provider_type_ == VirtualNetwork::PROVIDER_TYPE_L2TP_IPSEC_USER_CERT
       || provider_type_ == VirtualNetwork::PROVIDER_TYPE_OPEN_VPN;
 }
 
+bool VPNConfigView::HaveUserCerts() const {
+  UserCertComboboxModel* model = static_cast<UserCertComboboxModel*>(
+      user_cert_combobox_->model());
+  return model->HaveCerts();
+}
+
 void VPNConfigView::ContentsChanged(views::Textfield* sender,
                                     const string16& new_contents) {
   if (sender == server_textfield_ && !service_text_modified_) {
     // Set the service name to the server name up to '.', unless it has
     // been explicitly set by the user.
     string16 server = server_textfield_->text();
     string16::size_type n = server.find_first_of(L'.');
     service_name_from_server_ = server.substr(0, n);
     service_textfield_->SetText(service_name_from_server_);
   }
@@ skipping 40 matching lines @@
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   if (service_path_.empty()) {
     switch (provider_type_) {
       case VirtualNetwork::PROVIDER_TYPE_L2TP_IPSEC_PSK:
         cros->ConnectToVirtualNetworkPSK(GetService(),
                                          GetServer(),
                                          GetPSKPassphrase(),
                                          GetUsername(),
                                          GetUserPassphrase());
         break;
-      case VirtualNetwork::PROVIDER_TYPE_L2TP_IPSEC_USER_CERT:
+      case VirtualNetwork::PROVIDER_TYPE_L2TP_IPSEC_USER_CERT: {
+        cros->ConnectToVirtualNetworkCert(GetService(),
+                                          GetServer(),
+                                          GetUserCertID(),
+                                          GetUsername(),
+                                          GetUserPassphrase());
+        break;
+      }
       case VirtualNetwork::PROVIDER_TYPE_OPEN_VPN:
-        // TODO(stevenjb): Add support for OpenVPN and user certs.
+        // TODO(stevenjb): Add support for OpenVPN.
         LOG(WARNING) << "Unsupported provider type: " << provider_type_;
         break;
       case VirtualNetwork::PROVIDER_TYPE_MAX:
         break;
     }
   } else {
     VirtualNetwork* vpn = cros->FindVirtualNetworkByPath(service_path_);
     if (!vpn) {
       // TODO(stevenjb): Add notification for this.
       LOG(WARNING) << "VPN no longer exists: " << service_path_;
       return true;  // Close dialog.
     }
     switch (provider_type_) {
       case VirtualNetwork::PROVIDER_TYPE_L2TP_IPSEC_PSK:
         vpn->SetPSKPassphrase(GetPSKPassphrase());
         break;
-      case VirtualNetwork::PROVIDER_TYPE_L2TP_IPSEC_USER_CERT:
+      case VirtualNetwork::PROVIDER_TYPE_L2TP_IPSEC_USER_CERT: {
+        vpn->SetClientCertID(GetUserCertID());
+        break;
+      }
       case VirtualNetwork::PROVIDER_TYPE_OPEN_VPN: {
-        // TODO(jamescook): Figure out if flimflam consumes a cert path,
-        // PKCS#11 ID or other identifier.  Then do something like:
-        // vpn->SetUserCertID(GetUserCertID());
-        LOG(WARNING) << "VPN user certs not yet supported.";
+        LOG(WARNING) << "OpenVPN not yet supported.";
         break;
       }
       case VirtualNetwork::PROVIDER_TYPE_MAX:
         break;
     }
     vpn->SetUsername(GetUsername());
     vpn->SetUserPassphrase(GetUserPassphrase());
 
     cros->ConnectToVirtualNetwork(vpn);
   }
@@ skipping 153 matching lines @@
   if (vpn && !vpn->psk_passphrase().empty())
     psk_passphrase_textfield_->SetText(UTF8ToUTF16(vpn->psk_passphrase()));
   layout->AddView(psk_passphrase_textfield_);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // User certificate label and input.
   layout->StartRow(0, column_view_set_id);
   user_cert_label_ = new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_USER_CERT)));
   layout->AddView(user_cert_label_);
-  user_cert_combobox_ = new views::Combobox(new UserCertComboboxModel());
+  UserCertComboboxModel* user_cert_model = new UserCertComboboxModel();
+  user_cert_combobox_ = new views::Combobox(user_cert_model);
   user_cert_combobox_->set_listener(this);
-  if (vpn && !vpn->user_cert().empty()) {
-    string16 user_cert = UTF8ToUTF16(vpn->user_cert());
-    for (int i = 0; i < user_cert_combobox_->model()->GetItemCount(); ++i) {
-      // TODO(jamescook):  Select the proper certificate based on the
-      // appropriate property from flimflam, perhaps PKCS#11 ID.
-      if (user_cert_combobox_->model()->GetItemAt(i) == user_cert) {
+  if (vpn && !vpn->client_cert_id().empty()) {
+    // Select the current user certificate in the combobox.
+    for (int i = 0; i < user_cert_model->GetItemCount(); ++i) {
+      std::string cert_id = user_cert_model->GetCertID(i);
+      if (cert_id == vpn->client_cert_id()) {
         user_cert_combobox_->SetSelectedItem(i);
         break;
       }
     }
   }
   layout->AddView(user_cert_combobox_);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Username label and input.
   layout->StartRow(0, column_view_set_id);
@@ skipping 41 matching lines @@
       psk_passphrase_textfield_->SetEnabled(true);
       user_cert_label_->SetEnabled(false);
       user_cert_combobox_->SetEnabled(false);
       break;
     case VirtualNetwork::PROVIDER_TYPE_L2TP_IPSEC_USER_CERT:
     case VirtualNetwork::PROVIDER_TYPE_OPEN_VPN: {
       psk_passphrase_label_->SetEnabled(false);
       psk_passphrase_textfield_->SetEnabled(false);
       user_cert_label_->SetEnabled(true);
       // Only enable the combobox if the user actually has a cert to select.
-      bool have_cert = !GetUserCertID().empty();
-      user_cert_combobox_->SetEnabled(have_cert);
+      user_cert_combobox_->SetEnabled(HaveUserCerts());
       break;
     }
     default:
       NOTREACHED();
+      break;
   }
 }
 
 }  // namespace chromeos