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

Index: chrome/browser/extensions/api/networking_private/networking_private_linux.cc
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_linux.cc b/chrome/browser/extensions/api/networking_private/networking_private_linux.cc
index 5eace1fffc78106c5a7c23c67ed6b58409ecebb2..e7e886641da70c5721756f42064f1b640ade033d 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_linux.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_linux.cc
@@ -580,7 +580,10 @@ bool NetworkingPrivateLinux::GetAccessPointInfo(
                                   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.

[stevenjb, 2014/12/05 20:32:42]

nit: blank space since the comment applies to both of the next two blocks.

[zentaro, 2014/12/05 21:16:44]

Done.

+  uint32 wpa_security_flags = 0;
   {
     scoped_ptr<dbus::Response> response(GetAccessPointProperty(
         access_point_proxy,
@@ -590,18 +593,35 @@ bool NetworkingPrivateLinux::GetAccessPointInfo(
     }
 
     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;
@@ -717,9 +737,6 @@ void NetworkingPrivateLinux::AddOrUpdateAccessPoint(
 
 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;