- tor-commits - lists.torproject.org

[tor/master] Merge branch 'bug2797'
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 3799ce7970a5d1fe21ce2921c763f06e4369cfee Merge: 7dcd105 64c8e8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 11 09:48:38 2011 -0400 Merge branch 'bug2797' src/or/circuitbuild.c | 6 ++---- src/or/connection_edge.c | 3 +-- src/or/directory.c | 2 +- src/or/rendclient.c | 2 +- src/or/rendservice.c | 2 +- src/or/routerlist.c | 7 ++++--- 6 files changed, 10 insertions(+), 12 deletions(-)

1 0

[metrics-web/master] Show possible censorship events in user graphs.
by karsten＠torproject.org 11 Jul '11

11 Jul '11

commit ca34678f08780173a2e6736acf48db80e5903f3a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 11 13:24:33 2011 +0200 Show possible censorship events in user graphs. --- rserve/graphs.R | 23 ++++++++++++++++++- .../ernie/web/GraphParameterChecker.java | 23 +++++++++++++++++++- web/WEB-INF/users.jsp | 5 ++++ 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index cff39a2..c6ba4fd 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -600,7 +600,7 @@ plot_relayflags <- function(start, end, flags, granularity, path, dpi) { ggsave(filename = path, width = 8, height = 5, dpi = as.numeric(dpi)) } -plot_direct_users <- function(start, end, country, path, dpi) { +plot_direct_users <- function(start, end, country, events, path, dpi) { drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, r, bwp, brn, bwn, brp, bwr, brr ", @@ -630,7 +630,25 @@ plot_direct_users <- function(start, end, country, path, dpi) { date_breaks <- date_breaks( as.numeric(max(as.Date(u$date, "%Y-%m-%d")) - min(as.Date(u$date, "%Y-%m-%d")))) - ggplot(u, aes(x = as.Date(date, "%Y-%m-%d"), y = users)) + + plot <- ggplot(u, aes(x = as.Date(date, "%Y-%m-%d"), y = users)) + if (events == "on" & country != "all") { + r <- read.csv( + "/srv/metrics.torproject.org/web/direct-users-ranges.csv", + stringsAsFactors = FALSE) + r <- r[r$date >= start & r$date <= end & r$country == country, + c("date", "minusers", "maxusers")] + r <- cast(rbind(melt(u, id.vars = "date"), melt(r, id.vars = "date"))) + upturns <- r[r$users > r$maxusers, 1:2] + downturns <- r[r$users < r$minusers, 1:2] + plot <- plot + + geom_ribbon(data = r, aes(ymin = minusers, ymax = maxusers), + fill = "gray") + + geom_point(data = upturns, aes(x = date, y = users), size = 5, + colour = "dodgerblue2") + + geom_point(data = downturns, aes(x = date, y = users), size = 5, + colour = "firebrick2") + } + plot <- plot + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", "https://metrics.torproject.org/", sep = ""), @@ -639,6 +657,7 @@ plot_direct_users <- function(start, end, country, path, dpi) { scale_y_continuous(name = "", limits = c(0, max(u$users, na.rm = TRUE)), formatter = formatter) + opts(title = title) + print(plot) ggsave(filename = path, width = 8, height = 5, dpi = as.numeric(dpi)) } diff --git a/src/org/torproject/ernie/web/GraphParameterChecker.java b/src/org/torproject/ernie/web/GraphParameterChecker.java index 95e4cf0..7349bf9 100644 --- a/src/org/torproject/ernie/web/GraphParameterChecker.java +++ b/src/org/torproject/ernie/web/GraphParameterChecker.java @@ -50,7 +50,7 @@ public class GraphParameterChecker { this.availableGraphs.put("bwhist-flags", "start,end,filename,dpi"); this.availableGraphs.put("dirbytes", "start,end,filename,dpi"); this.availableGraphs.put("direct-users", - "start,end,country,filename,dpi"); + "start,end,country,events,filename,dpi"); this.availableGraphs.put("bridge-users", "start,end,country,filename,dpi"); this.availableGraphs.put("gettor", "start,end,bundle,filename,dpi"); @@ -70,6 +70,7 @@ public class GraphParameterChecker { sb.append("," + country[0]); } this.knownParameterValues.put("country", sb.toString()); + this.knownParameterValues.put("events", "on,off"); this.knownParameterValues.put("bundle", "all,en,zh_CN,fa"); this.knownParameterValues.put("source", "all,siv,moria,torperf"); this.knownParameterValues.put("filesize", "50kb,1mb,5mb"); @@ -197,6 +198,26 @@ public class GraphParameterChecker { recognizedGraphParameters.put("country", countryParameters); } + /* Parse whether the estimated min/max range shall be displayed if + * supported by the graph type. This parameter can either be "on" or + * "off," where "off" is the default. */ + if (supportedGraphParameters.contains("events")) { + String[] eventsParameter = (String[]) requestParameters.get( + "events"); + List<String> knownRanges = Arrays.asList( + this.knownParameterValues.get("events").split(",")); + if (eventsParameter != null) { + if (eventsParameter.length != 1 || + eventsParameter[0].length() == 0 || + !knownRanges.contains(eventsParameter[0])) { + return null; + } + } else { + eventsParameter = new String[] { "off" }; + } + recognizedGraphParameters.put("events", eventsParameter); + } + /* Parse GetTor bundle if supported by the graph type. Only a single * bundle can be passed. If no bundle is passed, use "all" as * default. */ diff --git a/web/WEB-INF/users.jsp b/web/WEB-INF/users.jsp index 60be8ab..814c15c 100644 --- a/web/WEB-INF/users.jsp +++ b/web/WEB-INF/users.jsp @@ -43,6 +43,11 @@ based on the requests seen by a few dozen directory mirrors.</p> </c:forEach> </select> </p><p> + Show possible censorship events if available (BETA) + <input type="checkbox" name="events" value="on" + <c:if test="${direct_users_events[0] eq 'on'}"> checked</c:if> + ></input> + </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${direct_users_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> <option value="150"<c:if test="${direct_users_dpi[0] eq '150'}"> selected</c:if>>Print low - 1200x750</option>

1 0

[metrics-tasks/master] Export min/max ranges of daily user numbers (#2718).
by karsten＠torproject.org 11 Jul '11

11 Jul '11

commit 9f401d1782ea8b16ad01ed35309d8c8404e26670 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 11 13:14:01 2011 +0200 Export min/max ranges of daily user numbers (#2718). --- task-2718/detector.py | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/task-2718/detector.py b/task-2718/detector.py index 0370d02..716bbdf 100644 --- a/task-2718/detector.py +++ b/task-2718/detector.py @@ -290,6 +290,25 @@ def plot_all(tss, minx, maxx, INTERV, DAYS=None, rdir="img"): plot_target(tss, c,xtitle, minx, maxx, DAYS, INTERV) summary_file.close() +def write_all(tss, minc, maxc, INTERVAL=7): + ranges_file = file("direct-users-ranges.csv", "w") + ranges_file.write("date,country,minusers,maxusers\n") + exclude = set(["all", "??", "date"]) + for c in tss.country_codes: + if c in exclude: + continue + print ".", + series = tss.get_country_series(c) + for i, v in enumerate(series): + if i > 0 and i - INTERVAL >= 0 and series[i] != None and series[i-INTERVAL] != None and series[i-INTERVAL] != 0 and minc[i]!= None and maxc[i]!= None: + minv = minc[i] * poisson.ppf(1-0.9999, series[i-INTERVAL]) + maxv = maxc[i] * poisson.ppf(0.9999, series[i-INTERVAL]) + if not minv < maxv: + print minv, maxv, series[i-INTERVAL], minc[i], maxc[i] + assert minv < maxv + ranges_file.write("%s,%s,%s,%s\n" % (tss.all_dates[i], c, minv, maxv)) + ranges_file.close() + def main(): # Change these to customize script CSV_FILE = "direct-users.csv" @@ -301,6 +320,7 @@ def main(): l = tss.get_largest_locations(50) minx, maxx = make_tendencies_minmax(l, INTERV) plot_all(tss, minx, maxx, INTERV, DAYS, rdir=GRAPH_DIR) + write_all(tss, minx, maxx, INTERV) if __name__ == "__main__": main()

1 0

[flashproxy/master] deleting a bunch of old testing scripts
by dcf＠torproject.org 09 Jul '11

09 Jul '11

commit d19e8dbec32ceff107b5897e43546a833954d2c8 Author: ellitron <jdellit(a)stanford.edu> Date: Sat Jul 9 18:42:24 2011 -0700 deleting a bunch of old testing scripts --- testing/fac_test_input_0 | 5 ----- testing/fac_test_input_1 | 5 ----- testing/fac_test_input_2 | 5 ----- testing/fac_test_input_3 | 5 ----- testing/fac_test_input_4 | 5 ----- testing/fac_test_input_5 | 5 ----- testing/fac_test_input_6 | 5 ----- testing/tester.py | 9 --------- 8 files changed, 0 insertions(+), 44 deletions(-) diff --git a/testing/fac_test_input_0 b/testing/fac_test_input_0 deleted file mode 100644 index f898fab..0000000 --- a/testing/fac_test_input_0 +++ /dev/null @@ -1,5 +0,0 @@ -POST / HTTP/1.0 - -clientt=127.0.0.1:88 - - diff --git a/testing/fac_test_input_1 b/testing/fac_test_input_1 deleted file mode 100644 index f5e686c..0000000 --- a/testing/fac_test_input_1 +++ /dev/null @@ -1,5 +0,0 @@ -POST / HTTP/1.0 - -client==127.0.0.1:88 - - diff --git a/testing/fac_test_input_2 b/testing/fac_test_input_2 deleted file mode 100644 index c987aa0..0000000 --- a/testing/fac_test_input_2 +++ /dev/null @@ -1,5 +0,0 @@ -POST / HTTP/1.0 - -client=127.0.0:88 - - diff --git a/testing/fac_test_input_3 b/testing/fac_test_input_3 deleted file mode 100644 index a5ca4f4..0000000 --- a/testing/fac_test_input_3 +++ /dev/null @@ -1,5 +0,0 @@ -POST / HTTP/1.0 - -client=127.0.0.A:88 - - diff --git a/testing/fac_test_input_4 b/testing/fac_test_input_4 deleted file mode 100644 index b6846b8..0000000 --- a/testing/fac_test_input_4 +++ /dev/null @@ -1,5 +0,0 @@ -POST / HTTP/1.0 - -client=127.0.0.1::88 - - diff --git a/testing/fac_test_input_5 b/testing/fac_test_input_5 deleted file mode 100644 index fa1e99b..0000000 --- a/testing/fac_test_input_5 +++ /dev/null @@ -1,5 +0,0 @@ -POST / HTTP/1.0 - -client=127.0.0.1:88A - - diff --git a/testing/fac_test_input_6 b/testing/fac_test_input_6 deleted file mode 100644 index 0e29ba6..0000000 --- a/testing/fac_test_input_6 +++ /dev/null @@ -1,5 +0,0 @@ -POST / HTTP/1.0 - -client=127.0.0.:88 - - diff --git a/testing/tester.py b/testing/tester.py deleted file mode 100755 index f2aeeed..0000000 --- a/testing/tester.py +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/python - -import os -import sys - -for i in range(int(sys.argv[1])): - print "Running test " + str(i) + "..." - os.system("cat fac_test_input_" + str(i) + " | ncat 127.0.0.1 9002") -

1 0

[flashproxy/master] added first experiment, scripted
by dcf＠torproject.org 09 Jul '11

09 Jul '11

commit 0dc4392cfecad180703e7d056a31c137ed33fd4c Author: ellitron <jdellit(a)stanford.edu> Date: Sat Jul 9 20:52:17 2011 -0700 added first experiment, scripted --- experiments/00 | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ experiments/README | 6 +++++ 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/experiments/00 b/experiments/00 new file mode 100755 index 0000000..973ee30 --- /dev/null +++ b/experiments/00 @@ -0,0 +1,58 @@ +#!/bin/bash + +# Go to flashproxy repo root dir +cd .. + +# Create 1GB dump file +echo "creating dump file..." +rm dump +dd if=/dev/null of=dump bs=1G seek=1 & + +sleep 1 + +# Start http server +echo "starting http server..." +thttpd -p 1080 + +sleep 1 + +# Start crossdomain policy server +echo "starting cross domain policy server..." +sudo ./crossdomaind.py & + +sleep 1 + +# Start the facilitator +echo "starting facilitator..." +./facilitator.py 4701 -r 127.0.0.1:1080 + +sleep 1 + +# Start the flash proxy +echo "starting flash proxy..." +google-chrome --app=http://localhost:1080/swfcat.swf?facilitator=127.0.0.1:4701 + +sleep 1 + +# Start socat adapter +echo "starting socat adapter..." +socat TCP-LISTEN:9000,reuseaddr,fork TCP-LISTEN:2000,reuseaddr & + +sleep 1 + +# Register with facilitator +echo "registering with facilitator..." +echo $'POST / HTTP/1.0\r\n\r\nclient=127.0.0.1:9000' | ncat localhost 4701 --send-only + +sleep 10 + +# wget the dump file +echo "getting the dump file..." +wget http://localhost:2000/dump -O - > /dev/null + +# Slaughter the processes +ps -ef | sed -n '/thttpd/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} +ps -ef | sed -n '/crossdomaind.py/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} +ps -ef | sed -n '/facilitator.py/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} +ps -ef | sed -n '/socat/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} + diff --git a/experiments/README b/experiments/README new file mode 100644 index 0000000..5d65b28 --- /dev/null +++ b/experiments/README @@ -0,0 +1,6 @@ +Scripts for running experiments. + +This README contains descriptions of each numbered experiment. + +Experiment +00 - Includes socat, crossdomaind, swfcat, httpd, and facilitator

1 0

[flashproxy/master] Flush the socket on each proxy transfer.
by dcf＠torproject.org 09 Jul '11

09 Jul '11

commit 1131da601b4bb03025d94bfaee06e2e2a2343bf0 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jul 10 01:30:35 2011 -0700 Flush the socket on each proxy transfer. The documentation for the Socket class says, "Data written by the write methods is not immediately transmitted; it is queued until the flush() method is called." This appears not to be the case on Mac and GNU/Linux, but is the case on Windows. --- ProxyPair.as | 1 + RTMFPSocket.as | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ProxyPair.as b/ProxyPair.as index 62c6ec2..2b66532 100644 --- a/ProxyPair.as +++ b/ProxyPair.as @@ -127,6 +127,7 @@ package bytes = new ByteArray(); s_from.readBytes(bytes, 0, n); s_to.writeBytes(bytes); + s_to.flush(); ui.rate_limit.update(n); log(label + ": read " + bytes.length + "."); } diff --git a/RTMFPSocket.as b/RTMFPSocket.as index 49c297b..9dca232 100644 --- a/RTMFPSocket.as +++ b/RTMFPSocket.as @@ -205,5 +205,10 @@ package /* Use a short method name because it's sent over the wire. */ outgoing.send("r", sendbuf); } + + public function flush():void + { + /* Ignored. */ + } } }

1 0

[flashproxy/master] Set "Cache-Control: no-cache" in facilitator client responses.
by dcf＠torproject.org 09 Jul '11

09 Jul '11

commit f6cd763b28da36f7e00479033e2e6993a7616253 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jul 10 01:27:25 2011 -0700 Set "Cache-Control: no-cache" in facilitator client responses. Flash Player on Internet Explorer appears to use the browser cache, getting stale facilitator results. --- facilitator.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/facilitator.py b/facilitator.py index 4d08673..eaad855 100755 --- a/facilitator.py +++ b/facilitator.py @@ -291,6 +291,7 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): client_str = "" self.send_response(200) self.send_header("Content-Type", "x-www-form-urlencoded") + self.send_header("Cache-Control", "no-cache") self.end_headers() data = {}

1 0

[arm/master] Starting Tor instance at wizard completion
by atagar＠torproject.org 09 Jul '11

09 Jul '11

commit 95cd487cc30c86d62f6ae44cc41cf44129d917ad Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 8 16:30:17 2011 -0700 Starting Tor instance at wizard completion This starts (or attempts to start) a Tor instance when the wizard finishes. Currently this just works for the basic use case where we have the permissions necessary to start Tor. --- src/cli/controller.py | 13 ++++++++++ src/cli/wizard.py | 51 +++++++++++++++++++++++++++----------- src/resources/torrcTemplate.txt | 1 + src/util/torConfig.py | 2 +- 4 files changed, 51 insertions(+), 16 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index c9ab6e7..633296e 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -3,6 +3,7 @@ Main interface loop for arm, periodically redrawing the screen and issuing user input to the proper panels. """ +import os import time import curses import threading @@ -25,6 +26,7 @@ from util import connections, conf, enum, log, panel, sysTools, torConfig, torTo ARM_CONTROLLER = None CONFIG = {"startup.events": "N3", + "startup.dataDirectory": "~/.arm", "startup.blindModeEnabled": False, "features.panels.show.graph": True, "features.panels.show.log": True, @@ -366,6 +368,17 @@ class Controller: if redraw: controlPanel.redraw(True) else: self._forceRedraw = True + def getDataDirectory(self): + """ + Provides the path where arm's resources are being placed. The path ends + with a slash and is created if it doesn't already exist. + """ + + dataDir = CONFIG["startup.dataDirectory"] + if not dataDir.endswith("/"): dataDir += "/" + if not os.path.exists(dataDir): os.makedirs(dataDir) + return os.path.expanduser(dataDir) + def isDone(self): """ True if arm should be terminated, false otherwise. diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 946ecd1..3ab3b9d 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -5,13 +5,16 @@ that's used by arm to run its own tor instance. import os import sys +import shutil import functools import curses import cli.popups import cli.controller -from util import connections, enum, log, torConfig, uiTools +from TorCtl import TorCtl + +from util import connections, enum, log, torConfig, torTools, uiTools # template used to generate the torrc TORRC_TEMPLATE = "resources/torrcTemplate.txt" @@ -72,8 +75,7 @@ MSG_COLOR = "green" OPTION_COLOR = "yellow" DISABLED_COLOR = "cyan" -CONFIG = {"startup.dataDirectory": "~/.arm", - "wizard.message.role": "", +CONFIG = {"wizard.message.role": "", "wizard.message.relay": "", "wizard.message.exit": "", "wizard.message.bridge": "", @@ -251,6 +253,7 @@ def showWizard(): # remembers the last selection made on the type prompt page relaySelection = RelayType.RELAY + controller = cli.controller.getController() while True: if relayType == None: @@ -265,18 +268,36 @@ def showWizard(): elif selection == NEXT: generatedTorrc = getTorrc(relayType, config) - dataDir = CONFIG["startup.dataDirectory"] - if not dataDir.endswith("/"): dataDir += "/" - torrcLocation = os.path.expanduser(dataDir) + "torrc" - - cli.controller.getController().requestRedraw(True) + torrcLocation = controller.getDataDirectory() + "torrc" + controller.requestRedraw(True) confirmationSelection = showConfirmationDialog(generatedTorrc, torrcLocation) if confirmationSelection == NEXT: - log.log(log.NOTICE, "Resulting torrc:\n%s" % generatedTorrc) - break # TODO: implement next screen - elif confirmationSelection == CANCEL: + log.log(log.INFO, "Writing torrc to '%s':\n%s" % (torrcLocation, generatedTorrc)) + + # if the torrc already exists then save it to a _bak file + if os.path.exists(torrcLocation): + shutil.copy(torrcLocation, torrcLocation + "_bak") + + # writes the torrc contents + torrcFile = open(torrcLocation, "w") + torrcFile.write(generatedTorrc) + torrcFile.close() + + try: + os.system("tor --quiet -f %s&" % torrcLocation) + torctlConn, authType, authValue = TorCtl.preauth_connect(controlPort = 9052) + + if authType == TorCtl.AUTH_TYPE.COOKIE: + torctlConn.authenticate(authValue) + torTools.getConn().init(torctlConn) + else: + raise IOError("unexpected authentication type '%s'" % authType) + except IOError, exc: + log.log(log.WARN, "Unable to start tor: %s" % exc) + break + elif confirmationSelection == CANCEL: break # redraws screen to clear away the dialog we just showed cli.controller.getController().requestRedraw(True) @@ -464,9 +485,9 @@ def getTorrc(relayType, config): templateOptions["BURST"] = "%i %s" % (int(relayRateComp[0]) * 2, " ".join(relayRateComp[1:])) # exit notice will be in our data directory - dataDir = CONFIG["startup.dataDirectory"] - if not dataDir.endswith("/"): dataDir += "/" - templateOptions["NOTICE_PATH"] = os.path.expanduser(dataDir) + "exit-notice.html" + dataDir = cli.controller.getController().getDataDirectory() + templateOptions["NOTICE_PATH"] = dataDir + "exit-notice.html" + templateOptions["LOG_ENTRY"] = "notice file %stor-log" % dataDir policyCategories = [] if not config[Options.POLICY].getValue(): @@ -564,7 +585,7 @@ def showConfirmationDialog(torrcContents, torrcLocation): div = option.find("#") if div != -1: option, comment = option[:div], option[div:] - div = option.find(" ") + div = option.strip().find(" ") if div != -1: option, arg = option[:div], option[div:] drawX = 2 + xOffset diff --git a/src/resources/torrcTemplate.txt b/src/resources/torrcTemplate.txt index abedd7f..072f847 100644 --- a/src/resources/torrcTemplate.txt +++ b/src/resources/torrcTemplate.txt @@ -9,6 +9,7 @@ [NEWLINE] ControlPort 9052 # port controllers can connect to CookieAuthentication 1 # method for controller authentication +Log [LOG_ENTRY] # location to log notices, warnings, and errors [IF RELAY | EXIT | BRIDGE] RunAsDaemon 1 # runs as a background process diff --git a/src/util/torConfig.py b/src/util/torConfig.py index e5f1cb2..8510c7a 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -930,7 +930,7 @@ def renderTorrc(template, options, commentIndent = 30): comment = "# %s" % comment.strip() # parses the argument from the option - if " " in parsedLine: + if " " in parsedLine.strip(): option, arg = parsedLine.split(" ", 1) option = option.strip() else:

1 0

[arm/master] Attempting to connect to the wizard port
by atagar＠torproject.org 09 Jul '11

09 Jul '11

commit d76a91e07e59b885096e07cdbdbaca1f8349b932 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 8 18:16:00 2011 -0700 Attempting to connect to the wizard port If the initial connection fails then also tries the port the relay setup wizard uses. This is a non-standard port to avoid conflicts with TBB instances. --- src/cli/wizard.py | 4 ++-- src/settings.cfg | 1 + src/starter.py | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 3ab3b9d..7e0907e 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -23,7 +23,7 @@ TORRC_TEMPLATE = "resources/torrcTemplate.txt" RelayType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") # all options that can be configured -Options = enum.Enum("DIVIDER", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "LOWPORTS", "PORTFORWARD", "STARTUP", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT", "DISTRIBUTE", "BRIDGED", "BRIDGE1", "BRIDGE2", "BRIDGE3", "REUSE") +Options = enum.Enum("DIVIDER", "CONTROL", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "LOWPORTS", "PORTFORWARD", "STARTUP", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT", "DISTRIBUTE", "BRIDGED", "BRIDGE1", "BRIDGE2", "BRIDGE3", "REUSE") RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.CONTACT, Options.NOTIFY, @@ -286,7 +286,7 @@ def showWizard(): try: os.system("tor --quiet -f %s&" % torrcLocation) - torctlConn, authType, authValue = TorCtl.preauth_connect(controlPort = 9052) + torctlConn, authType, authValue = TorCtl.preauth_connect(controlPort = int(CONFIG["wizard.default"][Options.CONTROL])) if authType == TorCtl.AUTH_TYPE.COOKIE: torctlConn.authenticate(authValue) diff --git a/src/settings.cfg b/src/settings.cfg index 162327b..f15aa49 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -371,6 +371,7 @@ wizard.suboptions Bridge1 wizard.suboptions Bridge2 wizard.suboptions Bridge3 +wizard.default Control => 9052 wizard.default Notify => true wizard.default Bandwidth => 5 MB/s wizard.default Startup => true diff --git a/src/starter.py b/src/starter.py index 234bf16..58bc6b1 100644 --- a/src/starter.py +++ b/src/starter.py @@ -39,6 +39,7 @@ CONFIG = {"startup.controlPassword": None, "startup.blindModeEnabled": False, "startup.events": "N3", "startup.dataDirectory": "~/.arm", + "wizard.default": {}, "features.allowDetachedStartup": False, "features.config.descriptions.enabled": True, "features.config.descriptions.persist": True, @@ -211,6 +212,21 @@ def _torCtlConnect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, i except Exception, exc: if conn: conn.close() + # attempts to connect with the default wizard address too + wizardPort = CONFIG["wizard.default"].get("Control") + + if wizardPort and wizardPort.isdigit(): + wizardPort = int(wizardPort) + + # Attempt to connect to the wizard port. If the connection fails then + # don't print anything and continue with the error case for the initial + # connection failure. Otherwise, return the connection result. + + if controlPort != wizardPort: + connResult = _torCtlConnect(controlAddr, wizardPort) + if connResult != None: return connResult + else: return None # wizard connection attempt, don't print anything + if passphrase and str(exc) == "Unable to authenticate: password incorrect": # provide a warning that the provided password didn't work, then try # again prompting for the user to enter it

1 0

[arm/master] Config option to shut down tor when quiting
by atagar＠torproject.org 09 Jul '11

09 Jul '11

commit 2ce33556601d2c4a1d0b177d7cbb075a3e8bec7e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 16:08:39 2011 -0700 Config option to shut down tor when quiting If attached to an arm made tor instance and the config option is set then offers to shut down tor gracefully when quitting. --- armrc.sample | 4 ++++ src/cli/controller.py | 25 ++++++++++++++++++++++++- src/util/torTools.py | 24 ++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletions(-) diff --git a/armrc.sample b/armrc.sample index bfe8976..c893bf9 100644 --- a/armrc.sample +++ b/armrc.sample @@ -31,6 +31,10 @@ features.colorInterface true # none, red, green, yellow, blue, cyan, magenta, black, white features.colorOverride none +# If arm is attached to an arm started tor instance when it shuts down then +# offers to shut down tor too if true, otherwise skips this prompt. +features.offerTorShutdownOnQuit false + # Includes unicode characters in the interface. features.printUnicode true diff --git a/src/cli/controller.py b/src/cli/controller.py index 633296e..ae1a59b 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -28,6 +28,7 @@ ARM_CONTROLLER = None CONFIG = {"startup.events": "N3", "startup.dataDirectory": "~/.arm", "startup.blindModeEnabled": False, + "features.offerTorShutdownOnQuit": False, "features.panels.show.graph": True, "features.panels.show.log": True, "features.panels.show.connection": True, @@ -388,10 +389,32 @@ class Controller: def quit(self): """ - Terminates arm after the input is processed. + Terminates arm after the input is processed. Optionally if we're connected + to a arm generated tor instance then this may check if that should be shut + down too. """ self._isDone = True + + if CONFIG["features.offerTorShutdownOnQuit"]: + conn = torTools.getConn() + torrcLoc = conn.getInfo("config-file") + wizardTorrcLoc = self.getDataDirectory() + "torrc" + + if torrcLoc == wizardTorrcLoc: + while True: + msg = "Shut down the Tor instance arm started (y/n)?" + confirmationKey = cli.popups.showMsg(msg, attr = curses.A_BOLD) + + if confirmationKey in (ord('y'), ord('Y')): + # attempts a graceful shutdown of tor, showing the issue if + # unsuccessful then continuing the shutdown + try: conn.shutdown() + except IOError, exc: cli.popups.showMsg(str(exc), 3, curses.A_BOLD) + + break + elif confirmationKey in (ord('n'), ord('N')): + break def shutdownDaemons(): """ diff --git a/src/util/torTools.py b/src/util/torTools.py index 7e9fa37..0fb71a8 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1465,6 +1465,30 @@ class Controller(TorCtl.PostEventListener): if raisedException: raise raisedException + def shutdown(self, force = False): + """ + Sends a shutdown signal to the attached tor instance. For relays the + actual shutdown is delayed for thirty seconds unless the force flag is + given. This raises an IOError if a signal is sent but fails. + + Arguments: + force - triggers an immediate shutdown for relays if True + """ + + self.connLock.acquire() + + raisedException = None + if self.isAlive(): + try: + signal = "HALT" if force else "SHUTDOWN" + self.conn.send_signal(signal) + except Exception, exc: + raisedException = IOError(str(exc)) + + self.connLock.release() + + if raisedException: raise raisedException + def msg_event(self, event): """ Listens for reload signal (hup), which is either produced by:

1 0