- tor-commits - lists.torproject.org

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

25 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/release] fix: fixing mishandling of GETCONF/RESETCONF
by atagar＠torproject.org 25 Sep '11

25 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/release] Util for fingerprint -> (ip address, or port) maps
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 6734eaff90dfc1f0fd57544755de1632381fcdee Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 3 14:16:56 2011 -0700 Util for fingerprint -> (ip address, or port) maps Moving lookup functionality for the address/or port of relays from the connection panel into the utils. This is a generally useful bit of information, and needed for the interpretor panel. --- src/cli/connections/circEntry.py | 31 ++------------------------- src/util/torTools.py | 41 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/src/cli/connections/circEntry.py b/src/cli/connections/circEntry.py index 7bf21db..25966df 100644 --- a/src/cli/connections/circEntry.py +++ b/src/cli/connections/circEntry.py @@ -13,32 +13,6 @@ import curses from cli.connections import entries, connEntry from util import torTools, uiTools -# cached fingerprint -> (IP Address, ORPort) results -RELAY_INFO = {} - -def getRelayInfo(fingerprint): - """ - Provides the (IP Address, ORPort) tuple for the given relay. If the lookup - fails then this returns ("192.168.0.1", "0"). - - Arguments: - fingerprint - relay to look up - """ - - if not fingerprint in RELAY_INFO: - conn = torTools.getConn() - failureResult = ("192.168.0.1", "0") - - nsEntry = conn.getConsensusEntry(fingerprint) - if not nsEntry: return failureResult - - nsLineComp = nsEntry.split("\n")[0].split(" ") - if len(nsLineComp) < 8: return failureResult - - RELAY_INFO[fingerprint] = (nsLineComp[6], nsLineComp[7]) - - return RELAY_INFO[fingerprint] - class CircEntry(connEntry.ConnectionEntry): def __init__(self, circuitID, status, purpose, path): connEntry.ConnectionEntry.__init__(self, "127.0.0.1", "0", "127.0.0.1", "0") @@ -72,14 +46,15 @@ class CircEntry(connEntry.ConnectionEntry): self.status = status self.lines = [self.lines[0]] + conn = torTools.getConn() if status == "BUILT" and not self.lines[0].isBuilt: - exitIp, exitORPort = getRelayInfo(path[-1]) + exitIp, exitORPort = conn.getRelayAddress(path[-1], ("192.168.0.1", "0")) self.lines[0].setExit(exitIp, exitORPort, path[-1]) for i in range(len(path)): relayFingerprint = path[i] - relayIp, relayOrPort = getRelayInfo(relayFingerprint) + relayIp, relayOrPort = conn.getRelayAddress(relayFingerprint, ("192.168.0.1", "0")) if i == len(path) - 1: if status == "BUILT": placementType = "Exit" diff --git a/src/util/torTools.py b/src/util/torTools.py index 5c1b1ad..adc175a 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -389,6 +389,7 @@ class Controller(TorCtl.PostEventListener): self._fingerprintsAttachedCache = None # cache of relays we're connected to self._nicknameLookupCache = {} # lookup cache with fingerprint -> nickname mappings self._nicknameToFpLookupCache = {} # lookup cache with nickname -> fingerprint mappings + self._addressLookupCache = {} # lookup cache with fingerprint -> (ip address, or port) mappings self._consensusLookupCache = {} # lookup cache with network status entries self._descriptorLookupCache = {} # lookup cache with relay descriptors self._isReset = False # internal flag for tracking resets @@ -462,6 +463,7 @@ class Controller(TorCtl.PostEventListener): self._fingerprintsAttachedCache = None self._nicknameLookupCache = {} self._nicknameToFpLookupCache = {} + self._addressLookupCache = {} self._consensusLookupCache = {} self._descriptorLookupCache = {} @@ -1248,6 +1250,44 @@ class Controller(TorCtl.PostEventListener): return result + def getRelayAddress(self, relayFingerprint, default = None): + """ + Provides the (IP Address, ORPort) tuple for a given relay. If the lookup + fails then this returns the default. + + Arguments: + relayFingerprint - fingerprint of the relay + """ + + self.connLock.acquire() + + result = None + if self.isAlive(): + # query the address if it isn't yet cached + if not relayFingerprint in self._addressLookupCache: + if relayFingerprint == self.getInfo("fingerprint"): + # this is us, simply check the config + myAddress = self.getInfo("address") + myOrPort = self.getOption("ORPort") + + if myAddress and myOrPort: + self._addressLookupCache[relayFingerprint] = (myAddress, myOrPort) + else: + # check the consensus for the relay + nsEntry = self.getConsensusEntry(relayFingerprint) + + if nsEntry: + nsLineComp = nsEntry.split("\n")[0].split(" ") + + if len(nsLineComp) >= 8: + self._addressLookupCache[relayFingerprint] = (nsLineComp[6], nsLineComp[7]) + + result = self._addressLookupCache.get(relayFingerprint, default) + + self.connLock.release() + + return result + def getNicknameFingerprint(self, relayNickname): """ Provides the fingerprint associated with the given relay. This provides @@ -1590,6 +1630,7 @@ class Controller(TorCtl.PostEventListener): self._fingerprintsAttachedCache = None self._nicknameLookupCache = {} self._nicknameToFpLookupCache = {} + self._addressLookupCache = {} self._consensusLookupCache = {} if self._fingerprintMappings != None:

1 0

[arm/release] Moving interpretor actions into functions
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 2727cf690f07d7c25f890621c122fd48915d5637 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 1 20:34:29 2011 -0700 Moving interpretor actions into functions Simplifying the handleQuery function by moving each of the interpretor actions into their own 'doX' function. --- src/util/torInterpretor.py | 91 ++++++++++++++++++++++---------------------- 1 files changed, 46 insertions(+), 45 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 0db95c3..7eaec16 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -217,23 +217,57 @@ class ControlInterpretor: return self.contents + [appendPrompt] else: return self.contents - def writeContents(self, path): + def doWrite(self, arg, outputEntry): """ - Attempts to write the display contents to a given path, raising an IOError - if unsuccessful. - - Arguments: - path - location to write the interpretor content to + Performs the '/write' operation, which attempts to save the backlog to a + given path, defaulting to the last location we write to. """ + if arg: self.writePath = arg outputLines = [] for line in self.contents: outputLines.append("".join([msg for msg, _ in line])) - outputFile = open(path, "w") - outputFile.write("\n".join(outputLines)) - outputFile.close() + try: + outputFile = open(self.writePath, "w") + outputFile.write("\n".join(outputLines)) + outputFile.close() + outputEntry.append(("Interpretor backlog written to: %s" % self.writePath, OUTPUT_FORMAT)) + except IOError, exc: + outputEntry.append(("Unable to write to '%s': %s" % (self.writePath, exc), ERROR_FORMAT)) + + def doFind(self, arg, outputEntry): + """ + Performs the '/find' operation, which lists output from the backlog which + matches the given regex. Results are deduplicated and matches are bolded. + """ + + argMatcher = None + + if not arg: + outputEntry.append(("Nothing to match against", ERROR_FORMAT)) + else: + try: argMatcher = re.compile("(%s)" % arg) + except: outputEntry.append(("Unable to compile regex '%s'" % arg, ERROR_FORMAT)) + + if argMatcher: + printedLines = [] + + for line in self.contents: + lineText = "".join([msg for msg, _ in line]) + + # skip if this was user input or a duplicate + if lineText.startswith(PROMPT[0]) or lineText in printedLines: + continue + + match = argMatcher.search(lineText) + if match: + # outputs the matching line, with the match itself bolded + outputEntry.append((lineText[:match.start()], OUTPUT_FORMAT)) + outputEntry.append((match.group(), (OUTPUT_FORMAT + (Attr.BOLD, )))) + outputEntry.append((lineText[match.end():] + "\n", OUTPUT_FORMAT)) + printedLines.append(lineText) def handleQuery(self, input): """ @@ -271,42 +305,9 @@ class ControlInterpretor: # interpretor command inputEntry.append((input, INPUT_INTERPRETOR_FORMAT)) - if cmd == "/quit": - raise InterpretorClosed() - elif cmd == "/write": - if arg: self.writePath = arg - - try: - self.writeContents(self.writePath) - outputEntry.append(("Interpretor backlog written to: %s" % self.writePath, OUTPUT_FORMAT)) - except IOError, exc: - outputEntry.append(("Unable to write to '%s': %s" % (self.writePath, exc), ERROR_FORMAT)) - elif cmd == "/find": - argMatcher = None - - if not arg: - outputEntry.append(("Nothing to match against", ERROR_FORMAT)) - else: - try: argMatcher = re.compile("(%s)" % arg) - except: outputEntry.append(("Unable to compile regex '%s'" % arg, ERROR_FORMAT)) - - if argMatcher: - printedLines = [] - - for line in self.contents: - lineText = "".join([msg for msg, _ in line]) - - # skip if this was user input or a duplicate - if lineText.startswith(PROMPT[0]) or lineText in printedLines: - continue - - match = argMatcher.search(lineText) - if match: - # outputs the matching line, with the match itself bolded - outputEntry.append((lineText[:match.start()], OUTPUT_FORMAT)) - outputEntry.append((match.group(), (OUTPUT_FORMAT + (Attr.BOLD, )))) - outputEntry.append((lineText[match.end():] + "\n", OUTPUT_FORMAT)) - printedLines.append(lineText) + if cmd == "/quit": raise InterpretorClosed() + elif cmd == "/write": self.doWrite(arg, outputEntry) + elif cmd == "/find": self.doFind(arg, outputEntry) else: outputEntry.append(("Not yet implemented...", ERROR_FORMAT)) # TODO: implement

1 0

[arm/release] Accounting for os.path.join being stupid
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 45b47166af00edc4e59c46548c2e52672042b9e3 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 12 08:27:01 2011 -0700 Accounting for os.path.join being stupid The os.path.join function simply doesn't work if the second argument is an absolute path. That is stupid. Working around this by making its second argument relative. --- src/starter.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/starter.py b/src/starter.py index 6953cf4..e4e7096 100644 --- a/src/starter.py +++ b/src/starter.py @@ -228,7 +228,15 @@ def _torCtlConnect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, i # appends the path prefix if it's set if authType == TorCtl.TorCtl.AUTH_TYPE.COOKIE: pathPrefix = util.torTools.getConn().getPathPrefix() - authValue = os.path.join(pathPrefix, authValue) + + # The os.path.join function is kinda stupid. If given an absolute path + # with the second argument then it will swallow the prefix. Ie... + # os.path.join("/tmp", "/foo") => "/foo" + + pathSuffix = conn._cookiePath + if pathSuffix.startswith("/"): pathSuffix = pathSuffix[1:] + + conn._cookiePath = os.path.join(pathPrefix, pathSuffix) conn.authenticate(authValue) return conn

1 0

[arm/release] fix: appending path prefix to auth cookie path
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 61eca7e9c9ca331e9a6cef082e628df5f6aa78a0 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 8 09:05:51 2011 -0700 fix: appending path prefix to auth cookie path Manually declared path prefixes weren't being applied to authentication cookies, so chroot instances using cookie auth couldn't connect. Caught by sid77 --- src/starter.py | 5 +++++ src/util/torTools.py | 5 ++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/starter.py b/src/starter.py index a2617f7..6953cf4 100644 --- a/src/starter.py +++ b/src/starter.py @@ -225,6 +225,11 @@ def _torCtlConnect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, i try: conn._cookiePath = util.sysTools.expandRelativePath(authValue, torPid) except IOError: pass + # appends the path prefix if it's set + if authType == TorCtl.TorCtl.AUTH_TYPE.COOKIE: + pathPrefix = util.torTools.getConn().getPathPrefix() + authValue = os.path.join(pathPrefix, authValue) + conn.authenticate(authValue) return conn except Exception, exc: diff --git a/src/util/torTools.py b/src/util/torTools.py index 8567158..c81847c 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1913,8 +1913,11 @@ class Controller(TorCtl.PostEventListener): self.connLock.acquire() + # Checks that the value is unset and we're running. One exception to this + # is the pathPrefix which doesn't depend on having a connection and may be + # needed for the init. currentVal, result = self._cachedParam.get(key), None - if currentVal == None and self.isAlive(): + if currentVal == None and (self.isAlive() or key == "pathPrefix"): # still unset - fetch value if key in ("nsEntry", "descEntry"): myFingerprint = self.getInfo("fingerprint")

1 0

[arm/release] Exposing ip -> (port, fp) mappings in tor util
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 5ef37f23c8ae7270a1ed773487208ce7f81007e1 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 7 10:00:29 2011 -0700 Exposing ip -> (port, fp) mappings in tor util Providing the cached relay locale mappings in the torTools util. This is generally useful information and gonna be needed to query the locales of all exits. --- src/util/torTools.py | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index adc175a..8567158 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1288,6 +1288,36 @@ class Controller(TorCtl.PostEventListener): return result + def getAllRelayAddresses(self, default = {}): + """ + Provides a mapping of... + Relay IP Address -> [(ORPort, Fingerprint)...] + + for all relays currently in the cached consensus. + + Arguments: + default - value returned if the query fails + """ + + self.connLock.acquire() + + result = default + + if self.isAlive(): + # check both if the cached mappings are unset or blank + if not self._fingerprintMappings: + self._fingerprintMappings = self._getFingerprintMappings() + + # Make a shallow copy of the results. This doesn't protect the internal + # listings, but good enough for the moment. + # TODO: change the [(port, fingerprint)...] lists to tuples? + if self._fingerprintMappings != {}: + result = dict(self._fingerprintMappings) + + self.connLock.release() + + return result + def getNicknameFingerprint(self, relayNickname): """ Provides the fingerprint associated with the given relay. This provides

1 0

[arm/release] Previous cookie path change broke general uses
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit e5fa6d9b99f7eabac6d86e1d4952173d4aad70f5 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 12 08:36:26 2011 -0700 Previous cookie path change broke general uses The hack to account for os.path.join's dumb implementation broke the general use case where the user *doesn't* have a path prefix by making it relative... oops. --- src/starter.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/starter.py b/src/starter.py index e4e7096..dd5f5c9 100644 --- a/src/starter.py +++ b/src/starter.py @@ -233,10 +233,11 @@ def _torCtlConnect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, i # with the second argument then it will swallow the prefix. Ie... # os.path.join("/tmp", "/foo") => "/foo" - pathSuffix = conn._cookiePath - if pathSuffix.startswith("/"): pathSuffix = pathSuffix[1:] - - conn._cookiePath = os.path.join(pathPrefix, pathSuffix) + if pathPrefix: + pathSuffix = conn._cookiePath + if pathSuffix.startswith("/"): pathSuffix = pathSuffix[1:] + + conn._cookiePath = os.path.join(pathPrefix, pathSuffix) conn.authenticate(authValue) return conn

1 0

[arm/release] Util for getting condensed exit policies
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 8a40c745ce5f040aef38963b2a047ba2f92ee392 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 12 19:27:14 2011 -0700 Util for getting condensed exit policies Expanding the ExitPolicy class to provide condensed exit policies like the tor consensus. --- src/util/torTools.py | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 92 insertions(+), 0 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 7c14d18..b9d9ac8 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -2286,6 +2286,21 @@ class Controller(TorCtl.PostEventListener): self.connLock.release() +class ExitPolicyIterator: + """ + Basic iterator for cycling through ExitPolicy entries. + """ + + def __init__(self, head): + self.head = head + + def next(self): + if self.head: + lastHead = self.head + self.head = self.head.nextRule + return lastHead + else: raise StopIteration + class ExitPolicy: """ Single rule from the user's exit policy. These are chained together to form @@ -2301,6 +2316,9 @@ class ExitPolicy: nextRule - next rule to be checked when queries don't match this policy """ + # cached summary string + self.summaryStr = None + # sanitize the input a bit, cleaning up tabs and stripping quotes ruleEntry = ruleEntry.replace("\\t", " ").replace("\"", "") @@ -2405,6 +2423,80 @@ class ExitPolicy: if self.nextRule: return self.nextRule.check(ipAddress, port) else: return True # fell off the chain without a conclusion (shouldn't happen...) + def getSummary(self): + """ + Provides a summary description of the policy chain similar to the + consensus. This excludes entries that don't cover all ips, and is either + a whitelist or blacklist policy based on the final entry. For instance... + accept 80, 443 # just accepts ports 80/443 + reject 1-1024, 5555 # just accepts non-privilaged ports, excluding 5555 + """ + + if not self.summaryStr: + # determines if we're a whitelist or blacklist + isWhitelist = False # default in case we don't have a catch-all policy at the end + + for rule in self: + if rule.isIpWildcard and rule.isPortWildcard: + isWhitelist = not rule.isAccept + break + + # Iterates over the rules and adds the the ports we'll return (ie, allows + # if a whitelist and rejects if a blacklist). Reguardless of a port's + # allow/reject policy, all further entries with that port are ignored since + # policies respect the first matching rule. + + displayPorts, skipPorts = [], [] + + for rule in self: + if not rule.isIpWildcard: continue + + if rule.minPort == rule.maxPort: + portRange = [rule.minPort] + else: + portRange = range(rule.minPort, rule.maxPort + 1) + + for port in portRange: + if port in skipPorts: continue + + # if accept + whitelist or reject + blacklist then add + if rule.isAccept == isWhitelist: + displayPorts.append(port) + + # all further entries with this port are to be ignored + skipPorts.append(port) + + # gets a list of the port ranges + if displayPorts: + displayRanges, tmpRange = [], [] + displayPorts.sort() + displayPorts.append(None) # ending item to include last range in loop + + for port in displayPorts: + if not tmpRange or tmpRange[-1] + 1 == port: + tmpRange.append(port) + else: + if len(tmpRange) > 1: + displayRanges.append("%i-%i" % (tmpRange[0], tmpRange[-1])) + else: + displayRanges.append(str(tmpRange[0])) + + tmpRange = [port] + else: + # everything for the inverse + isWhitelist = not isWhitelist + displayRanges = ["1-65535"] + + # constructs the summary string + labelPrefix = "accept " if isWhitelist else "reject " + + self.summaryStr = (labelPrefix + ", ".join(displayRanges)).strip() + + return self.summaryStr + + def __iter__(self): + return ExitPolicyIterator(self) + def __str__(self): # This provides the actual policy rather than the entry used to construct # it so the 'private' keyword is expanded.

1 0

[arm/release] Replacing displayed consensus policy with util
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit aa3e3ee7a397edb18595d86dc2652d63053b3584 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 12 19:44:58 2011 -0700 Replacing displayed consensus policy with util Using the ExitPolicy class' summary rather than the string from the consensus. Unless I'm misunderstanding how the consensus policy is derived, these should be equivilant. However, since this doesn't rely on the policy being in the consensus this will be rendered the same for both new and old versions of tor. --- src/cli/connections/connEntry.py | 20 ++++---------------- 1 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/cli/connections/connEntry.py b/src/cli/connections/connEntry.py index 075dfb2..de3fb01 100644 --- a/src/cli/connections/connEntry.py +++ b/src/cli/connections/connEntry.py @@ -711,28 +711,16 @@ class ConnectionLine(entries.ConnectionPanelLine): if len(nsLines) >= 2 and nsLines[1].startswith("s "): flags = nsLines[1][2:] - # The network status exit policy doesn't exist for older tor versions. - # If unavailable we'll need the full exit policy which is on the - # descriptor (if that's available). + exitPolicy = conn.getRelayExitPolicy(fingerprint) - exitPolicy = "unknown" - if len(nsLines) >= 4 and nsLines[3].startswith("p "): - exitPolicy = nsLines[3][2:].replace(",", ", ") - elif descEntry: - # the descriptor has an individual line for each entry in the exit policy - exitPolicyEntries = [] - - for line in descEntry.split("\n"): - if line.startswith("accept") or line.startswith("reject"): - exitPolicyEntries.append(line.strip()) - - exitPolicy = ", ".join(exitPolicyEntries) + if exitPolicy: policyLabel = exitPolicy.getSummary() + else: policyLabel = "unknown" dirPortLabel = "" if dirPort == "0" else "dirport: %s" % dirPort lines[2] = "nickname: %-25s orport: %-10s %s" % (nickname, orPort, dirPortLabel) lines[3] = "published: %s %s" % (pubDate, pubTime) lines[4] = "flags: %s" % flags.replace(" ", ", ") - lines[5] = "exit policy: %s" % exitPolicy + lines[5] = "exit policy: %s" % policyLabel if descEntry: torVersion, platform, contact = "", "", ""

1 0