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

[torbirdy/master] Merge pull request #14 from mrphs/master
by sukhbir＠torproject.org 24 Sep '13

24 Sep '13

commit bf317f58cea05cbcfca2ffede382c332c809eba9 Merge: 2ecedff b94e032 Author: Sukhbir Singh <sukhbir.in(a)gmail.com> Date: Mon Sep 23 17:52:39 2013 -0700 Merge pull request #14 from mrphs/master Adding brand new shiny TorBirdy logo chrome/skin/images/Logo-64.png | Bin 0 -> 40849 bytes install.rdf | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-)

1 0

[torbirdy/master] Add the new TorBirdy logo designed by Nima
by sukhbir＠torproject.org 24 Sep '13

24 Sep '13

commit a0196cc09440dc39c1668dba5a472b1f802d429a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Sep 23 22:58:05 2013 -0400 Add the new TorBirdy logo designed by Nima --- ChangeLog | 1 + chrome/skin/images/Logo-64.png | Bin 40849 -> 0 bytes chrome/skin/images/tor.png | Bin 2073 -> 40849 bytes install.rdf | 2 +- 4 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9f92895..fea99bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ `--throw-keyids' is now disabled by default We are no longer forcing Thunderbird updates (closes #8341) Add support for Thunderbird 24 (Gecko 17+) + We have a new TorBirdy logo. Thanks to Nima Fatemi! Add Persian translation (thanks to Nima) Add Czech translation (thanks to dope) Add Esperanto translation (thanks to Michael Moroni) diff --git a/chrome/skin/images/Logo-64.png b/chrome/skin/images/Logo-64.png deleted file mode 100644 index fcfc9cb..0000000 Binary files a/chrome/skin/images/Logo-64.png and /dev/null differ diff --git a/chrome/skin/images/tor.png b/chrome/skin/images/tor.png index 75b86bf..fcfc9cb 100644 Binary files a/chrome/skin/images/tor.png and b/chrome/skin/images/tor.png differ diff --git a/install.rdf b/install.rdf index 862bb84..0a6f6fc 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ <em:id>castironthunderbirdclub(a)torproject.org</em:id> <em:version>0.1.1</em:version> <em:type>2</em:type> - <em:iconURL>chrome://castironthunderbirdclub/skin/images/Logo-64.png</em:iconURL> + <em:iconURL>chrome://castironthunderbirdclub/skin/images/tor.png</em:iconURL> <em:targetApplication>

1 0

r26368: {website} 2.4.17-beta-2-pt3 pluggable transport bundles. (website/trunk/include)
by tor-svn＠svn.torproject.org 24 Sep '13

24 Sep '13

Author: dcf Date: 2013-09-24 02:32:40 +0000 (Tue, 24 Sep 2013) New Revision: 26368 Modified: website/trunk/include/versions.wmi Log: 2.4.17-beta-2-pt3 pluggable transport bundles. Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2013-09-21 13:49:26 UTC (rev 26367) +++ website/trunk/include/versions.wmi 2013-09-24 02:32:40 UTC (rev 26368) @@ -33,7 +33,7 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> <define-tag version-torbrowserbundlealpha whitespace=delete>2.4.17-beta-2</define-tag> -<define-tag version-torobfsbundlealpha whitespace=delete>2.4.16-beta-1-pt1</define-tag> +<define-tag version-torobfsbundlealpha whitespace=delete>2.4.17-beta-2-pt3</define-tag> <define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-13</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-13</define-tag> @@ -44,8 +44,8 @@ <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.4.17-beta-2</define-tag> <define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.4.17-beta-2</define-tag> -<define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.4.16-beta-1-pt1</define-tag> -<define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.4.16-beta-1-pt1</define-tag> +<define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.4.17-beta-2-pt3</define-tag> +<define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.4.17-beta-2-pt3</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>2.3.25-13</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-13</define-tag> @@ -55,8 +55,8 @@ <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.4.17-beta-2</define-tag> <define-tag version-torbrowserbundleosx64alpha whitespace=delete>2.4.17-beta-2</define-tag> -<define-tag version-torobfsbundleosx32alpha whitespace=delete>2.4.16-beta-1-pt1</define-tag> -<define-tag version-torobfsbundleosx64alpha whitespace=delete>2.4.16-beta-1-pt1</define-tag> +<define-tag version-torobfsbundleosx32alpha whitespace=delete>2.4.17-beta-2-pt3</define-tag> +<define-tag version-torobfsbundleosx64alpha whitespace=delete>2.4.17-beta-2-pt3</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.21</define-tag> <define-tag version-vidalia-alpha whitespace=delete>0.3.1</define-tag>

1 0

[flashproxy/master] Support DESTDIR in makefiles.
by dcf＠torproject.org 24 Sep '13

24 Sep '13

commit e926cbd6687e633ef58161a921b747ac6182377f Author: David Fifield <david(a)bamsoftware.com> Date: Mon Sep 23 17:12:11 2013 -0700 Support DESTDIR in makefiles. https://www.gnu.org/prep/standards/html_node/DESTDIR.html --- ChangeLog | 3 +++ Makefile | 9 +++++---- facilitator/Makefile | 7 ++++--- websocket-transport/Makefile | 5 +++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3cc3f6a..c4351d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ o Allowed websocket-server to gracefully handle SIGTERM. + o Makefiles that install now obey DESTDIR to install relative to a + different root. + Changes in version 1.3 o Added a new observed Google public key pin. diff --git a/Makefile b/Makefile index 1ccd69a..7aa71fc 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ VERSION = 1.3 +DESTDIR = PREFIX = /usr/local BINDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/share/man @@ -20,10 +21,10 @@ all: $(CLIENT_DIST_FILES) $(CLIENT_MAN) a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 24" -d manpage -f manpage $< install: - mkdir -p $(BINDIR) - mkdir -p $(MANDIR)/man1 - cp -f $(CLIENT_BIN) $(BINDIR) - cp -f $(CLIENT_MAN) $(MANDIR)/man1 + mkdir -p $(DESTDIR)$(BINDIR) + mkdir -p $(DESTDIR)$(MANDIR)/man1 + cp -f $(CLIENT_BIN) $(DESTDIR)$(BINDIR) + cp -f $(CLIENT_MAN) $(DESTDIR)$(MANDIR)/man1 DISTNAME = flashproxy-client-$(VERSION) DISTDIR = dist/$(DISTNAME) diff --git a/facilitator/Makefile b/facilitator/Makefile index 90855d2..07ed125 100644 --- a/facilitator/Makefile +++ b/facilitator/Makefile @@ -1,3 +1,4 @@ +DESTDIR = PREFIX = /usr/local BINDIR = $(PREFIX)/bin @@ -5,9 +6,9 @@ all: : install: - mkdir -p $(BINDIR) - cp -f facilitator facilitator-email-poller facilitator-reg-daemon facilitator-reg facilitator.cgi fac.py $(BINDIR) - cp -f init.d/facilitator init.d/facilitator-email-poller init.d/facilitator-reg-daemon /etc/init.d/ + mkdir -p $(DESTDIR)$(BINDIR) + cp -f facilitator facilitator-email-poller facilitator-reg-daemon facilitator-reg facilitator.cgi fac.py $(DESTDIR)$(BINDIR) + cp -f init.d/facilitator init.d/facilitator-email-poller init.d/facilitator-reg-daemon $(DESTDIR)/etc/init.d/ clean: rm -f *.pyc diff --git a/websocket-transport/Makefile b/websocket-transport/Makefile index a791c41..2ce4ffa 100644 --- a/websocket-transport/Makefile +++ b/websocket-transport/Makefile @@ -1,3 +1,4 @@ +DESTDIR = PREFIX = /usr/local BINDIR = $(PREFIX)/bin @@ -21,8 +22,8 @@ websocket-client: $(GOPATH)/src/websocket-client/*.go go build $(GOBUILDFLAGS) websocket-client install: - mkdir -p "$(BINDIR)" - cp -f websocket-server "$(BINDIR)" + mkdir -p "$(DESTDIR)$(BINDIR)" + cp -f websocket-server "$(DESTDIR)$(BINDIR)" clean: rm -f $(PROGRAMS)

1 0

[arm/master] Letting stem check available resolvers for us
by atagar＠torproject.org 24 Sep '13

24 Sep '13

commit af0837d52bed57c4fdd383c23f4a0773738bb37c Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 23 12:06:38 2013 -0700 Letting stem check available resolvers for us Now that stem checks that resolvers are in our PATH no need for us to do the same. --- arm/util/connections.py | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/arm/util/connections.py b/arm/util/connections.py index d43a85d..2eb7095 100644 --- a/arm/util/connections.py +++ b/arm/util/connections.py @@ -17,12 +17,11 @@ options that perform even better (thanks to Fabian Keil and Hans Schnehl): - procstat procstat -f <pid> | grep TCP | grep -v 0.0.0.0:0 """ -import re import os import time import threading -from stem.util import conf, connection, enum, log, proc, system +from stem.util import conf, connection, log, system # If true this provides new instantiations for resolvers if the old one has # been stopped. This can make it difficult ensure all threads are terminated @@ -189,23 +188,14 @@ class ConnectionResolver(threading.Thread): self.defaultRate = CONFIG["queries.connections.minRate"] self.lastLookup = -1 self.overwriteResolver = None - self.defaultResolver = connection.Resolver.PROC + self.defaultResolver = None self.resolverOptions = connection.get_system_resolvers() - osType = os.uname()[0] - log.info("Operating System: %s, Connection Resolvers: %s" % (osType, ", ".join(self.resolverOptions))) + log.info("Operating System: %s, Connection Resolvers: %s" % (os.uname()[0], ", ".join(self.resolverOptions))) - # sets the default resolver to be the first found in the system's PATH - # (left as netstat if none are found) - for resolver in self.resolverOptions: - # Resolver strings correspond to their command with the exception of bsd - # resolvers. - resolverCmd = resolver.replace(" (bsd)", "") - - if resolver == connection.Resolver.PROC or system.is_available(resolverCmd): - self.defaultResolver = resolver - break + if self.resolverOptions: + self.defaultResolver = self.resolverOptions[0] self._connections = [] # connection cache (latest results) self._resolutionCounter = 0 # number of successful connection resolutions

1 0

[arm/master] Error due to moved popup import
by atagar＠torproject.org 24 Sep '13

24 Sep '13

commit 780aa8a3ed64cd35c4480de0ded6f5638065a0fa Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 23 12:34:08 2013 -0700 Error due to moved popup import Oops, fixing an error from rearanging our imports. This came up when pressing 'e' to get the logging popup... Traceback (most recent call last): File "runner.py", line 3, in <module> arm.starter.main() File "/home/atagar/Desktop/arm/arm/starter.py", line 398, in main arm.controller.start_arm(start_time) File "/home/atagar/Desktop/arm/arm/controller.py", line 549, in start_arm curses.wrapper(drawTorMonitor, start_time) File "/usr/lib/python2.7/curses/wrapper.py", line 43, in wrapper return func(stdscr, *args, **kwds) File "/home/atagar/Desktop/arm/arm/controller.py", line 654, in drawTorMonitor isKeystrokeConsumed = panelImpl.handleKey(key) File "/home/atagar/Desktop/arm/arm/logPanel.py", line 879, in handleKey self.showEventSelectionPrompt() File "/home/atagar/Desktop/arm/arm/logPanel.py", line 756, in showEventSelectionPrompt popup, width, height = popups.init(11, 80) NameError: global name 'popups' is not defined --- arm/logPanel.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arm/logPanel.py b/arm/logPanel.py index b5ee962..f020c57 100644 --- a/arm/logPanel.py +++ b/arm/logPanel.py @@ -737,7 +737,7 @@ class LogPanel(panel.Panel, threading.Thread, logging.Handler): Prompts the user to add a new regex filter. """ - regexInput = popups.inputPrompt("Regular expression: ") + regexInput = arm.popups.inputPrompt("Regular expression: ") if regexInput: try: @@ -745,7 +745,7 @@ class LogPanel(panel.Panel, threading.Thread, logging.Handler): if regexInput in self.filterOptions: self.filterOptions.remove(regexInput) self.filterOptions.insert(0, regexInput) except re.error, exc: - popups.showMsg("Unable to compile expression: %s" % exc, 2) + arm.popups.showMsg("Unable to compile expression: %s" % exc, 2) def showEventSelectionPrompt(self): """ @@ -753,7 +753,7 @@ class LogPanel(panel.Panel, threading.Thread, logging.Handler): """ # allow user to enter new types of events to log - unchanged if left blank - popup, width, height = popups.init(11, 80) + popup, width, height = arm.popups.init(11, 80) if popup: try: @@ -767,27 +767,27 @@ class LogPanel(panel.Panel, threading.Thread, logging.Handler): popup.win.refresh() - userInput = popups.inputPrompt("Events to log: ") + userInput = arm.popups.inputPrompt("Events to log: ") if userInput: userInput = userInput.replace(' ', '') # strips spaces try: self.setLoggedEvents(expandEvents(userInput)) except ValueError, exc: - popups.showMsg("Invalid flags: %s" % str(exc), 2) - finally: popups.finalize() + arm.popups.showMsg("Invalid flags: %s" % str(exc), 2) + finally: arm.popups.finalize() def showSnapshotPrompt(self): """ Lets user enter a path to take a snapshot, canceling if left blank. """ - pathInput = popups.inputPrompt("Path to save log snapshot: ") + pathInput = arm.popups.inputPrompt("Path to save log snapshot: ") if pathInput: try: self.saveSnapshot(pathInput) - popups.showMsg("Saved: %s" % pathInput, 2) + arm.popups.showMsg("Saved: %s" % pathInput, 2) except IOError, exc: - popups.showMsg("Unable to save snapshot: %s" % exc.strerror, 2) + arm.popups.showMsg("Unable to save snapshot: %s" % exc.strerror, 2) def clear(self): """ @@ -849,7 +849,7 @@ class LogPanel(panel.Panel, threading.Thread, logging.Handler): self.valsLock.release() elif key == ord('c') or key == ord('C'): msg = "This will clear the log. Are you sure (c again to confirm)?" - keyPress = popups.showMsg(msg, attr = curses.A_BOLD) + keyPress = arm.popups.showMsg(msg, attr = curses.A_BOLD) if keyPress in (ord('c'), ord('C')): self.clear() elif key == ord('f') or key == ord('F'): # Provides menu to pick regular expression filters or adding new ones: @@ -861,7 +861,7 @@ class LogPanel(panel.Panel, threading.Thread, logging.Handler): # new filters panel.CURSES_LOCK.acquire() try: - selection = popups.showMenu("Log Filter:", options, oldSelection) + selection = arm.popups.showMenu("Log Filter:", options, oldSelection) # applies new setting if selection == 0:

1 0

[arm/master] Daemon class for backing our ConnectionResolver
by atagar＠torproject.org 24 Sep '13

24 Sep '13

commit 09786dea15a9762c2a6dc72c8df8188729d92471 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 23 13:15:53 2013 -0700 Daemon class for backing our ConnectionResolver We have a couple resolvers that pull information at a set rate. First splitting the ConnectionResolver between its specialized functionality and more general worker aspects, hopefully we'll be able to reuse this for our system resource fetcher without much trouble. --- arm/controller.py | 6 +- arm/menu/actions.py | 4 +- arm/util/connections.py | 256 ++++++++++++++++++++++++++--------------------- 3 files changed, 148 insertions(+), 118 deletions(-) diff --git a/arm/controller.py b/arm/controller.py index 3623a2f..c10551d 100644 --- a/arm/controller.py +++ b/arm/controller.py @@ -492,7 +492,7 @@ def connResetListener(controller, eventType, _): if connections.isResolverAlive("tor"): resolver = connections.getResolver("tor") - resolver.setPaused(eventType == State.CLOSED) + resolver.set_paused(eventType == State.CLOSED) if eventType in (State.INIT, State.RESET): # Reload the torrc contents. If the torrc panel is present then it will @@ -523,7 +523,7 @@ def start_arm(start_time): if controller.get_conf("DisableDebuggerAttachment", None) == "1": log.notice("Tor is preventing system utilities like netstat and lsof from working. This means that arm can't provide you with connection information. You can change this by adding 'DisableDebuggerAttachment 0' to your torrc and restarting tor. For more information see...\nhttps://trac.torproject.org/3313") - connections.getResolver("tor").setPaused(True) + connections.getResolver("tor").set_paused(True) else: # Configures connection resoultions. This is paused/unpaused according to # if Tor's connected or not. @@ -543,7 +543,7 @@ def start_arm(start_time): else: # constructs singleton resolver and, if tor isn't connected, initizes # it to be paused - connections.getResolver("tor").setPaused(not controller.is_alive()) + connections.getResolver("tor").set_paused(not controller.is_alive()) try: curses.wrapper(drawTorMonitor, start_time) diff --git a/arm/menu/actions.py b/arm/menu/actions.py index 052b249..055cc46 100644 --- a/arm/menu/actions.py +++ b/arm/menu/actions.py @@ -11,6 +11,8 @@ import arm.graphing.graphPanel from arm.util import connections, torTools, uiTools +import stem.util.connection + from stem.util import conf, str_tools CONFIG = conf.config_dict("arm", { @@ -242,7 +244,7 @@ def makeConnectionsMenu(connPanel): resolverMenu.add(arm.menu.item.SelectionMenuItem("auto", resolverGroup, None)) - for option in connections.Resolver: + for option in stem.util.connection.Resolver: resolverMenu.add(arm.menu.item.SelectionMenuItem(option, resolverGroup, option)) connectionsMenu.add(resolverMenu) diff --git a/arm/util/connections.py b/arm/util/connections.py index 2eb7095..dd34efb 100644 --- a/arm/util/connections.py +++ b/arm/util/connections.py @@ -122,7 +122,86 @@ def getResolver(processName, processPid = "", alias=None): else: RESOLVERS[haltedIndex] = r return r -class ConnectionResolver(threading.Thread): +class Daemon(threading.Thread): + """ + Daemon that can perform a unit of work at a given rate. + """ + + def __init__(self, rate): + threading.Thread.__init__(self) + self.daemon = True + + self._rate = rate + self._last_ran = -1 # time when we last ran + + self._is_paused = False + self._halt = False # terminates thread if true + self._cond = threading.Condition() # used for pausing the thread + + def run(self): + while not self._halt: + time_since_last_ran = time.time() - self._last_ran + + if self._is_paused or time_since_last_ran < self._rate: + sleep_duration = max(0.2, self._rate - time_since_last_ran) + + self._cond.acquire() + if not self._halt: + self._cond.wait(sleep_duration) + self._cond.release() + + continue # done waiting, try again + + self.task() + self._last_ran = time.time() + + def task(self): + """ + Task the resolver is meant to perform. This should be implemented by + subclasses. + """ + + pass + + def get_rate(self): + """ + Provides the rate at which we perform our given task. + + :returns: **float** for the rate in seconds at which we perform our task + """ + + return self._rate + + def set_rate(self, rate): + """ + Sets the rate at which we perform our task in seconds. + + :param float rate: rate at which to perform work in seconds + """ + + self._rate = rate + + def set_paused(self, pause): + """ + Either resumes or holds off on doing further work. + + :param bool pause: halts work if **True**, resumes otherwise + """ + + self._is_paused = pause + + def stop(self): + """ + Halts further work and terminates the thread. + """ + + self._cond.acquire() + self._halt = True + self._cond.notifyAll() + self._cond.release() + + +class ConnectionResolver(Daemon): """ Service that periodically queries for a process' current connections. This provides several benefits over on-demand queries: @@ -151,11 +230,6 @@ class ConnectionResolver(threading.Thread): Parameters: processName - name of the process being resolved processPid - pid of the process being resolved - resolveRate - minimum time between resolving connections (in seconds, - None if using the default) - * defaultRate - default time between resolving connections - lastLookup - time connections were last resolved (unix time, -1 if - no resolutions have yet been successful) overwriteResolver - method of resolution (uses default if None) * defaultResolver - resolver used by default (None if all resolution methods have been exhausted) @@ -164,7 +238,7 @@ class ConnectionResolver(threading.Thread): * read-only """ - def __init__(self, processName, processPid = "", resolveRate = None, handle = None): + def __init__(self, processName, processPid = "", handle = None): """ Initializes a new resolver daemon. When no longer needed it's suggested that this is stopped. @@ -172,21 +246,15 @@ class ConnectionResolver(threading.Thread): Arguments: processName - name of the process being resolved processPid - pid of the process being resolved - resolveRate - time between resolving connections (in seconds, None if - chosen dynamically) handle - name used to query this resolver, this is the processName if undefined """ - threading.Thread.__init__(self) - self.setDaemon(True) + Daemon.__init__(self, CONFIG["queries.connections.minRate"]) self.processName = processName self.processPid = processPid - self.resolveRate = resolveRate self.handle = handle if handle else processName - self.defaultRate = CONFIG["queries.connections.minRate"] - self.lastLookup = -1 self.overwriteResolver = None self.defaultResolver = None @@ -199,9 +267,6 @@ class ConnectionResolver(threading.Thread): self._connections = [] # connection cache (latest results) self._resolutionCounter = 0 # number of successful connection resolutions - self._isPaused = False - self._halt = False # terminates thread if true - self._cond = threading.Condition() # used for pausing the thread self._subsiquentFailures = 0 # number of failed resolutions with the default in a row self._resolverBlacklist = [] # resolvers that have failed to resolve @@ -228,83 +293,68 @@ class ConnectionResolver(threading.Thread): self.overwriteResolver = overwriteResolver - def run(self): - while not self._halt: - minWait = self.resolveRate if self.resolveRate else self.defaultRate - timeSinceReset = time.time() - self.lastLookup - - if self._isPaused or timeSinceReset < minWait: - sleepTime = max(0.2, minWait - timeSinceReset) - - self._cond.acquire() - if not self._halt: self._cond.wait(sleepTime) - self._cond.release() - - continue # done waiting, try again - - isDefault = self.overwriteResolver == None - resolver = self.defaultResolver if isDefault else self.overwriteResolver - - # checks if there's nothing to resolve with - if not resolver: - self.lastLookup = time.time() # avoids a busy wait in this case - continue + def task(self): + isDefault = self.overwriteResolver == None + resolver = self.defaultResolver if isDefault else self.overwriteResolver - try: - resolveStart = time.time() - time.sleep(2) - from stem.util import log - connResults = [(conn.local_address, conn.local_port, conn.remote_address, conn.remote_port) for conn in connection.get_connections(resolver, process_pid = self.processPid, process_name = self.processName)] - - lookupTime = time.time() - resolveStart - - self._connections = connResults - self._resolutionCounter += 1 - - newMinDefaultRate = 100 * lookupTime - if self.defaultRate < newMinDefaultRate: - if self._rateThresholdBroken >= 3: - # adding extra to keep the rate from frequently changing - self.defaultRate = newMinDefaultRate + 0.5 - - log.trace("connection lookup time increasing to %0.1f seconds per call" % self.defaultRate) - else: self._rateThresholdBroken += 1 - else: self._rateThresholdBroken = 0 - - if isDefault: self._subsiquentFailures = 0 - except (ValueError, IOError), exc: - # this logs in a couple of cases: - # - special failures noted by getConnections (most cases are already - # logged via system) - # - note fail-overs for default resolution methods - if str(exc).startswith("No results found using:"): - log.info(exc) - - if isDefault: - self._subsiquentFailures += 1 - - if self._subsiquentFailures >= RESOLVER_FAILURE_TOLERANCE: - # failed several times in a row - abandon resolver and move on to another - self._resolverBlacklist.append(resolver) - self._subsiquentFailures = 0 - - # pick another (non-blacklisted) resolver - newResolver = None - for r in self.resolverOptions: - if not r in self._resolverBlacklist: - newResolver = r - break - - if newResolver: - # provide notice that failures have occurred and resolver is changing - log.notice(RESOLVER_SERIAL_FAILURE_MSG % (resolver, newResolver)) - else: - # exhausted all resolvers, give warning - log.notice(RESOLVER_FINAL_FAILURE_MSG) + # checks if there's nothing to resolve with + if not resolver: + self.stop() + return - self.defaultResolver = newResolver - finally: - self.lastLookup = time.time() + try: + resolveStart = time.time() + time.sleep(2) + from stem.util import log + connResults = [(conn.local_address, conn.local_port, conn.remote_address, conn.remote_port) for conn in connection.get_connections(resolver, process_pid = self.processPid, process_name = self.processName)] + + lookupTime = time.time() - resolveStart + + self._connections = connResults + self._resolutionCounter += 1 + + newMinDefaultRate = 100 * lookupTime + if self.get_rate() < newMinDefaultRate: + if self._rateThresholdBroken >= 3: + # adding extra to keep the rate from frequently changing + self.set_rate(newMinDefaultRate + 0.5) + + log.trace("connection lookup time increasing to %0.1f seconds per call" % newMinDefaultRate) + else: self._rateThresholdBroken += 1 + else: self._rateThresholdBroken = 0 + + if isDefault: self._subsiquentFailures = 0 + except (ValueError, IOError), exc: + # this logs in a couple of cases: + # - special failures noted by getConnections (most cases are already + # logged via system) + # - note fail-overs for default resolution methods + if str(exc).startswith("No results found using:"): + log.info(exc) + + if isDefault: + self._subsiquentFailures += 1 + + if self._subsiquentFailures >= RESOLVER_FAILURE_TOLERANCE: + # failed several times in a row - abandon resolver and move on to another + self._resolverBlacklist.append(resolver) + self._subsiquentFailures = 0 + + # pick another (non-blacklisted) resolver + newResolver = None + for r in self.resolverOptions: + if not r in self._resolverBlacklist: + newResolver = r + break + + if newResolver: + # provide notice that failures have occurred and resolver is changing + log.notice(RESOLVER_SERIAL_FAILURE_MSG % (resolver, newResolver)) + else: + # exhausted all resolvers, give warning + log.notice(RESOLVER_FINAL_FAILURE_MSG) + + self.defaultResolver = newResolver def getConnections(self): """ @@ -341,28 +391,6 @@ class ConnectionResolver(threading.Thread): self.processPid = processPid - def setPaused(self, isPause): - """ - Allows or prevents further connection resolutions (this still makes use of - cached results). - - Arguments: - isPause - puts a freeze on further resolutions if true, allows them to - continue otherwise - """ - - if isPause == self._isPaused: return - self._isPaused = isPause - - def stop(self): - """ - Halts further resolutions and terminates the thread. - """ - - self._cond.acquire() - self._halt = True - self._cond.notifyAll() - self._cond.release() class AppResolver: """

1 0

[arm/master] Revising ConnectionResolver
by atagar＠torproject.org 24 Sep '13

24 Sep '13

commit f7c22d40d407ef7a2282808acc61fc2e9e7f66e8 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 23 15:05:18 2013 -0700 Revising ConnectionResolver Rewriting the ConnectionResolver to be more intuitive and conform to PEP8 conventions. Also dropping the extra complications we had to support multiple connection resolvers. We only get an instance for tor so we might as well keep it simple. --- arm/connections/connPanel.py | 16 +-- arm/controller.py | 22 ++- arm/graphing/connStats.py | 4 +- arm/menu/actions.py | 4 +- arm/settings.cfg | 3 + arm/util/connections.py | 305 ++++++++++++++---------------------------- 6 files changed, 132 insertions(+), 222 deletions(-) diff --git a/arm/connections/connPanel.py b/arm/connections/connPanel.py index 7d7864e..e52e954 100644 --- a/arm/connections/connPanel.py +++ b/arm/connections/connPanel.py @@ -241,9 +241,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): # provides a menu to pick the connection resolver title = "Resolver Util:" options = ["auto"] + list(connections.Resolver) - connResolver = connections.getResolver("tor") + connResolver = connections.get_resolver() - currentOverwrite = connResolver.overwriteResolver + currentOverwrite = connResolver.get_custom_resolver() if currentOverwrite == None: oldSelection = 0 else: oldSelection = options.index(currentOverwrite) @@ -252,7 +252,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): # applies new setting if selection != -1: selectedOption = options[selection] if selection != 0 else None - connResolver.overwriteResolver = selectedOption + connResolver.set_custom_resolver(selectedOption) elif key == ord('l') or key == ord('L'): # provides a menu to pick the primary information we list connections by title = "List By:" @@ -312,7 +312,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): lastDraw += CONFIG["features.connection.refreshRate"] * drawTicks def getHelp(self): - resolverUtil = connections.getResolver("tor").overwriteResolver + resolverUtil = connections.get_resolver().get_custom_resolver() if resolverUtil == None: resolverUtil = "auto" options = [] @@ -426,10 +426,10 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.appResolveSinceUpdate = False # if we don't have an initialized resolver then this is a no-op - if not connections.isResolverAlive("tor"): return + if not connections.get_resolver().is_alive(): return - connResolver = connections.getResolver("tor") - currentResolutionCount = connResolver.getResolutionCount() + connResolver = connections.get_resolver() + currentResolutionCount = connResolver.get_resolution_count() self.valsLock.acquire() @@ -439,7 +439,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): # newConnections [(local ip, local port, foreign ip, foreign port)...] # newCircuits {circuitID => (status, purpose, path)...} - newConnections = connResolver.getConnections() + newConnections = [(conn.local_address, conn.local_port, conn.remote_address, conn.remote_port) for conn in connResolver.get_connections()] newCircuits = {} for circuitID, status, purpose, path in torTools.getConn().getCircuits(): diff --git a/arm/controller.py b/arm/controller.py index c10551d..29d1fea 100644 --- a/arm/controller.py +++ b/arm/controller.py @@ -457,7 +457,7 @@ def shutdownDaemons(): # internal threadpools being joined might be sleeping hostnames.stop() resourceTrackers = sysTools.RESOURCE_TRACKERS.values() - resolver = connections.getResolver("tor") if connections.isResolverAlive("tor") else None + resolver = connections.get_resolver() if connections.get_resolver().is_alive() else None for tracker in resourceTrackers: tracker.stop() if resolver: resolver.stop() # sets halt flag (returning immediately) for tracker in resourceTrackers: tracker.join() @@ -490,8 +490,8 @@ def connResetListener(controller, eventType, _): pid if started again. """ - if connections.isResolverAlive("tor"): - resolver = connections.getResolver("tor") + if connections.get_resolver().is_alive(): + resolver = connections.get_resolver() resolver.set_paused(eventType == State.CLOSED) if eventType in (State.INIT, State.RESET): @@ -503,7 +503,12 @@ def connResetListener(controller, eventType, _): torConfig.getTorrc().load(True) try: - resolver.setPid(controller.get_pid()) + tor_cmd = system.get_name_by_pid(tor_pid) + + if tor_cmd is None: + tor_cmd = "tor" + + resolver.set_process(controller.get_pid(), tor_cmd) except ValueError: pass @@ -523,7 +528,7 @@ def start_arm(start_time): if controller.get_conf("DisableDebuggerAttachment", None) == "1": log.notice("Tor is preventing system utilities like netstat and lsof from working. This means that arm can't provide you with connection information. You can change this by adding 'DisableDebuggerAttachment 0' to your torrc and restarting tor. For more information see...\nhttps://trac.torproject.org/3313") - connections.getResolver("tor").set_paused(True) + connections.get_resolver().set_paused(True) else: # Configures connection resoultions. This is paused/unpaused according to # if Tor's connected or not. @@ -539,11 +544,14 @@ def start_arm(start_time): if tor_cmd is None: tor_cmd = "tor" - connections.getResolver(tor_cmd, tor_pid, "tor") + resolver = connections.get_resolver() + resolver.set_process(tor_pid, tor_cmd) + log.info("Operating System: %s, Connection Resolvers: %s" % (os.uname()[0], ", ".join(resolver._resolvers))) + resolver.start() else: # constructs singleton resolver and, if tor isn't connected, initizes # it to be paused - connections.getResolver("tor").set_paused(not controller.is_alive()) + connections.get_resolver().set_paused(not controller.is_alive()) try: curses.wrapper(drawTorMonitor, start_time) diff --git a/arm/graphing/connStats.py b/arm/graphing/connStats.py index 2b1b188..b21caa6 100644 --- a/arm/graphing/connStats.py +++ b/arm/graphing/connStats.py @@ -39,8 +39,8 @@ class ConnStats(graphPanel.GraphStats): inboundCount, outboundCount = 0, 0 - for entry in connections.getResolver("tor").getConnections(): - localPort = entry[1] + for entry in connections.get_resolver().get_connections(): + localPort = entry.local_port if localPort in (self.orPort, self.dirPort): inboundCount += 1 elif localPort == self.controlPort: pass # control connection else: outboundCount += 1 diff --git a/arm/menu/actions.py b/arm/menu/actions.py index 055cc46..0829e85 100644 --- a/arm/menu/actions.py +++ b/arm/menu/actions.py @@ -238,9 +238,9 @@ def makeConnectionsMenu(connPanel): connectionsMenu.add(arm.menu.item.MenuItem("Sorting...", connPanel.showSortDialog)) # resolver submenu - connResolver = connections.getResolver("tor") + connResolver = connections.get_resolver() resolverMenu = arm.menu.item.Submenu("Resolver") - resolverGroup = arm.menu.item.SelectionGroup(connResolver.setOverwriteResolver, connResolver.getOverwriteResolver()) + resolverGroup = arm.menu.item.SelectionGroup(connResolver.set_custom_resolver, connResolver.get_custom_resolver()) resolverMenu.add(arm.menu.item.SelectionMenuItem("auto", resolverGroup, None)) diff --git a/arm/settings.cfg b/arm/settings.cfg index 0d5227c..a42a081 100644 --- a/arm/settings.cfg +++ b/arm/settings.cfg @@ -62,6 +62,9 @@ msg.config_not_found No armrc loaded, using defaults. You can customize arm by p msg.unable_to_read_config Failed to load configuration (using defaults): "{error}" msg.unable_to_determine_pid Unable to determine Tor's pid. Some information, like its resource usage will be unavailable. +msg.unable_to_use_resolver Unable to query connections with {old_resolver}, trying {new_resolver} +msg.unable_to_use_all_resolvers We were unable to use any of your system's resolvers to get tor's connections. This is fine, but means that the connections page will be empty. This is usually permissions related so if you would like to fix this then run arm with the same user as tor (ie, "sudo -u <tor user> arm"). + # Important tor configuration options (shown by default) config.important BandwidthRate config.important BandwidthBurst diff --git a/arm/util/connections.py b/arm/util/connections.py index dd34efb..a2d1ed6 100644 --- a/arm/util/connections.py +++ b/arm/util/connections.py @@ -23,15 +23,7 @@ import threading from stem.util import conf, connection, log, system -# If true this provides new instantiations for resolvers if the old one has -# been stopped. This can make it difficult ensure all threads are terminated -# when accessed concurrently. -RECREATE_HALTED_RESOLVERS = False - -RESOLVERS = [] # connection resolvers available via the singleton constructor -RESOLVER_FAILURE_TOLERANCE = 3 # number of subsequent failures before moving on to another resolver -RESOLVER_SERIAL_FAILURE_MSG = "Unable to query connections with %s, trying %s" -RESOLVER_FINAL_FAILURE_MSG = "We were unable to use any of your system's resolvers to get tor's connections. This is fine, but means that the connections page will be empty. This is usually permissions related so if you would like to fix this then run arm with the same user as tor (ie, \"sudo -u <tor user> arm\")." +RESOLVER = None def conf_handler(key, value): if key.startswith("port.label."): @@ -58,8 +50,10 @@ def conf_handler(key, value): msg = "Unable to parse port range for entry: %s" % key log.notice(msg) -CONFIG = conf.config_dict("arm", { - "queries.connections.minRate": 5, +CONFIG = conf.config_dict('arm', { + 'queries.connections.minRate': 5, + 'msg.unable_to_use_resolver': '', + 'msg.unable_to_use_all_resolvers': '', }, conf_handler) PORT_USAGE = {} @@ -75,52 +69,17 @@ def getPortUsage(port): return PORT_USAGE.get(port) -def isResolverAlive(processName, processPid = ""): - """ - This provides true if a singleton resolver instance exists for the given - process/pid combination, false otherwise. - - Arguments: - processName - name of the process being checked - processPid - pid of the process being checked, if undefined this matches - against any resolver with the process name - """ - - for resolver in RESOLVERS: - if not resolver._halt and resolver.processName == processName and (not processPid or resolver.processPid == processPid): - return True - - return False - -def getResolver(processName, processPid = "", alias=None): +def get_resolver(): """ - Singleton constructor for resolver instances. If a resolver already exists - for the process then it's returned. Otherwise one is created and started. - - Arguments: - processName - name of the process being resolved - processPid - pid of the process being resolved, if undefined this matches - against any resolver with the process name - alias - alternative handle under which the resolver can be requested + Singleton constructor for a connection resolver for tor's process. """ - # check if one's already been created - requestHandle = alias if alias else processName - haltedIndex = -1 # old instance of this resolver with the _halt flag set - for i in range(len(RESOLVERS)): - resolver = RESOLVERS[i] - if resolver.handle == requestHandle and (not processPid or resolver.processPid == processPid): - if resolver._halt and RECREATE_HALTED_RESOLVERS: haltedIndex = i - else: return resolver + global RESOLVER - # make a new resolver - r = ConnectionResolver(processName, processPid, handle = requestHandle) - r.start() + if RESOLVER is None: + RESOLVER = ConnectionResolver() - # overwrites halted instance of this resolver if it exists, otherwise append - if haltedIndex == -1: RESOLVERS.append(r) - else: RESOLVERS[haltedIndex] = r - return r + return RESOLVER class Daemon(threading.Thread): """ @@ -203,193 +162,133 @@ class Daemon(threading.Thread): class ConnectionResolver(Daemon): """ - Service that periodically queries for a process' current connections. This - provides several benefits over on-demand queries: - - queries are non-blocking (providing cached results) - - falls back to use different resolution methods in case of repeated failures - - avoids overly frequent querying of connection data, which can be demanding - in terms of system resources - - Unless an overriding method of resolution is requested this defaults to - choosing a resolver the following way: - - - Checks the current PATH to determine which resolvers are available. This - uses the first of the following that's available: - netstat, ss, lsof (picks netstat if none are found) - - - Attempts to resolve using the selection. Single failures are logged at the - INFO level, and a series of failures at NOTICE. In the later case this - blacklists the resolver, moving on to the next. If all resolvers fail this - way then resolution's abandoned and logs a WARN message. - - The time between resolving connections, unless overwritten, is set to be - either five seconds or ten times the runtime of the resolver (whichever is - larger). This is to prevent systems either strapped for resources or with a - vast number of connections from being burdened too heavily by this daemon. - - Parameters: - processName - name of the process being resolved - processPid - pid of the process being resolved - overwriteResolver - method of resolution (uses default if None) - * defaultResolver - resolver used by default (None if all resolution - methods have been exhausted) - resolverOptions - resolvers to be cycled through (differ by os) - - * read-only + Daemon that periodically retrieves the connections made by a process. """ - def __init__(self, processName, processPid = "", handle = None): - """ - Initializes a new resolver daemon. When no longer needed it's suggested - that this is stopped. + def __init__(self): + Daemon.__init__(self, CONFIG["queries.connections.minRate"]) - Arguments: - processName - name of the process being resolved - processPid - pid of the process being resolved - handle - name used to query this resolver, this is the processName - if undefined - """ + self._resolvers = connection.get_system_resolvers() + self._connections = [] + self._custom_resolver = None + self._resolution_counter = 0 # number of successful connection resolutions - Daemon.__init__(self, CONFIG["queries.connections.minRate"]) + self._process_pid = None + self._process_name = None - self.processName = processName - self.processPid = processPid - self.handle = handle if handle else processName - self.overwriteResolver = None + # Number of times in a row we've either failed with our current resolver or + # concluded that our rate is too low. - self.defaultResolver = None - self.resolverOptions = connection.get_system_resolvers() + self._failure_count = 0 + self._rate_too_low_count = 0 - log.info("Operating System: %s, Connection Resolvers: %s" % (os.uname()[0], ", ".join(self.resolverOptions))) + def task(self): + if self._custom_resolver: + resolver = self._custom_resolver + is_default_resolver = False + elif self._resolvers: + resolver = self._resolvers[0] + is_default_resolver = True + else: + return # nothing to resolve with - if self.resolverOptions: - self.defaultResolver = self.resolverOptions[0] + try: + start_time = time.time() + self._connections = connection.get_connections(resolver, process_pid = self._process_pid, process_name = self._process_name) + runtime = time.time() - start_time - self._connections = [] # connection cache (latest results) - self._resolutionCounter = 0 # number of successful connection resolutions - self._subsiquentFailures = 0 # number of failed resolutions with the default in a row - self._resolverBlacklist = [] # resolvers that have failed to resolve + self._resolution_counter += 1 - # Number of sequential times the threshold rate's been too low. This is to - # avoid having stray spikes up the rate. - self._rateThresholdBroken = 0 + if is_default_resolver: + self._failure_count = 0 - def getOverwriteResolver(self): - """ - Provides the resolver connection resolution is forced to use. This returns - None if it's dynamically determined. - """ + # Reduce our rate if connection resolution is taking a long time. This is + # most often an issue for extremely busy relays. - return self.overwriteResolver + min_rate = 100 * runtime - def setOverwriteResolver(self, overwriteResolver): - """ - Sets the resolver used for connection resolution, if None then this is - automatically determined based on what is available. + if self.get_rate() < min_rate: + self._rate_too_low_count += 1 - Arguments: - overwriteResolver - connection resolver to be used - """ + if self._rate_too_low_count >= 3: + min_rate += 1 # little extra padding so we don't frequently update this + self.set_rate(min_rate) + self._rate_too_low_count = 0 + log.trace("connection lookup time increasing to %0.1f seconds per call" % min_rate) + else: + self._rate_too_low_count = 0 + except IOError as exc: + log.info(exc) - self.overwriteResolver = overwriteResolver + # Fail over to another resolver if we've repeatedly been unable to use + # this one. - def task(self): - isDefault = self.overwriteResolver == None - resolver = self.defaultResolver if isDefault else self.overwriteResolver + if is_default_resolver: + self._failure_count += 1 - # checks if there's nothing to resolve with - if not resolver: - self.stop() - return + if self._failure_count >= 3: + self._resolvers.pop() + self._failure_count = 0 - try: - resolveStart = time.time() - time.sleep(2) - from stem.util import log - connResults = [(conn.local_address, conn.local_port, conn.remote_address, conn.remote_port) for conn in connection.get_connections(resolver, process_pid = self.processPid, process_name = self.processName)] - - lookupTime = time.time() - resolveStart - - self._connections = connResults - self._resolutionCounter += 1 - - newMinDefaultRate = 100 * lookupTime - if self.get_rate() < newMinDefaultRate: - if self._rateThresholdBroken >= 3: - # adding extra to keep the rate from frequently changing - self.set_rate(newMinDefaultRate + 0.5) - - log.trace("connection lookup time increasing to %0.1f seconds per call" % newMinDefaultRate) - else: self._rateThresholdBroken += 1 - else: self._rateThresholdBroken = 0 - - if isDefault: self._subsiquentFailures = 0 - except (ValueError, IOError), exc: - # this logs in a couple of cases: - # - special failures noted by getConnections (most cases are already - # logged via system) - # - note fail-overs for default resolution methods - if str(exc).startswith("No results found using:"): - log.info(exc) - - if isDefault: - self._subsiquentFailures += 1 - - if self._subsiquentFailures >= RESOLVER_FAILURE_TOLERANCE: - # failed several times in a row - abandon resolver and move on to another - self._resolverBlacklist.append(resolver) - self._subsiquentFailures = 0 - - # pick another (non-blacklisted) resolver - newResolver = None - for r in self.resolverOptions: - if not r in self._resolverBlacklist: - newResolver = r - break - - if newResolver: - # provide notice that failures have occurred and resolver is changing - log.notice(RESOLVER_SERIAL_FAILURE_MSG % (resolver, newResolver)) + if self._resolvers: + log.notice(CONFIG['msg.unable_to_use_resolver'].format( + old_resolver = resolver, + new_resolver = self._resolvers[0], + )) else: - # exhausted all resolvers, give warning - log.notice(RESOLVER_FINAL_FAILURE_MSG) - - self.defaultResolver = newResolver + log.notice(CONFIG['msg.unable_to_use_all_resolvers']) - def getConnections(self): + def set_process(self, pid, name): """ - Provides the last queried connection results, an empty list if resolver - has been halted. + Sets the process we retrieve connections for. + + :param int pid: process id + :param str name: name of the process """ - if self._halt: return [] - else: return list(self._connections) + self._process_pid = pid + self._process_name = name - def getResolutionCount(self): + def get_custom_resolver(self): """ - Provides the number of successful resolutions so far. This can be used to - determine if the connection results are new for the caller or not. + Provides the custom resolver the user has selected. This is **None** if + we're picking resolvers dynamically. + + :returns: :data:`stem.util.connection.Resolver` we're overwritten to use """ - return self._resolutionCounter + return self._custom_resolver - def getPid(self): + def set_custom_resolver(self, resolver): """ - Provides the pid used to narrow down connection resolution. This is an - empty string if undefined. + Sets the resolver used for connection resolution. If **None** then this is + automatically determined based on what is available. + + :param stem.util.connection.Resolver resolver: resolver to use """ - return self.processPid + self._custom_resolver = resolver + + def get_connections(self): + """ + Provides the last queried connection results, an empty list if resolver + has been stopped. - def setPid(self, processPid): + :returns: **list** of :class:`~stem.util.connection.Connection` we last retrieved """ - Sets the pid used to narrow down connection resultions. - Arguments: - processPid - pid for the process we're fetching connections for + if self._halt: + return [] + else: + return list(self._connections) + + def get_resolution_count(self): + """ + Provides the number of successful resolutions so far. This can be used to + determine if the connection results are new for the caller or not. """ - self.processPid = processPid + return self._resolution_counter class AppResolver:

1 0

[stem/master] Only report connection resolvers that are in our PATH
by atagar＠torproject.org 24 Sep '13

24 Sep '13

commit 276fb65ef4dbf0536be91e3fcb1912363d5ada73 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 23 12:03:25 2013 -0700 Only report connection resolvers that are in our PATH Having get_system_resolvers() check that resolvers are in our PATH before returning them. --- stem/util/connection.py | 4 ++++ test/unit/util/connection.py | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/stem/util/connection.py b/stem/util/connection.py index 4605a57..0b93130 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -249,6 +249,10 @@ def get_system_resolvers(system = None): resolvers = [Resolver.NETSTAT, Resolver.SOCKSTAT, Resolver.LSOF, Resolver.SS] + # remove any that aren't in the user's PATH + + resolvers = filter(lambda r: stem.util.system.is_available(RESOLVER_COMMAND[r]), resolvers) + # proc resolution, by far, outperforms the others so defaults to this is able if stem.util.proc.is_available(): diff --git a/test/unit/util/connection.py b/test/unit/util/connection.py index 03d83c1..1d9e6f6 100644 --- a/test/unit/util/connection.py +++ b/test/unit/util/connection.py @@ -88,12 +88,14 @@ BSD_PROCSTAT_OUTPUT = """\ class TestConnection(unittest.TestCase): + @patch('stem.util.system.is_available') @patch('stem.util.proc.is_available') - def test_get_system_resolvers(self, proc_mock): + def test_get_system_resolvers(self, proc_mock, is_available_mock): """ Checks the get_system_resolvers function. """ + is_available_mock.return_value = True proc_mock.return_value = False self.assertEqual([], stem.util.connection.get_system_resolvers('Windows')) @@ -110,6 +112,11 @@ class TestConnection(unittest.TestCase): self.assertEqual(stem.util.connection.get_system_resolvers(platform.system()), stem.util.connection.get_system_resolvers()) + # check that lacking commands in our PATH drops them from the results + + is_available_mock.return_value = False + self.assertEqual([Resolver.PROC], stem.util.connection.get_system_resolvers('Linux')) + @patch('stem.util.proc.get_connections') def test_get_connections_by_proc(self, proc_mock): """

1 0

[tor-browser-bundle/master] Update changelog and versions for JS-Ctypes and Startpage fixes.
by mikeperry＠torproject.org 24 Sep '13

24 Sep '13

commit d1fad5a54345d9dad8f8997f2f956d3f4fdeb0f4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 23 14:24:26 2013 -0700 Update changelog and versions for JS-Ctypes and Startpage fixes. --- Bundle-Data/Docs/ChangeLog.txt | 8 ++++++-- gitian/versions | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4960a0a..ef14c4a 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,8 @@ -Tor Browser Bundle 3.0alpha4 -- Sep 20 2013 +Tor Browser Bundle 3.0alpha4 -- Sep 24 2013 * All Platforms: * Bug #8751: Randomize TLS HELLO timestamp in HTTPS connections + * Bug #9790 (workaround): Temporarily re-enable JS-Ctypes for cache + isolation and SSL Observatory * Update Firefox to 17.0.9esr * Update Tor to 0.2.4.17-rc * Update NoScript to 2.6.7.1 @@ -10,9 +12,11 @@ Tor Browser Bundle 3.0alpha4 -- Sep 20 2013 * Bug #9445: Allow user to enter bridges with or without 'bridge' keyword * Bug #9593: Use UTF16 for Tor process launch to handle unicode paths. * misc: Detect when Tor exits and display appropriate notification - * Update Torbutton to 1.6.2 + * Update Torbutton to 1.6.2.1 * Bug 9492: Fix Torbutton logo on OSX and Windows (and related initialization code) + * Bug 8839: Disable Google/Startpage search filters using Tor-specific urls + Tor Browser Bundle 3.0alpha3 -- Aug 01 2013 * All Platforms: diff --git a/gitian/versions b/gitian/versions index c89d110..1488b07 100755 --- a/gitian/versions +++ b/gitian/versions @@ -3,10 +3,10 @@ BUNDLE_LOCALES="de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-17.0.9esr-3.0alpha4-build1 +TORBROWSER_TAG=tor-browser-17.0.9esr-3.0alpha4-build2 TOR_TAG=tor-0.2.4.17-rc TORLAUNCHER_TAG=0.2.2-alpha -TORBUTTON_TAG=1.6.2 +TORBUTTON_TAG=1.6.2.1 HTTPSE_TAG=3.3.1 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8

1 0