- tor-commits - lists.torproject.org

[torouter/master] add two new configs
by ioerror＠torproject.org 17 Aug '11

17 Aug '11

commit 790e0771d7b908d235ea0379c58594bb027924fc Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Aug 17 17:46:05 2011 +0200 add two new configs --- packages/torouter-prep/configs/hostname | 1 + packages/torouter-prep/configs/hosts | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/packages/torouter-prep/configs/hostname b/packages/torouter-prep/configs/hostname new file mode 100644 index 0000000..a4a2962 --- /dev/null +++ b/packages/torouter-prep/configs/hostname @@ -0,0 +1 @@ +torouter diff --git a/packages/torouter-prep/configs/hosts b/packages/torouter-prep/configs/hosts new file mode 100644 index 0000000..64f3fc1 --- /dev/null +++ b/packages/torouter-prep/configs/hosts @@ -0,0 +1 @@ + 127.0.0.1 localhost

1 0

[torouter/master] add modified control
by ioerror＠torproject.org 17 Aug '11

17 Aug '11

commit e5dbdcb4bbe43a9f652a045f8dcf0b092b11eba0 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Aug 17 17:59:17 2011 +0200 add modified control --- packages/torouter-prep/debian/control | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-prep/debian/control b/packages/torouter-prep/debian/control index f9930d6..545c9f9 100644 --- a/packages/torouter-prep/debian/control +++ b/packages/torouter-prep/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.9.1 Homepage: <https://www.torproject.org/> -Package: torouter +Package: torouter-prep Architecture: all Depends: ${misc:Depends}, apt-utils, openssh-server, isc-dhcp-client, cron-apt Description: Torouter meta-package to take over the DreamPlug

1 0

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

17 Aug '11

commit 24b92ab9b034d6c957631a034a717ba41809a335 Merge: e5dbdcb ed08b56 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Aug 17 17:59:37 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-web/config.py | 2 + packages/torouter-web/tui/controllers/network.py | 10 ++++++- packages/torouter-web/tui/utils/parsing.py | 27 +++++++++++++++++---- packages/torouter-web/tui/views/status.html | 4 ++- 4 files changed, 35 insertions(+), 8 deletions(-)

1 0

[torouter/master] Add basic Makefile to make packages without signatures
by ioerror＠torproject.org 17 Aug '11

17 Aug '11

commit a944bcefad1737cac6d307dc9b065f49615aea42 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Aug 17 17:45:14 2011 +0200 Add basic Makefile to make packages without signatures --- packages/Makefile | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/packages/Makefile b/packages/Makefile new file mode 100644 index 0000000..6166493 --- /dev/null +++ b/packages/Makefile @@ -0,0 +1,9 @@ +debs: webdeb prepdeb + +webdeb: + # By default we will but not sign for now + cd torouter-web && debuild --no-tgz-check -us -uc +prepdeb: + # By default we will but not sign for now + cd torouter-prep && debuild --no-tgz-check -us -uc +

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 17 Aug '11

17 Aug '11

commit 06be6105e45eca8ce3ad24e58652ad3faa083c92 Merge: 14552a1 d79d648 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 17 12:00:44 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/config.c changes/bug3747 | 6 ++++++ src/or/config.c | 3 +++ src/or/connection.c | 3 --- 3 files changed, 9 insertions(+), 3 deletions(-) diff --cc src/or/config.c index 315884c,7202ea2..716d83a --- a/src/or/config.c +++ b/src/or/config.c @@@ -1120,7 -1034,10 +1120,10 @@@ options_act_reversible(const or_options /* No need to roll back, since you can't change the value. */ } + /* Write control ports to disk as appropriate */ + control_ports_write_to_file(); + - if (directory_caches_v2_dir_info(options)) { + if (directory_caches_v2_dir_info(options)) { size_t len = strlen(options->DataDirectory)+32; char *fn = tor_malloc(len); tor_snprintf(fn, len, "%s"PATH_SEPARATOR"cached-status",

1 0

[tor/master] Don't write ControlPorts to disk till after we setuid and make datadir
by nickm＠torproject.org 17 Aug '11

17 Aug '11

commit d79d648edcc19d1f11758016108fdbb57c80b4d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 17 11:22:16 2011 -0400 Don't write ControlPorts to disk till after we setuid and make datadir Fix for bug 3747; bugfix on 0.2.2.26-beta. --- changes/bug3747 | 6 ++++++ src/or/config.c | 3 +++ src/or/connection.c | 3 --- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/changes/bug3747 b/changes/bug3747 new file mode 100644 index 0000000..052dab1 --- /dev/null +++ b/changes/bug3747 @@ -0,0 +1,6 @@ + o Major bugfixes: + - Write control ports to disk only after switching UID and + creating the data directory. This way, we don't fail when + starting up with a nonexistant DataDirectory and a + ControlPortWriteToFile setting based on that directory. Fixes + bug 3747; bugfix on Tor 0.2.2.26-beta. \ No newline at end of file diff --git a/src/or/config.c b/src/or/config.c index e0ecab2..7202ea2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1034,6 +1034,9 @@ options_act_reversible(or_options_t *old_options, char **msg) /* No need to roll back, since you can't change the value. */ } + /* Write control ports to disk as appropriate */ + control_ports_write_to_file(); + if (directory_caches_v2_dir_info(options)) { size_t len = strlen(options->DataDirectory)+32; char *fn = tor_malloc(len); diff --git a/src/or/connection.c b/src/or/connection.c index c791309..2049f42 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1061,9 +1061,6 @@ connection_create_listener(const struct sockaddr *listensockaddr, "%s listening on port %u.", conn_type_to_string(type), gotPort); - if (type == CONN_TYPE_CONTROL_LISTENER) - control_ports_write_to_file(); - conn->state = LISTENER_STATE_READY; if (start_reading) { connection_start_reading(conn);

1 0

[tor/maint-0.2.2] Don't write ControlPorts to disk till after we setuid and make datadir
by nickm＠torproject.org 17 Aug '11

17 Aug '11

commit d79d648edcc19d1f11758016108fdbb57c80b4d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 17 11:22:16 2011 -0400 Don't write ControlPorts to disk till after we setuid and make datadir Fix for bug 3747; bugfix on 0.2.2.26-beta. --- changes/bug3747 | 6 ++++++ src/or/config.c | 3 +++ src/or/connection.c | 3 --- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/changes/bug3747 b/changes/bug3747 new file mode 100644 index 0000000..052dab1 --- /dev/null +++ b/changes/bug3747 @@ -0,0 +1,6 @@ + o Major bugfixes: + - Write control ports to disk only after switching UID and + creating the data directory. This way, we don't fail when + starting up with a nonexistant DataDirectory and a + ControlPortWriteToFile setting based on that directory. Fixes + bug 3747; bugfix on Tor 0.2.2.26-beta. \ No newline at end of file diff --git a/src/or/config.c b/src/or/config.c index e0ecab2..7202ea2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1034,6 +1034,9 @@ options_act_reversible(or_options_t *old_options, char **msg) /* No need to roll back, since you can't change the value. */ } + /* Write control ports to disk as appropriate */ + control_ports_write_to_file(); + if (directory_caches_v2_dir_info(options)) { size_t len = strlen(options->DataDirectory)+32; char *fn = tor_malloc(len); diff --git a/src/or/connection.c b/src/or/connection.c index c791309..2049f42 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1061,9 +1061,6 @@ connection_create_listener(const struct sockaddr *listensockaddr, "%s listening on port %u.", conn_type_to_string(type), gotPort); - if (type == CONN_TYPE_CONTROL_LISTENER) - control_ports_write_to_file(); - conn->state = LISTENER_STATE_READY; if (start_reading) { connection_start_reading(conn);

1 0

[torouter/master] Add status page for network interfaces
by hellais＠torproject.org 17 Aug '11

17 Aug '11

commit ed08b56338e9b230c2a475946511c0e13cfce487 Author: Arturo Filastò <hellais(a)torproject.org> Date: Wed Aug 17 17:43:17 2011 +0200 Add status page for network interfaces --- packages/torouter-web/config.py | 2 + packages/torouter-web/tui/controllers/network.py | 10 ++++++- packages/torouter-web/tui/utils/parsing.py | 27 +++++++++++++++++---- packages/torouter-web/tui/views/status.html | 4 ++- 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/packages/torouter-web/config.py b/packages/torouter-web/config.py index 765c3df..8fd716d 100644 --- a/packages/torouter-web/config.py +++ b/packages/torouter-web/config.py @@ -11,3 +11,5 @@ globals = {} # Add your own (username, password) pair authinfo = ("test", "test") +interfaces_file = os.getcwd() + "/../torouter-prep/configs/interfaces" + diff --git a/packages/torouter-web/tui/controllers/network.py b/packages/torouter-web/tui/controllers/network.py index b5da4e3..d189d0c 100644 --- a/packages/torouter-web/tui/controllers/network.py +++ b/packages/torouter-web/tui/controllers/network.py @@ -1,7 +1,7 @@ import web import view, config from view import render -from tui.utils import session,configuration +from tui.utils import session,configuration,parsing """ This function is used to generate the network @@ -116,8 +116,14 @@ General status page, displays a bit more detail than main """ class status: def GET(self): - return render.base(render.status(),menu(4)) + itfc = parsing.interfaces(config.interfaces_file) + itfc.parse() + network = itfc.html_output(itfc.wifi) + itfc.html_output(itfc.eth0) + itfc.html_output(itfc.eth1) + return render.base(render.status(network),menu(4)) def POST(self): + itfc = parsing.interfaces(config.interfaces_file) + itfc.parse() + network = itfc.html_output(itfc.wifi) + itfc.html_output(itfc.eth0) + itfc.html_output(itfc.eth1) return render.base(render.status(),menu(4)) diff --git a/packages/torouter-web/tui/utils/parsing.py b/packages/torouter-web/tui/utils/parsing.py index c6ebe02..e9ccc83 100644 --- a/packages/torouter-web/tui/utils/parsing.py +++ b/packages/torouter-web/tui/utils/parsing.py @@ -1,6 +1,8 @@ # These functions are for parsing /etc/network/interface # files, they will be used inside torouter to visualize # and edit configuration +import os + class interfaces: def __init__(self,filename): self.fp = open(filename, "r") @@ -47,6 +49,20 @@ class interfaces: if iface: self.parse_line(line, iface) + def html_output(self, data): + output = "<h3>Interface %s</h3>\n" % data['iface'].split(" ")[0] + output += "<table class=\"interface\" id=\"%s\">\n" % data['iface'].split(" ")[0] + + for item in data.items(): + if item[0] != "iface": + if type(item[1]) is list: + for i in item[1]: + output += "<tr><td>%s</td><td>%s</td></tr>\n" % (item[0], i) + else: + output += "<tr><td>%s</td><td>%s</td></tr>\n" % (item[0],item[1]) + output += "</table>" + print output + return output def output(self, data): print "iface %s" % data['iface'] @@ -58,9 +74,10 @@ class interfaces: else: print "%s %s" % (item[0],item[1]) -itfc = interfaces("/tmp/interfaces") -itfc.parse() -itfc.output(itfc.wifi) -itfc.output(itfc.eth1) -itfc.output(itfc.eth0) +#interfaces_file = os.getcwd() + "/../../../torouter-prep/configs/interfaces" +#itfc = interfaces(interfaces_file) +#itfc.parse() +#itfc.html_output(itfc.wifi) +#itfc.html_output(itfc.eth1) +#itfc.html_output(itfc.eth0) diff --git a/packages/torouter-web/tui/views/status.html b/packages/torouter-web/tui/views/status.html index 6a128dc..bfe2fcd 100644 --- a/packages/torouter-web/tui/views/status.html +++ b/packages/torouter-web/tui/views/status.html @@ -1 +1,3 @@ -the status page +$def with (content) + +$:content

1 0

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

17 Aug '11

commit cab97f7c6fc7f3c70c0b92ef07466251f7faca9e Merge: d7bbc0d b848fc8 Author: Arturo Filastò <hellais(a)torproject.org> Date: Wed Aug 17 17:25:38 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-prep/configs/dnsmasq.conf | 556 ++++++++++++++++++++ packages/torouter-prep/configs/interfaces | 38 ++ packages/torouter-prep/configs/sources.list | 14 + packages/torouter-prep/configs/sshd_config | 87 +++ .../torouter-prep/configs/tor-wireless-firewall.sh | 20 + packages/torouter-prep/configs/torrc | 177 +++++++ packages/torouter-prep/configs/udhcpd.conf | 26 + packages/torouter-web/debian/README | 6 + packages/torouter-web/debian/README.Debian | 8 + packages/torouter-web/debian/changelog | 5 + packages/torouter-web/debian/compat | 1 + packages/torouter-web/debian/control | 13 + packages/torouter-web/debian/copyright | 36 ++ packages/torouter-web/debian/dirs | 1 + packages/torouter-web/debian/postinst | 39 ++ packages/torouter-web/debian/postrm | 37 ++ packages/torouter-web/debian/preinst | 35 ++ packages/torouter-web/debian/prerm | 38 ++ packages/torouter-web/debian/rules | 6 + packages/torouter-web/debian/source/format | 1 + packages/torouter-web/debian/torouter-tui.default | 10 + 21 files changed, 1154 insertions(+), 0 deletions(-)

1 0

[torouter/master] Add License
by hellais＠torproject.org 17 Aug '11

17 Aug '11

commit d7bbc0d688a33764e8113a8e691fad5a83089a21 Author: Arturo Filastò <hellais(a)torproject.org> Date: Wed Aug 17 17:25:09 2011 +0200 Add License --- packages/torouter-web/LICENSE | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/packages/torouter-web/LICENSE b/packages/torouter-web/LICENSE new file mode 100644 index 0000000..cb2a71c --- /dev/null +++ b/packages/torouter-web/LICENSE @@ -0,0 +1,32 @@ +=============================================================================== +The tui code is distributed under this license: + +Copyright (c) 2011, Arturo Filasto' + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

1 0