diff options
Diffstat (limited to 'src/jarabe/model/network.py')
| -rw-r--r-- | src/jarabe/model/network.py | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py index f265ae4..84e3666 100644 --- a/src/jarabe/model/network.py +++ b/src/jarabe/model/network.py @@ -418,6 +418,7 @@ class Settings(object): self.connection = Connection() self.ip4_config = None self.wireless_security = None + self.wpa_eap_setting = None if wireless_cfg is not None: self.wireless = wireless_cfg @@ -433,6 +434,10 @@ class Settings(object): self.wireless_security.get_dict() if self.ip4_config is not None: settings['ipv4'] = self.ip4_config.get_dict() + if self.wpa_eap_setting is not None: + settings['802-1x'] = self.wpa_eap_setting + + return settings @@ -653,6 +658,9 @@ class NMSettingsConnection(dbus.service.Object): if self._settings.wireless.security is not None: config.set(identifier, 'security', self._settings.wireless.security) + if self._settings.wpa_eap_setting is not None: + config.set(identifier, 'wpa_eap_setting', + self._settings.wpa_eap_setting) if self._secrets is not None: if self._settings.wireless_security.key_mgmt == 'none': config.set(identifier, 'key', self._secrets.wep_key) @@ -895,21 +903,29 @@ def load_wifi_connections(): settings.wireless_security.key_mgmt = mgmt security = config.get(section, 'security') settings.wireless.security = security - key = config.get(section, 'key') if mgmt == 'none': + key = config.get(section, 'key') secrets.wep_key = key auth_alg = config.get(section, 'auth-alg') secrets.auth_alg = auth_alg - elif mgmt == 'wpa-psk': - secrets.psk = key + elif (mgmt == 'wpa-psk') or (mgmt == 'wpa-eap'): + if mgmt == 'wpa-psk': + key = config.get(section, 'key') + secrets.psk = key + elif mgmt == 'wpa-eap': + if config.has_option(section, + 'wpa_eap_setting'): + value = eval(config.get(section, + 'wpa_eap_setting')) + settings.wpa_eap_setting = value if config.has_option(section, 'proto'): - value = config.get(section, 'proto') + value = eval(config.get(section, 'proto')) settings.wireless_security.proto = value if config.has_option(section, 'group'): - value = config.get(section, 'group') + value = eval(config.get(section, 'group')) settings.wireless_security.group = value if config.has_option(section, 'pairwise'): - value = config.get(section, 'pairwise') + value = eval(config.get(section, 'pairwise')) settings.wireless_security.pairwise = value except ConfigParser.Error: logging.exception('Error reading section') |