- tor-commits - lists.torproject.org

[arm/release] Restricting OpenBSD to lsof connection resolution
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit b9446bdbb6df24fb0f042852a42e4d548c993263 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Oct 11 09:10:40 2011 -0700 Restricting OpenBSD to lsof connection resolution Linux resolvers naturally fail on OpenBSD. I'm not sure if the bsd variants of procstat/sockstat are installable (they're definitely not around by default) so falling back ot only lsof like macs. Thanks to a test system from Jordi Espasa Clofent. --- src/util/connections.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/connections.py b/src/util/connections.py index 9350cb8..250b113 100644 --- a/src/util/connections.py +++ b/src/util/connections.py @@ -337,7 +337,7 @@ def getSystemResolvers(osType = None): if osType == "FreeBSD": resolvers = [Resolver.BSD_SOCKSTAT, Resolver.BSD_PROCSTAT, Resolver.LSOF] - elif osType == "Darwin": + elif osType in ("OpenBSD", "Darwin"): resolvers = [Resolver.LSOF] else: resolvers = [Resolver.NETSTAT, Resolver.SOCKSTAT, Resolver.LSOF, Resolver.SS]

1 0

[arm/release] fix: grammatical error with torrc mismatch message
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit 38af67c1dbe9e06d0375811b0df1afaa0bffd4a7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 15 13:43:43 2011 -0700 fix: grammatical error with torrc mismatch message Caught by Sebastian: https://trac.torproject.org/projects/tor/ticket/4237 --- src/util/torConfig.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/torConfig.py b/src/util/torConfig.py index 1d54196..51bb656 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -832,7 +832,7 @@ class Torrc(): log.log(CONFIG["log.torrc.validation.unnecessaryTorrcEntries"], msg) if mismatchLines or missingOptions: - msg = "The torrc differ from what tor's using. You can issue a sighup to reload the torrc values by pressing x." + msg = "The torrc differs from what tor's using. You can issue a sighup to reload the torrc values by pressing x." if mismatchLines: if len(mismatchLines) > 1:

1 0

[arm/release] Skip validation warnings for DirReqStatistics
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit 1f347f33b2e6e2c5f18cb0658b4c5f77e870a280 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 15 16:18:17 2011 -0700 Skip validation warnings for DirReqStatistics In new tor versions the DirReqStatistics is enabled by default and disabled when geoip lookups are unavailable. This casuses arm to warn that the torrc differs from tor's state. Discarding this validation warning instead. Tested by checking that validation didn't complain when I SETCONF this option. Caught by Sebastian. https://trac.torproject.org/projects/tor/ticket/4237 --- src/util/torConfig.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/util/torConfig.py b/src/util/torConfig.py index 51bb656..477ad9e 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -580,6 +580,14 @@ def validate(contents = None): # checks if any custom options are missing from the torrc for option in customOptions: + # In new versions the 'DirReqStatistics' option is true by default and + # disabled on startup if geoip lookups are unavailable. If this option is + # missing then that's most likely the reason. + # + # https://trac.torproject.org/projects/tor/ticket/4237 + + if option == "DirReqStatistics": continue + if not option in seenOptions: issuesFound.append((None, ValidationError.MISSING, option))

1 0

[arm/release] Monkey patch for ACS disabling
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit bd94f0f5ef5490a48828aebfd4c11e39111daaa9 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 30 10:36:15 2011 -0800 Monkey patch for ACS disabling Making manual ACS disabling transparent to the rest of the interface by monkey patching the ord values of ACS entries to '+', '-', or '|'. This has the advantage that the rest of the arm interface doesn't need to be aware of this complication, however it doesn't address the builtin box() function usage, which still makes most dialogs render incorrectly. --- src/util/panel.py | 25 +++++-------------------- src/util/uiTools.py | 27 ++++++++++++++++++--------- 2 files changed, 23 insertions(+), 29 deletions(-) diff --git a/src/util/panel.py b/src/util/panel.py index c0c13d8..50ae2c0 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -23,8 +23,7 @@ FORMAT_TAGS = {"<b>": (_noOp, curses.A_BOLD), "<h>": (_noOp, curses.A_STANDOUT)} for colorLabel in uiTools.COLOR_LIST: FORMAT_TAGS["<%s>" % colorLabel] = (uiTools.getColor, colorLabel) -CONFIG = {"features.acsSupport": True, - "log.panelRecreated": log.DEBUG} +CONFIG = {"log.panelRecreated": log.DEBUG} # prevents curses redraws if set HALT_ACTIVITY = False @@ -426,11 +425,7 @@ class Panel(): if self.win and self.maxX > x and self.maxY > y: try: drawLength = min(length, self.maxX - x) - - if CONFIG["features.acsSupport"]: - self.win.hline(y, x, curses.ACS_HLINE | attr, drawLength) - else: - self.addstr(y, x, "-" * drawLength, attr) + self.win.hline(y, x, curses.ACS_HLINE | attr, drawLength) except: # in edge cases drawing could cause a _curses.error pass @@ -450,12 +445,7 @@ class Panel(): if self.win and self.maxX > x and self.maxY > y: try: drawLength = min(length, self.maxY - y) - - if CONFIG["features.acsSupport"]: - self.win.vline(y, x, curses.ACS_VLINE | attr, drawLength) - else: - for i in range(drawLength): - self.addch(y + i, x, "|", attr) + self.win.vline(y, x, curses.ACS_VLINE | attr, drawLength) except: # in edge cases drawing could cause a _curses.error pass @@ -696,13 +686,8 @@ class Panel(): # draws box around the scroll bar self.vline(drawTop, drawLeft + 1, drawBottom - 1) - - if CONFIG["features.acsSupport"]: - self.addch(drawBottom, drawLeft + 1, curses.ACS_LRCORNER) - self.addch(drawBottom, drawLeft, curses.ACS_HLINE) - else: - self.addch(drawBottom, drawLeft + 1, "+") - self.addch(drawBottom, drawLeft, "-") + self.addch(drawBottom, drawLeft + 1, curses.ACS_LRCORNER) + self.addch(drawBottom, drawLeft, curses.ACS_HLINE) def _resetSubwindow(self): """ diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 51f5fee..bc1fefe 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -338,15 +338,9 @@ def drawBox(panel, top, left, width, height, attr=curses.A_NORMAL): panel.vline(top + 1, left + width - 1, height - 2, attr) # draws the corners - if CONFIG["features.acsSupport"]: - panel.addch(top, left, curses.ACS_ULCORNER, attr) - panel.addch(top, left + width - 1, curses.ACS_URCORNER, attr) - panel.addch(top + height - 1, left, curses.ACS_LLCORNER, attr) - else: - panel.addch(top, left, "+", attr) - panel.addch(top, left + width - 1, "+", attr) - panel.addch(top + height - 1, left, "+", attr) - panel.addch(top + height - 1, left + width - 1, "+", attr) + panel.addch(top, left, curses.ACS_ULCORNER, attr) + panel.addch(top, left + width - 1, curses.ACS_URCORNER, attr) + panel.addch(top + height - 1, left, curses.ACS_LLCORNER, attr) def isSelectionKey(key): """ @@ -714,6 +708,21 @@ def _initColors(): global COLOR_ATTR_INITIALIZED, COLOR_IS_SUPPORTED if not COLOR_ATTR_INITIALIZED: + # hack to replace all ACS characters with '+' if ACS support has been + # manually disabled + if not CONFIG["features.acsSupport"]: + for item in curses.__dict__: + if item.startswith("ACS_"): + curses.__dict__[item] = ord('+') + + # replace a few common border pipes that are better rendered as '|' or + # '-' instead + + curses.ACS_SBSB = ord('|') + curses.ACS_VLINE = ord('|') + curses.ACS_BSBS = ord('-') + curses.ACS_HLINE = ord('-') + COLOR_ATTR_INITIALIZED = True COLOR_IS_SUPPORTED = False if not CONFIG["features.colorInterface"]: return

1 0

[arm/release] Checking the auth cookie's size before reading
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit b05787fb09764fe49473e82ca787dc6e92d5f0d5 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 26 21:56:03 2011 -0700 Checking the auth cookie's size before reading Adding a check that the authentication cookie is 32 bytes before sending its contents to the control port. This is to prevent a malicious socket from tricking us into reading them arbitrary file content. Tested by hardcoding an alternative file as being the cookie and confirming that this makes arm abort initialization. Caught by rransom. https://trac.torproject.org/projects/tor/ticket/4305 --- src/cli/controller.py | 4 ++++ src/cli/headerPanel.py | 10 ++++++++++ src/starter.py | 13 +++++++++++++ 3 files changed, 27 insertions(+), 0 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index aebc6f3..4bef5ec 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -550,6 +550,10 @@ class TorManager: if authType == TorCtl.AUTH_TYPE.COOKIE: try: + authCookieSize = os.path.getsize(authValue) + if authCookieSize != 32: + raise IOError("authentication cookie '%s' is the wrong size (%i bytes instead of 32)" % (authValue, authCookieSize)) + torctlConn.authenticate(authValue) torTools.getConn().init(torctlConn) except Exception, exc: diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index 2c32af8..bf8dbdb 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -146,6 +146,12 @@ class HeaderPanel(panel.Panel, threading.Thread): cli.popups.showMsg("Unable to reconnect (socket '%s' doesn't exist)" % self._config["startup.interface.socket"], 3) if not torctlConn and allowPortConnection: + # TODO: This has diverged from starter.py's connection, for instance it + # doesn't account for relative cookie paths or multiple authentication + # methods. We can't use the starter.py's connection function directly + # due to password prompts, but we could certainly make this mess more + # manageable. + try: ctlAddr, ctlPort = self._config["startup.interface.ipAddress"], self._config["startup.interface.port"] tmpConn, authType, authValue = TorCtl.TorCtl.preauth_connect(ctlAddr, ctlPort) @@ -153,6 +159,10 @@ class HeaderPanel(panel.Panel, threading.Thread): if authType == TorCtl.TorCtl.AUTH_TYPE.PASSWORD: authValue = cli.popups.inputPrompt("Controller Password: ") if not authValue: raise IOError() # cancel reconnection + elif authType == TorCtl.TorCtl.AUTH_TYPE.COOKIE: + authCookieSize = os.path.getsize(authValue) + if authCookieSize != 32: + raise IOError("authentication cookie '%s' is the wrong size (%i bytes instead of 32)" % (authValue, authCookieSize)) tmpConn.authenticate(authValue) torctlConn = tmpConn diff --git a/src/starter.py b/src/starter.py index 625000c..8deb500 100644 --- a/src/starter.py +++ b/src/starter.py @@ -243,6 +243,19 @@ def _torCtlConnect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, i if pathSuffix.startswith("/"): pathSuffix = pathSuffix[1:] conn._cookiePath = os.path.join(pathPrefix, pathSuffix) + + # Abort if the file isn't 32 bytes long. This is to avoid exposing + # arbitrary file content to the port. + # + # Without this a malicious socket could, for instance, claim that + # '~/.bash_history' or '~/.ssh/id_rsa' was its authentication cookie to + # trick us into reading it for them with our current permissions. + # + # https://trac.torproject.org/projects/tor/ticket/4305 + + authCookieSize = os.path.getsize(conn._cookiePath) + if authCookieSize != 32: + raise IOError("authentication cookie '%s' is the wrong size (%i bytes instead of 32)" % (conn._cookiePath, authCookieSize)) conn.authenticate(authValue) return conn

1 0

[arm/release] Option for disabling ACS support
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit b96f129b9349ccfb53d5eeb9c54b4c063fce3804 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 30 10:13:55 2011 -0800 Option for disabling ACS support Some terminals have issues with alternate character support which is widely used by arm for borders. Unfortunatley this makes the interface look pretty crappy... http://www.atagar.com/arm/images/acs_display_failure.png Explaining the issue in the README and adding an option to manually remedy the most obvious broken bits. ACS is used throughout arm so it's gonna take a much more invasive change to allow the user to completely replace ACS usage (for instance, we can't use the curses box() function...). Thanks to Robert for explaining the issue! --- README | 15 ++++++++++++++- armrc.sample | 4 ++++ src/util/panel.py | 25 ++++++++++++++++++++----- src/util/uiTools.py | 14 ++++++++++---- 4 files changed, 48 insertions(+), 10 deletions(-) diff --git a/README b/README index 87a6141..05f18cb 100644 --- a/README +++ b/README @@ -99,12 +99,25 @@ pid belongs to the open control port. If it's running as a different user (such as being in a chroot jail) then it's probably failing due to permission issues. Arm still runs, just no connection listing or ps stats. -> The bandwidth graph showing up +> The bandwidth graph isn't showing up Some terminals, most notably screen sessions on Gentoo, appear to have a bug where highlighted spaces aren't rendered. A reported workaround is to set: TERM="rxvt-unicode" +> There's borders like 'mwqqqqqqqqj' + +If you're getting something that looks like... +http://www.atagar.com/arm/images/acs_display_failure.png + +then you're encountering a bug between ncurses and your terminal where +alternate character support (ACS) is unavailable. For more information see... +http://invisible-island.net/ncurses/ncurses.faq.html#no_line_drawing + +Unfortunately there doesn't seem to be a way for arm to automatically detect +and correct this. To work around some of the issues set this in your armrc... +features.acsSupport false + > When I press enter in the connection panel to get details some of the information is either missing or outdated. Why is this? diff --git a/armrc.sample b/armrc.sample index 7daba30..7a611c0 100644 --- a/armrc.sample +++ b/armrc.sample @@ -28,6 +28,10 @@ queries.useProc true # Renders the interface with color if set and the terminal supports it features.colorInterface true +# Uses ACS (alternate character support) to display nice borders. This may not +# work on all terminals. +features.acsSupport true + # Replaces all colored content (ie, anything that isn't white) with this # color. Valid options are: # none, red, green, yellow, blue, cyan, magenta, black, white diff --git a/src/util/panel.py b/src/util/panel.py index 50ae2c0..c0c13d8 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -23,7 +23,8 @@ FORMAT_TAGS = {"<b>": (_noOp, curses.A_BOLD), "<h>": (_noOp, curses.A_STANDOUT)} for colorLabel in uiTools.COLOR_LIST: FORMAT_TAGS["<%s>" % colorLabel] = (uiTools.getColor, colorLabel) -CONFIG = {"log.panelRecreated": log.DEBUG} +CONFIG = {"features.acsSupport": True, + "log.panelRecreated": log.DEBUG} # prevents curses redraws if set HALT_ACTIVITY = False @@ -425,7 +426,11 @@ class Panel(): if self.win and self.maxX > x and self.maxY > y: try: drawLength = min(length, self.maxX - x) - self.win.hline(y, x, curses.ACS_HLINE | attr, drawLength) + + if CONFIG["features.acsSupport"]: + self.win.hline(y, x, curses.ACS_HLINE | attr, drawLength) + else: + self.addstr(y, x, "-" * drawLength, attr) except: # in edge cases drawing could cause a _curses.error pass @@ -445,7 +450,12 @@ class Panel(): if self.win and self.maxX > x and self.maxY > y: try: drawLength = min(length, self.maxY - y) - self.win.vline(y, x, curses.ACS_VLINE | attr, drawLength) + + if CONFIG["features.acsSupport"]: + self.win.vline(y, x, curses.ACS_VLINE | attr, drawLength) + else: + for i in range(drawLength): + self.addch(y + i, x, "|", attr) except: # in edge cases drawing could cause a _curses.error pass @@ -686,8 +696,13 @@ class Panel(): # draws box around the scroll bar self.vline(drawTop, drawLeft + 1, drawBottom - 1) - self.addch(drawBottom, drawLeft + 1, curses.ACS_LRCORNER) - self.addch(drawBottom, drawLeft, curses.ACS_HLINE) + + if CONFIG["features.acsSupport"]: + self.addch(drawBottom, drawLeft + 1, curses.ACS_LRCORNER) + self.addch(drawBottom, drawLeft, curses.ACS_HLINE) + else: + self.addch(drawBottom, drawLeft + 1, "+") + self.addch(drawBottom, drawLeft, "-") def _resetSubwindow(self): """ diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 01d2ad1..51f5fee 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -39,6 +39,7 @@ TIME_UNITS = [(86400.0, "d", " day"), (3600.0, "h", " hour"), Ending = enum.Enum("ELLIPSE", "HYPHEN") SCROLL_KEYS = (curses.KEY_UP, curses.KEY_DOWN, curses.KEY_PPAGE, curses.KEY_NPAGE, curses.KEY_HOME, curses.KEY_END) CONFIG = {"features.colorInterface": True, + "features.acsSupport": True, "features.printUnicode": True, "log.cursesColorSupport": log.INFO, "log.configEntryTypeError": log.NOTICE} @@ -337,10 +338,15 @@ def drawBox(panel, top, left, width, height, attr=curses.A_NORMAL): panel.vline(top + 1, left + width - 1, height - 2, attr) # draws the corners - panel.addch(top, left, curses.ACS_ULCORNER, attr) - panel.addch(top, left + width - 1, curses.ACS_URCORNER, attr) - panel.addch(top + height - 1, left, curses.ACS_LLCORNER, attr) - panel.addch(top + height - 1, left + width - 1, curses.ACS_LRCORNER, attr) + if CONFIG["features.acsSupport"]: + panel.addch(top, left, curses.ACS_ULCORNER, attr) + panel.addch(top, left + width - 1, curses.ACS_URCORNER, attr) + panel.addch(top + height - 1, left, curses.ACS_LLCORNER, attr) + else: + panel.addch(top, left, "+", attr) + panel.addch(top, left + width - 1, "+", attr) + panel.addch(top + height - 1, left, "+", attr) + panel.addch(top + height - 1, left + width - 1, "+", attr) def isSelectionKey(key): """

1 0

[arm/release] Fix a help entry on connection panel
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit 1945566a7e57e45bb9f60c050859ac82fdc44d43 Author: Tim Wilde <github(a)krellis.org> Date: Thu Dec 1 01:37:58 2011 +0000 Fix a help entry on connection panel --- src/cli/connections/connPanel.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index 9745176..3a8a07c 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -308,7 +308,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): options.append(("down arrow", "scroll down a line", None)) options.append(("page up", "scroll up a page", None)) options.append(("page down", "scroll down a page", None)) - options.append(("enter", "edit configuration option", None)) + options.append(("enter", "toggle connection details", None)) options.append(("d", "raw consensus descriptor", None)) if self.isClientsAllowed():

1 0

[arm/release] Replacing 'toggle' with 'show'
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit fbf672b17899f185e799b57f24ddfafcb5e89dd5 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Dec 1 07:32:22 2011 -0800 Replacing 'toggle' with 'show' Minor change to the previous fix's wording. --- src/cli/connections/connPanel.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index 3a8a07c..d108252 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -308,7 +308,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): options.append(("down arrow", "scroll down a line", None)) options.append(("page up", "scroll up a page", None)) options.append(("page down", "scroll down a page", None)) - options.append(("enter", "toggle connection details", None)) + options.append(("enter", "show connection details", None)) options.append(("d", "raw consensus descriptor", None)) if self.isClientsAllowed():

1 0

[arm/release] Ignoring default deb Log config option
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit 13b9ffe93748f4af0cd886ba330a256e07de2b2f Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Dec 7 07:36:19 2011 -0800 Ignoring default deb Log config option Tor debs have their default logging configuration changed via a patch, as per... https://trac.torproject.org/projects/tor/ticket/4602 Dropping this option when querying for the custom options the user has set to avoid giving a torrc validation error. This introduces a minor bug because if the user has this exact entry with a non-deb install, or the normal default log entry with a deb install, then arm will report that the entry matches the default. However, that would be a rare situation and this whole thing is a workaround for a tor bug so I'm fine with leaving it alone for now. Fixing that would need some method for checking if the instance we're connecting to was deb installed or not (I'm not sure how we'd do that). Issue was caught on a Tor Cloud image by koolfy --- src/util/torConfig.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/util/torConfig.py b/src/util/torConfig.py index 477ad9e..e26f634 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -395,10 +395,17 @@ def getCustomOptions(includeValue = False): # from Tor's defaults with the exception of its Log and Nickname entries # which, even if undefined, returns "Log notice stdout" as per: # https://trac.torproject.org/projects/tor/ticket/2362 + # + # If this is from the deb then it will be "Log notice file /var/log/tor/log" + # due to special patching applied to it, as per: + # https://trac.torproject.org/projects/tor/ticket/4602 try: configLines.remove("Log notice stdout") except ValueError: pass + try: configLines.remove("Log notice file /var/log/tor/log") + except ValueError: pass + try: configLines.remove("Nickname %s" % socket.gethostname()) except ValueError: pass

1 0

[arm/release] fix: cookie size check prevented multi-auth
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit c4e9bb71f2ce0676e2de7fb40184068bd4f5bc6a Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Dec 7 08:42:10 2011 -0800 fix: cookie size check prevented multi-auth When an exception arose in checking the cookie's size we'd always propegate that to the caller. This was a problem with multi-auth because we'd still have an alternative method of authentication to attempt (via the password). --- src/starter.py | 33 +++++++++++++++++++++++++-------- 1 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/starter.py b/src/starter.py index 8deb500..3d74315 100644 --- a/src/starter.py +++ b/src/starter.py @@ -212,11 +212,19 @@ def _torCtlConnect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, i 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: ") + # + # TODO: When handling multi-auth we should try to authenticate via the + # cookie first, then fall back to prompting the user for their password. + # With the stack of fixes and hacks we have here jerry-rigging that in + # without trying cookie auth twice will be a pita so leaving this alone + # for now. Stem will handle most of this transparently, letting us handle + # this much more elegantly. + + if not passphrase: + try: passphrase = getpass.getpass("Controller password: ") except KeyboardInterrupt: return None - elif TorCtl.TorCtl.AUTH_TYPE.COOKIE in authTypes and authValue[0] != "/": + + if 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: @@ -253,11 +261,20 @@ def _torCtlConnect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, i # # https://trac.torproject.org/projects/tor/ticket/4305 - authCookieSize = os.path.getsize(conn._cookiePath) - if authCookieSize != 32: - raise IOError("authentication cookie '%s' is the wrong size (%i bytes instead of 32)" % (conn._cookiePath, authCookieSize)) + try: + authCookieSize = os.path.getsize(conn._cookiePath) + if authCookieSize != 32: + raise IOError("authentication cookie '%s' is the wrong size (%i bytes instead of 32)" % (conn._cookiePath, authCookieSize)) + except Exception, exc: + # if the above fails then either... + # - raise an exception if cookie auth is the only method we have to + # authenticate + # - suppress the exception and try the other connection methods if we + # have alternatives + if len(authTypes) == 1: raise exc + else: conn._authTypes.remove(TorCtl.TorCtl.AUTH_TYPE.COOKIE) - conn.authenticate(authValue) + conn.authenticate(passphrase) return conn except Exception, exc: if conn: conn.close()

1 0