Leave client certificate combobox empty if managed certficate not found

chrome/browser/chromeos/options/wifi_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/wifi_config_view.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 310 matching lines @@
 
 int UserCertComboboxModel::GetItemCount() const {
   if (!owner_->UserCertActive())
     return 1;  // "None installed" (combobox must have at least 1 entry)
   if (CertLibrary::Get()->CertificatesLoading())
     return 1;  // "Loading"
   int num_certs =
       CertLibrary::Get()->NumCertificates(CertLibrary::CERT_TYPE_USER);
   if (num_certs == 0)
     return 1;  // "None installed"
+  if (owner_->ManagedUserCertNotFound())
+    return 1;  // Empty: no user cert found, but managed (not editable).
   return num_certs;
 }
 
 base::string16 UserCertComboboxModel::GetItemAt(int index) {
   if (!owner_->UserCertActive())
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_USER_CERT_NONE_INSTALLED);
   if (CertLibrary::Get()->CertificatesLoading())
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
   if (CertLibrary::Get()->NumCertificates(CertLibrary::CERT_TYPE_USER) == 0)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_USER_CERT_NONE_INSTALLED);
+  if (owner_->ManagedUserCertNotFound())
+    return base::string16();  // Empty: no user cert found, but managed (not
+                              // editable).
   return CertLibrary::Get()->GetCertDisplayStringAt(
       CertLibrary::CERT_TYPE_USER, index);
 }
 
 }  // namespace internal
 
 WifiConfigView::WifiConfigView(NetworkConfigView* parent,
                                const std::string& service_path,
                                bool show_8021x)
     : ChildNetworkConfigView(parent, service_path),
@@ skipping 756 matching lines @@
       layout->AddView(subject_match_textfield_, 1, 1, views::GridLayout::FILL,
                       views::GridLayout::FILL, 0,
                       ChildNetworkConfigView::kInputFieldHeight);
     } else {
       layout->AddView(subject_match_textfield_);
     }
     layout->AddPaddingRow(0, provider->GetDistanceMetric(
                                  views::DISTANCE_RELATED_CONTROL_VERTICAL));
 
     // User certificate
+    managed_user_cert_not_found_ = false;
     layout->StartRow(0, column_view_set_id);
     base::string16 user_cert_label_text = l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT);
     user_cert_label_ = new views::Label(user_cert_label_text);
     layout->AddView(user_cert_label_);
     user_cert_combobox_model_.reset(new internal::UserCertComboboxModel(this));
     user_cert_combobox_ = new views::Combobox(user_cert_combobox_model_.get());
     user_cert_combobox_->SetAccessibleName(user_cert_label_text);
     user_cert_label_->SetEnabled(false);
     user_cert_combobox_->SetEnabled(false);
@@ skipping 266 matching lines @@
     properties.GetStringWithoutPathExpansion(
         shill::kEapCertIdProperty, &eap_cert_id);
     int unused_slot_id = 0;
     std::string pkcs11_id = client_cert::GetPkcs11AndSlotIdFromEapCertId(
         eap_cert_id, &unused_slot_id);
     if (!pkcs11_id.empty()) {
       int cert_index =
           CertLibrary::Get()->GetUserCertIndexByPkcs11Id(pkcs11_id);
       if (cert_index >= 0)
         user_cert_combobox_->SetSelectedIndex(cert_index);
+    } else if (!user_cert_ui_data_.IsEditable() &&
+               CertLibrary::Get()->NumCertificates(
+                   CertLibrary::CERT_TYPE_USER) > 0) {
+      // The cert is not configured (e.g. policy-provided client cert pattern
+      // did not match anything), and the cert selection is not editable
+      // (probably because the network is configured by policy). In this case,
+      // we don't want to display the first certificate in the list, as that
+      // would be misleading.
+      managed_user_cert_not_found_ = true;
+      user_cert_combobox_->ModelChanged();
+      user_cert_combobox_->SetSelectedIndex(0);
     }
   }
 
   // Identity is always active.
   std::string eap_identity;
   properties.GetStringWithoutPathExpansion(
       shill::kEapIdentityProperty, &eap_identity);
   identity_textfield_->SetText(base::UTF8ToUTF16(eap_identity));
 
   // Passphrase
@@ skipping 62 matching lines @@
 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data,
                                         const NetworkState* network,
                                         const std::string& key) {
   std::string onc_tag = network->type() == shill::kTypeEthernet
                             ? ::onc::ethernet::kEAP
                             : ::onc::wifi::kEAP;
   ParseUIProperty(property_ui_data, network, onc_tag + '.' + key);
 }
 
 }  // namespace chromeos