- tor-commits - lists.torproject.org

[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

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

25 Sep '11

commit 6bd40f61ae5e8155be787514da80668505f56e78 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 18 21:15:09 2011 -0700 Interpretor help for SETEVENTS Basic usage information and lists the event types recognized by tor. Note that this option still isn't implemented (issuing a SETEVENTS will likely screw up caching and there's currently no option for seeing the events). --- src/util/torInterpretor.py | 36 +++++++++++++++++++++++++++++++----- 1 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index c2579ae..7e96d3c 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -59,7 +59,7 @@ Tor commands include: GETINFO - queries information from tor GETCONF, SETCONF, RESETCONF - show or edit a configuration option SIGNAL - issues control signal to the process (for resetting, stopping, etc) - SETEVENT - configures the events tor will notify us of + SETEVENTS - configures the events tor will notify us of USEFEATURE - enables custom behavior for the controller SAVECONF - writes tor's current configuration to our torrc @@ -138,6 +138,16 @@ SIGNAL_DESCRIPTIONS = ( ("NEWNYM", "clears the DNS cache and uses new circuits for future connections") ) +HELP_SETEVENTS = """Sets the events that we will receive. This turns off any events that aren't +listed so sending 'SETEVENTS' without any values will turn off all event reporting. + +For Tor versions between 0.1.1.9 and 0.2.2.1 adding 'EXTENDED' causes some +events to give us additional information. After version 0.2.2.1 this is +always on. + +Events include... +""" + HELP_OPTIONS = { "HELP": ("/help [OPTION]", HELP_HELP), "WRITE": ("/write [PATH]", HELP_WRITE), @@ -149,6 +159,7 @@ HELP_OPTIONS = { "SETCONF": ("SETCONF PARAM[=VALUE]", HELP_SETCONF), "RESETCONF": ("RESETCONF PARAM[=VALUE]", HELP_RESETCONF), "SIGNAL": ("SIGNAL SIG", HELP_SIGNAL), + "SETEVENTS": ("SETEVENTS [EXTENDED] [EVENTS]", HELP_SETEVENTS), } class InterpretorClosed(Exception): @@ -233,11 +244,11 @@ class TorControlCompleter: self.commands.append("SETCONF ") self.commands.append("RESETCONF ") - # adds all of the valid SETEVENT options + # adds all of the valid SETEVENTS options eventOptions = conn.getInfo("events/names") if eventOptions: - self.commands += ["SETEVENT %s" % event for event in eventOptions.split(" ")] - else: self.commands.append("SETEVENT ") + self.commands += ["SETEVENTS %s" % event for event in eventOptions.split(" ")] + else: self.commands.append("SETEVENTS ") # adds all of the valid USEFEATURE options featureOptions = conn.getInfo("features/names") @@ -391,7 +402,7 @@ class ControlInterpretor: if confOptions: confEntries = [opt.split(" ", 1)[0] for opt in confOptions.split("\n")] - # displays four columns of 30 characters + # displays two columns of 42 characters for i in range(0, len(confEntries), 2): lineEntries = confEntries[i : i+2] @@ -407,6 +418,21 @@ class ControlInterpretor: for signal, description in SIGNAL_DESCRIPTIONS: outputEntry.append(("%-15s" % signal, OUTPUT_FORMAT + (Attr.BOLD, ))) outputEntry.append((" - %s\n" % description, OUTPUT_FORMAT)) + elif arg == "SETEVENTS": + # lists all of the event types + eventOptions = torTools.getConn().getInfo("events/names") + if eventOptions: + eventEntries = eventOptions.split() + + # displays four columns of 20 characters + for i in range(0, len(eventEntries), 4): + lineEntries = eventEntries[i : i+4] + + lineContent = "" + for entry in lineEntries: + lineContent += "%-20s" % entry + + outputEntry.append((lineContent + "\n", OUTPUT_FORMAT)) else: # check if this is a configuration option manEntry = torConfig.getConfigDescription(arg)

1 0

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

25 Sep '11

commit cf42e1c26689c569e93c4ebd41f33f95d4268de7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 18 21:30:59 2011 -0700 Interpretor help for USEFEATURE This gives basic usage information and lists the options --- src/util/torInterpretor.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 74559ba..d9f3e69 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -149,6 +149,9 @@ always on. Events include... """ +HELP_USEFEATURE = """Customizes the behavior of the control port. Options include... +""" + HELP_OPTIONS = { "HELP": ("/help [OPTION]", HELP_HELP), "WRITE": ("/write [PATH]", HELP_WRITE), @@ -161,6 +164,7 @@ HELP_OPTIONS = { "RESETCONF": ("RESETCONF PARAM[=VALUE]", HELP_RESETCONF), "SIGNAL": ("SIGNAL SIG", HELP_SIGNAL), "SETEVENTS": ("SETEVENTS [EXTENDED] [EVENTS]", HELP_SETEVENTS), + "USEFEATURE": ("USEFEATURE OPTION", HELP_USEFEATURE), } class InterpretorClosed(Exception): @@ -434,6 +438,11 @@ class ControlInterpretor: lineContent += "%-20s" % entry outputEntry.append((lineContent + "\n", OUTPUT_FORMAT)) + elif arg == "USEFEATURE": + # lists the feature options + featureOptions = torTools.getConn().getInfo("features/names") + if featureOptions: + outputEntry.append((featureOptions + "\n", OUTPUT_FORMAT)) else: # check if this is a configuration option manEntry = torConfig.getConfigDescription(arg)

1 0

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

25 Sep '11

commit 58f79b5354580a956a489dd3254ef76705c23249 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 18 21:39:53 2011 -0700 Interpretor help for LOADCONF Provides basic usage information and an example. Multi-line controller input is not yet implemented (and probably won't be for the next release) so giving a warning. --- src/util/torInterpretor.py | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index d9f3e69..825e502 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -49,6 +49,8 @@ RESET = CSI % "0" BACKLOG_LIMIT = 100 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 @@ -152,6 +154,18 @@ Events include... HELP_USEFEATURE = """Customizes the behavior of the control port. Options include... """ +HELP_SAVECONF = """Writes Tor's current configuration to its torrc.""" + +HELP_LOADCONF = """Reads the given text like it belonged to our torrc. + +Example: + +LOADCONF + # sets our exit policy to just accept ports 80 and 443 + ExitPolicy accept *:80 + ExitPolicy accept *:443 + ExitPolicy reject *:* + .""" + HELP_OPTIONS = { "HELP": ("/help [OPTION]", HELP_HELP), "WRITE": ("/write [PATH]", HELP_WRITE), @@ -165,6 +179,8 @@ HELP_OPTIONS = { "SIGNAL": ("SIGNAL SIG", HELP_SIGNAL), "SETEVENTS": ("SETEVENTS [EXTENDED] [EVENTS]", HELP_SETEVENTS), "USEFEATURE": ("USEFEATURE OPTION", HELP_USEFEATURE), + "SAVECONF": ("SAVECONF", HELP_SAVECONF), + "LOADCONF": ("LOADCONF", HELP_LOADCONF), } class InterpretorClosed(Exception): @@ -443,6 +459,9 @@ class ControlInterpretor: featureOptions = torTools.getConn().getInfo("features/names") if featureOptions: outputEntry.append((featureOptions + "\n", OUTPUT_FORMAT)) + elif arg in ("LOADCONF"): + # gives a warning that this option isn't yet implemented + outputEntry.append(("\n" + MULTILINE_UNIMPLEMENTED_NOTICE + "\n", ERROR_FORMAT)) else: # check if this is a configuration option manEntry = torConfig.getConfigDescription(arg)

1 0

[arm/release] Notice that multi-line input isn't implemented
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 0b68c433fd1b58bc628eb53234a656845ff18a57 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 18 21:43:21 2011 -0700 Notice that multi-line input isn't implemented A couple controller options (LOADCONF and POSTDESCRIPTOR) use multi-line controller input. However, this isn't yet implemented and probably won't be for the next release (those controller options really aren't very useful for the interpretor). --- src/util/torInterpretor.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 825e502..3726517 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -787,6 +787,9 @@ class ControlInterpretor: conn.setOptions(paramList, isReset) except Exception, exc: outputEntry.append((str(exc), 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)) else: try: response = conn.getTorCtl().sendAndRecv("%s\r\n" % input)

1 0