tor-commits September 2011

tor-commits@lists.torproject.org

19 participants
865 discussions

[arm/master] Better handling for QUIT signals
by atagar＠torproject.org 19 Sep '11

19 Sep '11

commit e937fc31380a7a4a486ce0807dc1293ca8b151b9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 17 16:54:46 2011 -0700 Better handling for QUIT signals The prompt was naively assuming that the control connection was still alive when handling input, and not properly shutting down the control connection in case of '/quit'. --- src/cli/interpretorPanel.py | 5 ++++- src/util/torInterpretor.py | 24 +++++++++++++++++++++--- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/cli/interpretorPanel.py b/src/cli/interpretorPanel.py index cc8b496..283c371 100644 --- a/src/cli/interpretorPanel.py +++ b/src/cli/interpretorPanel.py @@ -5,7 +5,7 @@ information, tab completion, and other usability features. import curses -from util import panel, textInput, torInterpretor, uiTools +from util import panel, textInput, torInterpretor, torTools, uiTools USAGE_INFO = "to use this panel press enter" PROMPT_LINE = [torInterpretor.PROMPT, (USAGE_INFO, torInterpretor.USAGE_FORMAT)] @@ -79,6 +79,9 @@ class InterpretorPanel(panel.Panel): try: inputEntry, outputEntry = self.interpretor.handleQuery(input) except torInterpretor.InterpretorClosed: + # Makes our control connection check if its been closed or not + torTools.getConn().isAlive() + isDone = True if isDone: diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 1cc66bd..6781b83 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -595,6 +595,12 @@ class ControlInterpretor: input - user input to be processed """ + conn = torTools.getConn() + + # abort if the control connection has been severed + if not conn.isAlive(): + raise InterpretorClosed("Control connection has been closed") + input = input.strip() # appends new input, cropping if too long @@ -603,7 +609,6 @@ class ControlInterpretor: if backlogCrop > 0: self.backlog = self.backlog[backlogCrop:] inputEntry, outputEntry = [PROMPT], [] - conn = torTools.getConn() # input falls into three general categories: # - interpretor command which starts with a '/' @@ -684,6 +689,9 @@ class ControlInterpretor: try: response = conn.getTorCtl().sendAndRecv("%s\r\n" % input) + if cmd == "QUIT": + raise InterpretorClosed("Closing the connection") + for entry in response: # Response entries are tuples with the response code, body, and # extra info. For instance: @@ -692,13 +700,17 @@ class ControlInterpretor: if len(entry) == 3: outputEntry.append((entry[1], OUTPUT_FORMAT)) except Exception, exc: - outputEntry.append((str(exc), ERROR_FORMAT)) + if isinstance(exc, InterpretorClosed): + raise exc + else: + outputEntry.append((str(exc), ERROR_FORMAT)) # converts to lists split on newlines inputLines = _splitOnNewlines(inputEntry) outputLines = _splitOnNewlines(outputEntry) # appends new contents, cropping if too long + # TODO: it would be nice if InterpretorClosed exceptions were added to the content too self.contents += inputLines + outputLines cropLines = len(self.contents) - CONTENT_LIMIT if cropLines > 0: self.contents = self.contents[cropLines:] @@ -745,11 +757,17 @@ def prompt(): try: input = raw_input(prompt) _, outputEntry = interpretor.handleQuery(input) - except: + except Exception, exc: + if isinstance(exc, InterpretorClosed) and str(exc): + print format(str(exc), *ERROR_FORMAT) + # moves cursor to the next line and terminates (most commonly # KeyboardInterrupt and EOFErro) print + torTools.NO_SPAWN = True + torTools.getConn().close() + # stop daemons hostnames.stop()

1 0

[arm/master] fix: fixing mishandling of GETCONF/RESETCONF
by atagar＠torproject.org 19 Sep '11

19 Sep '11

commit ba0f67cc882c1d43fe963cded15c4f70b2b9367a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 18 19:43:41 2011 -0700 fix: fixing mishandling of GETCONF/RESETCONF Allowing for non-quoted GETCONF values and RESETCONF values by the interpretor (I wrote the previous handling when I didn't have an internet connection so couldn't consult the specs. --- src/util/torInterpretor.py | 26 +++++++++++++++----------- src/util/torTools.py | 16 +++++++++++----- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 6781b83..2424a29 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -651,8 +651,9 @@ class ControlInterpretor: outputEntry.append((response, OUTPUT_FORMAT)) except Exception, exc: outputEntry.append((str(exc), ERROR_FORMAT)) - elif cmd == "SETCONF": - # arguments can either be '<param>' or '<param>="<value>"' entries + elif cmd == "SETCONF" or cmd == "RESETCONF": + # arguments can either be '<param>', '<param>=<value>', or + # '<param>="<value>"' entries paramList = [] while arg: @@ -662,14 +663,21 @@ class ControlInterpretor: # echos back faithfully rather than being parsed) so leaving this # alone for now. - m = re.match(r'^(\S+)=\"([^"]+)\"', arg) + quotedMatch = re.match(r'^(\S+)=\"([^"]+)\"', arg) + nonquotedMatch = re.match(r'^(\S+)=(\S+)', arg) - if m: + if quotedMatch: # we're dealing with a '<param>="<value>"' entry - param, value = m.groups() + param, value = quotedMatch.groups() paramList.append((param, value)) arg = arg[len(param) + len(value) + 3:].strip() + elif nonquotedMatch: + # we're dealing with a '<param>=<value>' entry + param, value = nonquotedMatch.groups() + + paramList.append((param, value)) + arg = arg[len(param) + len(value) + 1:].strip() else: # starts with just a param param = arg.split()[0] @@ -677,12 +685,8 @@ class ControlInterpretor: arg = arg[len(param):].strip() try: - conn.setOptions(paramList) - except Exception, exc: - outputEntry.append((str(exc), ERROR_FORMAT)) - elif cmd == "RESETCONF": - try: - conn.setOptions([(param, None) for param in arg.split()]) + isReset = cmd == "RESETCONF" + conn.setOptions(paramList, isReset) except Exception, exc: outputEntry.append((str(exc), ERROR_FORMAT)) else: diff --git a/src/util/torTools.py b/src/util/torTools.py index fcd8247..f6d9d86 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -728,8 +728,8 @@ class Controller(TorCtl.PostEventListener): def setOption(self, param, value = None): """ Issues a SETCONF to set the given option/value pair. An exeptions raised - if it fails to be set. If no value is provided then this resets the - configuration option. + if it fails to be set. If no value is provided then this sets the option to + 0 or NULL. Arguments: param - configuration option to be set @@ -739,16 +739,19 @@ class Controller(TorCtl.PostEventListener): self.setOptions(((param, value),)) - def setOptions(self, paramList): + def setOptions(self, paramList, isReset = False): """ Issues a SETCONF to replace a set of configuration options. This takes a list of parameter/new value tuple pairs. Values can be... - a string to set a single value - a list of strings to set a series of values (for instance the ExitPolicy) - - None to reset the parameter + - None to set the value to 0 or NULL Arguments: paramList - list of parameter/value tuple pairs + isReset - issues a RESETCONF instead of SETCONF, causing any None + mappings to revert the parameter to its default rather than + set it to 0 or NULL """ self.connLock.acquire() @@ -769,7 +772,10 @@ class Controller(TorCtl.PostEventListener): startTime, raisedExc = time.time(), None if self.isAlive(): try: - self.conn.sendAndRecv("SETCONF %s\r\n" % setConfStr) + if isReset: + self.conn.sendAndRecv("RESETCONF %s\r\n" % setConfStr) + else: + self.conn.sendAndRecv("SETCONF %s\r\n" % setConfStr) # flushing cached values (needed until we can detect SETCONF calls) for param, _ in paramList:

1 0

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

19 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/master] Interpretor help for SETCONF
by atagar＠torproject.org 19 Sep '11

19 Sep '11

commit 07826242636f2fcb877404587a8266c94551b238 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 18 20:18:57 2011 -0700 Interpretor help for SETCONF Providing basic usage information 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 2424a29..f0d0639 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -104,14 +104,25 @@ HELP_GETINFO = """Queries the tor process for information. Options are... HELP_GETCONF = """Provides the current value for a given configuration value. Options include... """ +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: + * 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_OPTIONS = { "HELP": ("/help [OPTION]", HELP_HELP), "WRITE": ("/write [PATH]", HELP_WRITE), "INFO": ("/info [relay fingerprint, nickname, or IP address]", HELP_INFO), "FIND": ("/find PATTERN", HELP_FIND), "QUIT": ("/quit", HELP_QUIT), - "GETINFO": ("GETINFO [OPTION]", HELP_GETINFO), - "GETCONF": ("GETCONF [OPTION]", HELP_GETCONF) + "GETINFO": ("GETINFO OPTION", HELP_GETINFO), + "GETCONF": ("GETCONF OPTION", HELP_GETCONF), + "SETCONF": ("SETCONF PARAM[=VALUE]", HELP_SETCONF) } class InterpretorClosed(Exception):

1 0

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

19 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/master] Interpretor help for RESETCONF
by atagar＠torproject.org 19 Sep '11

19 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/master] Interpretor help for SETEVENTS
by atagar＠torproject.org 19 Sep '11

19 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/master] Interpretor help for LOADCONF
by atagar＠torproject.org 19 Sep '11

19 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/master] Only doing the prompt padding hack when needed
by atagar＠torproject.org 19 Sep '11

19 Sep '11

commit 7769d33b56b124ee7fceba435a6040ef790b2dc9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 18 21:23:12 2011 -0700 Only doing the prompt padding hack when needed The color prompt bug mentioned in 'http://bugs.python.org/issue12972' only effects Python 2.6 and earlier so dropping the hack where I pad the prompt for versions that don't need it. --- src/util/torInterpretor.py | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 7e96d3c..74559ba 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -5,6 +5,7 @@ directly, history and tab completion. """ import re +import sys import readline import version @@ -791,8 +792,8 @@ class ControlInterpretor: return (inputLines, outputLines) def prompt(): - # Cycling history via the readline module with up/down is buggy with a color - # prompt. For more information see: + # For Python 2.6 and earlier cycling history via the readline module with + # up/down is buggy with a color prompt. For more information see: # http://bugs.python.org/issue12972 # # To work around this while keeping a color prompt I'm padding the prompt @@ -805,7 +806,12 @@ def prompt(): if COLOR_PROMPT: prompt = format(">>> ", Color.GREEN, Attr.BOLD) - prompt += "\x1b[0m" * 10 + + majorVersion = sys.version_info[0] + minorVersion = sys.version_info[1] + + if majorVersion <= 2 and minorVersion <= 6: + prompt += "\x1b[0m" * 10 else: prompt = ">>> "

1 0

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

19 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

← Newer
1
...
31
32
33
34
35
36
37
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2011