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

[arm/release] Minor fixes spotted while prepping for release
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit d84dc4dba0c3143337ba6ebbf50f75df33ae6e15 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 17:53:25 2011 -0700 Minor fixes spotted while prepping for release --- README | 1 + src/cli/interpretorPanel.py | 2 +- src/util/__init__.py | 2 +- src/util/torTools.py | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index cbaf2f7..87a6141 100644 --- a/README +++ b/README @@ -208,6 +208,7 @@ Layout: sysTools.py - helper for system calls, providing client side caching textInput.py - expands the capabilities of text input fields torConfig.py - functions for working with the torrc and config options + torInterpretor.py - provides a shell around raw control port access torTools.py - TorCtl wrapper, providing caching and derived information uiTools.py - helper functions for presenting the user interface diff --git a/src/cli/interpretorPanel.py b/src/cli/interpretorPanel.py index 283c371..37b9e58 100644 --- a/src/cli/interpretorPanel.py +++ b/src/cli/interpretorPanel.py @@ -77,7 +77,7 @@ class InterpretorPanel(panel.Panel): isDone = True else: try: - inputEntry, outputEntry = self.interpretor.handleQuery(input) + self.interpretor.handleQuery(input) except torInterpretor.InterpretorClosed: # Makes our control connection check if its been closed or not torTools.getConn().isAlive() diff --git a/src/util/__init__.py b/src/util/__init__.py index 973527e..2b8f928 100644 --- a/src/util/__init__.py +++ b/src/util/__init__.py @@ -4,5 +4,5 @@ application's status, making cross platform system calls, parsing tor data, and safely working with curses (hiding some of the gory details). """ -__all__ = ["conf", "connections", "enum", "gtkTools", "hostnames", "log", "panel", "procTools", "procName", "sysTools", "textInput", "torConfig", "torTools", "uiTools"] +__all__ = ["conf", "connections", "enum", "gtkTools", "hostnames", "log", "panel", "procTools", "procName", "sysTools", "textInput", "torConfig", "torInterpretor", "torTools", "uiTools"] diff --git a/src/util/torTools.py b/src/util/torTools.py index 9f06a61..8e2d6d5 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -123,7 +123,6 @@ def connect_socket(socketPath="/var/run/tor/control", ConnClass=TorCtl.Connectio ConnClass - connection type to instantiate """ - import socket try: s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) s.connect(socketPath)

1 0

[arm/release] fix: fetching relay address could ignored default
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 0b9d52bc7c33aa722cca219882832bc4d2ed44a6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 16:43:47 2011 -0700 fix: fetching relay address could ignored default The getRelayAddress function would ignore its default argument if tor is shut down, causing it to return None and make arm crash. This is probably a timing issue which is why it went undiscovered so long. --- 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 3d18fcb..9f06a61 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1546,7 +1546,7 @@ class Controller(TorCtl.PostEventListener): self.connLock.acquire() - result = None + result = default if self.isAlive(): # query the address if it isn't yet cached if not relayFingerprint in self._addressLookupCache:

1 0

[arm/release] Cautioning users against running tor as root
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit b1a5794c26d02b31a32762a4ef357878f4742fb7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 16:14:22 2011 -0700 Cautioning users against running tor as root Notice level message at startup that cautions the user against running tor as root. --- src/starter.py | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/starter.py b/src/starter.py index 2347f7b..6ed516e 100644 --- a/src/starter.py +++ b/src/starter.py @@ -99,6 +99,9 @@ STANDARD_CFG_NOT_FOUND_MSG = "No armrc loaded, using defaults. You can customize # torrc entries that are scrubbed when dumping PRIVATE_TORRC_ENTRIES = ["HashedControlPassword", "Bridge", "HiddenServiceDir"] +# notices given if the user is running arm or tor as root +TOR_ROOT_NOTICE = "Tor is currently running with root permissions. This is not a good idea and shouldn't be necessary. See the 'User UID' option from Tor's man page for an easy method of reducing its permissions after startup." + def allowConnectionTypes(): """ This provides a tuple with booleans indicating if we should or shouldn't @@ -489,7 +492,14 @@ if __name__ == '__main__': # skewing the startup time results so this isn't counted initTime = time.time() - startTime controller = util.torTools.getConn() - if conn: controller.init(conn) + + if conn: + controller.init(conn) + + # give a notice if tor is running with root + if controller.getMyUser() == "root": + util.log.log(util.log.NOTICE, TOR_ROOT_NOTICE) + # fetches descriptions for tor's configuration options _loadConfigurationDescriptions(pathPrefix)

1 0

[arm/release] Cautioning users against running arm as root
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit e0248705018a57c55d7c99295a66857b617a06f1 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 16:56:26 2011 -0700 Cautioning users against running arm as root Notice level message at startup that cautions the user against running arm as root. --- src/starter.py | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/starter.py b/src/starter.py index 6ed516e..b184330 100644 --- a/src/starter.py +++ b/src/starter.py @@ -101,6 +101,7 @@ PRIVATE_TORRC_ENTRIES = ["HashedControlPassword", "Bridge", "HiddenServiceDir"] # notices given if the user is running arm or tor as root TOR_ROOT_NOTICE = "Tor is currently running with root permissions. This is not a good idea and shouldn't be necessary. See the 'User UID' option from Tor's man page for an easy method of reducing its permissions after startup." +ARM_ROOT_NOTICE = "Arm is currently running with root permissions. This is not a good idea, and will still work perfectly well if it's run with the same user as Tor (ie, starting with \"sudo -u %s arm\")." def allowConnectionTypes(): """ @@ -493,13 +494,23 @@ if __name__ == '__main__': initTime = time.time() - startTime controller = util.torTools.getConn() + torUser = None if conn: controller.init(conn) # give a notice if tor is running with root - if controller.getMyUser() == "root": + torUser = controller.getMyUser() + if torUser == "root": util.log.log(util.log.NOTICE, TOR_ROOT_NOTICE) - + + # Give a notice if arm is running with root. Querying connections usually + # requires us to have the same permissions as tor so if tor is running as + # root then drop this notice (they're already then being warned about tor + # being root, anyway). + + if torUser != "root" and os.getuid() == 0: + torUserLabel = torUser if torUser else "<tor user>" + util.log.log(util.log.NOTICE, ARM_ROOT_NOTICE % torUserLabel) # fetches descriptions for tor's configuration options _loadConfigurationDescriptions(pathPrefix)

1 0

[arm/release] Arm release 1.4.4
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 881c67adcfb60bac79feeafd7d2a0ae6fd40408d Merge: 6cf4836 902455c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 25 14:34:04 2011 -0700 Arm release 1.4.4 ChangeLog | 40 ++- README | 14 +- armrc.sample | 13 +- src/cli/__init__.py | 2 +- src/cli/configPanel.py | 10 +- src/cli/connections/__init__.py | 2 +- src/cli/connections/circEntry.py | 54 +-- src/cli/connections/connEntry.py | 61 +- src/cli/connections/connPanel.py | 103 +++- src/cli/connections/countPopup.py | 100 +++ src/cli/connections/descriptorPopup.py | 229 +++++++ src/cli/connections/entries.py | 13 +- src/cli/controller.py | 100 ++-- src/cli/descriptorPopup.py | 216 ------- src/cli/graphing/bandwidthStats.py | 13 +- src/cli/graphing/graphPanel.py | 2 +- src/cli/headerPanel.py | 88 ++- src/cli/interpretorPanel.py | 136 ++++ src/cli/logPanel.py | 27 +- src/cli/menu/item.py | 2 +- src/cli/menu/menu.py | 2 +- src/cli/wizard.py | 150 ++++- src/gui/arm.xml | 169 ++++-- src/gui/configPanel.py | 161 +++++ src/gui/connections/circEntry.py | 37 +- src/gui/connections/connEntry.py | 48 +- src/gui/connections/connPanel.py | 134 ++--- src/gui/controller.py | 32 +- src/gui/generalPanel.py | 25 +- src/gui/graphing/__init__.py | 2 +- src/gui/graphing/bandwidthStats.py | 12 +- src/gui/graphing/graphPanel.py | 144 +++++ src/gui/graphing/graphStats.py | 142 ----- src/gui/logPanel.py | 26 +- src/resources/arm.1 | 2 +- src/resources/torrcOverride/override.c | 50 ++ src/resources/torrcOverride/override.h | 1 + src/resources/torrcOverride/override.py | 363 +++++++++++ src/resources/torrcTemplate.txt | 2 +- src/settings.cfg | 6 + src/starter.py | 164 ++++- src/util/__init__.py | 2 +- src/util/connections.py | 4 +- src/util/gtkTools.py | 405 ++++++++++++ src/util/panel.py | 70 +-- src/util/textInput.py | 195 ++++++ src/util/torConfig.py | 40 +- src/util/torInterpretor.py | 1058 +++++++++++++++++++++++++++++++ src/util/torTools.py | 534 +++++++++++++++- src/util/uiTools.py | 67 -- src/version.py | 4 +- 51 files changed, 4302 insertions(+), 974 deletions(-) diff --cc src/version.py index 1653b22,a1c26cf..f50af80 --- a/src/version.py +++ b/src/version.py @@@ -2,6 -2,6 +2,6 @@@ Provides arm's version and release date. """ - VERSION = '1.4.3' - LAST_MODIFIED = "July 16, 2011" -VERSION = '1.4.4_dev' -LAST_MODIFIED = "July 17, 2011" ++VERSION = '1.4.4' ++LAST_MODIFIED = "September 25, 2011"

1 0

[arm/release] 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] Interpretor help for RESETCONF
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 1e638c14399a90234534499475d3848d5b7d9573 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 18 20:36:55 2011 -0700 Interpretor help for RESETCONF Similiar to GETCONF - basic usage and examples. --- src/util/torInterpretor.py | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 963a465..ff02a8b 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -107,13 +107,23 @@ HELP_GETCONF = """Provides the current value for a given configuration value. Op HELP_SETCONF = """Sets the given configuration parameters. Values can be quoted or non-quoted strings, and reverts the option to 0 or NULL if not provided. -Example: +Examples: * Sets a contact address and resets our family to NULL SETCONF MyFamily ContactInfo=foo(a)bar.com * Sets an exit policy that only includes port 80/443 SETCONF ExitPolicy=\"accept *:80, accept *:443, reject *:*\"""" +HELP_RESETCONF = """Reverts the given configuration options to their default values. If a value +is provided then this behaves in the same way as SETCONF. + +Examples: + * Returns both of our accounting parameters to their defaults + RESETCONF AccountingMax AccountingStart + + * Uses the default exit policy and sets our nickname to be 'Goomba' + RESETCONF ExitPolicy Nickname=Goomba""" + HELP_OPTIONS = { "HELP": ("/help [OPTION]", HELP_HELP), "WRITE": ("/write [PATH]", HELP_WRITE), @@ -122,7 +132,8 @@ HELP_OPTIONS = { "QUIT": ("/quit", HELP_QUIT), "GETINFO": ("GETINFO OPTION", HELP_GETINFO), "GETCONF": ("GETCONF OPTION", HELP_GETCONF), - "SETCONF": ("SETCONF PARAM[=VALUE]", HELP_SETCONF) + "SETCONF": ("SETCONF PARAM[=VALUE]", HELP_SETCONF), + "RESETCONF": ("RESETCONF PARAM[=VALUE]", HELP_RESETCONF), } class InterpretorClosed(Exception):

1 0

[arm/release] Allowing for multiple GETINFO arguments
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 2add4d9eb8fc53166a0d62a3881620ea1dcc22cd Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 18 20:20:45 2011 -0700 Allowing for multiple GETINFO arguments The control spec allows for multiple GETINFO arguments so respecting this, though including a newline between results so it's actually readable (yea, it's not what the control-spec says but I'm just a crazy rebel like that). --- src/util/torInterpretor.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index f0d0639..963a465 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -658,8 +658,9 @@ class ControlInterpretor: if cmd == "GETINFO": try: - response = conn.getInfo(arg, suppressExc = False) - outputEntry.append((response, OUTPUT_FORMAT)) + for param in arg.split(): + response = conn.getInfo(param, suppressExc = False) + outputEntry.append((response + "\n", OUTPUT_FORMAT)) except Exception, exc: outputEntry.append((str(exc), ERROR_FORMAT)) elif cmd == "SETCONF" or cmd == "RESETCONF":

1 0

[arm/release] Interpretor help for the SIGNAL command
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 2035fdf636b0dcaab3f261d9cde7aee8e9724ed2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 18 20:59:46 2011 -0700 Interpretor help for the SIGNAL command General usage information and descriptions for all of the signals. --- src/util/torInterpretor.py | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index ff02a8b..c2579ae 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -124,6 +124,20 @@ Examples: * Uses the default exit policy and sets our nickname to be 'Goomba' RESETCONF ExitPolicy Nickname=Goomba""" +HELP_SIGNAL = """Issues a signal that tells the tor process to reload its torrc, dump its +stats, halt, etc. +""" + +SIGNAL_DESCRIPTIONS = ( + ("RELOAD / HUP", "reload our torrc"), + ("SHUTDOWN / INT", "gracefully shut down, waiting 30 seconds if we're a relay"), + ("DUMP / USR1", "logs information about open connections and circuits"), + ("DEBUG / USR2", "makes us log at the DEBUG runlevel"), + ("HALT / TERM", "immediately shut down"), + ("CLEARDNSCACHE", "clears any cached DNS results"), + ("NEWNYM", "clears the DNS cache and uses new circuits for future connections") +) + HELP_OPTIONS = { "HELP": ("/help [OPTION]", HELP_HELP), "WRITE": ("/write [PATH]", HELP_WRITE), @@ -134,6 +148,7 @@ HELP_OPTIONS = { "GETCONF": ("GETCONF OPTION", HELP_GETCONF), "SETCONF": ("SETCONF PARAM[=VALUE]", HELP_SETCONF), "RESETCONF": ("RESETCONF PARAM[=VALUE]", HELP_RESETCONF), + "SIGNAL": ("SIGNAL SIG", HELP_SIGNAL), } class InterpretorClosed(Exception): @@ -387,6 +402,11 @@ class ControlInterpretor: outputEntry.append((lineContent + "\n", OUTPUT_FORMAT)) outputEntry.append(("For more information use '/help [CONFIG OPTION]'.", OUTPUT_FORMAT + (Attr.BOLD, ))) + elif arg == "SIGNAL": + # lists descriptions for all of the signals + for signal, description in SIGNAL_DESCRIPTIONS: + outputEntry.append(("%-15s" % signal, OUTPUT_FORMAT + (Attr.BOLD, ))) + outputEntry.append((" - %s\n" % description, OUTPUT_FORMAT)) else: # check if this is a configuration option manEntry = torConfig.getConfigDescription(arg)

1 0

[arm/release] Interpretor help for MAPADDRESS
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit c3b70bef3e9f85b733d7087963374b58f73b9240 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 19 07:28:47 2011 -0700 Interpretor help for MAPADDRESS Basic description and the example from the control spec. --- src/util/torInterpretor.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 3726517..658b65e 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -166,6 +166,11 @@ Example: ExitPolicy reject *:* .""" +HELP_MAPADDRESS = """Replaces future requests for one address with another. + +Example: + MAPADDRESS 0.0.0.0=torproject.org 1.2.3.4=tor.freehaven.net""" + HELP_OPTIONS = { "HELP": ("/help [OPTION]", HELP_HELP), "WRITE": ("/write [PATH]", HELP_WRITE), @@ -181,6 +186,7 @@ HELP_OPTIONS = { "USEFEATURE": ("USEFEATURE OPTION", HELP_USEFEATURE), "SAVECONF": ("SAVECONF", HELP_SAVECONF), "LOADCONF": ("LOADCONF", HELP_LOADCONF), + "MAPADDRESS": ("MAPADDRESS SOURCE_ADDR=DESTINATION_ADDR", HELP_MAPADDRESS), } class InterpretorClosed(Exception):

1 0