Show ****** in wifi passphrase field

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 "ash/system/chromeos/network/network_connect.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
 #include "chrome/browser/chromeos/net/onc_utils.h"
+#include "chrome/browser/chromeos/options/passphrase_textfield.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/network_configuration_handler.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_ui_data.h"
 #include "chromeos/network/onc/onc_constants.h"
 #include "grit/chromium_strings.h"
@@ skipping 371 matching lines @@
 }
 
 bool WifiConfigView::CanLogin() {
   static const size_t kMinWirelessPasswordLen = 5;
 
   // We either have an existing wifi network or the user entered an SSID.
   if (service_path_.empty() && GetSsid().empty())
     return false;
 
   // If the network requires a passphrase, make sure it is the right length.
-  if (passphrase_textfield_ != NULL
-      && passphrase_textfield_->enabled()
-      && passphrase_textfield_->text().length() < kMinWirelessPasswordLen)
+  if (passphrase_textfield_ != NULL &&
+      passphrase_textfield_->enabled() &&
+      !passphrase_textfield_->show_fake() &&
+      passphrase_textfield_->text().length() < kMinWirelessPasswordLen)
     return false;
 
   // If we're using EAP, we must have a method.
   if (eap_method_combobox_ &&
       eap_method_combobox_->selected_index() == EAP_METHOD_INDEX_NONE)
     return false;
 
   // Block login if certs are required but user has none.
   if (UserCertRequired() && (!HaveUserCerts() || !IsUserCertValid()))
       return false;
@@ skipping 630 matching lines @@
     layout->AddView(new ControlledSettingIndicatorView(identity_ui_data_));
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
 
   // Passphrase input
   layout->StartRow(0, column_view_set_id);
   int label_text_id = IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE;
   string16 passphrase_label_text = l10n_util::GetStringUTF16(label_text_id);
   passphrase_label_ = new views::Label(passphrase_label_text);
   layout->AddView(passphrase_label_);
-  passphrase_textfield_ = new views::Textfield(
-      views::Textfield::STYLE_OBSCURED);
+  passphrase_textfield_ = new PassphraseTextfield();
   passphrase_textfield_->SetController(this);
   // Disable passphrase input initially for other network.
-  passphrase_label_->SetEnabled(wifi != NULL);
+  passphrase_label_->SetEnabled(wifi);
   passphrase_textfield_->SetEnabled(wifi && passphrase_ui_data_.IsEditable());
   passphrase_textfield_->SetAccessibleName(passphrase_label_text);
   layout->AddView(passphrase_textfield_);
 
   if (passphrase_ui_data_.IsManaged()) {
     layout->AddView(new ControlledSettingIndicatorView(passphrase_ui_data_));
   } else {
     // Password visible button.
     passphrase_visible_button_ = new views::ToggleImageButton(this);
     passphrase_visible_button_->set_focusable(true);
@@ skipping 93 matching lines @@
         base::Bind(&WifiConfigView::InitFromProperties,
                    weak_ptr_factory_.GetWeakPtr(), show_8021x),
         base::Bind(&ShillError, "GetProperties"));
   }
 }
 
 void WifiConfigView::InitFromProperties(
     bool show_8021x,
     const std::string& service_path,
     const base::DictionaryValue& properties) {
-  std::string passphrase;
-  properties.GetStringWithoutPathExpansion(
-      flimflam::kPassphraseProperty, &passphrase);
-  passphrase_textfield_->SetText(UTF8ToUTF16(passphrase));
-
-  if (!show_8021x)
+  if (!show_8021x) {
+    std::string passphrase;
+    properties.GetStringWithoutPathExpansion(
+        flimflam::kPassphraseProperty, &passphrase);
+    passphrase_textfield_->SetText(UTF8ToUTF16(passphrase));
     return;
+  }
 
   // EAP Method
   std::string eap_method;
   properties.GetStringWithoutPathExpansion(
       flimflam::kEapMethodProperty, &eap_method);
   if (eap_method == flimflam::kEapMethodPEAP)
     eap_method_combobox_->SetSelectedIndex(EAP_METHOD_INDEX_PEAP);
   else if (eap_method == flimflam::kEapMethodTTLS)
     eap_method_combobox_->SetSelectedIndex(EAP_METHOD_INDEX_TTLS);
   else if (eap_method == flimflam::kEapMethodTLS)
@@ skipping 78 matching lines @@
   properties.GetStringWithoutPathExpansion(
       flimflam::kEapIdentityProperty, &eap_identity);
   identity_textfield_->SetText(UTF8ToUTF16(eap_identity));
 
   // Passphrase
   if (PassphraseActive()) {
     std::string eap_password;
     properties.GetStringWithoutPathExpansion(
         flimflam::kEapPasswordProperty, &eap_password);
     passphrase_textfield_->SetText(UTF8ToUTF16(eap_password));
+    // If 'Connectable' is True, show a fake passphrase to indicate that it
+    // has already been set.
+    bool connectable = false;
+    properties.GetBooleanWithoutPathExpansion(
+        flimflam::kConnectableProperty, &connectable);

[armansito, 2013/09/04 00:25:16]

From my understanding, passphrases are not mandatory for 802.1x, so there maybe
no password involved at all (i.e. flimflam::kPassphraseRequiredProperty would be
false) but the service might still be connectable. Would it be confusing for a
user if a fake password is displayed in that case, even though one is not set?

[stevenjb, 2013/09/04 00:41:14]

So, kPassphraseRequiredProperty does not apply to 802.1x.

PassphraseActive() will be false for TLS which uses a certificate. 

My understanding is that other 802.1x methods (PEAP, LEAP, TTLS) do generally
require a passphrase.

I think we should change Shill to either set kPassphraseRequiredProperty or
another property for 802.1x, but this seemed like a reasonable short term fix.

+    passphrase_textfield_->SetShowFake(connectable);
   }
 
   // Save credentials
   bool save_credentials = false;
   properties.GetBooleanWithoutPathExpansion(
       flimflam::kSaveCredentialsProperty, &save_credentials);
   save_credentials_checkbox_->SetChecked(save_credentials);
 
   RefreshShareCheckbox();
   UpdateErrorLabel();
@@ skipping 30 matching lines @@
 void WifiConfigView::ParseWiFiEAPUIProperty(
     NetworkPropertyUIData* property_ui_data,
     const NetworkState* network,
     const std::string& key) {
   ParseWiFiUIProperty(
       property_ui_data, network,
       base::StringPrintf("%s.%s", onc::wifi::kEAP, key.c_str()));
 }
 
 }  // namespace chromeos