Support checking RsnFlags as well as WpaFlags so that security type is reported correctly for all n…

chrome/browser/extensions/api/networking_private/networking_private_linux.cc

 // Copyright 2014 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/extensions/api/networking_private/networking_private_linux.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 562 matching lines @@
     if (!reader.PopVariantOfByte(&strength)) {
       LOG(ERROR) << "Unexpected response for " << access_point_path.value()
                  << ": " << response->ToString();
       return false;
     }
 
     access_point_info->SetInteger(kAccessPointInfoWifiSignalStrengthDotted,
                                   strength);
   }
 
-  // Read the security type.
+  // Read the security type. This is from the WpaFlags and RsnFlags property
+  // which are of the same type and can be OR'd together to find all supported
+  // security modes.
+
+  uint32 wpa_security_flags = 0;
   {
     scoped_ptr<dbus::Response> response(GetAccessPointProperty(
         access_point_proxy,
         networking_private::kNetworkManagerWpaFlagsProperty));
     if (!response) {
       return false;
     }
 
     dbus::MessageReader reader(response.get());
-    uint32 security_flags = 0;
-    if (!reader.PopVariantOfUint32(&security_flags)) {
+
+    if (!reader.PopVariantOfUint32(&wpa_security_flags)) {
       LOG(ERROR) << "Unexpected response for " << access_point_path.value()
                  << ": " << response->ToString();
       return false;
     }
-
-    std::string security;
-    MapSecurityFlagsToString(security_flags, &security);
-    access_point_info->SetString(kAccessPointInfoWifiSecurityDotted, security);
   }
 
+  uint32 rsn_security_flags = 0;
+  {
+    scoped_ptr<dbus::Response> response(GetAccessPointProperty(
+        access_point_proxy,
+        networking_private::kNetworkManagerRsnFlagsProperty));
+    if (!response) {
+      return false;
+    }
+
+    dbus::MessageReader reader(response.get());
+
+    if (!reader.PopVariantOfUint32(&rsn_security_flags)) {
+      LOG(ERROR) << "Unexpected response for " << access_point_path.value()
+                 << ": " << response->ToString();
+      return false;
+    }
+  }
+
+  std::string security;
+  MapSecurityFlagsToString(rsn_security_flags | wpa_security_flags, &security);
+  access_point_info->SetString(kAccessPointInfoWifiSecurityDotted, security);
   access_point_info->SetString(kAccessPointInfoType, kAccessPointInfoTypeWifi);
   access_point_info->SetBoolean(kAccessPointInfoConnectable, true);
   return true;
 }
 
 bool NetworkingPrivateLinux::AddAccessPointsFromDevice(
     const dbus::ObjectPath& device_path,
     NetworkMap* network_map) {
   AssertOnDBusThread();
   dbus::ObjectPath connected_access_point;
@@ skipping 95 matching lines @@
                                        connection_state);
       existing_access_point->SetInteger(
           kAccessPointInfoWifiSignalStrengthDotted, signal_strength);
       existing_access_point->SetString(kAccessPointInfoGuid, network_guid);
     }
   }
 }
 
 void NetworkingPrivateLinux::MapSecurityFlagsToString(uint32 security_flags,
                                                       std::string* security) {
-  // TODO(zentaro): Correct mapping - this may not be correct but the underlying
-  // API appears not to work on Trusty so I can't verify yet.
-  // Everything returns 0.
   // Valid values are None, WEP-PSK, WEP-8021X, WPA-PSK, WPA-EAP
   if (security_flags == NetworkingPrivateLinux::NM_802_11_AP_SEC_NONE) {
     *security = kAccessPointSecurityNone;
   } else if (security_flags &
              NetworkingPrivateLinux::NM_802_11_AP_SEC_KEY_MGMT_PSK) {
     *security = kAccessPointSecurityWpaPsk;
   } else if (security_flags &
              NetworkingPrivateLinux::NM_802_11_AP_SEC_KEY_MGMT_802_1X) {
     *security = kAccessPointSecurity9021X;
   } else {
@@ skipping 141 matching lines @@
 
   if (!variant_reader.PopObjectPath(access_point_path)) {
     LOG(ERROR) << "Unexpected response: " << response->ToString();
     return false;
   }
 
   return true;
 }
 
 }  // namespace extensions