May 2011 - tor-commits - lists.torproject.org

[arm/master] fix: --debug flag broke if config-text unavailable
by atagar＠torproject.org 25 May '11

25 May '11

commit d6df7862474e728c31fea1edd9613a3e64dc73f8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 21 13:59:20 2011 -0700 fix: --debug flag broke if config-text unavailable When in debug mode arm attempted to log the results of 'GETINFO config-text' without taking into account that this call may fail (this is a new config option so this happens quite a bit). Caught by trogdor --- src/starter.py | 5 +++-- 1 files changed, 3 insertions(+), 2 … [View More]

1 0

[arm/master] fix: Man page had author's hard coded home
by atagar＠torproject.org 25 May '11

25 May '11

commit 13ba8d61c35bb7ceff0514a68cd6ee99b55059c4 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 25 08:17:58 2011 -0700 fix: Man page had author's hard coded home The debug flag referenced /home/atagar rather than ~ (caught by kuhkatz) --- arm.1 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arm.1 b/arm.1 index 32a03cc..6a1fa19 100644 --- a/arm.1 +++ b/arm.1 @@ -31,7 +31,7 @@ user provided configuration file (default is \fB~/.armrc\… [View More]

1 0

[arm/master] Adding an option for reconnecting to Tor
by atagar＠torproject.org 25 May '11

25 May '11

commit 3941336e68bb6fd16b2fe4c6c8dd955262a90286 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 25 09:39:59 2011 -0700 Adding an option for reconnecting to Tor If Tor is shut down then restarted this provides an option so the user can press 'r' to reconnect to the new instance. Use cases are... Success -> log and display message indicating success Password Required -> prompt for password Failure -> display message with a … [View More]description of the problem --- src/cli/controller.py | 16 +++++++++++----- src/cli/headerPanel.py | 34 +++++++++++++++++++++++++++++++--- src/starter.py | 10 +++------- src/util/connections.py | 18 ++++++++++++++++++ src/util/torTools.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 108 insertions(+), 15 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index d9895e6..e94f7f6 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -18,7 +18,7 @@ import cli.graphing.connStats import cli.graphing.resourceStats import cli.connections.connPanel -from util import connections, conf, enum, log, panel, sysTools, torConfig, torTools, uiTools +from util import connections, conf, enum, log, panel, sysTools, torConfig, torTools ARM_CONTROLLER = None @@ -346,7 +346,7 @@ def heartbeatCheck(isUnresponsive): conn = torTools.getConn() lastHeartbeat = conn.getHeartbeat() - if conn.isAlive() and "BW" in conn.getControllerEvents() and lastHeartbeat != 0: + if conn.isAlive() and "BW" in conn.getControllerEvents(): if not isUnresponsive and (time.time() - lastHeartbeat) >= 10: isUnresponsive = True log.log(log.NOTICE, "Relay unresponsive (last heartbeat: %s)" % time.ctime(lastHeartbeat)) @@ -357,15 +357,21 @@ def heartbeatCheck(isUnresponsive): return isUnresponsive -def connResetListener(_, eventType): +def connResetListener(conn, eventType): """ - Pauses connection resolution when tor's shut down, and resumes if started - again. + Pauses connection resolution when tor's shut down, and resumes with the new + pid if started again. """ if connections.isResolverAlive("tor"): resolver = connections.getResolver("tor") resolver.setPaused(eventType == torTools.State.CLOSED) + + if eventType == torTools.State.INIT: + torPid = conn.getMyPid() + + if torPid and torPid != resolver.getPid(): + resolver.setPid(torPid) def startTorMonitor(startTime): """ diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index 102ef64..decf975 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -19,6 +19,8 @@ import time import curses import threading +import cli.popups + from util import log, panel, sysTools, torTools, uiTools # minimum width for which panel attempts to double up contents (two columns to @@ -33,7 +35,9 @@ FLAG_COLORS = {"Authority": "white", "BadExit": "red", "BadDirectory": "red VERSION_STATUS_COLORS = {"new": "blue", "new in series": "blue", "obsolete": "red", "recommended": "green", "old": "red", "unrecommended": "red", "unknown": "cyan"} -DEFAULT_CONFIG = {"features.showFdUsage": False, +DEFAULT_CONFIG = {"startup.interface.ipAddress": "127.0.0.1", + "startup.interface.port": 9051, + "features.showFdUsage": False, "log.fdUsageSixtyPercent": log.NOTICE, "log.fdUsageNinetyPercent": log.WARN} @@ -107,6 +111,29 @@ class HeaderPanel(panel.Panel, threading.Thread): if self.vals["tor/orPort"]: return 4 if isWide else 6 else: return 3 if isWide else 4 + def handleKey(self, key): + isKeystrokeConsumed = True + + if key in (ord('r'), ord('R')) and not self._isTorConnected: + try: + ctlAddr, ctlPort = self._config["startup.interface.ipAddress"], self._config["startup.interface.port"] + tmpConn, authType, authValue = torTools.getConnectionComponents(ctlAddr, ctlPort) + + if authType == torTools.AUTH_TYPE.PASSWORD: + authValue = cli.popups.inputPrompt("Controller Password: ") + if not authValue: raise IOError() # cancel reconnection + + tmpConn.authenticate(authValue) + torTools.getConn().init(tmpConn) + log.log(log.NOTICE, "Reconnected to Tor's control port") + cli.popups.showMsg("Tor reconnected", 1) + except Exception, exc: + # displays notice for failed connection attempt + if exc.args: cli.popups.showMsg("Unable to reconnect (%s)" % exc, 3) + else: isKeystrokeConsumed = False + + return isKeystrokeConsumed + def draw(self, width, height): self.valsLock.acquire() isWide = width + 1 >= MIN_DUAL_COL_WIDTH @@ -233,7 +260,8 @@ class HeaderPanel(panel.Panel, threading.Thread): else: statusTime = torTools.getConn().getStatus()[1] statusTimeLabel = time.strftime("%H:%M %m/%d/%Y", time.localtime(statusTime)) - self.addfstr(2 if isWide else 4, 0, "<b><red>Tor Disconnected</red></b> (%s)" % statusTimeLabel) + msg = "<b><red>Tor Disconnected</red></b> (%s) - press r to reconnect" % statusTimeLabel + self.addfstr(2 if isWide else 4, 0, msg) # Undisplayed / Line 3 Right (exit policy) if isWide: @@ -313,7 +341,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self._cond.notifyAll() self._cond.release() - def resetListener(self, conn, eventType): + def resetListener(self, _, eventType): """ Updates static parameters on tor reload (sighup) events. diff --git a/src/starter.py b/src/starter.py index 0454f9e..b41b18b 100644 --- a/src/starter.py +++ b/src/starter.py @@ -11,7 +11,6 @@ import sys import time import getopt import locale -import socket import platform import version @@ -327,7 +326,7 @@ if __name__ == '__main__': # sets up TorCtl connection, prompting for the passphrase if necessary and # sending problems to stdout if they arise - TorCtl.INCORRECT_PASSWORD_MSG = "Controller password found in '%s' was incorrect" % configPath + TorCtl.TorCtl.INCORRECT_PASSWORD_MSG = "Controller password found in '%s' was incorrect" % configPath authPassword = config.get("startup.controlPassword", CONFIG["startup.controlPassword"]) conn = TorCtl.TorCtl.connect(controlAddr, controlPort, authPassword) if conn == None: @@ -344,12 +343,9 @@ if __name__ == '__main__': # making this a much bigger hack). try: - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.connect((controlAddr, controlPort)) - tmpConn = TorCtl.TorCtl.Connection(s) + tmpConn, authType, cookiePath = util.torTools.getConnectionComponents(controlAddr, controlPort) - if tmpConn.get_auth_type() == TorCtl.TorCtl.AUTH_TYPE.COOKIE: - cookiePath = tmpConn.get_auth_cookie_path() + if authType == util.torTools.AUTH_TYPE.COOKIE: torPid = util.torTools.getPid(controlPort) if torPid and cookiePath[0] != "/": diff --git a/src/util/connections.py b/src/util/connections.py index c090893..47aa8af 100644 --- a/src/util/connections.py +++ b/src/util/connections.py @@ -538,6 +538,24 @@ class ConnectionResolver(threading.Thread): return self._resolutionCounter + def getPid(self): + """ + Provides the pid used to narrow down connection resolution. This is an + empty string if undefined. + """ + + return self.processPid + + def setPid(self, processPid): + """ + Sets the pid used to narrow down connection resultions. + + Arguments: + processPid - pid for the process we're fetching connections for + """ + + self.processPid = processPid + def setPaused(self, isPause): """ Allows or prevents further connection resolutions (this still makes use of diff --git a/src/util/torTools.py b/src/util/torTools.py index 12af772..d7ffa4d 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -25,6 +25,9 @@ from util import enum, log, procTools, sysTools, uiTools # CLOSED - control port closed State = enum.Enum("INIT", "CLOSED") +# enums for authentication on the tor control port +AUTH_TYPE = enum.Enum("NONE", "COOKIE", "PASSWORD") + # Addresses of the default directory authorities for tor version 0.2.3.0-alpha # (this comes from the dirservers array in src/or/config.c). DIR_SERVERS = [("86.59.21.38", "80"), # tor26 @@ -301,6 +304,45 @@ def parseVersion(versionStr): return result +def getConnectionComponents(controlAddr="127.0.0.1", controlPort=9051): + """ + Provides an uninitiated torctl connection for the control port. This returns + a tuple with the... + (torctl connection, authType, authValue) + + The authValue corresponds to the cookie path if using an authentication + cookie. Otherwise this is the empty string. This raises an IOError if unable + to connect. + + Arguments: + controlAddr - ip address belonging to the controller + controlPort - port belonging to the controller + """ + + try: + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.connect((controlAddr, controlPort)) + conn = TorCtl.Connection(s) + authType, authValue = conn.get_auth_type(), "" + + if authType == TorCtl.AUTH_TYPE.COOKIE: + authValue = conn.get_auth_cookie_path() + + # converts to our enum type + if authType == TorCtl.AUTH_TYPE.NONE: + authType = AUTH_TYPE.NONE + elif authType == TorCtl.AUTH_TYPE.COOKIE: + authType = AUTH_TYPE.COOKIE + elif authType == TorCtl.AUTH_TYPE.PASSWORD: + authType = AUTH_TYPE.PASSWORD + + return (conn, authType, authValue) + except socket.error, exc: + if "Connection refused" in exc.args: + raise IOError("Connection refused. Is the ControlPort enabled?") + else: raise IOError("Failed to establish socket: %s" % exc) + except Exception, exc: raise IOError(exc) + def getConn(): """ Singleton constructor for a Controller. Be aware that this starts as being @@ -385,6 +427,9 @@ class Controller(TorCtl.PostEventListener): self.conn.add_event_listener(self) for listener in self.eventListeners: self.conn.add_event_listener(listener) + # registers this as our first heartbeat + self._updateHeartbeat() + # reset caches for ip -> fingerprint lookups self._fingerprintMappings = None self._fingerprintLookupCache = {} [View Less]

1 0

[arm/master] fix: Unicode init needs to be before curses
by atagar＠torproject.org 25 May '11

25 May '11

commit d8ebaa88886c0aeb421623416990bd3058b175f9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 21 13:36:19 2011 -0700 fix: Unicode init needs to be before curses The locale needs to be set before initializing curses for unicode characters to be rendered. --- src/cli/controller.py | 6 ------ src/starter.py | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 8222da8.… [View More]

1 0

r24786: {website} add rob to the board page. (website/trunk/about/en)
by Andrew Lewman 25 May '11

25 May '11

Author: phobos Date: 2011-05-25 15:51:16 +0000 (Wed, 25 May 2011) New Revision: 24786 Modified: website/trunk/about/en/board.wml Log: add rob to the board page. Modified: website/trunk/about/en/board.wml =================================================================== --- website/trunk/about/en/board.wml 2011-05-25 15:46:41 UTC (rev 24785) +++ website/trunk/about/en/board.wml 2011-05-25 15:51:16 UTC (rev 24786) @@ -33,7 +33,9 @@ <td class="beige"> <div class="name">… [View More]

1 0

r24785: {website} remove linus from the volunteer page since he's already on t (website/trunk/about/en)
by Andrew Lewman 25 May '11

25 May '11

Author: phobos Date: 2011-05-25 15:46:41 +0000 (Wed, 25 May 2011) New Revision: 24785 Modified: website/trunk/about/en/volunteers.wml Log: remove linus from the volunteer page since he's already on the core people page. Modified: website/trunk/about/en/volunteers.wml =================================================================== --- website/trunk/about/en/volunteers.wml 2011-05-24 03:20:22 UTC (rev 24784) +++ website/trunk/about/en/volunteers.wml 2011-05-25 15:46:41 UTC (rev 24785) @@… [View More]

1 0

[metrics-tasks/master] Add another graph for #3277.
by karsten＠torproject.org 25 May '11

25 May '11

commit a7ad71b01533b64e2d5e0b9c4f0f8f63d8d2a593 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 25 08:02:13 2011 +0200 Add another graph for #3277. --- task-3277/hsdir-sessions.R | 38 ++++++++++++++++++++++++++++++++++---- 1 files changed, 34 insertions(+), 4 deletions(-) diff --git a/task-3277/hsdir-sessions.R b/task-3277/hsdir-sessions.R index 4b28131..51633f5 100644 --- a/task-3277/hsdir-sessions.R +++ b/task-3277/hsdir-sessions.R @@ -7,10 +7,28 @@ data &… [View More]

1 0

[metrics-tasks/master] Fix indentation in global LICENSE
by karsten＠torproject.org 25 May '11

25 May '11

commit 9328c2b7b35be1affe31b4a5d6aaee6e311ab954 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Mar 16 10:36:33 2011 -0700 Fix indentation in global LICENSE --- LICENSE | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/LICENSE b/LICENSE index d5b67cd..52fb34e 100644 --- a/LICENSE +++ b/LICENSE @@ -12,7 +12,7 @@ met: in the documentation and/or other materials provided with the distribution. - * Neither the names of the copyright owners … [View More]

1 0

[metrics-tasks/master] Commit HSDir-set-listing scripts for #2649
by karsten＠torproject.org 25 May '11

25 May '11

commit 22eb1da05f6a0b667f9ba03ca700fc341a3722f6 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue May 24 13:06:02 2011 -0700 Commit HSDir-set-listing scripts for #2649 The scripts were done early on 2011-04-18, but never committed. --- task-2649/.gitignore | 2 + task-2649/README | 31 ++++++++++++++++++++++++++++++ task-2649/generate-consensus-hsdir-lists | 28 +++++++++++++++++++++++++++ task-2649/list-… [View More]consensus-hsdirs | 19 ++++++++++++++++++ task-2649/list-consensus-hsdirs.awk | 25 ++++++++++++++++++++++++ 5 files changed, 105 insertions(+), 0 deletions(-) diff --git a/task-2649/.gitignore b/task-2649/.gitignore new file mode 100644 index 0000000..c77b69b --- /dev/null +++ b/task-2649/.gitignore @@ -0,0 +1,2 @@ +dev/ +out/ diff --git a/task-2649/README b/task-2649/README new file mode 100644 index 0000000..4283696 --- /dev/null +++ b/task-2649/README @@ -0,0 +1,31 @@ + +Purpose: + + These scripts are intended to determine how unstable the set of + relays with the HSDir flag is. + +Dependencies: + + You will need linedemux and linemux installed. See branch parrun in + https://gitweb.torproject.org/rransom/tor-utils.git for now. + + You will also need Tcl 8.5.9 and gnuplot 4.4.0 installed. + +Instructions: + + First, unpack all of the v3 consensus archive tarballs you want to + analyze into a single directory, and set the consensus_archive_dir + environment variable to point to that directory. + + Then run: + + ./generate-consensus-hsdir-lists + ./compute-hsdir-set-instability + ./graph-hsdir-set-instability + +Bugs: + + This code compares each consensus with each of the four following + consensuses; it should compare each hour's consensus with the + consensuses in effect in each of the four following hours. + diff --git a/task-2649/generate-consensus-hsdir-lists b/task-2649/generate-consensus-hsdir-lists new file mode 100755 index 0000000..104e4bc --- /dev/null +++ b/task-2649/generate-consensus-hsdir-lists @@ -0,0 +1,28 @@ +#!/bin/sh + +# This script must be run as ./generate-consensus-hsdir-lists . + +# This script will die horribly later if $consensus_archive_dir +# expands to a string containing a shell metacharacter, so don't try +# to not die now. +test -z $consensus_archive_dir && +export consensus_archive_dir=/usr/local/opt/tor-consensuses + + +mkdir -m 0700 -p dev/ +for i in 0 1 2 3 ;do mkfifo -m 0600 dev/in$i dev/out$i ;done + +mkdir -p out/consensus-hsdir-lists + + +(cd "$consensus_archive_dir" ;find consensuses-* -type f -print ) | +sed -e 's|^|./list-consensus-hsdirs |' | +linedemux --fname -- dev/in0 dev/in1 dev/in2 dev/in3 & + +sh <dev/in0 >dev/out0 & +sh <dev/in1 >dev/out1 & +sh <dev/in2 >dev/out2 & +sh <dev/in3 >dev/out3 & + +linemux --fname -- dev/out0 dev/out1 dev/out2 dev/out3 + diff --git a/task-2649/list-consensus-hsdirs b/task-2649/list-consensus-hsdirs new file mode 100755 index 0000000..1b10243 --- /dev/null +++ b/task-2649/list-consensus-hsdirs @@ -0,0 +1,19 @@ +#!/bin/sh + +# This script must be run as ./list-consensus-hsdirs , by +# generate-consensus-hsdir-lists. + +consensus_file="$1" + + +consensus_basename="$(basename "$consensus_file" -consensus )" +hsdir_list_dir="out/consensus-hsdir-lists/$(echo "$consensus_basename" |cut -f 1-2 -d - )" +hsdir_list_name="$hsdir_list_dir/$consensus_basename" + + +mkdir -p "$hsdir_list_dir" + +awk -f list-consensus-hsdirs.awk <"$consensus_archive_dir/$consensus_file" >"$hsdir_list_name" + +echo "generated HSDir list $consensus_basename" + diff --git a/task-2649/list-consensus-hsdirs.awk b/task-2649/list-consensus-hsdirs.awk new file mode 100644 index 0000000..343c5e7 --- /dev/null +++ b/task-2649/list-consensus-hsdirs.awk @@ -0,0 +1,25 @@ + +BEGIN { + OFS=":" + idDigest="<oops>" +} + +$1 == "r" { + idDigest=$3 +} + +$1 == "s" { + isHSDir=0 + for (i = NF; i >= 1; --i) { + if ($i == "HSDir") { + isHSDir=1 + } + } + + if (isHSDir != 0) { + print idDigest + } + + idDigest="<oops>" +} + [View Less]

1 0

[metrics-tasks/master] Use sh -e
by karsten＠torproject.org 25 May '11

25 May '11

commit 65e0dfc58c728c2e54042f4f6eba1a812628cf64 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue May 24 14:36:07 2011 -0700 Use sh -e --- task-2649/generate-consensus-hsdir-lists | 2 +- task-2649/list-consensus-hsdirs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/task-2649/generate-consensus-hsdir-lists b/task-2649/generate-consensus-hsdir-lists index 104e4bc..7dea186 100755 --- a/task-2649/generate-consensus-hsdir-lists +++ b/… [View More]

1 0