commit 6e277774580c52073c919c4cbebedae27861d845
author mukesh agrawal <quiche@chromium.org> Thu Sep 29 15:04:23 2011 -0700
committer mukesh agrawal <quiche@chromium.org> Mon Oct 03 11:09:57 2011 -0700
tree 85419cd98a4a0dfabf94884935ebe2ec45465ea5
parent 1830fa1f2e8691073f4d07b0883f059a290a9cc2

shill: add support for connecting to WPA-PSK networks

BUG=chromium-os:20897
TEST=unittests, some autotests (see below)

the following autotests now pass, at least in the wifi_vm_config:
- network_WiFiManager.000_SSID_Length_Limit
- network_WiFiSecMat.010CheckWPA_TKIP
- network_WiFiSecMat.011CheckWPA_AES
- network_WiFiSecMat.012CheckWPA_Multi
- network_WiFiSecMat.018CheckWPA_CounterMeasures

Change-Id: Ie7499fd87f661ceef3ef0aae348a08bd43c305f4
Reviewed-on: http://gerrit.chromium.org/gerrit/8586
Tested-by: mukesh agrawal <quiche@google.com>
Reviewed-by: Paul Stewart <pstew@chromium.org>

wifi_service.cc

diff --git a/wifi_service.cc b/wifi_service.cc
index 881bf1d..861e969 100644
--- a/wifi_service.cc
+++ b/wifi_service.cc
@@ -11,11 +11,14 @@
 #include <base/string_number_conversions.h>
 #include <base/string_util.h>
 #include <chromeos/dbus/service_constants.h>
+#include <dbus/dbus.h>
 
 #include "shill/control_interface.h"
 #include "shill/device.h"
 #include "shill/shill_event.h"
 #include "shill/wifi.h"
+#include "shill/wifi_endpoint.h"
+#include "shill/wpa_supplicant.h"
 
 using std::string;
 
@@ -27,15 +30,13 @@
                          const WiFiRefPtr &device,
                          const std::vector<uint8_t> ssid,
                          const std::string &mode,
-                         const std::string &key_management)
+                         const std::string &security)
     : Service(control_interface, dispatcher, manager, flimflam::kTypeWifi),
-      security_(flimflam::kSecurityNone),
+      security_(security),
       mode_(mode),
       task_factory_(this),
       wifi_(device),
       ssid_(ssid) {
-  SetEAPKeyManagement(key_management);
-
   PropertyStore *store = this->mutable_store();
   store->RegisterConstString(flimflam::kModeProperty, &mode_);
   store->RegisterString(flimflam::kPassphraseProperty, &passphrase_);
@@ -54,8 +55,30 @@
            "_" +
            string(reinterpret_cast<const char*>(ssid_.data()), ssid_.size()));
 
-  // TODO(quiche): set based on security properties
-  need_passphrase_ = false;
+  // TODO(quiche): determine if it is okay to set EAP.KeyManagement for
+  // a service that is not 802.1x.
+  if (security_ == flimflam::kSecurity8021x) {
+    NOTIMPLEMENTED();
+    // XXX needs_passpharse_ = false ?
+  } else if (security_ == flimflam::kSecurityPsk) {
+    SetEAPKeyManagement("WPA-PSK");
+    need_passphrase_ = true;
+  } else if (security_ == flimflam::kSecurityRsn) {
+    SetEAPKeyManagement("WPA-PSK");
+    need_passphrase_ = true;
+  } else if (security_ == flimflam::kSecurityWpa) {
+    SetEAPKeyManagement("WPA-PSK");
+    need_passphrase_ = true;
+  } else if (security_ == flimflam::kSecurityWep) {
+    SetEAPKeyManagement("NONE");
+    need_passphrase_ = true;
+  } else if (security_ == flimflam::kSecurityNone) {
+    SetEAPKeyManagement("NONE");
+    need_passphrase_ = false;
+  } else {
+    LOG(ERROR) << "unsupported security method " << security_;
+  }
+
   // TODO(quiche): figure out when to set true
   hidden_ssid_ = false;
 }
@@ -105,7 +128,39 @@
 
 // private methods
 void WiFiService::ConnectTask() {
-  wifi_->ConnectTo(this);
+  std::map<string, DBus::Variant> params;
+  DBus::MessageIter writer;
+
+  params[wpa_supplicant::kNetworkPropertyMode].writer().
+      append_uint32(WiFiEndpoint::ModeStringToUint(mode_));
+
+  if (security_ == flimflam::kSecurity8021x) {
+    NOTIMPLEMENTED();
+  } else if (security_ == flimflam::kSecurityPsk) {
+    NOTIMPLEMENTED();
+  } else if (security_ == flimflam::kSecurityRsn) {
+    NOTIMPLEMENTED();
+  } else if (security_ == flimflam::kSecurityWpa) {
+    params[wpa_supplicant::kPropertySecurityProtocol].writer().
+        append_string(wpa_supplicant::kSecurityModeWPA);
+    params[wpa_supplicant::kPropertyPreSharedKey].writer().
+        append_string(passphrase_.c_str());
+  } else if (security_ == flimflam::kSecurityWep) {
+    NOTIMPLEMENTED();
+  } else if (security_ == flimflam::kSecurityNone) {
+    // nothing special to do here
+  } else {
+    LOG(ERROR) << "can't connect. unsupported security method " << security_;
+  }
+
+  params[wpa_supplicant::kPropertyKeyManagement].writer().
+      append_string(key_management().c_str());
+  // TODO(quiche): figure out why we can't use operator<< without the
+  // temporary variable.
+  writer = params[wpa_supplicant::kNetworkPropertySSID].writer();
+  writer << ssid_;
+
+  wifi_->ConnectTo(this, params);
 }
 
 string WiFiService::GetDeviceRpcId() {