brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

network: fix handling of AP flags and enhance for 802.1x

Browse Source 
All WPA APs were getting set as WPA2 due to the check for privacy;
WPA/WPA2 APs *must* set the Privacy bit according to the standard,
so we'd never end up in the case for NMAccessPointSecurity.WPA.

Fix that, and also add flags for WPA[2] Enterprise which we'll
use a bit later for the first-time connect case for 802.1x enabled
access points.
This commit is contained in:
Dan Williams 2011-05-03 12:21:45 -05:00 committed by Owen W. Taylor
parent 8dd45bea1c
commit ccc4b20e83
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
js/ui/status/network.js
View File

@ -33,8 +33,10 @@ const NMAccessPointSecurity = {
UNKNOWN: 0, UNKNOWN: 0,
NONE: 1, NONE: 1,
WEP: 2, WEP: 2,
WPA: 3, WPA_PSK: 3,
WPA2: 4 WPA2_PSK: 4,
WPA_ENT: 5,
WPA2_ENT: 6
}; };
// small optimization, to avoid using [] all the time // small optimization, to avoid using [] all the time
@ -1098,26 +1100,28 @@ NMDeviceWireless.prototype = {
_getApSecurityType: function(accessPoint) { _getApSecurityType: function(accessPoint) {
if (accessPoint._secType) if (accessPoint._secType)
return accessPoint._secType; return accessPoint._secType;
// XXX: have this checked by someone familiar with IEEE 802.1x
let flags = accessPoint.flags; let flags = accessPoint.flags;
let wpa_flags = accessPoint.wpa_flags; let wpa_flags = accessPoint.wpa_flags;
let rsn_flags = accessPoint.rsn_flags; let rsn_flags = accessPoint.rsn_flags;
let type; let type;
if ( !(flags & NM80211ApFlags.PRIVACY) if (rsn_flags != NM80211ApSecurityFlags.NONE) {
&& (wpa_flags == NM80211ApSecurityFlags.NONE) /* RSN check first so that WPA+WPA2 APs are treated as RSN/WPA2 */
&& (rsn_flags == NM80211ApSecurityFlags.NONE)) if (rsn_flags & NM80211ApSecurityFlags.KEY_MGMT_802_1X)
type = NMAccessPointSecurity.NONE; type = NMAccessPointSecurity.WPA2_ENT;
else if ( (flags & NM80211ApFlags.PRIVACY) else if (rsn_flags & NM80211ApSecurityFlags.KEY_MGMT_PSK)
&& (wpa_flags == NM80211ApSecurityFlags.NONE) type = NMAccessPointSecurity.WPA2_PSK;
&& (rsn_flags == NM80211ApSecurityFlags.NONE)) } else if (wpa_flags != NM80211ApSecurityFlags.NONE) {
if (wpa_flags & NM80211ApSecurityFlags.KEY_MGMT_802_1X)
type = NMAccessPointSecurity.WPA_ENT;
else if (wpa_flags & NM80211ApSecurityFlags.KEY_MGMT_PSK)
type = NMAccessPointSecurity.WPA_PSK;
} else {
if (flags & NM80211ApFlags.PRIVACY)
type = NMAccessPointSecurity.WEP; type = NMAccessPointSecurity.WEP;
else if ( !(flags & NM80211ApFlags.PRIVACY)
&& (wpa_flags != NM80211ApSecurity.NONE)
&& (rsn_flags != NM80211ApSecurity.NONE))
type = NMAccessPointSecurity.WPA;
else else
type = NMAccessPointSecurity.WPA2; type = NMAccessPointSecurity.NONE;
}
// cache the found value to avoid checking flags all the time // cache the found value to avoid checking flags all the time
accessPoint._secType = type; accessPoint._secType = type;