- tor-commits - lists.torproject.org

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

19 Aug '11

commit 5f78ef9d5e4716ca40b72aa747c7a5f027177c49 Merge: 1a75c1e 254d2d3 Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 19 15:29:41 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-prep/configs/sources.list | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)

1 0

[torouter/master] add a few more repos for fun
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit d891a6dc8241809863eb53794d9028f75ac5362b Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 15:09:25 2011 +0200 add a few more repos for fun --- packages/torouter-prep/configs/sources.list | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/packages/torouter-prep/configs/sources.list b/packages/torouter-prep/configs/sources.list index 2b25569..38ba8fe 100644 --- a/packages/torouter-prep/configs/sources.list +++ b/packages/torouter-prep/configs/sources.list @@ -16,5 +16,13 @@ deb http://backports.debian.org/debian-backports squeeze-backports main deb http://deb.torproject.org/torproject.org/ squeeze main deb-src http://deb.torproject.org/torproject.org squeeze main +# Tor project experimental package repo +deb http://deb.torproject.org/torproject.org experimental-squeeze main +deb-src http://deb.torproject.org/torproject.org experimental-squeeze main + +# Tor 0.2.3.x package repo +deb http://deb.torproject.org/torproject.org tor-0.2.3.x-squeeze main +deb-src http://deb.torproject.org/torproject.org tor-0.2.3.x-squeeze main + # Torouter project repo deb http://torrouter.torproject.org/torrouter torrouter main

1 0

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

19 Aug '11

commit 254d2d3f6d1dfc01481ae4158302aae306bef793 Merge: d891a6d 21472ff Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 15:09:45 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-web/setup.py | 5 ++- packages/torouter-web/src/config.py | 16 --------------- packages/torouter-web/src/runui.py | 2 +- packages/torouter-web/src/tui/controllers/main.py | 5 ++- .../torouter-web/src/tui/controllers/network.py | 5 ++- packages/torouter-web/src/tui/controllers/tor.py | 21 +++++++++++++++---- .../torouter-web/src/tui/models/router_config.py | 2 +- .../torouter-web/src/tui/utils/configuration.py | 5 +++- packages/torouter-web/src/tui/utils/fileio.py | 21 ++++++++++++++++++++ packages/torouter-web/src/tui/utils/parsing.py | 7 ++++++ packages/torouter-web/src/tui/utils/session.py | 2 +- packages/torouter-web/src/tui/views/torconfig.html | 12 ++++++++++- packages/torouter-web/src/tui/views/torstatus.html | 2 + packages/torouter-web/src/view.py | 11 ---------- 14 files changed, 73 insertions(+), 43 deletions(-)

1 0

[torouter/master] Add support for torrc file read and write
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit 406ad86833f44167cf3719d7d052bdca0c0da0d7 Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 19 15:05:07 2011 +0200 Add support for torrc file read and write --- packages/torouter-web/src/config.py | 5 ++- packages/torouter-web/src/tui/controllers/tor.py | 16 ++++++++++++-- .../torouter-web/src/tui/utils/configuration.py | 3 ++ packages/torouter-web/src/tui/utils/fileio.py | 21 ++++++++++++++++++++ packages/torouter-web/src/tui/utils/parsing.py | 7 ++++++ packages/torouter-web/src/tui/views/torconfig.html | 12 ++++++++++- packages/torouter-web/src/tui/views/torstatus.html | 2 + 7 files changed, 60 insertions(+), 6 deletions(-) diff --git a/packages/torouter-web/src/config.py b/packages/torouter-web/src/config.py index 15057df..f3f8dcc 100644 --- a/packages/torouter-web/src/config.py +++ b/packages/torouter-web/src/config.py @@ -11,6 +11,7 @@ globals = {} # Add your own (username, password) pair authinfo = ("test", "test") -interfaces_file = os.getcwd() + "/../torouter-prep/configs/interfaces" -torrc_file = os.getcwd() + "/../torouter-prep/configs/torrc" +interfaces_file = os.getcwd() + "/../../torouter-prep/configs/interfaces" +#torrc_file = os.getcwd() + "/../../torouter-prep/configs/torrc" +torrc_file = "/tmp/torrc" diff --git a/packages/torouter-web/src/tui/controllers/tor.py b/packages/torouter-web/src/tui/controllers/tor.py index af8678c..eaa587d 100644 --- a/packages/torouter-web/src/tui/controllers/tor.py +++ b/packages/torouter-web/src/tui/controllers/tor.py @@ -1,7 +1,7 @@ import web import view, config from view import render -from tui.utils import session, parsing +from tui.utils import session, parsing, fileio """ The main Tor status page @@ -24,12 +24,22 @@ Tor configuration page """ class torrc: def update_config(self, data): + # Now it will just write to /tmp/torrc + files = [('/tmp/torrc',data.torrc)] + fileio.write(files) + return True def GET(self): - return render.base(render.torconfig()) + trc = parsing.torrc(config.torrc_file) + output = trc.output() + return render.base(render.torconfig(output)) def POST(self): self.update_config(web.input()) - return render.base(render.torconfig()) + trc = parsing.torrc(config.torrc_file) + trc.parse() + output = trc.html_output() + return render.base(render.torstatus(output,config.torrc_file)) + diff --git a/packages/torouter-web/src/tui/utils/configuration.py b/packages/torouter-web/src/tui/utils/configuration.py index 88bbc05..ba3d251 100644 --- a/packages/torouter-web/src/tui/utils/configuration.py +++ b/packages/torouter-web/src/tui/utils/configuration.py @@ -8,6 +8,7 @@ def get(name): if name == "wireless": conf['essid'] = "Torouter" conf['encryption'] = "WPA2" + conf['mac'] = "00:66:66:66:66:66" conf['key'] = "ljdasjkbcuBH12389Ba" return conf elif name == "firewall": @@ -43,6 +44,8 @@ def get_form(name): return web.form.Form( web.form.Textbox(name='essid', description='Wireless ESSID', value=c['essid']), + web.form.Textbox(name='mac', + description='Wireless MAC address', value=c['mac']), web.form.Dropdown(name='enctype', args=['WPA2', 'WPA', 'WEP (not reccomended)', 'open'], description='Wireless encryption scheme', value=c['encryption']), web.form.Password(name='key', diff --git a/packages/torouter-web/src/tui/utils/fileio.py b/packages/torouter-web/src/tui/utils/fileio.py new file mode 100644 index 0000000..3234f1e --- /dev/null +++ b/packages/torouter-web/src/tui/utils/fileio.py @@ -0,0 +1,21 @@ +import os + +def write(files): + tmpfiles = [] + for file in files: + tmpfile = "/tmp/" + file[0].split("/")[-1:][0] + ".tmp" + tmpfiles.append((tmpfile,file[0])) + # open the tmp file for write + f = open(tmpfile, 'w') + # write the data (file[1]) to the temp file + f.write(file[1]) + f.close() + + # rename all the file. This operation is atomic + for file in tmpfiles: + os.rename(file[0], file[1]) + +files = [('/tmp/file1','blablbal'),('/tmp/file2','The content'),('/tmp/file3','The content 3')] + +write(files) + diff --git a/packages/torouter-web/src/tui/utils/parsing.py b/packages/torouter-web/src/tui/utils/parsing.py index beb45d3..daf4436 100644 --- a/packages/torouter-web/src/tui/utils/parsing.py +++ b/packages/torouter-web/src/tui/utils/parsing.py @@ -87,6 +87,13 @@ class torrc: else: self.parsed.append(line) + def output(self): + output = "" + for line in self.fp.readlines(): + print line + output += line + return output + def html_output(self): output = "<ul id=\"torrc\">" for line in self.parsed: diff --git a/packages/torouter-web/src/tui/views/torconfig.html b/packages/torouter-web/src/tui/views/torconfig.html index 26bd228..223c339 100644 --- a/packages/torouter-web/src/tui/views/torconfig.html +++ b/packages/torouter-web/src/tui/views/torconfig.html @@ -1 +1,11 @@ -The main Tor config page +$def with (content) + +<form method="POST" action="/tor/config" enctype="multipart/form-data"> +<ul> +<li><textarea cols="100" rows="50" name="torrc"> +$:content +</textarea></li> +<li><input type="submit" name="save"></li> +</ul> +</form> + diff --git a/packages/torouter-web/src/tui/views/torstatus.html b/packages/torouter-web/src/tui/views/torstatus.html index 27b2888..a2eeacf 100644 --- a/packages/torouter-web/src/tui/views/torstatus.html +++ b/packages/torouter-web/src/tui/views/torstatus.html @@ -1,3 +1,5 @@ $def with (content, torrc) <h2>This is the content of $:torrc</h2> $:content + +<a href="/tor/config">edit torrc</a>

1 0

[torouter/master] Fix setup.py installation script
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit e4d842cd5c1b66e43687f269adae4e4a4dcbaad7 Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 19 15:20:57 2011 +0200 Fix setup.py installation script --- packages/torouter-web/setup.py | 5 +++-- packages/torouter-web/src/config.py | 17 ----------------- packages/torouter-web/src/runui.py | 2 +- packages/torouter-web/src/tui/controllers/main.py | 5 +++-- .../torouter-web/src/tui/controllers/network.py | 5 +++-- packages/torouter-web/src/tui/controllers/tor.py | 5 +++-- .../torouter-web/src/tui/models/router_config.py | 2 +- .../torouter-web/src/tui/utils/configuration.py | 2 +- packages/torouter-web/src/tui/utils/session.py | 2 +- packages/torouter-web/src/view.py | 11 ----------- 10 files changed, 16 insertions(+), 40 deletions(-) diff --git a/packages/torouter-web/setup.py b/packages/torouter-web/setup.py index 7629b6b..2ff99fa 100644 --- a/packages/torouter-web/setup.py +++ b/packages/torouter-web/setup.py @@ -2,7 +2,8 @@ from distutils.core import setup setup(name='torouter-tui', - packages=['tui'], + packages=['tui', 'tui.controllers', + 'tui.models', 'tui.utils'], package_dir = {'tui': 'src/tui/'}, package_data = {'tui': ['src/tui/']}, data_files = [('/usr/share/torouter-tui/static', @@ -12,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/view.py', 'src/config.py']) + scripts=['src/runui.py', 'src/tui/view.py', 'src/tui/config.py']) diff --git a/packages/torouter-web/src/config.py b/packages/torouter-web/src/config.py deleted file mode 100644 index f3f8dcc..0000000 --- a/packages/torouter-web/src/config.py +++ /dev/null @@ -1,17 +0,0 @@ -# tui, Tor web UI -# by Arturo Filasto' <hellais(a)torproject.org> -# - -import web, os - -cache = False - -globals = {} - -# Add your own (username, password) pair -authinfo = ("test", "test") - -interfaces_file = os.getcwd() + "/../../torouter-prep/configs/interfaces" -#torrc_file = os.getcwd() + "/../../torouter-prep/configs/torrc" -torrc_file = "/tmp/torrc" - diff --git a/packages/torouter-web/src/runui.py b/packages/torouter-web/src/runui.py index 80836b3..da1960a 100644 --- a/packages/torouter-web/src/runui.py +++ b/packages/torouter-web/src/runui.py @@ -3,7 +3,7 @@ # import web -import config +from tui import config import tui.controllers from tui.utils import session diff --git a/packages/torouter-web/src/tui/controllers/main.py b/packages/torouter-web/src/tui/controllers/main.py index 060caa6..fb925d3 100644 --- a/packages/torouter-web/src/tui/controllers/main.py +++ b/packages/torouter-web/src/tui/controllers/main.py @@ -1,6 +1,7 @@ import web -import view, config -from view import render +from tui import config +from tui import view +from tui.view import render from tui.utils import session """ diff --git a/packages/torouter-web/src/tui/controllers/network.py b/packages/torouter-web/src/tui/controllers/network.py index cc46643..bf48f54 100644 --- a/packages/torouter-web/src/tui/controllers/network.py +++ b/packages/torouter-web/src/tui/controllers/network.py @@ -1,6 +1,7 @@ import web -import view, config -from view import render +from tui import config +from tui import view +from tui.view import render from tui.utils import session,configuration,parsing """ diff --git a/packages/torouter-web/src/tui/controllers/tor.py b/packages/torouter-web/src/tui/controllers/tor.py index eaa587d..bc66623 100644 --- a/packages/torouter-web/src/tui/controllers/tor.py +++ b/packages/torouter-web/src/tui/controllers/tor.py @@ -1,6 +1,7 @@ import web -import view, config -from view import render +from tui import config +from tui import view +from tui.view import render from tui.utils import session, parsing, fileio """ diff --git a/packages/torouter-web/src/tui/models/router_config.py b/packages/torouter-web/src/tui/models/router_config.py index e83f9aa..a9bd975 100644 --- a/packages/torouter-web/src/tui/models/router_config.py +++ b/packages/torouter-web/src/tui/models/router_config.py @@ -1,5 +1,5 @@ import web -from config import db +from tui.config import db def new_config(conf): db.insert('router_config', diff --git a/packages/torouter-web/src/tui/utils/configuration.py b/packages/torouter-web/src/tui/utils/configuration.py index ba3d251..7133443 100644 --- a/packages/torouter-web/src/tui/utils/configuration.py +++ b/packages/torouter-web/src/tui/utils/configuration.py @@ -1,5 +1,5 @@ import web -import config +from tui import config def get(name): conf = {} diff --git a/packages/torouter-web/src/tui/utils/session.py b/packages/torouter-web/src/tui/utils/session.py index a554dad..4570196 100644 --- a/packages/torouter-web/src/tui/utils/session.py +++ b/packages/torouter-web/src/tui/utils/session.py @@ -1,5 +1,5 @@ import web -import config +from tui import config # The main session class diff --git a/packages/torouter-web/src/view.py b/packages/torouter-web/src/view.py deleted file mode 100644 index f4c9b39..0000000 --- a/packages/torouter-web/src/view.py +++ /dev/null @@ -1,11 +0,0 @@ -import web -import config - -t_globals = dict( - datestr=web.datestr, - ) - -# create the render object -render = web.template.render('tui/views', cache=config.cache, globals=t_globals) -render._keywords['globals']['render'] = render -

1 0

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

19 Aug '11

commit 21472ffb02bb44782d232ce5efe79042c8cb27c6 Merge: e4d842c 7c28ada Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 19 15:22:43 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-prep/configs/openntpd-default | 6 ++++++ packages/torouter-prep/configs/sources.list | 3 +++ packages/torouter-prep/src/torouter_config.sh | 1 + packages/torouter-web/src/runui.py | 1 + packages/torouter_easy_setup.sh | 8 ++++++++ 5 files changed, 19 insertions(+), 0 deletions(-)

1 0

[torouter/master] add python #!
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit 7c28ada512ff9f99b11b2b0df4f3b11a37d5f472 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 14:47:18 2011 +0200 add python #! --- packages/torouter-web/src/runui.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/packages/torouter-web/src/runui.py b/packages/torouter-web/src/runui.py index 80836b3..4c9e199 100644 --- a/packages/torouter-web/src/runui.py +++ b/packages/torouter-web/src/runui.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # tui - Tor web UI # by Arturo Filasto' <hellais(a)torproject.org> #

1 0

[torouter/master] sync time on first startup and all subsequent startups
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit 1ce6ae2823cd10c38340da21962a48f90879bde0 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 14:31:45 2011 +0200 sync time on first startup and all subsequent startups --- packages/torouter-prep/configs/openntpd-default | 6 ++++++ packages/torouter-prep/src/torouter_config.sh | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/packages/torouter-prep/configs/openntpd-default b/packages/torouter-prep/configs/openntpd-default new file mode 100644 index 0000000..318e7bd --- /dev/null +++ b/packages/torouter-prep/configs/openntpd-default @@ -0,0 +1,6 @@ +# /etc/default/openntpd + +# Append '-s' to set the system time when starting in case the offset +# between the local clock and the servers is more than 180 seconds. +# For other options, see man ntpd(8). +DAEMON_OPTS="-f /etc/openntpd/ntpd.conf -s" diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index 7d78f04..e27c81e 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -93,6 +93,7 @@ cp $config_dir/dnsmasq.conf /etc/dnsmasq.conf # Configure ntp cp $config_dir/ntp.conf /etc/ntp.conf +cp $config_dir/openntpd-default /etc/default/openntpd # XXX We should configure ufw here # XXX We should configure denyhosts

1 0

[torouter/master] add sid
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit 6d5f6e5e68fbb4cb017224f273ae76dbe104f3cb Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 14:13:15 2011 +0200 add sid --- packages/torouter-prep/configs/sources.list | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/packages/torouter-prep/configs/sources.list b/packages/torouter-prep/configs/sources.list index c7e7e4a..2b25569 100644 --- a/packages/torouter-prep/configs/sources.list +++ b/packages/torouter-prep/configs/sources.list @@ -2,6 +2,9 @@ deb http://ftp.de.debian.org/pub/debian/ squeeze main non-free contrib deb-src http://ftp.de.debian.org/pub/debian/ squeeze main non-free contrib deb http://security.debian.org/ squeeze/updates main +# Sid for uaputl +deb http://ftp.debian.org/debian sid main + # experimental for natpmp deb http://ftp.debian.org/debian experimental main deb-src http://ftp.debian.org/debian experimental main

1 0

[torouter/master] add repo
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit 9a84ce931b8b1e6643f946e9cfc6eecdd98b0ec9 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 13:38:54 2011 +0200 add repo --- packages/torouter_easy_setup.sh | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/packages/torouter_easy_setup.sh b/packages/torouter_easy_setup.sh index 6d15d86..2d65481 100755 --- a/packages/torouter_easy_setup.sh +++ b/packages/torouter_easy_setup.sh @@ -24,6 +24,11 @@ kGU= -----END PGP PUBLIC KEY BLOCK----- EOF +cat << 'EOF' >> /etc/apt/sources.list +# Torouter project repo +deb http://torrouter.torproject.org/torrouter torrouter main +EOF + apt-key add /tmp/torouter-repo.key apt-get update apt-get install -t torrouter -y torouter-prep

1 0