1
0
mirror of https://github.com/gryf/wicd.git synced 2025-12-19 20:38:00 +01:00

Revert commit 691/8aa66e4: Don't support wireless networks with '\x00' in the ESSID

This commit is contained in:
David Paleino
2012-01-15 15:19:40 +01:00
parent d85033998e
commit 8248152cfb
5 changed files with 0 additions and 28 deletions

6
NEWS
View File

@@ -1,12 +1,6 @@
Wicd 1.7 Series Wicd 1.7 Series
--------------- ---------------
1.7.1
Major Changes:
- Wireless networks with NULL bytes ('\x00') in the ESSID are not
supported. They will still show up in the UIs, but you won't be able
to do anything with them.
1.7.1b2: 1.7.1b2:
Changes for Packagers: Changes for Packagers:
- You will now want to use the --python option to setup.py configure to - You will now want to use the --python option to setup.py configure to

View File

@@ -158,9 +158,6 @@ if options.network_property:
if not options.set_to: if not options.set_to:
print wireless.GetWirelessProperty(network_id, options.network_property) print wireless.GetWirelessProperty(network_id, options.network_property)
else: else:
if '<NULL>' in wireless.GetWirelessProperty(network_id, 'essid'):
print 'ERROR: networks with NULL bytes are not supported.'
sys.exit(2)
wireless.SetWirelessProperty(network_id, \ wireless.SetWirelessProperty(network_id, \
options.network_property, options.set_to) options.network_property, options.set_to)
elif options.wired: elif options.wired:
@@ -187,9 +184,6 @@ if options.connect:
is_valid_wireless_network_id(options.network) is_valid_wireless_network_id(options.network)
name = wireless.GetWirelessProperty(options.network, 'essid') name = wireless.GetWirelessProperty(options.network, 'essid')
encryption = wireless.GetWirelessProperty(options.network, 'enctype') encryption = wireless.GetWirelessProperty(options.network, 'enctype')
if '<NULL>' in name:
print 'ERROR: networks with NULL bytes are not supported.'
sys.exit(2)
print "Connecting to %s with %s on %s" % (name, encryption, print "Connecting to %s with %s on %s" % (name, encryption,
wireless.DetectWirelessInterface()) wireless.DetectWirelessInterface())
wireless.ConnectWireless(options.network) wireless.ConnectWireless(options.network)
@@ -248,10 +242,6 @@ if options.wireless and options.list_encryption_types:
if options.save and options.network > -1: if options.save and options.network > -1:
if options.wireless: if options.wireless:
is_valid_wireless_network_id(options.network) is_valid_wireless_network_id(options.network)
essid = wireless.GetWirelessProperty(options.network, 'essid')
if '<NULL>' in essid:
print 'ERROR: networks with NULL bytes are not supported.'
sys.exit(2)
config.SaveWirelessNetworkProfile(options.network) config.SaveWirelessNetworkProfile(options.network)
elif options.wired: elif options.wired:
config.SaveWiredNetworkProfile(options.name) config.SaveWiredNetworkProfile(options.name)

View File

@@ -364,9 +364,6 @@ class NetLabel(urwid.WidgetWrap):
self.__super.__init__(w) self.__super.__init__(w)
def selectable(self): def selectable(self):
# Disable widget if the ESSID contains one (or more) NULL byte
if '<NULL>' in self.essid:
return False
return True return True
def keypress(self,size,key): def keypress(self,size,key):
return self._w.keypress(size,key) return self._w.keypress(size,key)

View File

@@ -862,10 +862,6 @@ class WirelessNetworkEntry(NetworkEntry):
self.advanced_dialog = WirelessSettingsDialog(networkID) self.advanced_dialog = WirelessSettingsDialog(networkID)
self.wifides = self.connect("destroy", self.destroy_called) self.wifides = self.connect("destroy", self.destroy_called)
# Disable widget if the ESSID contains one (or more) NULL byte
if '<NULL>' in self.essid:
self.set_sensitive(False)
def _escape(self, val): def _escape(self, val):
""" Escapes special characters so they're displayed correctly. """ """ Escapes special characters so they're displayed correctly. """
return val.replace("&", "&amp;").replace("<", "&lt;").\ return val.replace("&", "&amp;").replace("<", "&lt;").\

View File

@@ -1252,11 +1252,6 @@ class BaseWirelessInterface(BaseInterface):
print 'Unicode problem with current network essid, ignoring!!' print 'Unicode problem with current network essid, ignoring!!'
return None return None
# We (well, DBus) don't support ESSIDs with null bytes in it.
# Substitute the byte for use everywhere, so that the UIs know
# what to disable.
ap['essid'].replace('\x00', '<NULL>')
if ap['essid'] in ['Hidden', '<hidden>', "", None]: if ap['essid'] in ['Hidden', '<hidden>', "", None]:
print 'hidden' print 'hidden'
ap['hidden'] = True ap['hidden'] = True