- tor-commits - lists.torproject.org

[arm/packaging] fix: rpm generator script missed dependencies
by atagar＠torproject.org 26 Sep '11

26 Sep '11

commit c24113db59ac47356ca724e5cb20942a33a2c8b0 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 26 07:44:26 2011 -0700 fix: rpm generator script missed dependencies The script for making rpms simply cloned the release branch without fetching the dependencies. This is the purpose of export.sh so using that instead. Caught by Juan Alcaine --- rpm-prep.sh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/rpm-prep.sh b/rpm-prep.sh index 09c422b..242e8cf 100755 --- a/rpm-prep.sh +++ b/rpm-prep.sh @@ -4,7 +4,6 @@ # cd release_rpm # ./redhat/make-rpm -mkdir release_rpm -git archive --format=tar release | (cd ./release_rpm && tar xf -) +./export.sh release_rpm (cd build && git archive --format=tar packaging redhat) | (cd ./release_rpm && tar xf -)

1 0

[arm/master] fix: replacing changelog 'ticket' entries w/ links
by atagar＠torproject.org 26 Sep '11

26 Sep '11

commit 28194cc5af6fddb431221b72a1278373d6acdc32 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 26 07:10:52 2011 -0700 fix: replacing changelog 'ticket' entries w/ links Forgot to fill in the trac urls for the tickets when making the changelog for this last release. --- ChangeLog | 8 ++++---- src/version.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 472dd5d..5ab7654 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,12 +11,12 @@ Besides the normal bug fixes and minor features, this release introduces the con o /find option which searches the backlog for the given regex o /events option which displays any events that we've listened for o /write option which dumps the interpretor backlog to a file - * added: control socket support (feature request by dererk, ticket) - * added: optional system wide torrc integration (thanks to ioerror, ticket) + * added: control socket support (feature request by dererk, https://trac.torproject.org/projects/tor/ticket/3638) + * added: optional system wide torrc integration (thanks to ioerror, https://trac.torproject.org/projects/tor/ticket/3629) * added: dialog for guards, bridges, and exits with exit port usage and client locales (feature request by waltman and ioerror) * added: configuration editor for the gui interface (implemented by krkhan) * added: notice that warns the user against running tor or arm as root - * change: doing a manual redraw when the user presses ctrl+L (ticket) + * change: doing a manual redraw when the user presses ctrl+L (https://trac.torproject.org/projects/tor/ticket/2830) * change: moving download location to archive.torproject.org so downloads will have ssl (suggested by arma) * change: rewrite of the descriptor popup, cleaning up the code and minor performance improvements * fix: preventing arm from starting if there's a running tor instance that we can't connect to @@ -25,7 +25,7 @@ Besides the normal bug fixes and minor features, this release introduces the con * fix: skipping log parsing if misformatted (caught by Sjon) * fix: incorrect armrc path in man page (caught by dererk) * fix: toning down the warning when all connection resolvers fail (suggested by Sebastian) - * fix: quitting wizard when the user presses 'q' instead of just esc (suggested by monochromec, ticket) + * fix: quitting wizard when the user presses 'q' instead of just esc (suggested by monochromec, https://trac.torproject.org/projects/tor/ticket/3995) * fix: quitting could cause unclean curses shutdown * fix: relay address fetching would ignore default values at shutdown, causing a stacktrace * fix: concurrency bug could crash arm if a CIRC event occurs while caching attached relays diff --git a/src/version.py b/src/version.py index 8e7f493..0745fb9 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.5.0_dev' +VERSION = '1.4.5_dev' LAST_MODIFIED = "September 25, 2011"

1 0

[arm/master] Added log duplicate masks for longer-than-expected circuit build times and re-estimates of slow circuits.
by atagar＠torproject.org 26 Sep '11

26 Sep '11

commit 079201c6a0dec175823956d5490661ac742fb32b Author: Tom Lowenthal <me(a)tomlowenthal.com> Date: Sun Sep 25 20:30:58 2011 -0700 Added log duplicate masks for longer-than-expected circuit build times and re-estimates of slow circuits. --- src/settings.cfg | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/settings.cfg b/src/settings.cfg index 0e8f9dd..28c3008 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -272,6 +272,12 @@ config.summary.TestingEstimatedDescriptorPropagationTime Delay before clients at # 16 (79.193.61.171:443). # [INFO] rep_hist_downrate_old_runs(): Discounting all old stability info by a # factor of 0.950000 +# [NOTICE] Circuit build timeout of 96803ms is beyond the maximum build time we +# have ever observed. Capping it to 96107ms. +# The above NOTICE changes to an INFO message in maint-0.2.2 +# [NOTICE] Based on 1000 circuit times, it looks like we don't need to wait so +# long for circuits to finish. We will now assume a circuit is too slow +# to use after waiting 65 seconds. # [NOTICE] We stalled too much while trying to write 150 bytes to address # [scrubbed]. If this happens a lot, either something is wrong with # your network connection, or something is wrong with theirs. (fd 238, @@ -312,6 +318,9 @@ msg.DEBUG *pending in tls object). at_most msg.DEBUG connection_read_to_buf(): TLS connection closed on read. Closing. msg.INFO run_connection_housekeeping(): Expiring msg.INFO rep_hist_downrate_old_runs(): Discounting all old stability info by a factor of +msg.INFO *build time we have ever observed. Capping it to +msg.NOTICE *build time we have ever observed. Capping it to +msg.NOTICE *We will now assume a circuit is too slow to use after waiting msg.NOTICE We stalled too much while trying to write msg.NOTICE I learned some more directory information, but not enough to build a circuit msg.NOTICE Attempt by

1 0

[arm/master] Minor post-release tidying up
by atagar＠torproject.org 26 Sep '11

26 Sep '11

commit ce179d515c96a9dbd76d7159c51d84c5e5db4a37 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 25 20:52:24 2011 -0700 Minor post-release tidying up --- ChangeLog | 4 ++-- src/version.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 402c355..472dd5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ CHANGE LOG -9/25/11 - version 1.4.4 +9/25/11 - version 1.4.4 (881c67a) Besides the normal bug fixes and minor features, this release introduces the control port interpretor. This is a new page or standalone prompt that gives raw control port access with several usability improvements (tab completion, history, irc style help, interpretor commands, etc). * added: control port interpretor which provides... @@ -13,7 +13,7 @@ Besides the normal bug fixes and minor features, this release introduces the con o /write option which dumps the interpretor backlog to a file * added: control socket support (feature request by dererk, ticket) * added: optional system wide torrc integration (thanks to ioerror, ticket) - * added: dialog for guards, bridges, and exits with exit port usage and client locales + * added: dialog for guards, bridges, and exits with exit port usage and client locales (feature request by waltman and ioerror) * added: configuration editor for the gui interface (implemented by krkhan) * added: notice that warns the user against running tor or arm as root * change: doing a manual redraw when the user presses ctrl+L (ticket) diff --git a/src/version.py b/src/version.py index a1c26cf..8e7f493 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.4_dev' -LAST_MODIFIED = "July 17, 2011" +VERSION = '1.4.5.0_dev' +LAST_MODIFIED = "September 25, 2011"

1 0

[arm/master] Adding changelog notes for 1.4.4
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 902455c92f5e16e5646f9cf02ccd5fee8d474389 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 25 14:30:28 2011 -0700 Adding changelog notes for 1.4.4 --- ChangeLog | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5692ec3..402c355 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,43 @@ CHANGE LOG +9/25/11 - version 1.4.4 +Besides the normal bug fixes and minor features, this release introduces the control port interpretor. This is a new page or standalone prompt that gives raw control port access with several usability improvements (tab completion, history, irc style help, interpretor commands, etc). + + * added: control port interpretor which provides... + o tab completion + o history scrollback + o /help option which provides usage information for all of the tor/interpretor commands and tor configuration options + o /info option for querying relay information via fingerprint, nickname, or IP address + o /find option which searches the backlog for the given regex + o /events option which displays any events that we've listened for + o /write option which dumps the interpretor backlog to a file + * added: control socket support (feature request by dererk, ticket) + * added: optional system wide torrc integration (thanks to ioerror, ticket) + * added: dialog for guards, bridges, and exits with exit port usage and client locales + * added: configuration editor for the gui interface (implemented by krkhan) + * added: notice that warns the user against running tor or arm as root + * change: doing a manual redraw when the user presses ctrl+L (ticket) + * change: moving download location to archive.torproject.org so downloads will have ssl (suggested by arma) + * change: rewrite of the descriptor popup, cleaning up the code and minor performance improvements + * fix: preventing arm from starting if there's a running tor instance that we can't connect to + * fix: when the config-text GETINFO option was unavailable we'd write a blank torrc (caught by Runa) + * fix: appending path prefix to auth cookie path (caught by sid77) + * fix: skipping log parsing if misformatted (caught by Sjon) + * fix: incorrect armrc path in man page (caught by dererk) + * fix: toning down the warning when all connection resolvers fail (suggested by Sebastian) + * fix: quitting wizard when the user presses 'q' instead of just esc (suggested by monochromec, ticket) + * fix: quitting could cause unclean curses shutdown + * fix: relay address fetching would ignore default values at shutdown, causing a stacktrace + * fix: concurrency bug could crash arm if a CIRC event occurs while caching attached relays + * fix: crashing issue from use of an uninitialized buffer when paused with accounting stats + * fix: periodically redrawing content to prevent weird terminal glitches from persisting + * fix: pressing 'enter' on config panel when never attached to tor would crash + * fix: hotkey for saving the torrc conflicted with the relay setup wizard + * fix: avoiding catch-all during controller init + * fix: listener wasn't registering GUARD events + * fix: dropping nonexistent ORCONN attributes + * fix: clarifying the missing torrc message + 7/16/11 - version 1.4.3 (6cf4836) This completes the codebase refactoring project that's been a year in the works and provides numerous performance and usability improvements. Most notably this includes a setup wizard for new relays, menuing interface, gui prototype, substantial performance improvements, and support for Mac OSX.

1 0

[arm/release] Remaining interpretor help options
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit b96fb574edbd3f8f8542ce04e83b88345fad6867 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 19 09:15:31 2011 -0700 Remaining interpretor help options Basic descriptions for the remaining controller options. This should complete the /help option. --- src/util/torInterpretor.py | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 3beef9d..1f208ba 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -179,6 +179,29 @@ uses Tor's normal path selection.""" HELP_SETCIRCUITPURPOSE = """Sets the purpose attribute for a circuit.""" +HELP_CLOSECIRCUIT = """Closes the given circuit. If "IfUnused" is included then this only closes +the circuit if it isn't currently being used.""" + +HELP_ATTACHSTREAM = """Attaches a stream with the given built circuit (tor picks one on its own if +CircuitID is zero). If HopNum is given then this hop is used to exit the +circuit, otherwise the last relay is used.""" + +HELP_REDIRECTSTREAM = """Sets the destination for a given stream. This can only be done after a +stream is created but before it's attached to a circuit.""" + +HELP_CLOSESTREAM = """Closes the given stream, the reason being an integer matching a reason as +per section 6.3 of the tor-spec.""" + +HELP_RESOLVE = """Performs IPv4 DNS resolution over tor, doing a reverse lookup instead if +"mode=reverse" is included. This request is processed in the background and +results in a ADDRMAP event with the response.""" + +HELP_TAKEOWNERSHIP = """Instructs Tor to gracefully shut down when this control connection is closed.""" + +HELP_PROTOCOLINFO = """Provides bootstrapping information that a controller might need when first +starting, like Tor's version and controller authentication. This can be done +before authenticating to the control port.""" + HELP_OPTIONS = { "HELP": ("/help [OPTION]", HELP_HELP), "WRITE": ("/write [PATH]", HELP_WRITE), @@ -198,6 +221,13 @@ HELP_OPTIONS = { "POSTDESCRIPTOR": ("POSTDESCRIPTOR [purpose=general/controller/bridge] [cache=yes/no]...", HELP_POSTDESCRIPTOR), "EXTENDCIRCUIT": ("EXTENDCIRCUIT CircuitID [PATH] [purpose=general/controller]", HELP_EXTENDCIRCUIT), "SETCIRCUITPURPOSE": ("SETCIRCUITPURPOSE CircuitID purpose=general/controller", HELP_SETCIRCUITPURPOSE), + "CLOSECIRCUIT": ("CLOSECIRCUIT CircuitID [IfUnused]", HELP_CLOSECIRCUIT), + "ATTACHSTREAM": ("ATTACHSTREAM StreamID CircuitID [HOP=HopNum]", HELP_ATTACHSTREAM), + "REDIRECTSTREAM": ("REDIRECTSTREAM StreamID Address [Port]", HELP_REDIRECTSTREAM), + "CLOSESTREAM": ("CLOSESTREAM StreamID Reason [Flag]", HELP_CLOSESTREAM), + "RESOLVE": ("RESOLVE [mode=reverse] address", HELP_RESOLVE), + "TAKEOWNERSHIP": ("TAKEOWNERSHIP", HELP_TAKEOWNERSHIP), + "PROTOCOLINFO": ("PROTOCOLINFO [ProtocolVersion]", HELP_PROTOCOLINFO), } class InterpretorClosed(Exception):

1 0

[arm/release] fix: tor process detection limited to our user
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 795f5a061f2960cbb0659a6e5f796423e7873187 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 21 09:01:12 2011 -0700 fix: tor process detection limited to our user When checking to see if a tor process is already running I forgot the '-A' flag for ps, limiting the check to our user. --- src/util/torTools.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index f6d9d86..8c7a1ed 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -352,7 +352,7 @@ def isTorRunning(): """ # suggestions welcome for making this more reliable - commandResults = sysTools.call("ps co command") + commandResults = sysTools.call("ps -A co command") if commandResults: for cmd in commandResults: if cmd.strip() == "tor": return True

1 0

[arm/release] Event handling for the interpretor
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit b2d22453d55516c97d1ba3af8f2f218e8450c71a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 19 09:59:48 2011 -0700 Event handling for the interpretor Intercepts SETEVENTS requests and provides received events via an "/events [TYPE]" option. --- src/util/torInterpretor.py | 70 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 65 insertions(+), 5 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 1f208ba..cb2dcb7 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -10,6 +10,12 @@ import readline import version +# TODO: util should never import from the cli. This is being done as a hack to +# simplify event listening, but we should later move the TorEventObserver into +# the util. + +from cli.logPanel import TorEventObserver + from util import connections, enum, hostnames, torConfig, torTools, uiTools COLOR_PROMPT = True # provides a colored interpretor prompt @@ -47,16 +53,18 @@ RESET = CSI % "0" # limits used for cropping BACKLOG_LIMIT = 100 +EVENTS_LIMIT = 200 CONTENT_LIMIT = 20000 MULTILINE_UNIMPLEMENTED_NOTICE = "Multi-line control options like this are not yet implemented." GENERAL_HELP = """Interpretor commands include: - /help - provides information for interpretor and tor commands/config options - /write - saves backlog to a given location - /info - general information for a relay - /find - searches backlog for lines with the given regex - /quit - shuts down the interpretor + /help - provides information for interpretor and tor commands/config options + /info - general information for a relay + /find - searches backlog for lines with the given regex + /events - prints events that we've received + /write - saves backlog to a given location + /quit - shuts down the interpretor Tor commands include: GETINFO - queries information from tor @@ -93,6 +101,10 @@ Example: HELP_WRITE = """Writes the interpretor's backlog to the given path. If no location is specified then this saves to the last path specified (initially '%s').""" % DEFAULT_WRITE_PATH +HELP_EVENTS = """Provides events that we've received belonging to the given event types. If +no types are specified then this provides all the messages that we've +received.""" + HELP_INFO = """Provides general information for a relay that's currently in the consensus. If no relay is specified then this provides information on ourselves.""" @@ -205,6 +217,7 @@ before authenticating to the control port.""" HELP_OPTIONS = { "HELP": ("/help [OPTION]", HELP_HELP), "WRITE": ("/write [PATH]", HELP_WRITE), + "EVENTS": ("/events [types]", HELP_EVENTS), "INFO": ("/info [relay fingerprint, nickname, or IP address]", HELP_INFO), "FIND": ("/find PATTERN", HELP_FIND), "QUIT": ("/quit", HELP_QUIT), @@ -428,6 +441,21 @@ class ControlInterpretor: self.backlog = [] # prior requests the user has made self.contents = [] # (msg, format list) tuples for what's been displayed self.writePath = DEFAULT_WRITE_PATH # last location we've saved to + self.eventBuffer = [] # unread event messages + self.loggedEvents = [] # event types that we're listening for + + torTools.getConn().addEventListener(TorEventObserver(self.registerEvent)) + + def registerEvent(self, event): + """ + Adds the event to our buffer so it'll be in '/events' output. + """ + + if event.type in self.loggedEvents: + self.eventBuffer.append(event) + + eventsCrop = len(self.eventBuffer) - EVENTS_LIMIT + if eventsCrop > 0: self.eventBuffer = self.eventBuffer[eventsCrop:] def getBacklog(self): """ @@ -573,6 +601,23 @@ class ControlInterpretor: else: outputEntry.append((line + "\n", OUTPUT_FORMAT + (Attr.BOLD, ))) + def doEvents(self, arg, outputEntry): + """ + Performs the '/events' operation, dumping the events that we've received + belonging to the given types. If no types are specified then this provides + all buffered events. + """ + + bufferedEvents = self.eventBuffer + + # if we have an argument then restrict it to those event types + eventTypes = arg.upper().split() + if eventTypes: + bufferedEvents = [event for event in self.eventBuffer if event.type in eventTypes] + + for event in bufferedEvents: + outputEntry.append((event.getDisplayMessage() + "\n", OUTPUT_FORMAT)) + def doWrite(self, arg, outputEntry): """ Performs the '/write' operation, which attempts to save the backlog to a @@ -803,6 +848,7 @@ class ControlInterpretor: elif cmd == "/help": self.doHelp(arg, outputEntry) elif cmd == "/write": self.doWrite(arg, outputEntry) elif cmd == "/find": self.doFind(arg, outputEntry) + elif cmd == "/events": self.doEvents(arg, outputEntry) elif cmd == "/info": self.doInfo(arg, outputEntry) else: outputEntry.append(("Not yet implemented...", ERROR_FORMAT)) # TODO: implement @@ -865,6 +911,20 @@ class ControlInterpretor: conn.setOptions(paramList, isReset) except Exception, exc: outputEntry.append((str(exc), ERROR_FORMAT)) + elif cmd == "SETEVENTS": + self.loggedEvents = arg.split() + allEvents = torTools.getConn().setControllerEvents(self.loggedEvents) + setEvents = set(self.loggedEvents).intersection(allEvents) + + if setEvents: + outputEntry.append(("Successfully set event listening to: %s\n" % ", ".join(setEvents), OUTPUT_FORMAT)) + else: + if not self.loggedEvents: + # we purposefully disabled event listening + outputEntry.append(("Disabled event listening\n", OUTPUT_FORMAT)) + else: + # we tried to set events but they all failed + outputEntry.append(("Unable to set any of the events. Event listening disabled.\n", ERROR_FORMAT)) elif cmd.replace("+", "") in ("LOADCONF", "POSTDESCRIPTOR"): # provides a notice that multi-line controller input isn't yet implemented outputEntry.append((MULTILINE_UNIMPLEMENTED_NOTICE + "\n", ERROR_FORMAT))

1 0

[arm/release] fix: using all controller authentication methods
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 8070fd004acde588f4d56d75bf6aa2c3f4d61b77 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 21 09:33:28 2011 -0700 fix: using all controller authentication methods This is a hacked up version of the fix for https://trac.torproject.org/projects/tor/ticket/3958 It's a bit of a Frankenstein and will be removed when the TorCtl fix is merged. --- src/starter.py | 9 ++- src/util/torTools.py | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 186 insertions(+), 4 deletions(-) diff --git a/src/starter.py b/src/starter.py index dd5f5c9..4315f06 100644 --- a/src/starter.py +++ b/src/starter.py @@ -203,15 +203,16 @@ def _torCtlConnect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, i conn = None try: - conn, authType, authValue = TorCtl.TorCtl.preauth_connect(controlAddr, controlPort) + #conn, authType, authValue = TorCtl.TorCtl.preauth_connect(controlAddr, controlPort) + conn, authTypes, authValue = util.torTools.preauth_connect_alt(controlAddr, controlPort) - if authType == TorCtl.TorCtl.AUTH_TYPE.PASSWORD: + if TorCtl.TorCtl.AUTH_TYPE.PASSWORD in authTypes: # password authentication, promting for the password if it wasn't provided if passphrase: authValue = passphrase else: try: authValue = getpass.getpass("Controller password: ") except KeyboardInterrupt: return None - elif authType == TorCtl.TorCtl.AUTH_TYPE.COOKIE and authValue[0] != "/": + elif TorCtl.TorCtl.AUTH_TYPE.COOKIE in authTypes and authValue[0] != "/": # Connecting to the control port will probably fail if it's using cookie # authentication and the cookie path is relative (unfortunately this is # the case for TBB). This is discussed in: @@ -226,7 +227,7 @@ def _torCtlConnect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, i except IOError: pass # appends the path prefix if it's set - if authType == TorCtl.TorCtl.AUTH_TYPE.COOKIE: + if TorCtl.TorCtl.AUTH_TYPE.COOKIE in authTypes: pathPrefix = util.torTools.getConn().getPathPrefix() # The os.path.join function is kinda stupid. If given an absolute path diff --git a/src/util/torTools.py b/src/util/torTools.py index 8c7a1ed..e59b35e 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -359,6 +359,187 @@ def isTorRunning(): return False +# ============================================================ +# TODO: Remove when TorCtl can handle multiple auth methods +# https://trac.torproject.org/projects/tor/ticket/3958 +# +# The following is a hacked up version of the fix in that ticket. +# ============================================================ + +class FixedConnection(TorCtl.Connection): + def __init__(self, sock): + TorCtl.Connection.__init__(self, sock) + self._authTypes = [] + + def get_auth_types(self): + """ + Provides the list of authentication types used for the control port. Each + are members of the AUTH_TYPE enumeration and return results will always + have at least one result. This raises an IOError if the query to + PROTOCOLINFO fails. + """ + + if not self._authTypes: + # check PROTOCOLINFO for authentication type + try: + authInfo = self.sendAndRecv("PROTOCOLINFO\r\n")[1][1] + except Exception, exc: + if exc.message: excMsg = ": %s" % exc + else: excMsg = "" + raise IOError("Unable to query PROTOCOLINFO for the authentication type%s" % excMsg) + + # parses the METHODS and COOKIEFILE entries for details we need to + # authenticate + + authTypes, cookiePath = [], None + + for entry in authInfo.split(): + if entry.startswith("METHODS="): + # Comma separated list of our authentication types. If we have + # multiple then any of them will work. + + methodsEntry = entry[8:] + + for authEntry in methodsEntry.split(","): + if authEntry == "NULL": + authTypes.append(TorCtl.AUTH_TYPE.NONE) + elif authEntry == "HASHEDPASSWORD": + authTypes.append(TorCtl.AUTH_TYPE.PASSWORD) + elif authEntry == "COOKIE": + authTypes.append(TorCtl.AUTH_TYPE.COOKIE) + else: + # not of a recognized authentication type (new addition to the + # control-spec?) + + raise IOError("Unrecognized authentication type: %s" % authEntry) + elif entry.startswith("COOKIEFILE=\"") and entry.endswith("\""): + # Quoted path of the authentication cookie. This only exists if we're + # using cookie auth and, of course, doesn't account for chroot. + + cookiePath = entry[12:-1] + + # There should always be a AUTH METHODS entry. If we didn't then throw a + # wobbly. + + if not authTypes: + raise IOError("PROTOCOLINFO response didn't include any authentication methods") + + self._authType = authTypes[0] + self._authTypes = authTypes + self._cookiePath = cookiePath + + return list(self._authTypes) + + def authenticate(self, secret=""): + """ + Authenticates to the control port. If an issue arises this raises either of + the following: + - IOError for failures in reading an authentication cookie or querying + PROTOCOLINFO. + - TorCtl.ErrorReply for authentication failures or if the secret is + undefined when using password authentication + """ + + # fetches authentication type and cookie path if still unloaded + if not self._authTypes: self.get_auth_types() + + # validates input + if TorCtl.AUTH_TYPE.PASSWORD in self._authTypes and secret == "": + raise TorCtl.ErrorReply("Unable to authenticate: no passphrase provided") + + # tries each of our authentication methods, throwing the last exception if + # they all fail + + raisedExc = None + for authMethod in self._authTypes: + authCookie = None + try: + if authMethod == TorCtl.AUTH_TYPE.NONE: + self.authenticate_password("") + elif authMethod == TorCtl.AUTH_TYPE.PASSWORD: + self.authenticate_password(secret) + else: + authCookie = open(self._cookiePath, "r") + self.authenticate_cookie(authCookie) + authCookie.close() + + # Did the above raise an exception? No? Cool, we're done. + return + except TorCtl.ErrorReply, exc: + if authCookie: authCookie.close() + issue = str(exc) + + # simplifies message if the wrong credentials were provided (common + # mistake) + if issue.startswith("515 Authentication failed: "): + if issue[27:].startswith("Password did not match"): + issue = "password incorrect" + elif issue[27:] == "Wrong length on authentication cookie.": + issue = "cookie value incorrect" + + raisedExc = TorCtl.ErrorReply("Unable to authenticate: %s" % issue) + except IOError, exc: + if authCookie: authCookie.close() + issue = None + + # cleaner message for common errors + if str(exc).startswith("[Errno 13] Permission denied"): + issue = "permission denied" + elif str(exc).startswith("[Errno 2] No such file or directory"): + issue = "file doesn't exist" + + # if problem's recognized give concise message, otherwise print exception + # string + if issue: raisedExc = IOError("Failed to read authentication cookie (%s): %s" % (issue, self._cookiePath)) + else: raisedExc = IOError("Failed to read authentication cookie: %s" % exc) + + # if we got to this point then we failed to authenticate and should have a + # raisedExc + + if raisedExc: raise raisedExc + +def preauth_connect_alt(controlAddr="127.0.0.1", controlPort=9051, + ConnClass=FixedConnection): + """ + Provides an uninitiated torctl connection components for the control port, + returning a tuple of the form... + (torctl connection, authTypes, authValue) + + The authValue corresponds to the cookie path if using an authentication + cookie, otherwise this is the empty string. This raises an IOError in case + of failure. + + Arguments: + controlAddr - ip address belonging to the controller + controlPort - port belonging to the controller + ConnClass - connection type to instantiate + """ + + conn = None + try: + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.connect((controlAddr, controlPort)) + conn = ConnClass(s) + authTypes, authValue = conn.get_auth_types(), "" + + if TorCtl.AUTH_TYPE.COOKIE in authTypes: + authValue = conn.get_auth_cookie_path() + + return (conn, authTypes, authValue) + except socket.error, exc: + if conn: conn.close() + + if "Connection refused" in exc.args: + # most common case - tor control port isn't available + raise IOError("Connection refused. Is the ControlPort enabled?") + + raise IOError("Failed to establish socket: %s" % exc) + except Exception, exc: + if conn: conn.close() + raise IOError(exc) + +# ============================================================ + def getConn(): """ Singleton constructor for a Controller. Be aware that this starts as being

1 0

[arm/release] fix: concurrency issue could crash from CIRC event
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit e884fcbd894c9e764c60e6b40c5bd3e14583352e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 13:03:20 2011 -0700 fix: concurrency issue could crash from CIRC event If we got a CIRC event while populating the cache of relays that we're attached to we could reset _fingerprintsAttachedCache to None while we were in the middle of populating it. Manipulation of this cache is supposed to be governed by the connection lock, so fixing that for the CIRC event's reset. --- src/util/torTools.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index e59b35e..3d18fcb 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -2004,7 +2004,9 @@ class Controller(TorCtl.PostEventListener): # CIRC events aren't required, but if one's received then flush this cache # since it uses circuit-status results. + self.connLock.acquire() self._fingerprintsAttachedCache = None + self.connLock.release() self._cachedParam["circuits"] = None @@ -2085,6 +2087,10 @@ class Controller(TorCtl.PostEventListener): relayPort - orport of relay (to further narrow the results) """ + # Events can reset _fingerprintsAttachedCache to None, so all uses of this + # function need to be under the connection lock (skipping that might also + # scew with the conn usage of this function...) + # If we were provided with a string port then convert to an int (so # lookups won't mismatch based on type). if isinstance(relayPort, str): relayPort = int(relayPort)

1 0