- tor-commits - lists.torproject.org

[arm/master] Adding text input validator for command backlogs
by atagar＠torproject.org 23 Aug '11

23 Aug '11

commit ec436c57401218a9680edbae4e1e043f3c977b30 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 23 10:07:27 2011 -0700 Adding text input validator for command backlogs This allows the up and down arrow keys to scroll through a backlog of commands (it'll be used in the interpretor panel). --- src/util/textInput.py | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/src/util/textInput.py b/src/util/textInput.py index 9422f81..c3c229f 100644 --- a/src/util/textInput.py +++ b/src/util/textInput.py @@ -99,3 +99,52 @@ class BasicValidator(TextInputValidator): return PASS +class HistoryValidator(TextInputValidator): + """ + This intercepts the up and down arrow keys to scroll through a backlog of + previous commands. + """ + + def __init__(self, commandBacklog = [], nextValidator = None): + TextInputValidator.__init__(self, nextValidator) + + # contents that can be scrolled back through, newest to oldest + self.commandBacklog = commandBacklog + + # selected item from the backlog, -1 if we're not on a backlog item + self.selectionIndex = -1 + + # the fields input prior to selecting a backlog item + self.customInput = "" + + def handleKey(self, key, textbox): + if key in (curses.KEY_UP, curses.KEY_DOWN): + offset = 1 if key == curses.KEY_UP else -1 + newSelection = self.selectionIndex + offset + + # constrains the new selection to valid bounds + newSelection = max(-1, newSelection) + newSelection = min(len(self.commandBacklog) - 1, newSelection) + + # skips if this is a no-op + if self.selectionIndex == newSelection: + return None + + # saves the previous input if we weren't on the backlog + if self.selectionIndex == -1: + self.customInput = textbox.gather().strip() + + if newSelection == -1: newInput = self.customInput + else: newInput = self.commandBacklog[newSelection] + + y, _ = textbox.win.getyx() + _, maxX = textbox.win.getmaxyx() + textbox.win.clear() + textbox.win.addstr(y, 0, newInput[:maxX - 1]) + textbox.win.move(y, min(len(newInput), maxX - 1)) + + self.selectionIndex = newSelection + return None + + return PASS +

1 0

[torouter/master] Use wlan0 instead of uap0
by hellais＠torproject.org 23 Aug '11

23 Aug '11

commit 4b7143c2feea76120750394f04a40d757bdbde57 Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Aug 23 16:58:43 2011 +0200 Use wlan0 instead of uap0 --- packages/torouter-prep/configs/dnsmasq.conf | 2 +- packages/torouter-prep/configs/interfaces | 6 +++--- .../torouter-prep/configs/tor-wireless-firewall.sh | 2 +- packages/torouter-prep/configs/udhcpd.conf | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/torouter-prep/configs/dnsmasq.conf b/packages/torouter-prep/configs/dnsmasq.conf index 2711486..cc6477d 100644 --- a/packages/torouter-prep/configs/dnsmasq.conf +++ b/packages/torouter-prep/configs/dnsmasq.conf @@ -83,7 +83,7 @@ no-poll # interface (eg eth0) here. # Repeat the line for more than one interface. interface=eth1 -interface=uap0 +interface=wlan0 # Or you can specify which interface _not_ to listen on except-interface=eth0 except-interface=lo diff --git a/packages/torouter-prep/configs/interfaces b/packages/torouter-prep/configs/interfaces index a72d593..d1b9ba3 100644 --- a/packages/torouter-prep/configs/interfaces +++ b/packages/torouter-prep/configs/interfaces @@ -8,8 +8,8 @@ iface lo inet loopback # The primary network interface auto eth0 iface eth0 inet dhcp - post-up ifup uap0 - post-down ifdown uap0 + post-up ifup wlan0 + post-down ifdown wlan0 auto eth1 iface eth1 inet static @@ -18,7 +18,7 @@ iface eth1 inet static network 10.23.42.0 broadcast 10.23.42.255 post-up echo 1 > /proc/sys/net/ipv4/ip_forward - # this must happen after have brought up uap0 because it clears the nat tables + # this must happen after have brought up wlan0 because it clears the nat tables post-up iptables -t nat -A POSTROUTING -s 10.23.42.0/24 -o eth0 -j MASQUERADE post-up /etc/init.d/dnsmasq restart diff --git a/packages/torouter-prep/configs/tor-wireless-firewall.sh b/packages/torouter-prep/configs/tor-wireless-firewall.sh index 4310e7b..bdb2587 100755 --- a/packages/torouter-prep/configs/tor-wireless-firewall.sh +++ b/packages/torouter-prep/configs/tor-wireless-firewall.sh @@ -7,7 +7,7 @@ NON_TOR="10.0.2.0/24 10.23.42.0/24 172.16.23.0/24" TRANS_PORT="9040" # your internal interface -INT_IF="uap0" +INT_IF="wlan0" iptables -F iptables -t nat -F diff --git a/packages/torouter-prep/configs/udhcpd.conf b/packages/torouter-prep/configs/udhcpd.conf index 04160aa..db88e38 100644 --- a/packages/torouter-prep/configs/udhcpd.conf +++ b/packages/torouter-prep/configs/udhcpd.conf @@ -5,7 +5,7 @@ start 172.16.23.10 end 172.16.23.254 # The interface that udhcpd will use -interface uap0 +interface wlan0 # The maximim number of leases (includes addressesd reserved # by OFFER's, DECLINE's, and ARP conficts

1 0

[torouter/master] Use wlan0 instead of uap0
by hellais＠torproject.org 23 Aug '11

23 Aug '11

commit e09646bce65198fdc6dc13ca94b6653059c7ae0b Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Aug 23 16:03:21 2011 +0200 Use wlan0 instead of uap0 --- .../torouter-web/src/tui/controllers/network.py | 2 +- packages/torouter-web/src/tui/utils/parsing.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/torouter-web/src/tui/controllers/network.py b/packages/torouter-web/src/tui/controllers/network.py index 690dc3f..6b62da7 100644 --- a/packages/torouter-web/src/tui/controllers/network.py +++ b/packages/torouter-web/src/tui/controllers/network.py @@ -81,7 +81,7 @@ class wireless: itfc.set_mac(data.mac) itfc.wifi['netmask'] = data.netmask itfc.wifi['address'] = data.address - filecontent = itfc.exclude_output("uap0") + itfc.output(itfc.wifi) + filecontent = itfc.exclude_output("wlan0") + itfc.output(itfc.wifi) files = [('/etc/network/interfaces', filecontent)] fileio.write(files) #print itfc.output(itfc.wifi) diff --git a/packages/torouter-web/src/tui/utils/parsing.py b/packages/torouter-web/src/tui/utils/parsing.py index b4dbaee..4d52c87 100644 --- a/packages/torouter-web/src/tui/utils/parsing.py +++ b/packages/torouter-web/src/tui/utils/parsing.py @@ -27,7 +27,7 @@ class interfaces: def parse_line(self, line, iface): name = line.split(" ")[0] values = " ".join(line.split(" ")[1:]).rstrip() - if iface == "uap0": + if iface == "wlan0": if self.wifi.has_key(name): if type(self.wifi[name]) is list: self.wifi[name].append(values) @@ -99,7 +99,7 @@ class interfaces: # XXX currently works for one pre-up entry, must make it work also for arrays def set_mac(self, mac): - self.wifi['pre-up'] = 'ifconfig uap0 hw ether ' + mac + self.wifi['pre-up'] = 'ifconfig wlan0 hw ether ' + mac class torrc:

1 0

[torouter/master] we want wlan0 not uap0 for freedom-maker
by ioerror＠torproject.org 23 Aug '11

23 Aug '11

commit 74e568fc3ca899b202e839a31ec166f8f8c528c8 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Aug 23 15:54:29 2011 +0200 we want wlan0 not uap0 for freedom-maker --- packages/torouter-prep/configs/interfaces | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-prep/configs/interfaces b/packages/torouter-prep/configs/interfaces index ef3071a..a72d593 100644 --- a/packages/torouter-prep/configs/interfaces +++ b/packages/torouter-prep/configs/interfaces @@ -23,7 +23,7 @@ iface eth1 inet static post-up /etc/init.d/dnsmasq restart # The magic Tor wireless network -iface uap0 inet static +iface wlan0 inet static address 172.16.23.1 netmask 255.255.255.0 network 172.16.23.0

1 0

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by ioerror＠torproject.org 23 Aug '11

23 Aug '11

commit fe5f1654f9713984eabb2cb263953810788440d4 Merge: b23081a cc1981d Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Aug 23 14:43:21 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-web/src/runui.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)

1 0

[torouter/master] remove polipo, really
by ioerror＠torproject.org 23 Aug '11

23 Aug '11

commit b23081ada483babfab8e1f0fe1bca2f8baca24fb Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Aug 23 14:42:55 2011 +0200 remove polipo, really --- packages/torouter-prep/src/torouter_config.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index 36e0677..81b90ab 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -117,7 +117,7 @@ cp $config_dir/ttdnsd-default /etc/default/ttdnsd cp $config_dir/sshd_config /etc/ssh/sshd_config # Clean up our cache -apt-get -y polipo +apt-get -y remove polipo apt-get -y autoremove apt-get -y clean

1 0

[torouter/master] remove minissdpd
by ioerror＠torproject.org 23 Aug '11

23 Aug '11

commit e851b4a60db561e32f32a1aea777670ee10d0d46 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Aug 23 15:01:01 2011 +0200 remove minissdpd --- packages/torouter-prep/src/torouter_config.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index 81b90ab..e5a3391 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -117,7 +117,7 @@ cp $config_dir/ttdnsd-default /etc/default/ttdnsd cp $config_dir/sshd_config /etc/ssh/sshd_config # Clean up our cache -apt-get -y remove polipo +apt-get -y remove polipo minissdpd apt-get -y autoremove apt-get -y clean

1 0

[torouter/master] use $IFACE rather than uap0 per suggestion by weasel
by ioerror＠torproject.org 23 Aug '11

23 Aug '11

commit 3dd720f3d17b946481ab59ec191bf17cafec50e5 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Aug 23 15:19:17 2011 +0200 use $IFACE rather than uap0 per suggestion by weasel --- packages/torouter-prep/configs/interfaces | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/torouter-prep/configs/interfaces b/packages/torouter-prep/configs/interfaces index 903bdb4..ef3071a 100644 --- a/packages/torouter-prep/configs/interfaces +++ b/packages/torouter-prep/configs/interfaces @@ -28,11 +28,11 @@ iface uap0 inet static netmask 255.255.255.0 network 172.16.23.0 broadcast 172.16.23.255 - pre-up ifconfig uap0 hw ether 00:66:66:66:66:66 + pre-up ifconfig $IFACE hw ether 00:66:66:66:66:66 post-up /etc/init.d/tor reload post-up /etc/init.d/dnsmasq restart post-up /etc/init.d/ttdnsd restart - post-up /usr/bin/uaputl sys_cfg_ssid "torproject" - post-up /usr/bin/uaputl bss_start + post-up /usr/bin/uaputl sys_cfg_ssid "torproject" + post-up /usr/bin/uaputl bss_start post-up /usr/share/torouter-prep/example-configs/tor-wireless-firewall.sh pre-down /usr/bin/uaputl bss_stop

1 0

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by ioerror＠torproject.org 23 Aug '11

23 Aug '11

commit 5c61f445926f1420f61e509cea51dc7a24e1b0b5 Merge: 3dd720f b540393 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Aug 23 15:20:12 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-web/setup.py | 6 +- packages/torouter-web/src/runui.py | 2 +- packages/torouter-web/src/tui/view.py | 5 ++- packages/torouter-web/src/tui/views/base.html | 55 ++++++++++++++++++++++++- 4 files changed, 62 insertions(+), 6 deletions(-)

1 0

[torouter/master] Fix typo
by hellais＠torproject.org 23 Aug '11

23 Aug '11

commit b54039300353ad6bfb59e6668f03fe9e1745c763 Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Aug 23 15:18:21 2011 +0200 Fix typo --- packages/torouter-web/src/tui/view.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/src/tui/view.py b/packages/torouter-web/src/tui/view.py index 48b03c5..ea885be 100644 --- a/packages/torouter-web/src/tui/view.py +++ b/packages/torouter-web/src/tui/view.py @@ -9,6 +9,6 @@ t_globals = dict( # get the path where the script currently resides current_path = "/".join(os.path.abspath(__file__).split("/")[:-1]) # create the render object -cender = web.template.render(current_path+'/views', cache=config.cache, globals=t_globals) +render = web.template.render(current_path+'/views', cache=config.cache, globals=t_globals) render._keywords['globals']['render'] = render

1 0