June 2013 - tor-commits - lists.torproject.org

[arm/master] Removing the _getRelayAttr() helper
by atagar＠torproject.org 02 Jun '13

02 Jun '13

commit 8204d5ff01cc471edf1ff64da5fe1dbd28d01968 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 1 17:24:43 2013 -0700 Removing the _getRelayAttr() helper Finish moving method implementations from _getRelayAttr() to their actual methods. This removes a layer of caching and thread safety we might need to add back in later. --- src/util/torTools.py | 253 +++++++++++++++++++------------------------------- 1 file changed, 96 insertions(+), 157 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index e698bf5..9ea87da 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -87,9 +87,6 @@ class Controller: # only done once for the duration of the application to avoid pointless # messages. self._pathPrefixLogging = True - - # cached parameters for custom getters (None if unset or possibly changed) - self._cachedParam = {} def init(self, controller): """ @@ -399,7 +396,21 @@ class Controller: default - result if the query fails """ - return self._getRelayAttr("bwRate", default) + # effective relayed bandwidth is the minimum of BandwidthRate, + # MaxAdvertisedBandwidth, and RelayBandwidthRate (if set) + effectiveRate = int(self.getOption("BandwidthRate", None)) + + relayRate = self.getOption("RelayBandwidthRate", None) + if relayRate and relayRate != "0": + effectiveRate = min(effectiveRate, int(relayRate)) + + maxAdvertised = self.getOption("MaxAdvertisedBandwidth", None) + if maxAdvertised: effectiveRate = min(effectiveRate, int(maxAdvertised)) + + if effectiveRate is not None: + return effectiveRate + else: + return default def getMyBandwidthBurst(self, default = None): """ @@ -410,7 +421,18 @@ class Controller: default - result if the query fails """ - return self._getRelayAttr("bwBurst", default) + # effective burst (same for BandwidthBurst and RelayBandwidthBurst) + effectiveBurst = int(self.getOption("BandwidthBurst", None)) + + relayBurst = self.getOption("RelayBandwidthBurst", None) + + if relayBurst and relayBurst != "0": + effectiveBurst = min(effectiveBurst, int(relayBurst)) + + if effectiveBurst is not None: + return effectiveBurst + else: + return default def getMyBandwidthObserved(self, default = None): """ @@ -424,7 +446,15 @@ class Controller: default - result if the query fails """ - return self._getRelayAttr("bwObserved", default) + myFingerprint = self.getInfo("fingerprint", None) + + if myFingerprint: + myDescriptor = self.controller.get_server_descriptor(myFingerprint) + + if myDescriptor: + result = myDescriptor.observed_bandwidth + + return default def getMyBandwidthMeasured(self, default = None): """ @@ -439,7 +469,19 @@ class Controller: default - result if the query fails """ - return self._getRelayAttr("bwMeasured", default) + # TODO: Tor is documented as providing v2 router status entries but + # actually looks to be v3. This needs to be sorted out between stem + # and tor. + + myFingerprint = self.getInfo("fingerprint", None) + + if myFingerprint: + myStatusEntry = self.controller.get_network_status(myFingerprint) + + if myStatusEntry and hasattr(myStatusEntry, 'bandwidth'): + return myStatusEntry.bandwidth + + return default def getMyFlags(self, default = None): """ @@ -525,14 +567,39 @@ class Controller: Provides the maximum number of file descriptors this process can have. Only the Tor process itself reliably knows this value, and the option for getting this was added in Tor 0.2.3.x-final. If that's unavailable then - we estimate the file descriptor limit based on other factors. + we can only estimate the file descriptor limit based on other factors. The return result is a tuple of the form: (fileDescLimit, isEstimate) and if all methods fail then both values are None. """ - return self._getRelayAttr("fdLimit", (None, True)) + # provides -1 if the query fails + queriedLimit = self.getInfo("process/descriptor-limit", None) + + if queriedLimit != None and queriedLimit != "-1": + return (int(queriedLimit), False) + + torUser = self.getMyUser() + + # This is guessing the open file limit. Unfortunately there's no way + # (other than "/usr/proc/bin/pfiles pid | grep rlimit" under Solaris) + # to get the file descriptor limit for an arbitrary process. + + if torUser == "debian-tor": + # probably loaded via /etc/init.d/tor which changes descriptor limit + return (8192, True) + else: + # uses ulimit to estimate (-H is for hard limit, which is what tor uses) + ulimitResults = system.call("ulimit -Hn") + + if ulimitResults: + ulimit = ulimitResults[0].strip() + + if ulimit.isdigit(): + return (int(ulimit), True) + + return (None, None) def getMyDirAuthorities(self): """ @@ -573,7 +640,26 @@ class Controller: jail's path. """ - return self._getRelayAttr("pathPrefix", "") + # make sure the path prefix is valid and exists (providing a notice if not) + prefixPath = CONFIG["features.pathPrefix"].strip() + + if not prefixPath and os.uname()[0] == "FreeBSD": + prefixPath = system.get_bsd_jail_path(getConn().controller.get_pid(0)) + + if prefixPath and self._pathPrefixLogging: + log.info("Adjusting paths to account for Tor running in a jail at: %s" % prefixPath) + + if prefixPath: + # strips off ending slash from the path + if prefixPath.endswith("/"): prefixPath = prefixPath[:-1] + + # avoid using paths that don't exist + if self._pathPrefixLogging and prefixPath and not os.path.exists(prefixPath): + log.notice("The prefix path set in your config (%s) doesn't exist." % prefixPath) + prefixPath = "" + + self._pathPrefixLogging = False # prevents logging if fetched again + return prefixPath def getStartTime(self): """ @@ -933,7 +1019,6 @@ class Controller: if not issueSighup: try: self.controller.signal(stem.Signal.RELOAD) - self._cachedParam = {} except Exception, exc: # new torrc parameters caused an error (tor's likely shut down) raisedException = IOError(str(exc)) @@ -975,8 +1060,6 @@ class Controller: if errorLine: raise IOError(" ".join(errorLine.split()[3:])) else: raise IOError("failed silently") - - self._cachedParam = {} except IOError, exc: raisedException = exc @@ -1017,21 +1100,10 @@ class Controller: def ns_event(self, event): self._consensusLookupCache = {} - - myFingerprint = self.getInfo("fingerprint", None) - if myFingerprint: - for desc in event.desc: - if desc.fingerprint == myFingerprint: - self._cachedParam["bwMeasured"] = None - return - else: - self._cachedParam["bwMeasured"] = None def new_consensus_event(self, event): self.connLock.acquire() - self._cachedParam["bwMeasured"] = None - # reconstructs consensus based mappings self._fingerprintLookupCache = {} self._fingerprintsAttachedCache = None @@ -1051,9 +1123,6 @@ class Controller: myFingerprint = self.getInfo("fingerprint", None) desc_fingerprints = [fingerprint for (fingerprint, nickname) in event.relays] - if not myFingerprint or myFingerprint in desc_fingerprints: - self._cachedParam["bwObserved"] = None - # If we're tracking ip address -> fingerprint mappings then update with # the new relays. self._fingerprintLookupCache = {} @@ -1196,134 +1265,4 @@ class Controller: if len(potentialMatches) == 1: return potentialMatches[0][1] else: return None - - def _getRelayAttr(self, key, default, cacheUndefined = True): - """ - Provides information associated with this relay, using the cached value if - available and otherwise looking it up. - - Arguments: - key - parameter being queried - default - value to be returned if undefined - cacheUndefined - caches when values are undefined, avoiding further - lookups if true - """ - - # Several controller options were added in ticket 2291... - # https://trac.torproject.org/projects/tor/ticket/2291 - # which is only available with newer tor versions (tested them against - # Tor v0.2.3.0-alpha-dev). When using these options we need to be - # especially careful to have good fallback logic. - - currentVal = self._cachedParam.get(key) - if currentVal != None: - if currentVal == UNKNOWN: return default - else: return currentVal - - 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() or key == "pathPrefix"): - # still unset - fetch value - if key == "bwRate": - # effective relayed bandwidth is the minimum of BandwidthRate, - # MaxAdvertisedBandwidth, and RelayBandwidthRate (if set) - effectiveRate = int(self.getOption("BandwidthRate", None)) - - relayRate = self.getOption("RelayBandwidthRate", None) - if relayRate and relayRate != "0": - effectiveRate = min(effectiveRate, int(relayRate)) - - maxAdvertised = self.getOption("MaxAdvertisedBandwidth", None) - if maxAdvertised: effectiveRate = min(effectiveRate, int(maxAdvertised)) - - result = effectiveRate - elif key == "bwBurst": - # effective burst (same for BandwidthBurst and RelayBandwidthBurst) - effectiveBurst = int(self.getOption("BandwidthBurst", None)) - - relayBurst = self.getOption("RelayBandwidthBurst", None) - if relayBurst and relayBurst != "0": - effectiveBurst = min(effectiveBurst, int(relayBurst)) - - result = effectiveBurst - elif key == "bwObserved": - myFingerprint = self.getInfo("fingerprint", None) - - if myFingerprint: - myDescriptor = self.controller.get_server_descriptor(myFingerprint) - - if myDescriptor: - result = myDescriptor.observed_bandwidth - elif key == "bwMeasured": - # TODO: Currently there's no client side indication of what type of - # measurement was used. Include this in results if it's ever available. - - # TODO: Tor is documented as providing v2 router status entries but - # actually looks to be v3. This needs to be sorted out between stem - # and tor. - - myFingerprint = self.getInfo("fingerprint", None) - - if myFingerprint: - myStatusEntry = self.controller.get_network_status(myFingerprint) - - if myStatusEntry and hasattr(myStatusEntry, 'bandwidth'): - result = myStatusEntry.bandwidth - elif key == "fdLimit": - # provides -1 if the query fails - queriedLimit = self.getInfo("process/descriptor-limit", None) - - if queriedLimit != None and queriedLimit != "-1": - result = (int(queriedLimit), False) - else: - torUser = self.getMyUser() - - # This is guessing the open file limit. Unfortunately there's no way - # (other than "/usr/proc/bin/pfiles pid | grep rlimit" under Solaris) - # to get the file descriptor limit for an arbitrary process. - - if torUser == "debian-tor": - # probably loaded via /etc/init.d/tor which changes descriptor limit - result = (8192, True) - else: - # uses ulimit to estimate (-H is for hard limit, which is what tor uses) - ulimitResults = system.call("ulimit -Hn") - - if ulimitResults: - ulimit = ulimitResults[0].strip() - if ulimit.isdigit(): result = (int(ulimit), True) - elif key == "pathPrefix": - # make sure the path prefix is valid and exists (providing a notice if not) - prefixPath = CONFIG["features.pathPrefix"].strip() - - if not prefixPath and os.uname()[0] == "FreeBSD": - prefixPath = system.get_bsd_jail_path(getConn().controller.get_pid(0)) - - if prefixPath and self._pathPrefixLogging: - log.info("Adjusting paths to account for Tor running in a jail at: %s" % prefixPath) - - if prefixPath: - # strips off ending slash from the path - if prefixPath.endswith("/"): prefixPath = prefixPath[:-1] - - # avoid using paths that don't exist - if self._pathPrefixLogging and prefixPath and not os.path.exists(prefixPath): - log.notice("The prefix path set in your config (%s) doesn't exist." % prefixPath) - prefixPath = "" - - self._pathPrefixLogging = False # prevents logging if fetched again - result = prefixPath - - # cache value - if result != None: self._cachedParam[key] = result - elif cacheUndefined: self._cachedParam[key] = UNKNOWN - - self.connLock.release() - - if result == None or result == UNKNOWN: return default - else: return result

1 0

[arm/master] Drop manual descriptor parsing in getNicknameFingerprint()
by atagar＠torproject.org 02 Jun '13

02 Jun '13

commit 8d2f0d22d992ecdd58be276cff9e6b9bb37fba51 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 1 11:01:50 2013 -0700 Drop manual descriptor parsing in getNicknameFingerprint() Our getNicknameFingerprint() manually parsed router status entries to get the fingerprint. There's no longer any need to do this. --- src/util/torTools.py | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 49506c5..e698bf5 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -858,26 +858,13 @@ class Controller: result = None if self.isAlive(): - # determine the fingerprint if it isn't yet cached if not relayNickname in self._nicknameToFpLookupCache: - # Fingerprints are base64 encoded hex with an extra '='. For instance... - # GETINFO ns/name/torexp2 -> - # r torexp2 NPfjt8Vjr+drcbbFLQONN3KapNo LxoHteGax7ZNYh/9g/FF8I617fY 2011-04-27 15:20:35 141.161.20.50 9001 0 - # decode base64 of "NPfjt8Vjr+drcbbFLQONN3KapNo=" -> - # "4\xf7\xe3\xb7\xc5c\xaf\xe7kq\xb6\xc5-\x03\x8d7r\x9a\xa4\xda" - # encode hex of the above -> - # "34f7e3b7c563afe76b71b6c52d038d37729aa4da" + consensusEntry = self.controller.get_network_status(relayNickname, None) - relayFingerprint = None - consensusEntry = self.getInfo("ns/name/%s" % relayNickname, None) if consensusEntry: - encodedFp = consensusEntry.split()[2] - decodedFp = (encodedFp + "=").decode('base64').encode('hex') - relayFingerprint = decodedFp.upper() - - self._nicknameToFpLookupCache[relayNickname] = relayFingerprint + self._nicknameToFpLookupCache[relayNickname] = consensusEntry.fingerprint - result = self._nicknameToFpLookupCache[relayNickname] + result = self._nicknameToFpLookupCache.get(relayNickname) self.connLock.release()

1 0

[arm/master] Dropping functionality to sighup via pkill
by atagar＠torproject.org 02 Jun '13

02 Jun '13

commit b16f7b82e403ddc7ccc768a4b79a28a00811c309 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 1 19:17:01 2013 -0700 Dropping functionality to sighup via pkill Once I had a phobia of deleting any code that could possibly prove to be useful later. This is a great example: the initial version of arm could reset tor by issuing a pkill to sighup. I later learned that this could also be done far more simpily by issuing a 'SIGNAL RELOAD'. So what did I do? I changed arm to use SIGNAL of course, but I also left the pkill code around just in case I needed it in the future. The only advantage of pkill is that we can sighup tor instances that lack a control port. This might make its way into stem's process module someday if we ever have a need, but arm's implementation is old and unused so it's about time it got deleted. --- src/util/torTools.py | 68 ++++++-------------------------------------------- 1 file changed, 7 insertions(+), 61 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 0cb3a22..1ed1bbb 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -992,77 +992,23 @@ class Controller: return list(self.controllerEvents) - def reload(self, issueSighup = False): + def reload(self): """ This resets tor (sending a RELOAD signal to the control port) causing tor's - internal state to be reset and the torrc reloaded. This can either be done - by... - - the controller via a RELOAD signal (default and suggested) - conn.send_signal("RELOAD") - - system reload signal (hup) - pkill -sighup tor - - The later isn't really useful unless there's some reason the RELOAD signal - won't do the trick. Both methods raise an IOError in case of failure. - - Arguments: - issueSighup - issues a sighup rather than a controller RELOAD signal + internal state to be reset and the torrc reloaded. """ self.connLock.acquire() - raisedException = None - if self.isAlive(): - if not issueSighup: + try: + if self.isAlive(): try: self.controller.signal(stem.Signal.RELOAD) except Exception, exc: # new torrc parameters caused an error (tor's likely shut down) - raisedException = IOError(str(exc)) - else: - try: - # Redirects stderr to stdout so we can check error status (output - # should be empty if successful). Example error: - # pkill: 5592 - Operation not permitted - # - # note that this may provide multiple errors, even if successful, - # hence this: - # - only provide an error if Tor fails to log a sighup - # - provide the error message associated with the tor pid (others - # would be a red herring) - if not system.is_available("pkill"): - raise IOError("pkill command is unavailable") - - self._isReset = False - pkillCall = os.popen("pkill -sighup ^tor$ 2> /dev/stdout") - pkillOutput = pkillCall.readlines() - pkillCall.close() - - # Give the sighupTracker a moment to detect the sighup signal. This - # is, of course, a possible concurrency bug. However I'm not sure - # of a better method for blocking on this... - waitStart = time.time() - while time.time() - waitStart < 1: - time.sleep(0.1) - if self._isReset: break - - if not self._isReset: - errorLine, torPid = "", self.controller.get_pid(None) - - if torPid: - for line in pkillOutput: - if line.startswith("pkill: %s - " % torPid): - errorLine = line - break - - if errorLine: raise IOError(" ".join(errorLine.split()[3:])) - else: raise IOError("failed silently") - except IOError, exc: - raisedException = exc - - self.connLock.release() - - if raisedException: raise raisedException + raise IOError(str(exc)) + finally: + self.connLock.release() def shutdown(self, force = False): """

1 0

[arm/master] Dropping CIRC event listener
by atagar＠torproject.org 02 Jun '13

02 Jun '13

commit 07e533df751eba58258392805a0d0f6ffe5d6e60 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 1 19:09:35 2013 -0700 Dropping CIRC event listener The CIRC event listener is no longer used so dropping it. --- src/util/torTools.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 2d3979e..0cb3a22 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -109,7 +109,6 @@ class Controller: self.controller.add_event_listener(self.ns_event, stem.control.EventType.NS) self.controller.add_event_listener(self.new_consensus_event, stem.control.EventType.NEWCONSENSUS) self.controller.add_event_listener(self.new_desc_event, stem.control.EventType.NEWDESC) - self.controller.add_event_listener(self.circ_status_event, stem.control.EventType.CIRC) # reset caches for ip -> fingerprint lookups self._fingerprintMappings = None @@ -1149,12 +1148,6 @@ class Controller: self.connLock.release() - def circ_status_event(self, event): - # CIRC events aren't required, but if one's received then flush this cache - # since it uses circuit-status results. - self.connLock.acquire() - self.connLock.release() - def _getFingerprintMappings(self, descriptors = None): """ Provides IP address to (port, fingerprint) tuple mappings for all of the

1 0

[arm/master] Dropping complicated disambiguation step from _getRelayFingerprint()
by atagar＠torproject.org 02 Jun '13

02 Jun '13

commit 47644d9d534b09c67a5edcb23a19452d46f4c172 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 1 19:04:40 2013 -0700 Dropping complicated disambiguation step from _getRelayFingerprint() The _getRelayFingerprint() helper starts with very sensible approaches to resolve addresses/ports to fingerprints. However, after it has checked if it's us and if the consensus holds the answer it does some mind bogglingly weird steps involving orconn-status and circuit-status. These final disambiguation steps are horribly slow (it performs at one point a GETINFO for every relay in the consensus) and, from my read, pointless. I doubt this logic has ever been encountered and, if it has, it probably hasn't helped the resolution. My suspicion is that this is leftover code from arms very first version. --- src/util/torTools.py | 51 +------------------------------------------------- 1 file changed, 1 insertion(+), 50 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 9ea87da..2d3979e 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -74,7 +74,6 @@ class Controller: self.controllerEvents = [] # list of successfully set controller events self._fingerprintMappings = None # mappings of ip -> [(port, fingerprint), ...] self._fingerprintLookupCache = {} # lookup cache with (ip, port) -> fingerprint mappings - 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 @@ -115,7 +114,6 @@ class Controller: # reset caches for ip -> fingerprint lookups self._fingerprintMappings = None self._fingerprintLookupCache = {} - self._fingerprintsAttachedCache = None self._nicknameLookupCache = {} self._nicknameToFpLookupCache = {} self._addressLookupCache = {} @@ -1106,7 +1104,6 @@ class Controller: # reconstructs consensus based mappings self._fingerprintLookupCache = {} - self._fingerprintsAttachedCache = None self._nicknameLookupCache = {} self._nicknameToFpLookupCache = {} self._addressLookupCache = {} @@ -1126,7 +1123,6 @@ class Controller: # If we're tracking ip address -> fingerprint mappings then update with # the new relays. self._fingerprintLookupCache = {} - self._fingerprintsAttachedCache = None self._descriptorLookupCache = {} if self._fingerprintMappings != None: @@ -1157,7 +1153,6 @@ class Controller: # CIRC events aren't required, but if one's received then flush this cache # since it uses circuit-status results. self.connLock.acquire() - self._fingerprintsAttachedCache = None self.connLock.release() def _getFingerprintMappings(self, descriptors = None): @@ -1191,10 +1186,6 @@ class Controller: relayPort - orport of relay (to further narrow the results) """ - # Events can reset _fingerprintsAttachedCache to None, so all uses of this - # function need to be under the connection lock (skipping that might also - # scew with the conn usage of this function...) - # If we were provided with a string port then convert to an int (so # lookups won't mismatch based on type). if isinstance(relayPort, str): relayPort = int(relayPort) @@ -1224,45 +1215,5 @@ class Controller: if entryPort == relayPort: return entryFingerprint - # Disambiguates based on our orconn-status and circuit-status results. - # This only includes relays we're connected to, so chances are pretty - # slim that we'll still have a problem narrowing this down. Note that we - # aren't necessarily checking for events that can create new client - # circuits (so this cache might be a little dirty). - - # populates the cache - if self._fingerprintsAttachedCache == None: - self._fingerprintsAttachedCache = [] - - # orconn-status has entries of the form: - # $33173252B70A50FE3928C7453077936D71E45C52=shiven CONNECTED - orconnResults = self.getInfo("orconn-status", None) - if orconnResults: - for line in orconnResults.split("\n"): - self._fingerprintsAttachedCache.append(line[1:line.find("=")]) - - # circuit-status results (we only make connections to the first hop) - for _, _, _, path in self.getCircuits(): - self._fingerprintsAttachedCache.append(path[0]) - - # narrow to only relays we have a connection to - attachedMatches = [] - for _, entryFingerprint in potentialMatches: - if entryFingerprint in self._fingerprintsAttachedCache: - attachedMatches.append(entryFingerprint) - - if len(attachedMatches) == 1: - return attachedMatches[0] - - for entryPort, entryFingerprint in list(potentialMatches): - try: - nsEntry = self.controller.get_network_status(entryFingerprint) - - if not stem.Flag.RUNNING in nsEntry.flags: - potentialMatches.remove((entryPort, entryFingerprint)) - except stem.ControllerError: pass - - if len(potentialMatches) == 1: - return potentialMatches[0][1] - else: return None + return None

1 0

[arm/master] Removing manual descriptor parsing from getRelayNickname()
by atagar＠torproject.org 02 Jun '13

02 Jun '13

commit 7c6752d998690a1d3e4ec271a856a83a20199c4e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 1 19:50:01 2013 -0700 Removing manual descriptor parsing from getRelayNickname() The getRelayNickname() method did a little manual parsing of router status entries to get the nickname. Replacing this with a call to our controller's get_network_status(). --- src/util/torTools.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index a603f21..0cfa13c 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -757,13 +757,10 @@ class Controller: myNickname = self.getOption("Nickname", "Unnamed") self._nicknameLookupCache[relayFingerprint] = myNickname else: - # check the consensus for the relay - nsEntry = self.getConsensusEntry(relayFingerprint) + nsEntry = self.controller.get_network_status(relayFingerprint, None) - if nsEntry: relayNickname = nsEntry[2:nsEntry.find(" ", 2)] - else: relayNickname = None - - self._nicknameLookupCache[relayFingerprint] = relayNickname + if nsEntry: + self._nicknameLookupCache[relayFingerprint] = nsEntry.nickname result = self._nicknameLookupCache[relayFingerprint]

1 0

[arm/master] Accounting for moved to_camel_case() util
by atagar＠torproject.org 02 Jun '13

02 Jun '13

commit 52c64ce772833b46af4db51ec426a84a921ff226 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 1 19:23:22 2013 -0700 Accounting for moved to_camel_case() util Prior to stem's release I decided that the to_camel_case() function in the str_tools util wasn't something that I want to vend to stem users. This in turn broke our menu... Traceback (most recent call last): File "./src/starter.py", line 478, in <module> cli.controller.startTorMonitor(time.time() - initTime) File "/home/atagar/Desktop/arm/src/cli/controller.py", line 564, in startTorMonitor curses.wrapper(drawTorMonitor, startTime) File "/usr/lib/python2.7/curses/wrapper.py", line 43, in wrapper return func(stdscr, *args, **kwds) File "/home/atagar/Desktop/arm/src/cli/controller.py", line 635, in drawTorMonitor cli.menu.menu.showMenu() File "/home/atagar/Desktop/arm/src/cli/menu/menu.py", line 80, in showMenu menu = cli.menu.actions.makeMenu() File "/home/atagar/Desktop/arm/src/cli/menu/actions.py", line 27, in makeMenu baseMenu.add(makeViewMenu()) File "/home/atagar/Desktop/arm/src/cli/menu/actions.py", line 93, in makeViewMenu label = " / ".join([str_tools.to_camel_case(panel.getName()) for panel in pagePanels]) AttributeError: 'module' object has no attribute 'to_camel_case' Swapping arm to use stem's private method. This is, of course, bad since stem may change it in the future but this'll do the trick at least until we come up with a more permanent solution while rewriting arm. --- src/cli/menu/actions.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index 77357c9..8cc265b 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -90,7 +90,7 @@ def makeViewMenu(): for i in range(control.getPageCount()): pagePanels = control.getDisplayPanels(pageNumber = i, includeSticky = False) - label = " / ".join([str_tools.to_camel_case(panel.getName()) for panel in pagePanels]) + label = " / ".join([str_tools._to_camel_case(panel.getName()) for panel in pagePanels]) viewMenu.add(cli.menu.item.SelectionMenuItem(label, pageGroup, i)) @@ -101,7 +101,7 @@ def makeViewMenu(): colorMenu.add(cli.menu.item.SelectionMenuItem("All", colorGroup, None)) for color in uiTools.COLOR_LIST: - colorMenu.add(cli.menu.item.SelectionMenuItem(str_tools.to_camel_case(color), colorGroup, color)) + colorMenu.add(cli.menu.item.SelectionMenuItem(str_tools._to_camel_case(color), colorGroup, color)) viewMenu.add(colorMenu) @@ -141,7 +141,7 @@ def makeGraphMenu(graphPanel): availableStats.sort() for statKey in ["None"] + availableStats: - label = str_tools.to_camel_case(statKey, divider = " ") + label = str_tools._to_camel_case(statKey, divider = " ") statKey = None if statKey == "None" else statKey graphMenu.add(cli.menu.item.SelectionMenuItem(label, statGroup, statKey)) @@ -154,7 +154,7 @@ def makeGraphMenu(graphPanel): for i in range(len(cli.graphing.graphPanel.UPDATE_INTERVALS)): label = cli.graphing.graphPanel.UPDATE_INTERVALS[i][0] - label = str_tools.to_camel_case(label, divider = " ") + label = str_tools._to_camel_case(label, divider = " ") intervalMenu.add(cli.menu.item.SelectionMenuItem(label, intervalGroup, i)) graphMenu.add(intervalMenu)

1 0

[arm/master] Dropping unused getNicknameFingerprint() method
by atagar＠torproject.org 02 Jun '13

02 Jun '13

commit 7edb74c95af24e0e6106f43126c8a87155f95cff Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 1 19:56:06 2013 -0700 Dropping unused getNicknameFingerprint() method We were only using getNicknameFingerprint() once internally, so merging what little it does with its caller. --- src/util/torTools.py | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index e2206d8..d6e1220 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -63,7 +63,6 @@ class Controller: self._fingerprintMappings = None # mappings of ip -> [(port, fingerprint), ...] self._fingerprintLookupCache = {} # lookup cache with (ip, port) -> fingerprint mappings 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 @@ -102,7 +101,6 @@ class Controller: self._fingerprintMappings = None self._fingerprintLookupCache = {} self._nicknameLookupCache = {} - self._nicknameToFpLookupCache = {} self._addressLookupCache = {} self._consensusLookupCache = {} self._descriptorLookupCache = {} @@ -292,7 +290,10 @@ class Controller: for fp, nickname in entry.path: if not fp: - fp = self.getNicknameFingerprint(nickname) + consensusEntry = self.controller.get_network_status(nickname, None) + + if consensusEntry: + fp = consensusEntry.fingerprint # It shouldn't be possible for this lookup to fail, but we # need to fill something (callers won't expect our own client @@ -832,31 +833,6 @@ class Controller: return result - def getNicknameFingerprint(self, relayNickname): - """ - Provides the fingerprint associated with the given relay. This provides - None if no such relay exists. - - Arguments: - relayNickname - nickname of the relay - """ - - self.connLock.acquire() - - result = None - if self.isAlive(): - if not relayNickname in self._nicknameToFpLookupCache: - consensusEntry = self.controller.get_network_status(relayNickname, None) - - if consensusEntry: - self._nicknameToFpLookupCache[relayNickname] = consensusEntry.fingerprint - - result = self._nicknameToFpLookupCache.get(relayNickname) - - self.connLock.release() - - return result - def addEventListener(self, listener, *eventTypes): """ Directs further tor controller events to callback functions of the @@ -954,7 +930,6 @@ class Controller: # reconstructs consensus based mappings self._fingerprintLookupCache = {} self._nicknameLookupCache = {} - self._nicknameToFpLookupCache = {} self._addressLookupCache = {} self._consensusLookupCache = {}

1 0

[arm/master] Don't set our controller to None when disconnected
by atagar＠torproject.org 02 Jun '13

02 Jun '13

commit ded14d732c8875e8c2ab09e74f47db41a1d5d51a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 1 19:31:07 2013 -0700 Don't set our controller to None when disconnected Several of our changes expect us to have a controller attribute, so setting it to None causes a stacktrace when tor is shut down. Actually, stem provides us with graceful re-attachability so there's no reason to get rid of our Controller instance so simply leaving it alone. --- src/util/torTools.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 1ed1bbb..adc4d93 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -132,9 +132,7 @@ class Controller: self.connLock.acquire() if self.controller: self.controller.close() - self.controller = None - self.connLock.release() - else: self.connLock.release() + self.connLock.release() def getController(self): return self.controller

1 0

[arm/master] Dropping unused setOptions() method
by atagar＠torproject.org 02 Jun '13

02 Jun '13

commit 57754b9927d8c26f371707ad0363881432609a3b Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 1 19:38:35 2013 -0700 Dropping unused setOptions() method Arm's Controller was meant to be a complete wrapper around TorCtl, and as such it provided some funtionality that arm itself doesn't use. One instance of this is setOptions() which allowed the Controller to set multiple configuration options at once. There's no method for doing this in the curses interface so dropping the method. --- src/util/torTools.py | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index adc4d93..7c8eb9c 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -228,30 +228,13 @@ class Controller: list of strings) """ - self.setOptions(((param, value),)) - - 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 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() try: if not self.isAlive(): raise stem.SocketClosed() - self.controller.set_options(paramList, isReset) + self.controller.set_conf(param, value) except stem.SocketClosed, exc: self.close() raise exc

1 0