gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-01-06 05:44:18 +01:00
Code Issues Projects Releases Wiki Activity

Implement WEP key index specification

Browse Source
This commit is contained in:
David Paleino
2012-05-04 19:39:04 +02:00
parent bca11618be
commit 63460113b8
8 changed files with 45 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
wicd/misc.py
View File

@@ -252,15 +252,16 @@ def to_bool(var):
var = bool(var)
return var
def Noneify(variable):
def Noneify(variable, to_bool=True):
""" Convert string types to either None or booleans"""
#set string Nones to real Nones
if variable in ("None", "", None):
return None
if variable in ("False", "0"):
return False
if variable in ("True", "1"):
return True
if to_bool:
if variable in ("False", "0"):
return False
if variable in ("True", "1"):
return True
return variable
def ParseEncryption(network):
@@ -288,18 +289,18 @@ def ParseEncryption(network):
elif "$_" in line:
cur_val = re.findall('\$_([A-Z0-9_]+)', line)
if cur_val:
if cur_val[0] == 'SCAN':
#TODO should this be hardcoded?
line = line.replace("$_SCAN", "1")
rep_val = network.get(cur_val[0].lower())
if not rep_val:
# hardcode some default values
if cur_val[0] == 'SCAN':
rep_val = '1'
elif cur_val[0] == 'KEY_INDEX':
rep_val = '0'
if rep_val:
line = line.replace("$_%s" % cur_val[0], str(rep_val))
config_file = ''.join([config_file, line])
else:
rep_val = network.get(cur_val[0].lower())
if rep_val:
line = line.replace("$_%s" % cur_val[0],
str(rep_val))
config_file = ''.join([config_file, line])
else:
print "Ignoring template line: '%s'" % line
print "Ignoring template line: '%s'" % line
else:
print "Weird parsing error occurred"
else: # Just a regular entry.

1
wicd/translations.py
View File

@@ -78,6 +78,7 @@ language['authentication'] = _('Authentication')
language['domain'] = _('Domain')
language['identity'] = _('Identity')
language['key'] = _('Key')
language['key_index'] = _('Key index')
language['passphrase'] = _('Passphrase')
language['password'] = _('Password')
language['path_to_ca_cert'] = _('Path to CA cert')

6
wicd/wicd-daemon.py
View File

@@ -1069,7 +1069,11 @@ class WirelessDaemon(dbus.service.Object):
print 'Setting script properties through the daemon' \
+ ' is not permitted.'
return False
self.LastScan[netid][prop] = misc.to_unicode(misc.Noneify(value))
# whitelist some props that need different handling
if prop in ('key_index', ):
self.LastScan[netid][prop] = misc.to_unicode(misc.Noneify(value, False))
else:
self.LastScan[netid][prop] = misc.to_unicode(misc.Noneify(value))
@dbus.service.method('org.wicd.daemon.wireless')
def DetectWirelessInterface(self):