From 25a61b0744b74f5ab042ab593418df4a559d513f Mon Sep 17 00:00:00 2001 From: Andrew Psaltis Date: Sat, 18 Jul 2009 10:55:26 -0400 Subject: [PATCH 1/5] Strip IPs before submitting them in wicd-curses. --- curses/netentry_curses.py | 4 ++++ curses/prefs_curses.py | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/curses/netentry_curses.py b/curses/netentry_curses.py index b74eec4..cda4355 100644 --- a/curses/netentry_curses.py +++ b/curses/netentry_curses.py @@ -140,6 +140,10 @@ class AdvancedSettingsDialog(urwid.WidgetWrap): not self.global_dns_cb.get_state(): self.set_net_prop('use_static_dns', True) self.set_net_prop('use_global_dns', False) + # Strip addressses before checking them in the daemon. + for i in [self.dns1, self.dns2, + self.dns3,self.dns_dom, self.search_dom, self.dns_dom]: + i.set_edit_text(i.get_edit_text().strip()) self.set_net_prop('dns_domain', noneToString(self.dns_dom_edit.get_edit_text())) self.set_net_prop("search_domain", noneToString(self.search_dom_edit.get_edit_text())) self.set_net_prop("dns1", noneToString(self.dns1.get_edit_text())) diff --git a/curses/prefs_curses.py b/curses/prefs_curses.py index bf1eb74..d843705 100644 --- a/curses/prefs_curses.py +++ b/curses/prefs_curses.py @@ -326,6 +326,11 @@ class PrefsDialog(urwid.WidgetWrap): """ Pushes the selected settings to the daemon. This exact order is found in prefs.py""" daemon.SetUseGlobalDNS(self.global_dns_checkb.get_state()) + + for i in [self.dns1, self.dns2, + self.dns3,self.dns_dom, self.search_dom, self.dns_dom]: + i.set_edit_text(i.get_edit_text().strip()) + daemon.SetGlobalDNS(self.dns1.get_edit_text(), self.dns2.get_edit_text(), self.dns3.get_edit_text(), self.dns_dom.get_edit_text(), self.search_dom.get_edit_text()) From fb2702aa8117f775723d8bd033ef448e81ee45f5 Mon Sep 17 00:00:00 2001 From: Andrew Psaltis Date: Sat, 18 Jul 2009 22:10:32 -0400 Subject: [PATCH 2/5] Strip spaces from the IPs in wicd-client. --- wicd/gui.py | 2 ++ wicd/netentry.py | 8 ++++++++ wicd/prefs.py | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/wicd/gui.py b/wicd/gui.py index 2c426f9..8905b0e 100644 --- a/wicd/gui.py +++ b/wicd/gui.py @@ -579,6 +579,7 @@ class appGui(object): # Required entries. for lblent in req_entlist: + lblent.set_text(lblent.get_text().strip()) if not misc.IsValidIP(lblent.get_text()): error(self.window, language['invalid_address']. replace('$A', lblent.label.get_label())) @@ -586,6 +587,7 @@ class appGui(object): # Optional entries, only check for validity if they're entered. for lblent in opt_entlist: + lblent.set_text(lblent.get_text().strip()) if lblent.get_text() and not misc.IsValidIP(lblent.get_text()): error(self.window, language['invalid_address']. replace('$A', lblent.label.get_label())) diff --git a/wicd/netentry.py b/wicd/netentry.py index 979832d..62dfc4d 100644 --- a/wicd/netentry.py +++ b/wicd/netentry.py @@ -118,6 +118,7 @@ class AdvancedSettingsDialog(gtk.Dialog): def set_defaults(self, widget=None, event=None): """ Put some default values into entries to help the user out. """ + self.txt_ip.set_text(self.txt_ip.get_text().strip()) ipAddress = self.txt_ip.get_text() # For easy typing :) netmask = self.txt_netmask gateway = self.txt_gateway @@ -208,6 +209,9 @@ class AdvancedSettingsDialog(gtk.Dialog): def save_settings(self): """ Save settings common to wired and wireless settings dialogs. """ if self.chkbox_static_ip.get_active(): + # for i in [self.txt_ip,self.txt_netmask,self.txt_gateway ]: + # i.set_text(i.get_text().strip()) + self.set_net_prop("ip", noneToString(self.txt_ip.get_text())) self.set_net_prop("netmask", noneToString(self.txt_netmask.get_text())) self.set_net_prop("gateway", noneToString(self.txt_gateway.get_text())) @@ -220,6 +224,10 @@ class AdvancedSettingsDialog(gtk.Dialog): not self.chkbox_global_dns.get_active(): self.set_net_prop('use_static_dns', True) self.set_net_prop('use_global_dns', False) + # Strip whitespace from DNS entries + #for i in [self.txt_domain, self.txt_search_dom,self.txt_dns_1, + # self.txt_dns2,self.txt_dns3]: + # i.set_text(i.get_text().strip()) self.set_net_prop('dns_domain', noneToString(self.txt_domain.get_text())) self.set_net_prop("search_domain", noneToString(self.txt_search_dom.get_text())) self.set_net_prop("dns1", noneToString(self.txt_dns_1.get_text())) diff --git a/wicd/prefs.py b/wicd/prefs.py index 4677463..7d3426e 100644 --- a/wicd/prefs.py +++ b/wicd/prefs.py @@ -183,6 +183,10 @@ class PreferencesDialog(object): def save_results(self): """ Pushes the selected settings to the daemon. """ daemon.SetUseGlobalDNS(self.useGlobalDNSCheckbox.get_active()) + # Strip whitespace from DNS entries + for i in [self.dns1Entry, self.dns2Entry, self.dns3Entry, + self.dnsDomEntry, self.searchDomEntry]: + i.set_text(i.get_text().strip()) daemon.SetGlobalDNS(self.dns1Entry.get_text(), self.dns2Entry.get_text(), self.dns3Entry.get_text(), self.dnsDomEntry.get_text(), self.searchDomEntry.get_text()) From c49c51ca29aced5ae96ccfe3aec55c6a36a8c2d3 Mon Sep 17 00:00:00 2001 From: Andrew Psaltis Date: Sat, 18 Jul 2009 22:18:21 -0400 Subject: [PATCH 3/5] Finish stripping all IPs in wicd-curses, and fix a variable in netentry_curses.py. --- curses/netentry_curses.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/curses/netentry_curses.py b/curses/netentry_curses.py index cda4355..bdf33ed 100644 --- a/curses/netentry_curses.py +++ b/curses/netentry_curses.py @@ -128,6 +128,9 @@ class AdvancedSettingsDialog(urwid.WidgetWrap): def save_settings(self): """ Save settings common to wired and wireless settings dialogs. """ if self.static_ip_cb.get_state(): + for i in [self.ip_edit,self.netmask_edit,self.gateway_edit]: + i.set_edit_text(i.get_edit_text().strip()) + self.set_net_prop("ip", noneToString(self.ip_edit.get_edit_text())) self.set_net_prop("netmask", noneToString(self.netmask_edit.get_edit_text())) self.set_net_prop("gateway", noneToString(self.gateway_edit.get_edit_text())) @@ -142,7 +145,7 @@ class AdvancedSettingsDialog(urwid.WidgetWrap): self.set_net_prop('use_global_dns', False) # Strip addressses before checking them in the daemon. for i in [self.dns1, self.dns2, - self.dns3,self.dns_dom, self.search_dom, self.dns_dom]: + self.dns3,self.dns_dom_edit, self.search_dom_edit]: i.set_edit_text(i.get_edit_text().strip()) self.set_net_prop('dns_domain', noneToString(self.dns_dom_edit.get_edit_text())) self.set_net_prop("search_domain", noneToString(self.search_dom_edit.get_edit_text())) From 271ff125dada68cb27da00f5800d445467bdc6c9 Mon Sep 17 00:00:00 2001 From: Andrew Psaltis Date: Sat, 18 Jul 2009 22:26:18 -0400 Subject: [PATCH 4/5] Strip the IPs from the Ad Hoc network creation dialogs. --- curses/wicd-curses.py | 2 +- wicd/gui.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py index 4a0c041..a77ec07 100755 --- a/curses/wicd-curses.py +++ b/curses/wicd-curses.py @@ -480,7 +480,7 @@ class AdHocDialog(Dialog2): self.view.keypress( size, k ) def on_exit(self,exitcode): data = ( self.essid_edit.get_edit_text(), - self.ip_edit.get_edit_text(), + self.ip_edit.get_edit_text().strip(), self.channel_edit.get_edit_text(), self.use_ics_chkb.get_state(), self.use_encrypt_chkb.get_state(), diff --git a/wicd/gui.py b/wicd/gui.py index 8905b0e..6324a27 100644 --- a/wicd/gui.py +++ b/wicd/gui.py @@ -274,7 +274,8 @@ class appGui(object): if response == 1: wireless.CreateAdHocNetwork(essid_entry.entry.get_text(), channel_entry.entry.get_text(), - ip_entry.entry.get_text(), "WEP", + ip_entry.entry.get_text().strip(), + "WEP", self.key_entry.entry.get_text(), self.chkbox_use_encryption.get_active(), False) #chkbox_use_ics.get_active()) From 607c10361512ae98e5d0fcd9c44d352a91f64b88 Mon Sep 17 00:00:00 2001 From: Andrew Psaltis Date: Mon, 20 Jul 2009 20:37:34 -0400 Subject: [PATCH 5/5] Removed excess comments from netentry.py. --- wicd/netentry.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/wicd/netentry.py b/wicd/netentry.py index 62dfc4d..85c73e2 100644 --- a/wicd/netentry.py +++ b/wicd/netentry.py @@ -209,9 +209,6 @@ class AdvancedSettingsDialog(gtk.Dialog): def save_settings(self): """ Save settings common to wired and wireless settings dialogs. """ if self.chkbox_static_ip.get_active(): - # for i in [self.txt_ip,self.txt_netmask,self.txt_gateway ]: - # i.set_text(i.get_text().strip()) - self.set_net_prop("ip", noneToString(self.txt_ip.get_text())) self.set_net_prop("netmask", noneToString(self.txt_netmask.get_text())) self.set_net_prop("gateway", noneToString(self.txt_gateway.get_text())) @@ -224,10 +221,6 @@ class AdvancedSettingsDialog(gtk.Dialog): not self.chkbox_global_dns.get_active(): self.set_net_prop('use_static_dns', True) self.set_net_prop('use_global_dns', False) - # Strip whitespace from DNS entries - #for i in [self.txt_domain, self.txt_search_dom,self.txt_dns_1, - # self.txt_dns2,self.txt_dns3]: - # i.set_text(i.get_text().strip()) self.set_net_prop('dns_domain', noneToString(self.txt_domain.get_text())) self.set_net_prop("search_domain", noneToString(self.txt_search_dom.get_text())) self.set_net_prop("dns1", noneToString(self.txt_dns_1.get_text()))