- tor-commits - lists.torproject.org

[tor/maint-0.2.2] changes file for bug 4059
by nickm＠torproject.org 20 Sep '11

20 Sep '11

commit bfa75f70bb5eef7b470068df8bf9e3c7fa88c21a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 20 09:56:26 2011 -0400 changes file for bug 4059 --- changes/bug4059 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug4059 b/changes/bug4059 new file mode 100644 index 0000000..82a4b1a --- /dev/null +++ b/changes/bug4059 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Change an integer overflow check in the OpenBSD_Malloc code so + that GCC is less likely to eliminate it as impossible. Patch + from Mansour Moufid. Fixes bug 4059. +

1 0

[tor/maint-0.2.2] Fix a potentially useless integer overflow check.
by nickm＠torproject.org 20 Sep '11

20 Sep '11

commit 1ba90ab655fab036f00ba0185ca7b456612a12bd Author: Mansour Moufid <mansourmoufid(a)gmail.com> Date: Mon Sep 19 21:25:23 2011 -0400 Fix a potentially useless integer overflow check. GCC 4.2 and maybe other compilers optimize away unsigned integer overflow checks of the form (foo + bar < foo), for all bar. Fix one such check in `src/common/OpenBSD_malloc_Linux.c'. --- src/common/OpenBSD_malloc_Linux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/OpenBSD_malloc_Linux.c b/src/common/OpenBSD_malloc_Linux.c index 19dac77..445135c 100644 --- a/src/common/OpenBSD_malloc_Linux.c +++ b/src/common/OpenBSD_malloc_Linux.c @@ -1236,7 +1236,7 @@ imalloc(size_t size) ptralloc = 1; size = malloc_pagesize; } - if ((size + malloc_pagesize) < size) { /* Check for overflow */ + if (size > SIZE_MAX - malloc_pagesize) { /* Check for overflow */ result = NULL; errno = ENOMEM; } else if (size <= malloc_maxsize)

1 0

r25088: {} Remove empty projects/puppettor.html page which has 6 transl (website/trunk/projects/en)
by Karsten Loesing 20 Sep '11

20 Sep '11

Author: kloesing Date: 2011-09-20 11:53:49 +0000 (Tue, 20 Sep 2011) New Revision: 25088 Removed: website/trunk/projects/en/puppettor.wml Log: Remove empty projects/puppettor.html page which has 6 translations Deleted: website/trunk/projects/en/puppettor.wml =================================================================== --- website/trunk/projects/en/puppettor.wml 2011-09-19 07:12:57 UTC (rev 25087) +++ website/trunk/projects/en/puppettor.wml 2011-09-20 11:53:49 UTC (rev 25088) @@ -1,26 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 3-low - -#include "head.wmi" TITLE="Tor Project: Projects Overview" CHARSET="UTF-8" ANNOUNCE_RSS="yes" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page projects/projects>">Projects » </a> - <a href="<page projects/projects>">Sample Project</a> - </div> - <div id="maincol"> - - <h1>Sample Tor Project</h1> - Here is some information - - </div> -  - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi>

1 0

[arm/master] fix: tab completion could truncated results
by atagar＠torproject.org 19 Sep '11

19 Sep '11

commit 48e955db099c5295edcee19508844fbd812b5948 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 19 08:10:12 2011 -0700 fix: tab completion could truncated results When the tab completion matches had prefixes with multiple cases (for instance "MAPADDRESS" and "MapAddress") then tab completion would crop input to the common portion (just "M"). Instead picking the prefix with the largest set of results. This isn't perfect since it could hide some results but seems like the best option for getting around this stupid behavior. --- src/util/torInterpretor.py | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index d5abb88..593f29c 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -348,6 +348,30 @@ class TorControlCompleter: if text != self._prefix: self._prefix = text self._prefixMatches = self.getMatches(text) + + # Tab completion fills in the first common prefix which can be + # problematic if they don't all match. For instance completing "Map" will + # result in ["MAPADDRESS", "MapAddress"], which gets truncated to the + # common prefix of just "M" when the user presses tab. + + if len(self._prefixMatches) > 1: + prefixToResult = {} + + for match in self._prefixMatches: + prefix = match[:len(text)] + + if prefix in prefixToResult: + prefixToResult[prefix].append(match) + else: + prefixToResult[prefix] = [match] + + if len(prefixToResult) > 1: + # we have multiple prefixes, pick the one with the most results + self._prefixMatches = None + + for matchSet in prefixToResult.values(): + if not self._prefixMatches or len(self._prefixMatches) < len(matchSet): + self._prefixMatches = matchSet if state < len(self._prefixMatches): return self._prefixMatches[state]

1 0

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

19 Sep '11

commit 59768dee3ddeb3c69b2b617ec3939fb13d0677ad Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 19 08:29:11 2011 -0700 Interpretor help for POSTDESCRIPTOR Just basic usage information and a warning that, like LOADCONF, this isn't yet implemented. --- src/util/torInterpretor.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index e6b2e52..9c08f06 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -171,6 +171,8 @@ 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_POSTDESCRIPTOR = """Simulates getting a new relay descriptor.""" + HELP_OPTIONS = { "HELP": ("/help [OPTION]", HELP_HELP), "WRITE": ("/write [PATH]", HELP_WRITE), @@ -185,8 +187,9 @@ HELP_OPTIONS = { "SETEVENTS": ("SETEVENTS [EXTENDED] [EVENTS]", HELP_SETEVENTS), "USEFEATURE": ("USEFEATURE OPTION", HELP_USEFEATURE), "SAVECONF": ("SAVECONF", HELP_SAVECONF), - "LOADCONF": ("LOADCONF", HELP_LOADCONF), + "LOADCONF": ("LOADCONF...", HELP_LOADCONF), "MAPADDRESS": ("MAPADDRESS SOURCE_ADDR=DESTINATION_ADDR", HELP_MAPADDRESS), + "POSTDESCRIPTOR": ("POSTDESCRIPTOR [purpose=general/controller/bridge] [cache=yes/no]...", HELP_POSTDESCRIPTOR), } class InterpretorClosed(Exception): @@ -496,7 +499,7 @@ class ControlInterpretor: featureOptions = torTools.getConn().getInfo("features/names") if featureOptions: outputEntry.append((featureOptions + "\n", OUTPUT_FORMAT)) - elif arg in ("LOADCONF"): + elif arg in ("LOADCONF", "POSTDESCRIPTOR"): # gives a warning that this option isn't yet implemented outputEntry.append(("\n" + MULTILINE_UNIMPLEMENTED_NOTICE + "\n", ERROR_FORMAT)) else:

1 0

[arm/master] fix: uncaught keyboard interrupt exceptions
by atagar＠torproject.org 19 Sep '11

19 Sep '11

commit 5ae0195c30785e7bef1ca34e5ae8c1ac058623a8 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 19 08:15:51 2011 -0700 fix: uncaught keyboard interrupt exceptions KeyboardInterrupt isn't an Exception subclass (wtf?), causing a previous change to fetch the exception object to result in keyboard interrupts being uncaught. --- src/util/torInterpretor.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 593f29c..e6b2e52 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -904,7 +904,7 @@ def prompt(): try: input = raw_input(prompt) _, outputEntry = interpretor.handleQuery(input) - except Exception, exc: + except (KeyboardInterrupt, Exception), exc: if isinstance(exc, InterpretorClosed) and str(exc): print format(str(exc), *ERROR_FORMAT)

1 0

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

19 Sep '11

commit 236d7521154721258fd4d4a925b579f34200b511 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 19 08:42:59 2011 -0700 Interpretor help for SETCIRCUITPURPOSE Just a basic description. --- 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 fd8d5d7..3beef9d 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -177,6 +177,8 @@ HELP_EXTENDCIRCUIT = """Extends the given circuit or create a new one if the Cir PATH is a comma separated list of fingerprints. If it isn't set then this uses Tor's normal path selection.""" +HELP_SETCIRCUITPURPOSE = """Sets the purpose attribute for a circuit.""" + HELP_OPTIONS = { "HELP": ("/help [OPTION]", HELP_HELP), "WRITE": ("/write [PATH]", HELP_WRITE), @@ -195,6 +197,7 @@ HELP_OPTIONS = { "MAPADDRESS": ("MAPADDRESS SOURCE_ADDR=DESTINATION_ADDR", HELP_MAPADDRESS), "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), } class InterpretorClosed(Exception):

1 0

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

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

19 Sep '11

commit 8e416a54b760b2b3b4b3e96079e29e1b6e427729 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 19 08:37:11 2011 -0700 Interpretor help for EXTENDCIRCUIT Kinda guessing at what "ServerSpec" means, hopefully I'm right. --- src/util/torInterpretor.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 9c08f06..fd8d5d7 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -173,6 +173,10 @@ Example: HELP_POSTDESCRIPTOR = """Simulates getting a new relay descriptor.""" +HELP_EXTENDCIRCUIT = """Extends the given circuit or create a new one if the CircuitID is zero. The +PATH is a comma separated list of fingerprints. If it isn't set then this +uses Tor's normal path selection.""" + HELP_OPTIONS = { "HELP": ("/help [OPTION]", HELP_HELP), "WRITE": ("/write [PATH]", HELP_WRITE), @@ -190,6 +194,7 @@ HELP_OPTIONS = { "LOADCONF": ("LOADCONF...", HELP_LOADCONF), "MAPADDRESS": ("MAPADDRESS SOURCE_ADDR=DESTINATION_ADDR", HELP_MAPADDRESS), "POSTDESCRIPTOR": ("POSTDESCRIPTOR [purpose=general/controller/bridge] [cache=yes/no]...", HELP_POSTDESCRIPTOR), + "EXTENDCIRCUIT": ("EXTENDCIRCUIT CircuitID [PATH] [purpose=general/controller]", HELP_EXTENDCIRCUIT), } class InterpretorClosed(Exception):

1 0

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

19 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