- tor-commits - lists.torproject.org

[torouter/master] Add daemon to setup.py
by hellais＠torproject.org 23 Aug '11

23 Aug '11

commit 1e8a3c15a00cc7e44f3d746fca8e65c18b8245b5 Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Aug 23 12:23:35 2011 +0200 Add daemon to setup.py --- packages/torouter-web/setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/setup.py b/packages/torouter-web/setup.py index 2ff99fa..f505f38 100644 --- a/packages/torouter-web/setup.py +++ b/packages/torouter-web/setup.py @@ -13,5 +13,5 @@ setup(name='torouter-tui', author='Arturo Filasto', author_email='hellais(a)torproject.org', url='https://www.torproject.org/', - scripts=['src/runui.py', 'src/tui/view.py', 'src/tui/config.py']) + scripts=['src/runui.py', 'src/tui/view.py', 'src/tui/config.py', 'src/tui/daemon.py'])

1 0

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

23 Aug '11

commit 9b11ad9654554273bb77df4152e6de6912c19a6f Merge: 1e8a3c1 ecd17f3 Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Aug 23 12:24:22 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-prep/configs/torrc | 4 ++-- packages/torouter-prep/src/torouter_config.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[torouter/master] We want tor 0.2.2, so use experimental
by runa＠torproject.org 23 Aug '11

23 Aug '11

commit ecd17f3cba8317e69bd7757a1f6619db4091fd65 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Tue Aug 23 11:21:54 2011 +0100 We want tor 0.2.2, so use experimental --- 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 106ffc3..3b72511 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -52,7 +52,7 @@ apt-get -y install denyhosts ufw apt-get -y -t squeeze-backports install openntpd # Install Tor and deps: -apt-get -y install tor tor-geoipdb +apt-get -y -t experimental install tor tor-geoipdb # To build a 0.2.3.x Tor: # apt-get source tor=0.2.3.1-alpha-1~~squeeze+1 # Debuild here...

1 0

[torouter/master] Fix typo in torrc for RelayBandwidthRate and RelayBandwidthBurst
by runa＠torproject.org 23 Aug '11

23 Aug '11

commit a0ae9b97d97b1a69de289bbb011a499e5bad8671 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Tue Aug 23 10:56:56 2011 +0100 Fix typo in torrc for RelayBandwidthRate and RelayBandwidthBurst --- packages/torouter-prep/configs/torrc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/torouter-prep/configs/torrc b/packages/torouter-prep/configs/torrc index 29a9526..0979ddc 100644 --- a/packages/torouter-prep/configs/torrc +++ b/packages/torouter-prep/configs/torrc @@ -96,8 +96,8 @@ Nickname Torouter ## Define these to limit how much relayed traffic you will allow. Your ## own traffic is still unthrottled. Note that RelayBandwidthRate must ## be at least 20 KBytes. -RelayBandwidthRate 50KB KBytes -RelayBandwidthBurst 75KB KBytes +RelayBandwidthRate 50KB +RelayBandwidthBurst 75KB ## Contact info to be published in the directory, so we can contact you ## if your relay is misconfigured or something else goes wrong. Google

1 0

r24961: {website} add the latest VOA news story. (website/trunk/press/en)
by Andrew Lewman 23 Aug '11

23 Aug '11

Author: phobos Date: 2011-08-23 00:38:00 +0000 (Tue, 23 Aug 2011) New Revision: 24961 Modified: website/trunk/press/en/inthemedia.wml Log: add the latest VOA news story. Modified: website/trunk/press/en/inthemedia.wml =================================================================== --- website/trunk/press/en/inthemedia.wml 2011-08-22 01:36:47 UTC (rev 24960) +++ website/trunk/press/en/inthemedia.wml 2011-08-23 00:38:00 UTC (rev 24961) @@ -32,6 +32,13 @@ <th>Topic</th> </tr> </thead> +<tr style="background-color: #e5e5e5;"> +<td>2011 Aug 22</td> +<td>VOA News: Asia</td> +<td><a +href="http://www.voanews.com/english/news/asia/Some-Chinese-Surf-Freely-for-Now-1…">Some +Chinese Surf Freely, for Now</a></td> +</tr> <tr> <td>2011 Aug 01</td> <td>Peace & Conflict Review</td>

1 0

[torouter/master] Make it start a daemon if invoked with no arguments
by hellais＠torproject.org 23 Aug '11

23 Aug '11

commit 4c06ca7f2d0855f8aefa352a74fbad5103906159 Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Aug 23 01:35:13 2011 +0200 Make it start a daemon if invoked with no arguments --- packages/torouter-web/src/runui.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/torouter-web/src/runui.py b/packages/torouter-web/src/runui.py index 488c483..4353475 100644 --- a/packages/torouter-web/src/runui.py +++ b/packages/torouter-web/src/runui.py @@ -55,7 +55,7 @@ if __name__ == "__main__": sys.exit(2) sys.exit(0) else: - print "usage: %s start|stop|restart" % sys.argv[0] - sys.exit(2) - + sys.argv[1] = '8080' + print "starting daemon..." + service.start()

1 0

[torouter/master] Fix #3790 Add a daemon class and make tor web ui run as such.
by hellais＠torproject.org 23 Aug '11

23 Aug '11

commit 2e645039c2ea7a7e0684e46799db2a901a5d3cae Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Aug 23 01:33:13 2011 +0200 Fix #3790 Add a daemon class and make tor web ui run as such. --- packages/torouter-web/src/daemon.py | 129 +++++++++++++++++++++++++++++++++++ packages/torouter-web/src/runui.py | 63 ++++++++++++----- 2 files changed, 173 insertions(+), 19 deletions(-) diff --git a/packages/torouter-web/src/daemon.py b/packages/torouter-web/src/daemon.py new file mode 100644 index 0000000..4ccc15c --- /dev/null +++ b/packages/torouter-web/src/daemon.py @@ -0,0 +1,129 @@ +#!/usr/bin/env python + +import sys, os, time, atexit +from signal import SIGTERM + +class Daemon: + """ + A generic daemon class. + + Usage: subclass the Daemon class and override the run() method + """ + def __init__(self, pidfile, stdin='/dev/null', stdout='/dev/null', stderr='/dev/null'): + self.stdin = stdin + self.stdout = stdout + self.stderr = stderr + self.pidfile = pidfile + + def daemonize(self): + """ + do the UNIX double-fork magic, see Stevens' "Advanced + Programming in the UNIX Environment" for details (ISBN 0201563177) + http://www.erlenstar.demon.co.uk/unix/faq_2.html#SEC16 + """ + try: + pid = os.fork() + if pid > 0: + # exit first parent + sys.exit(0) + except OSError, e: + sys.stderr.write("fork #1 failed: %d (%s)\n" % (e.errno, e.strerror)) + sys.exit(1) + + # decouple from parent environment + #os.chdir("/") + os.setsid() + os.umask(0) + + # do second fork + try: + pid = os.fork() + if pid > 0: + # exit from second parent + sys.exit(0) + except OSError, e: + sys.stderr.write("fork #2 failed: %d (%s)\n" % (e.errno, e.strerror)) + sys.exit(1) + + # redirect standard file descriptors + sys.stdout.flush() + sys.stderr.flush() + si = file(self.stdin, 'r') + so = file(self.stdout, 'a+') + se = file(self.stderr, 'a+', 0) + os.dup2(si.fileno(), sys.stdin.fileno()) + os.dup2(so.fileno(), sys.stdout.fileno()) + os.dup2(se.fileno(), sys.stderr.fileno()) + + # write pidfile + atexit.register(self.delpid) + pid = str(os.getpid()) + file(self.pidfile,'w+').write("%s\n" % pid) + + def delpid(self): + os.remove(self.pidfile) + + def start(self): + """ + Start the daemon + """ + # Check for a pidfile to see if the daemon already runs + try: + pf = file(self.pidfile,'r') + pid = int(pf.read().strip()) + pf.close() + except IOError: + pid = None + + if pid: + message = "pidfile %s already exist. Daemon already running?\n" + sys.stderr.write(message % self.pidfile) + sys.exit(1) + + # Start the daemon + self.daemonize() + self.run() + + def stop(self): + """ + Stop the daemon + """ + # Get the pid from the pidfile + try: + pf = file(self.pidfile,'r') + pid = int(pf.read().strip()) + pf.close() + except IOError: + pid = None + + if not pid: + message = "pidfile %s does not exist. Daemon not running?\n" + sys.stderr.write(message % self.pidfile) + return # not an error in a restart + + # Try killing the daemon process + try: + while 1: + os.kill(pid, SIGTERM) + time.sleep(0.1) + except OSError, err: + err = str(err) + if err.find("No such process") > 0: + if os.path.exists(self.pidfile): + os.remove(self.pidfile) + else: + print str(err) + sys.exit(1) + + def restart(self): + """ + Restart the daemon + """ + self.stop() + self.start() + + def run(self): + """ + You should override this method when you subclass Daemon. It will be called after the process has been + daemonized by start() or restart(). + """ diff --git a/packages/torouter-web/src/runui.py b/packages/torouter-web/src/runui.py index d5c7c9e..488c483 100644 --- a/packages/torouter-web/src/runui.py +++ b/packages/torouter-web/src/runui.py @@ -3,6 +3,8 @@ # by Arturo Filasto' <hellais(a)torproject.org> # +import sys, time, os +from daemon import Daemon import web from tui import config import tui.controllers @@ -10,27 +12,50 @@ import tui.controllers from tui.utils import session from tui.view import render - # This is the main structure of URLs urls = ( - '/', 'tui.controllers.main.index', -# '/config/(tor|router)', 'tui.controllers.main.config', - '/network', 'tui.controllers.network.main', - '/network/firewall', 'tui.controllers.network.firewall', - '/network/wireless', 'tui.controllers.network.wireless', - '/network/wired', 'tui.controllers.network.wired', - '/network/status', 'tui.controllers.network.status', - '/tor', 'tui.controllers.tor.status', - '/tor/config', 'tui.controllers.tor.torrc', - '/logout', 'tui.controllers.main.logout' - ) -# '/wizard/([0-9a-f]{1,2})?', 'tui.controllers.wizard.step', -# '/status', 'tui.controllers.status') + '/', 'tui.controllers.main.index', +# '/config/(tor|router)', 'tui.controllers.main.config', + '/network', 'tui.controllers.network.main', + '/network/firewall', 'tui.controllers.network.firewall', + '/network/wireless', 'tui.controllers.network.wireless', + '/network/wired', 'tui.controllers.network.wired', + '/network/status', 'tui.controllers.network.status', + '/tor', 'tui.controllers.tor.status', + '/tor/config', 'tui.controllers.tor.torrc', + '/logout', 'tui.controllers.main.logout' + ) +# '/wizard/([0-9a-f]{1,2})?', 'tui.controllers.wizard.step', +# '/status', 'tui.controllers.status') + +app = web.application(urls, globals()) +# add session management to the app +session.add_session_to_app(app) +app.internalerror = web.debugerror +class TorWebDaemon(Daemon): + def run(self): + app.run() + +DEBUG = False if __name__ == "__main__": - app = web.application(urls, globals()) - # Add session management to the app - session.add_session_to_app(app) - app.internalerror = web.debugerror - app.run() + if DEBUG: + app.run() + service = TorWebDaemon(os.path.join(os.getcwd(),'tui.pid')) + if len(sys.argv) == 2: + if 'start' == sys.argv[1]: + sys.argv[1] = '8080' + service.start() + elif 'stop' == sys.argv[1]: + service.stop() + elif 'restart' == sys.argv[1]: + service.restart() + else: + print "Unknown command" + sys.exit(2) + sys.exit(0) + else: + print "usage: %s start|stop|restart" % sys.argv[0] + sys.exit(2) +

1 0

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

22 Aug '11

commit fb4546cfd1ab55341508271faeb556bab9c39f14 Merge: cc9579c 6caf641 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Mon Aug 22 13:27:03 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter_easy_setup.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --cc packages/torouter_easy_setup.sh index 2d65481,2d65481..f5bf6c5 --- a/packages/torouter_easy_setup.sh +++ b/packages/torouter_easy_setup.sh @@@ -30,7 -30,7 +30,7 @@@ deb http://torrouter.torproject.org/tor EOF apt-key add /tmp/torouter-repo.key --apt-get update ++apt-get update --fix-missing apt-get install -t torrouter -y torouter-prep echo "We're going to trash your system now; you have 30 seconds to bail out!"

1 0

[torouter/master] add fstab entries
by ioerror＠torproject.org 22 Aug '11

22 Aug '11

commit cc9579c8b5c91c4154802b2a8ed9e431477b0a5b Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat Aug 20 22:44:52 2011 +0200 add fstab entries --- packages/torouter-prep/configs/fstab | 2 ++ packages/torouter-prep/src/torouter_config.sh | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/packages/torouter-prep/configs/fstab b/packages/torouter-prep/configs/fstab new file mode 100644 index 0000000..292e521 --- /dev/null +++ b/packages/torouter-prep/configs/fstab @@ -0,0 +1,2 @@ +# This is the weird boot partition (hopefully ext2/3/4 later) +/dev/sda1 /boot vfat nodev,noexec,nosuid 0 0 diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index deaa72b..106ffc3 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -88,6 +88,9 @@ zcat $config_dir/armrc.sample.gz > ~$ADMINUSER/.armrc # Reconfigure /etc/inittab here cp $config_dir/inittab /etc/inittab +# Reconfigure fstab +cp $config_dir/fstab /etc/fstab + # Configure the network # eth0 is our "internet" interface with a dhcp client cp $config_dir/interfaces /etc/network/interfaces

1 0

[torouter/master] Putting the / back
by runa＠torproject.org 22 Aug '11

22 Aug '11

commit 6caf6419b710e868ed9a9a66fb93c7d384d81cfc Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Mon Aug 22 12:05:43 2011 +0100 Putting the / back --- 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 791a7b2..deaa72b 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -6,7 +6,7 @@ echo "This program will now reconfigure your Debian system into a Torouter" # For every file we touch, move it to the temp_dir and then tar it up in the end export temp_dir="`mktemp -d`" -export config_dir="/usr/share/torouter-prep/example-configs" +export config_dir="/usr/share/torouter-prep/example-configs/" # Add a user to administrate the Torouter later export ADMINUSER="torouter"

1 0