Prevented access to WEP passphrase from UI. Fixed forget network button in se...

chrome/browser/chromeos/dom_ui/internet_options_handler.cc

 // Copyright (c) 2010 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/dom_ui/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <string>
 #include <vector>
@@ skipping 125 matching lines @@
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NETWORK_ID));
   localized_strings->SetString("inetIdent",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_IDENTITY));
   localized_strings->SetString("inetCert",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT));
   localized_strings->SetString("inetCertPass",
       l10n_util::GetStringUTF16(
            IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PRIVATE_KEY_PASSWORD));
-  localized_strings->SetString("inetPass",
+  localized_strings->SetString("inetPassProtected",
       l10n_util::GetStringUTF16(
-           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE));
+          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NET_PROTECTED));
   localized_strings->SetString("inetRememberNetwork",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_AUTO_CONNECT));
   localized_strings->SetString("inetCertPkcs",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_INSTALLED));
   localized_strings->SetString("inetLogin",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_LOGIN));
   localized_strings->SetString("inetShowPass",
@@ skipping 339 matching lines @@
     NOTREACHED();
     return;
   }
   chromeos::NetworkLibrary* cros =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   chromeos::WifiNetwork* network = cros->FindWifiNetworkByPath(service_path);
   if (!network)
     return;
   bool changed = false;
   if (network->encrypted()) {
-    std::string password;
-
-    if (args->GetSize() != 5 ||
-        !args->GetString(4, &password)) {
-      NOTREACHED();
-      return;
-    }
-    if (password != network->passphrase()) {
-      network->set_passphrase(password);
-      changed = true;
-    }
-
-    if (network->encryption() == chromeos::SECURITY_8021X) {
+    if (network->encrypted() &&
+        network->encryption() == chromeos::SECURITY_8021X) {
       std::string ident;
       std::string certpath;
 
       if (!args->GetString(2, &ident) ||
           !args->GetString(3, &certpath)) {
         NOTREACHED();
         return;
       }
       if (ident != network->identity()) {
         network->set_identity(ident);
@@ skipping 75 matching lines @@
             dictionary.SetBoolean("certInPkcs", true);
           } else {
             dictionary.SetBoolean("certInPkcs", false);
           }
           dictionary.SetString("certPath",wireless->cert_path());
           dictionary.SetString("ident",wireless->identity());
           dictionary.SetBoolean("certNeeded", true);
           dictionary.SetString("certPass",wireless->passphrase());
         } else {
           dictionary.SetBoolean("certNeeded", false);
-          dictionary.SetString("pass", wireless->passphrase());
         }
       } else {
         dictionary.SetBoolean("encrypted", false);
       }
     }
   } else if (type == chromeos::TYPE_CELLULAR) {
     chromeos::CellularNetwork* cellular =
         cros->FindCellularNetworkByPath(net->service_path());
     if (!cellular) {
       LOG(WARNING) << "Cannot find network " << net->service_path();
     } else {
       // Cellular network / connection settings.
       dictionary.SetString("serviceName", cellular->service_name());
       dictionary.SetString("networkTechnology",
                            cellular->GetNetworkTechnologyString());
       dictionary.SetString("operatorName", cellular->operator_name());
       dictionary.SetString("operatorCode", cellular->operator_code());
       dictionary.SetString("activationState",
                            cellular->GetActivationStateString());
       dictionary.SetString("roamingState",
                            cellular->GetRoamingStateString());
       dictionary.SetString("restrictedPool",
           cellular->restricted_pool() ?
             l10n_util::GetStringUTF8(IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL) :
             l10n_util::GetStringUTF8(IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL));
       dictionary.SetString("errorState", cellular->GetErrorString());
+      dictionary.SetString("supportUrl",
+                           cellular->payment_url());
       // Device settings.
       dictionary.SetString("manufacturer", cellular->manufacturer());
       dictionary.SetString("modelId", cellular->model_id());
       dictionary.SetString("firmwareRevision", cellular->firmware_revision());
       dictionary.SetString("hardwareRevision", cellular->hardware_revision());
       dictionary.SetString("lastUpdate", cellular->last_update());
       dictionary.SetString("prlVersion", StringPrintf("%u",
                                                       cellular->prl_version()));
       dictionary.SetString("meid", cellular->meid());
       dictionary.SetString("imei", cellular->imei());
@@ skipping 17 matching lines @@
 void InternetOptionsHandler::PopupWirelessPassword(
     const chromeos::WifiNetwork* network) {
   DictionaryValue dictionary;
   dictionary.SetString("servicePath",network->service_path());
   if (network->encryption() == chromeos::SECURITY_8021X) {
     dictionary.SetBoolean("certNeeded", true);
     dictionary.SetString("ident", network->identity());
     dictionary.SetString("cert", network->cert_path());
   } else {
     dictionary.SetBoolean("certNeeded", false);
-    dictionary.SetString("pass", network->passphrase());
   }
   dom_ui_->CallJavascriptFunction(
       L"options.InternetOptions.showPasswordEntry", dictionary);
 }
 
 void InternetOptionsHandler::LoginCallback(const ListValue* args) {
 
   std::string service_path;
   std::string password;
 
@@ skipping 15 matching lines @@
     // TODO(chocobo): Display error message.
     LOG(WARNING) << "Cannot find network to connect " << service_path;
   }
 }
 
 void InternetOptionsHandler::LoginCertCallback(const ListValue* args) {
 
   std::string service_path;
   std::string identity;
   std::string certpath;
-  std::string password;
-
-  if (args->GetSize() != 4 ||
+  if (args->GetSize() < 3 ||
       !args->GetString(0, &service_path) ||
       !args->GetString(1, &certpath) ||
-      !args->GetString(2, &identity) ||
-      !args->GetString(3, &password)) {
-    NOTREACHED();
+      !args->GetString(2, &identity)) {
     return;
   }
   chromeos::NetworkLibrary* cros =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   chromeos::WifiNetwork* network =
       cros->FindWifiNetworkByPath(service_path);
-  if (network) {
-    cros->ConnectToWifiNetwork(
-        network, password, identity, certpath);
-  } else {
-    // TODO(dhg): Send error back to UI
+  if (!network)
+    return;
+  // If password does not come from the input, use one saved with the
+  // network details.
+  std::string password;
+  if (args->GetSize() != 4 || !args->GetString(3, &password)) {
+    password = network->passphrase();
   }
+  cros->ConnectToWifiNetwork(
+      network, password, identity, certpath);
 }
 
 void InternetOptionsHandler::LoginToOtherCallback(const ListValue* args) {
   std::string security;
   std::string ssid;
   std::string password;
 
   if (args->GetSize() != 3 ||
       !args->GetString(0, &security) ||
       !args->GetString(1, &ssid) ||
@@ skipping 253 matching lines @@
         icon,
         (*it)->name(),
         (*it)->connecting(),
         (*it)->connected(),
         chromeos::TYPE_WIFI,
         true,
         chromeos::ACTIVATION_STATE_UNKNOWN));
   }
   return list;
 }