- tor-commits - lists.torproject.org

[arm/master] Option to just start the control interpretor
by atagar＠torproject.org 26 Aug '11

26 Aug '11

commit 3e1a13538a4afa9ef2d66367b21e6d13ab7bc528 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Aug 25 18:19:28 2011 -0700 Option to just start the control interpretor The control interpretor can be ran in either a curses panel or terminal prompt so giving an arm startup option for the later. --- src/starter.py | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/starter.py b/src/starter.py index 2a81cd2..5b86c10 100644 --- a/src/starter.py +++ b/src/starter.py @@ -25,6 +25,7 @@ import util.panel import util.procTools import util.sysTools import util.torConfig +import util.torInterpretor import util.torTools import util.uiTools import TorCtl.TorCtl @@ -53,13 +54,14 @@ CONFIG = {"startup.controlPassword": None, "log.configDescriptions.persistance.saveFailed": util.log.NOTICE, "log.savingDebugLog": util.log.NOTICE} -OPT = "gi:s:c:dbe:vh" -OPT_EXPANDED = ["gui", "interface=", "socket=", "config=", "debug", "blind", "event=", "version", "help"] +OPT = "gpi:s:c:dbe:vh" +OPT_EXPANDED = ["gui", "prompt", "interface=", "socket=", "config=", "debug", "blind", "event=", "version", "help"] HELP_MSG = """Usage arm [OPTION] Terminal status monitor for Tor relays. -g, --gui launch the Gtk+ interface + -p, --prompt only start the control interpretor -i, --interface [ADDRESS:]PORT change control interface from %s:%i -s, --socket SOCKET_PATH attach using unix domain socket if present, SOCKET_PATH defaults to: %s @@ -298,6 +300,7 @@ if __name__ == '__main__': startTime = time.time() param = dict([(key, None) for key in CONFIG.keys()]) launchGui = False + launchPrompt = False isDebugMode = False configPath = DEFAULT_CONFIG # path used for customized configuration @@ -329,6 +332,7 @@ if __name__ == '__main__': elif opt in ("-s", "--socket"): param["startup.interface.socket"] = arg elif opt in ("-g", "--gui"): launchGui = True + elif opt in ("-p", "--prompt"): launchPrompt = True elif opt in ("-c", "--config"): configPath = arg # sets path of user's config elif opt in ("-d", "--debug"): isDebugMode = True # dumps all logs elif opt in ("-b", "--blind"): @@ -486,9 +490,11 @@ if __name__ == '__main__': if util.uiTools.isUnicodeAvailable(): locale.setlocale(locale.LC_ALL, "") - if launchGui == True: + if launchGui: import gui.controller gui.controller.start_gui() + elif launchPrompt: + util.torInterpretor.prompt() else: cli.controller.startTorMonitor(time.time() - initTime)

1 0

[arm/master] fix: prevent startup if can't connect to tor
by atagar＠torproject.org 26 Aug '11

26 Aug '11

commit d977dc8d965abf0cb8ebae527222cb48b8ca3cdb Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Aug 26 08:23:56 2011 -0700 fix: prevent startup if can't connect to tor We've had a couple people confused because tor is running without a control port but when they start arm it provides the wizard, saying that tor's shut down. Making detached startup contingent on not having an active tor process to avoid this. --- src/starter.py | 8 ++++++-- src/util/torTools.py | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/starter.py b/src/starter.py index ff2f4a8..a2617f7 100644 --- a/src/starter.py +++ b/src/starter.py @@ -386,8 +386,12 @@ if __name__ == '__main__': msg = STANDARD_CFG_NOT_FOUND_MSG % configPath util.log.log(util.log.NOTICE, msg) - # when launching a prompt it doens't make sense to be without a tor instance - if launchPrompt: + # prevent arm from starting without a tor instance if... + # - we're launching a prompt + # - tor is running (otherwise it would be kinda confusing, "tor is running + # but why does arm say that it's shut down?") + + if launchPrompt or util.torTools.isTorRunning(): config.set("features.allowDetachedStartup", "false") # revises defaults to match user's configuration diff --git a/src/util/torTools.py b/src/util/torTools.py index 39cb176..5c1b1ad 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -345,6 +345,20 @@ def isVersion(myVersion, minVersion): return True # versions match (should have been caught above...) +def isTorRunning(): + """ + Simple check for if a tor process is running. If this can't be determined + then this returns False. + """ + + # suggestions welcome for making this more reliable + commandResults = sysTools.call("ps co command") + if commandResults: + for cmd in commandResults: + if cmd.strip() == "tor": return True + + return False + def getConn(): """ Singleton constructor for a Controller. Be aware that this starts as being

1 0

[arm/master] fix: preventing prompt launch without tor instance
by atagar＠torproject.org 26 Aug '11

26 Aug '11

commit 1bdc11a0df6b35530b1dfa5a5c033cbcd88a4845 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Aug 26 07:54:56 2011 -0700 fix: preventing prompt launch without tor instance It doesn't really make sense to allow the control prompt to launch when we're unable to connect to tor. --- src/starter.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/starter.py b/src/starter.py index 5b86c10..ff2f4a8 100644 --- a/src/starter.py +++ b/src/starter.py @@ -386,6 +386,10 @@ if __name__ == '__main__': msg = STANDARD_CFG_NOT_FOUND_MSG % configPath util.log.log(util.log.NOTICE, msg) + # when launching a prompt it doens't make sense to be without a tor instance + if launchPrompt: + config.set("features.allowDetachedStartup", "false") + # revises defaults to match user's configuration config.update(CONFIG)

1 0

[torouter/master] we use unbound for local dns resolution
by ioerror＠torproject.org 26 Aug '11

26 Aug '11

commit 62ad6dbce756110f6614207ccb9a6d60bc89a155 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 26 11:53:09 2011 +0200 we use unbound for local dns resolution --- packages/torouter-prep/configs/torrc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/packages/torouter-prep/configs/torrc b/packages/torouter-prep/configs/torrc index 0979ddc..5023d57 100644 --- a/packages/torouter-prep/configs/torrc +++ b/packages/torouter-prep/configs/torrc @@ -163,7 +163,8 @@ TransPort 9040 TransListenAddress 172.16.23.1 DNSPort 5353 DNSListenAddress 172.16.23.1 -DNSListenAddress 127.0.0.1:53 +# If you disable unbound, you may enable this +#DNSListenAddress 127.0.0.1:53 User debian-tor

1 0

[torspec/master] proposals 160 and 161 went into 0.2.1
by arma＠torproject.org 26 Aug '11

26 Aug '11

commit 13a8163100d9768e39144dc469d08cceeaba326a Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Aug 26 01:34:56 2011 -0400 proposals 160 and 161 went into 0.2.1 --- proposals/000-index.txt | 4 ++-- proposals/160-bandwidth-offset.txt | 2 +- proposals/161-computing-bandwidth-adjustments.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 97248b8..5e6cd41 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -151,8 +151,8 @@ Proposals by status: 151 Improving Tor Path Selection 155 Four Improvements of Hidden Service Performance [in 0.2.1.x] 158 Clients download consensus + microdescriptors [in 0.2.3.1-alpha] - 160 Authorities vote for bandwidth offsets in consensus [for 0.2.2.x] - 161 Computing Bandwidth Adjustments [for 0.2.2.x] + 160 Authorities vote for bandwidth offsets in consensus [for 0.2.1.x] + 161 Computing Bandwidth Adjustments [for 0.2.1.x] 162 Publish the consensus in multiple flavors [in 0.2.3.1-alpha] CLOSED: 101 Voting on the Tor Directory System [in 0.2.0.x] diff --git a/proposals/160-bandwidth-offset.txt b/proposals/160-bandwidth-offset.txt index 96935ad..de9c6e4 100644 --- a/proposals/160-bandwidth-offset.txt +++ b/proposals/160-bandwidth-offset.txt @@ -3,7 +3,7 @@ Title: Authorities vote for bandwidth offsets in consensus Author: Roger Dingledine Created: 4-May-2009 Status: Finished -Target: 0.2.2.x +Target: 0.2.1.x 1. Motivation diff --git a/proposals/161-computing-bandwidth-adjustments.txt b/proposals/161-computing-bandwidth-adjustments.txt index d219826..a0ad429 100644 --- a/proposals/161-computing-bandwidth-adjustments.txt +++ b/proposals/161-computing-bandwidth-adjustments.txt @@ -2,7 +2,7 @@ Title: Computing Bandwidth Adjustments Filename: 161-computing-bandwidth-adjustments.txt Author: Mike Perry Created: 12-May-2009 -Target: 0.2.2.x +Target: 0.2.1.x Status: Finished

1 0

[torouter/master] add new packages for networking and dns
by ioerror＠torproject.org 25 Aug '11

25 Aug '11

commit 91a2be8a5f023e8aef9cc8fd238fc371498d307b Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 26 01:38:23 2011 +0200 add new packages for networking and dns --- packages/torouter-prep/src/torouter_config.sh | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index d02ae0c..c2a8527 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -46,8 +46,11 @@ apt-get -y install vim # install a sane pager apt-get -y install less +# Install screen +apt-get -y install screen + # Install a few networking tools -apt-get -y install lsof wireless-tools +apt-get -y install lsof wireless-tools iputils-ping # Install the weird wireless control for the DreamPlug apt-get install -y -t sid uaputl @@ -91,6 +94,9 @@ apt-get -y install dnsmasq # install the best dhcp client we're gonna get in debian land apt-get -y install isc-dhcp-client +# install our own real dns cache +apt-get -y install unbound + ## ## Configuration stage of the script ## @@ -128,12 +134,12 @@ cp $config_dir/ttdnsd-default /etc/default/ttdnsd cp $config_dir/sshd_config /etc/ssh/sshd_config # Clean up our cache -apt-get -f -y remove polipo minissdpd +apt-get -f -y remove --purge polipo minissdpd # Remove a bunch of stuff: apt-get -y remove exim4-base exim4-config exim4-daemon-light dbus -apt-get -y autoremove +#apt-get -y autoremove apt-get -y clean # Fixup apt if something goes wrong @@ -142,13 +148,16 @@ apt-get install -f ## Disable ipv6 support for now cp $config_dir/modprobe.d-blacklist.conf /etc/modprobe.d/blacklist.conf -echo net.ipv6.conf.all.disable_ipv6=1 > /etc/sysctl.d/disableipv6.conf +# We don't need this if the ipv6 module is not loaded +#echo net.ipv6.conf.all.disable_ipv6=1 > /etc/sysctl.d/disableipv6.conf ## ## Restart the network here ## ifup -a +apt-get -y install unbound + ## ## Restart services here ##

1 0

[torouter/master] add some other useful packages
by ioerror＠torproject.org 25 Aug '11

25 Aug '11

commit 19219db01b1a4929d4fc54fe7ad38e2f5eac491a Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 26 01:04:20 2011 +0200 add some other useful packages --- packages/torouter-prep/src/torouter_config.sh | 29 +++++++++++++++++++++--- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index 8449eec..d02ae0c 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -38,8 +38,16 @@ cp $config_dir/apt.conf /etc/apt/apt.conf apt-get -y update -# Remove a bunch of stuff: -apt-get -y remove exim4-base exim4-config exim4-daemon-light dbus +apt-get -y install apt-utils + +# Install a sane editor +apt-get -y install vim + +# install a sane pager +apt-get -y install less + +# Install a few networking tools +apt-get -y install lsof wireless-tools # Install the weird wireless control for the DreamPlug apt-get install -y -t sid uaputl @@ -61,7 +69,7 @@ apt-get -y -t experimental install tor tor-geoipdb # To build with natpmp support apt-get -y -t experimental install libnatpmp-dev -apt-get -y -t experimental install libnatpmp0 +apt-get -y -t experimental install libnatpmp1 # To build with miniupnpc support apt-get -y -t squeeze-backports install libminiupnpc-dev @@ -120,13 +128,26 @@ 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 minissdpd +apt-get -f -y remove polipo minissdpd + +# Remove a bunch of stuff: +apt-get -y remove exim4-base exim4-config exim4-daemon-light dbus + apt-get -y autoremove apt-get -y clean +# Fixup apt if something goes wrong +apt-get install -f + + ## Disable ipv6 support for now cp $config_dir/modprobe.d-blacklist.conf /etc/modprobe.d/blacklist.conf echo net.ipv6.conf.all.disable_ipv6=1 > /etc/sysctl.d/disableipv6.conf +## +## Restart the network here +## + +ifup -a ## ## Restart services here

1 0

[torouter/master] libertas and libertas_sdio are not our friends
by ioerror＠torproject.org 25 Aug '11

25 Aug '11

commit 749e1e5cce0969f2c92977e2bcff30393af07038 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 26 00:50:14 2011 +0200 libertas and libertas_sdio are not our friends --- .../configs/modprobe.d-blacklist.conf | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/packages/torouter-prep/configs/modprobe.d-blacklist.conf b/packages/torouter-prep/configs/modprobe.d-blacklist.conf index 87c6fbe..e14a9d0 100644 --- a/packages/torouter-prep/configs/modprobe.d-blacklist.conf +++ b/packages/torouter-prep/configs/modprobe.d-blacklist.conf @@ -22,5 +22,9 @@ blacklist am53c974 # these watchdog drivers break some systems blacklist iTCO_wdt - +# We do not need or want ipv6 right now blacklist ipv6 + +# This wireless driver does not give us AP support, sadly +blacklist libertas +blacklist libertas_sdio

1 0

[torouter/master] update freedom-maker docs
by ioerror＠torproject.org 25 Aug '11

25 Aug '11

commit d21f90f85b71a7c55d809d4e59c8898e06040849 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 26 00:50:40 2011 +0200 update freedom-maker docs --- freedom-maker/README | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/freedom-maker/README b/freedom-maker/README index 15a1c50..1428d26 100644 --- a/freedom-maker/README +++ b/freedom-maker/README @@ -48,5 +48,13 @@ following to switch the root filesystem back to the internal microSD card: - - - - - +To turn the device into a Torouter you'll want to do the following: + # ssh or login to the router + wget https://gitweb.torproject.org/torouter.git/blob_plain/HEAD:/packages/torout… + bash torouter_easy_setup.sh + reboot + +This should result in a proper Torouter without any need for further configuration. + Be aware that this is an imcomplete solution for now .. you will want to at least do things like create unique ssh host keys for your device!

1 0

[torouter/master] auto uap0
by ioerror＠torproject.org 25 Aug '11

25 Aug '11

commit 97d4f9226eb8b3b7db34450f8098eb91f6542cb9 Merge: acb8da4 b3f4d69 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 26 00:58:06 2011 +0200 auto uap0 packages/torouter-prep/configs/interfaces | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0