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

[tor-browser/tor-browser-17.0.9esr-1] fixup! Tor Browser's official .mozconfigs.
by mikeperry＠torproject.org 24 Sep '13

24 Sep '13

commit 9f620fdcda8ed8df0a974e78761e610c0e3146fa Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 23 14:11:44 2013 -0700 fixup! Tor Browser's official .mozconfigs. Temporarily re-enable ctypes to work around #9790. --- .mozconfig | 2 +- .mozconfig-mac | 2 +- .mozconfig-mingw | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.mozconfig b/.mozconfig index 86d1989a..6253b7e 100755 --- a/.mozconfig +++ b/.mozconfig @@ -16,4 +16,4 @@ ac_add_options --disable-debug ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc -ac_add_options --disable-ctypes +#ac_add_options --disable-ctypes diff --git a/.mozconfig-mac b/.mozconfig-mac index 9a8a6d8..79a40fe 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -20,4 +20,4 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests -ac_add_options --disable-ctypes +#ac_add_options --disable-ctypes diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 46ef4cf..1f88406 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -26,4 +26,4 @@ ac_add_options --disable-tests ac_add_options --disable-accessibility ac_add_options --disable-webgl -ac_add_options --disable-ctypes +#ac_add_options --disable-ctypes

1 0

[torbutton/master] Bump version and changelog for startpage search fix.
by mikeperry＠torproject.org 23 Sep '13

23 Sep '13

commit 67aee468746e6e79865b200ca81591bfd1956285 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 23 13:02:20 2013 -0700 Bump version and changelog for startpage search fix. --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 20557d6..a9eeff6 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.6.2.1: + 23 Sep 2013: + * Bug 8839: Switch about:tor search link to unfiltered startpage link + 1.6.2: 18 Sep 2013 * bug 9492: Fix Torbutton logo on OSX and Windows (and related diff --git a/src/install.rdf b/src/install.rdf index a18bf7d..550c3b7 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.2</em:version> + <em:version>1.6.2.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 23 Sep '13

23 Sep '13

commit 095398c2981a94dcb2fd25436be69e742ccde034 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 23 17:15:50 2013 +0000 Update translations for whisperback_completed --- pt_BR/pt_BR.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index f8ee596..b79887e 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -6,14 +6,15 @@ # Augustine <evandro(a)geocities.com>, 2013 # bruuh <bruuh(a)outlook.com>, 2012 # betodso <beto.cpv(a)gmail.com>, 2013 +# jkaizer <jkck2010(a)hotmail.com>, 2013 # Snake Plissken <>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-08-13 15:40+0000\n" -"Last-Translator: betodso <beto.cpv(a)gmail.com>\n" +"PO-Revision-Date: 2013-09-23 17:00+0000\n" +"Last-Translator: jkaizer <jkck2010(a)hotmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,7 +31,7 @@ msgstr "E-mail de contato inválido: %s" #: ../whisperBack/whisperback.py:80 #, python-format msgid "Invalid contact OpenPGP key: %s" -msgstr "Chave OpenPGP de contato inválida: %s" +msgstr "Key OpenPGP de contato inválida: %s" #: ../whisperBack/whisperback.py:82 msgid "Invalid contact OpenPGP public key block" @@ -45,7 +46,7 @@ msgstr "A variável %s não foi encontrada em quaisquer dos arquivos de configur #: ../whisperBack/gui.py:154 msgid "Unable to load a valid configuration." -msgstr "Habilitar carregar uma configuração válida" +msgstr "Habilitar carregamento de configuração válida" #: ../whisperBack/gui.py:220 msgid "Sending mail..." @@ -58,11 +59,11 @@ msgstr "Enviando e-mail" #. pylint: disable=C0301 #: ../whisperBack/gui.py:223 msgid "This could take a while..." -msgstr "Isto pode levar um tempo..." +msgstr "Isto pode levar alguns minutos..." #: ../whisperBack/gui.py:237 msgid "The contact email adress doesn't seem valid." -msgstr "O e-mail de contato não parece ser válido" +msgstr "O e-mail de contato parece não ser válido" #: ../whisperBack/gui.py:254 msgid "Unable to send the mail: SMTP error."

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 23 Sep '13

23 Sep '13

commit 8abbaca291cd9d18dc538c9d114160cb75d7092c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 23 17:15:47 2013 +0000 Update translations for whisperback --- pt_BR/pt_BR.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index f8ee596..b79887e 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -6,14 +6,15 @@ # Augustine <evandro(a)geocities.com>, 2013 # bruuh <bruuh(a)outlook.com>, 2012 # betodso <beto.cpv(a)gmail.com>, 2013 +# jkaizer <jkck2010(a)hotmail.com>, 2013 # Snake Plissken <>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-08-13 15:40+0000\n" -"Last-Translator: betodso <beto.cpv(a)gmail.com>\n" +"PO-Revision-Date: 2013-09-23 17:00+0000\n" +"Last-Translator: jkaizer <jkck2010(a)hotmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,7 +31,7 @@ msgstr "E-mail de contato inválido: %s" #: ../whisperBack/whisperback.py:80 #, python-format msgid "Invalid contact OpenPGP key: %s" -msgstr "Chave OpenPGP de contato inválida: %s" +msgstr "Key OpenPGP de contato inválida: %s" #: ../whisperBack/whisperback.py:82 msgid "Invalid contact OpenPGP public key block" @@ -45,7 +46,7 @@ msgstr "A variável %s não foi encontrada em quaisquer dos arquivos de configur #: ../whisperBack/gui.py:154 msgid "Unable to load a valid configuration." -msgstr "Habilitar carregar uma configuração válida" +msgstr "Habilitar carregamento de configuração válida" #: ../whisperBack/gui.py:220 msgid "Sending mail..." @@ -58,11 +59,11 @@ msgstr "Enviando e-mail" #. pylint: disable=C0301 #: ../whisperBack/gui.py:223 msgid "This could take a while..." -msgstr "Isto pode levar um tempo..." +msgstr "Isto pode levar alguns minutos..." #: ../whisperBack/gui.py:237 msgid "The contact email adress doesn't seem valid." -msgstr "O e-mail de contato não parece ser válido" +msgstr "O e-mail de contato parece não ser válido" #: ../whisperBack/gui.py:254 msgid "Unable to send the mail: SMTP error."

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 23 Sep '13

23 Sep '13

commit 1d2e4083394d2e729057099c657560d63090f761 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 23 14:16:09 2013 +0000 Update translations for torbirdy_completed --- lv/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lv/torbirdy.dtd b/lv/torbirdy.dtd index 7aa0eb3..1779d58 100644 --- a/lv/torbirdy.dtd +++ b/lv/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Globāls"> <!ENTITY torbirdy.prefs.imap.label "IMAP kontiem [noklusēti: atspējots] iespējot e-pastu pašpiegādes atbalstu"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Sākot darbu, izvēlēties pēdējo apmeklēto pasta mapi [noklusēti: atspējots, izvēlēsies Vietējās mapes]"> +<!ENTITY torbirdy.prefs.startup_folder.label "Sākot darbu, izvēlēties pēdējo apmeklēto pasta mapi [noklusēti: atspējots]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Neiestatīt Thunderbird'a laika zonu uz UTC [noklusēti: iestatīt uz UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 23 Sep '13

23 Sep '13

commit 9e1bbfcf6de6e433f0496e39477591be7f61ac22 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 23 14:16:03 2013 +0000 Update translations for torbirdy --- lv/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lv/torbirdy.dtd b/lv/torbirdy.dtd index 886b638..1779d58 100644 --- a/lv/torbirdy.dtd +++ b/lv/torbirdy.dtd @@ -35,7 +35,7 @@ <!ENTITY torbirdy.prefs.global "Globāls"> <!ENTITY torbirdy.prefs.imap.label "IMAP kontiem [noklusēti: atspējots] iespējot e-pastu pašpiegādes atbalstu"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label ""> +<!ENTITY torbirdy.prefs.startup_folder.label "Sākot darbu, izvēlēties pēdējo apmeklēto pasta mapi [noklusēti: atspējots]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "Neiestatīt Thunderbird'a laika zonu uz UTC [noklusēti: iestatīt uz UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z">

1 0

[metrics-db/master] Warn if we cannot recognize a bridge descriptor line.
by karsten＠torproject.org 23 Sep '13

23 Sep '13

commit 58d76ef7f21fe67a9d60cabbf641054b7d481495 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Sep 23 11:35:17 2013 +0200 Warn if we cannot recognize a bridge descriptor line. --- .../torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java index d7cfb98..5861ade 100644 --- a/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java @@ -776,7 +776,8 @@ public class SanitizedBridgesWriter extends Thread { * that we need to remove or replace for the sanitized descriptor * version. */ } else { - this.logger.fine("Unrecognized line '" + line + "'. Skipping."); + this.logger.warning("Unrecognized line '" + line + + "'. Skipping."); return; } } @@ -913,7 +914,8 @@ public class SanitizedBridgesWriter extends Thread { * that we need to remove or replace for the sanitized descriptor * version. */ } else { - this.logger.fine("Unrecognized line '" + line + "'. Skipping."); + this.logger.warning("Unrecognized line '" + line + + "'. Skipping."); return; } }

1 0

[arm/master] Using stem's connection resolution
by atagar＠torproject.org 23 Sep '13

23 Sep '13

commit 7a5131d401a3981e16dc5c6056afbb0067ef36bb Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 23 00:10:07 2013 -0700 Using stem's connection resolution Dropping use of our connection resolvers in favor of stem's. Unfortunately there's still quite a bit more work needed to get rid of this module... --- arm/logPanel.py | 4 +- arm/util/connections.py | 205 +++-------------------------------------------- 2 files changed, 10 insertions(+), 199 deletions(-) diff --git a/arm/logPanel.py b/arm/logPanel.py index 101a7e8..b5ee962 100644 --- a/arm/logPanel.py +++ b/arm/logPanel.py @@ -566,9 +566,7 @@ class LogPanel(panel.Panel, threading.Thread, logging.Handler): stem_logger.addHandler(self) def emit(self, record): - if record.levelname == "ERROR": - record.levelname = "ERR" - elif record.levelname == "WARNING": + if record.levelname == "WARNING": record.levelname = "WARN" eventColor = RUNLEVEL_EVENT_COLOR[record.levelname] diff --git a/arm/util/connections.py b/arm/util/connections.py index bdb3c3f..d43a85d 100644 --- a/arm/util/connections.py +++ b/arm/util/connections.py @@ -22,55 +22,13 @@ import os import time import threading -from stem.util import conf, enum, log, proc, system - -# enums for connection resolution utilities -Resolver = enum.Enum(("PROC", "proc"), - ("NETSTAT", "netstat"), - ("SS", "ss"), - ("LSOF", "lsof"), - ("SOCKSTAT", "sockstat"), - ("BSD_SOCKSTAT", "sockstat (bsd)"), - ("BSD_PROCSTAT", "procstat (bsd)")) +from stem.util import conf, connection, enum, log, proc, 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 -# formatted strings for the commands to be executed with the various resolvers -# options are: -# n = prevents dns lookups, p = include process -# output: -# tcp 0 0 127.0.0.1:9051 127.0.0.1:53308 ESTABLISHED 9912/tor -# *note: bsd uses a different variant ('-t' => '-p tcp', but worse an -# equivilant -p doesn't exist so this can't function) -RUN_NETSTAT = "netstat -np" - -# n = numeric ports, p = include process, t = tcp sockets, u = udp sockets -# output: -# ESTAB 0 0 127.0.0.1:9051 127.0.0.1:53308 users:(("tor",9912,20)) -# *note: under freebsd this command belongs to a spreadsheet program -RUN_SS = "ss -nptu" - -# n = prevent dns lookups, P = show port numbers (not names), i = ip only, -# -w = no warnings -# output: -# tor 3873 atagar 45u IPv4 40994 0t0 TCP 10.243.55.20:45724->194.154.227.109:9001 (ESTABLISHED) -# -# oddly, using the -p flag via: -# lsof lsof -nPi -p <pid> | grep "^<process>.*(ESTABLISHED)" -# is much slower (11-28% in tests I ran) -RUN_LSOF = "lsof -wnPi" - -# output: -# atagar tor 3475 tcp4 127.0.0.1:9051 127.0.0.1:38942 ESTABLISHED -# *note: this isn't available by default under ubuntu -RUN_SOCKSTAT = "sockstat" - -RUN_BSD_SOCKSTAT = "sockstat -4c" -RUN_BSD_PROCSTAT = "procstat -f %s" - 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" @@ -118,130 +76,6 @@ def getPortUsage(port): return PORT_USAGE.get(port) -def getResolverCommand(resolutionCmd, processName, processPid = ""): - """ - Provides the command and line filter that would be processed for the given - resolver type. This raises a ValueError if either the resolutionCmd isn't - recognized or a pid was requited but not provided. - - Arguments: - resolutionCmd - command to use in resolving the address - processName - name of the process for which connections are fetched - processPid - process ID (this helps improve accuracy) - """ - - if not processPid: - # the pid is required for procstat resolution - if resolutionCmd == Resolver.BSD_PROCSTAT: - raise ValueError("procstat resolution requires a pid") - - # if the pid was undefined then match any in that field - processPid = "[0-9]*" - - no_op_filter = lambda line: True - - if resolutionCmd == Resolver.PROC: return ("", no_op_filter) - elif resolutionCmd == Resolver.NETSTAT: - return ( - RUN_NETSTAT, - lambda line: "ESTABLISHED %s/%s" % (processPid, processName) in line - ) - elif resolutionCmd == Resolver.SS: - return ( - RUN_SS, - lambda line: ("ESTAB" in line) and ("\"%s\",%s" % (processName, processPid) in line) - ) - elif resolutionCmd == Resolver.LSOF: - return ( - RUN_LSOF, - lambda line: re.match("^%s *%s.*((UDP.*)|(\(ESTABLISHED\)))" % (processName, processPid)) - ) - elif resolutionCmd == Resolver.SOCKSTAT: - return ( - RUN_SOCKSTAT, - lambda line: re.match("%s *%s.*ESTABLISHED" % (processName, processPid)) - ) - elif resolutionCmd == Resolver.BSD_SOCKSTAT: - return ( - RUN_BSD_SOCKSTAT, - lambda line: re.match("%s *%s" % (processName, processPid)) - ) - elif resolutionCmd == Resolver.BSD_PROCSTAT: - return ( - RUN_BSD_PROCSTAT % processPid, - lambda line: "TCP" in line and "0.0.0.0:0" not in line - ) - else: raise ValueError("Unrecognized resolution type: %s" % resolutionCmd) - -def getConnections(resolutionCmd, processName, processPid = ""): - """ - Retrieves a list of the current connections for a given process, providing a - tuple list of the form: - [(local_ipAddr1, local_port1, foreign_ipAddr1, foreign_port1), ...] - this raises an IOError if no connections are available or resolution fails - (in most cases these appear identical). Common issues include: - - insufficient permissions - - resolution command is unavailable - - usage of the command is non-standard (particularly an issue for BSD) - - Arguments: - resolutionCmd - command to use in resolving the address - processName - name of the process for which connections are fetched - processPid - process ID (this helps improve accuracy) - """ - - if resolutionCmd == Resolver.PROC: - # Attempts resolution via checking the proc contents. - if not processPid: - raise ValueError("proc resolution requires a pid") - - try: - return proc.get_connections(processPid) - except Exception, exc: - raise IOError(str(exc)) - else: - # Queries a resolution utility (netstat, lsof, etc). This raises an - # IOError if the command fails or isn't available. - cmd, cmd_filter = getResolverCommand(resolutionCmd, processName, processPid) - results = system.call(cmd) - results = filter(cmd_filter, results) - - if not results: raise IOError("No results found using: %s" % cmd) - - # parses results for the resolution command - conn = [] - for line in results: - if resolutionCmd == Resolver.LSOF: - # Different versions of lsof have different numbers of columns, so - # stripping off the optional 'established' entry so we can just use - # the last one. - comp = line.replace("(ESTABLISHED)", "").strip().split() - else: comp = line.split() - - if resolutionCmd == Resolver.NETSTAT: - localIp, localPort = comp[3].split(":") - foreignIp, foreignPort = comp[4].split(":") - elif resolutionCmd == Resolver.SS: - localIp, localPort = comp[4].split(":") - foreignIp, foreignPort = comp[5].split(":") - elif resolutionCmd == Resolver.LSOF: - local, foreign = comp[-1].split("->") - localIp, localPort = local.split(":") - foreignIp, foreignPort = foreign.split(":") - elif resolutionCmd == Resolver.SOCKSTAT: - localIp, localPort = comp[4].split(":") - foreignIp, foreignPort = comp[5].split(":") - elif resolutionCmd == Resolver.BSD_SOCKSTAT: - localIp, localPort = comp[5].split(":") - foreignIp, foreignPort = comp[6].split(":") - elif resolutionCmd == Resolver.BSD_PROCSTAT: - localIp, localPort = comp[9].split(":") - foreignIp, foreignPort = comp[10].split(":") - - conn.append((localIp, localPort, foreignIp, foreignPort)) - - return conn - def isResolverAlive(processName, processPid = ""): """ This provides true if a singleton resolver instance exists for the given @@ -289,30 +123,6 @@ def getResolver(processName, processPid = "", alias=None): else: RESOLVERS[haltedIndex] = r return r -def getSystemResolvers(osType = None): - """ - Provides the types of connection resolvers available on this operating - system. - - Arguments: - osType - operating system type, fetched from the os module if undefined - """ - - if osType == None: osType = os.uname()[0] - - if osType == "FreeBSD": - resolvers = [Resolver.BSD_SOCKSTAT, Resolver.BSD_PROCSTAT, Resolver.LSOF] - elif osType in ("OpenBSD", "Darwin"): - resolvers = [Resolver.LSOF] - else: - resolvers = [Resolver.NETSTAT, Resolver.SOCKSTAT, Resolver.LSOF, Resolver.SS] - - # proc resolution, by far, outperforms the others so defaults to this is able - if proc.is_available(): - resolvers = [Resolver.PROC] + resolvers - - return resolvers - class ConnectionResolver(threading.Thread): """ Service that periodically queries for a process' current connections. This @@ -379,11 +189,11 @@ class ConnectionResolver(threading.Thread): self.defaultRate = CONFIG["queries.connections.minRate"] self.lastLookup = -1 self.overwriteResolver = None - self.defaultResolver = Resolver.PROC + self.defaultResolver = connection.Resolver.PROC - osType = os.uname()[0] - self.resolverOptions = getSystemResolvers(osType) + self.resolverOptions = connection.get_system_resolvers() + osType = os.uname()[0] log.info("Operating System: %s, Connection Resolvers: %s" % (osType, ", ".join(self.resolverOptions))) # sets the default resolver to be the first found in the system's PATH @@ -393,7 +203,7 @@ class ConnectionResolver(threading.Thread): # resolvers. resolverCmd = resolver.replace(" (bsd)", "") - if resolver == Resolver.PROC or system.is_available(resolverCmd): + if resolver == connection.Resolver.PROC or system.is_available(resolverCmd): self.defaultResolver = resolver break @@ -452,7 +262,10 @@ class ConnectionResolver(threading.Thread): try: resolveStart = time.time() - connResults = getConnections(resolver, self.processName, self.processPid) + 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

1 0

[stem/master] Proc unit tests didn't reflect protocol addition
by atagar＠torproject.org 23 Sep '13

23 Sep '13

commit 7c0002d40db176d02c6a57e400ec53b5fb7a63a4 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 23 00:28:01 2013 -0700 Proc unit tests didn't reflect protocol addition Oops, our unit tests didn't account for proc now providing the protocol. Caught by our jenkins tests. --- test/unit/util/proc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py index 4ee598b..caf9d7a 100644 --- a/test/unit/util/proc.py +++ b/test/unit/util/proc.py @@ -172,8 +172,8 @@ class TestProc(unittest.TestCase): self.assertEquals([], proc.get_connections(0)) expected_results = [ - ('17.17.17.17', 4369, '34.34.34.34', 8738), - ('187.187.187.187', 48059, '204.204.204.204', 52428), + ('17.17.17.17', 4369, '34.34.34.34', 8738, 'tcp'), + ('187.187.187.187', 48059, '204.204.204.204', 52428, 'udp'), ] self.assertEquals(expected_results, proc.get_connections(pid))

1 0

[stem/master] Adding function for getting the system's resolvers
by atagar＠torproject.org 23 Sep '13

23 Sep '13

commit 87b0d512e2b83a2dcced709e33128eaed10cc439 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 22 12:25:00 2013 -0700 Adding function for getting the system's resolvers Adding a get_system_resolvers() function that provides the connection resolvers that are likely to work on a given platform. --- stem/util/connection.py | 47 +++++++++++++++++++++++++++++++++++++++++- test/unit/util/connection.py | 27 ++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/stem/util/connection.py b/stem/util/connection.py index 0e4c190..e0b08df 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -21,13 +21,58 @@ but for now just moving the parts we need. import hashlib import hmac import os +import platform import re -CRYPTOVARIABLE_EQUALITY_COMPARISON_NONCE = os.urandom(32) +import stem.util.proc + +from stem.util import enum + +Resolver = enum.Enum( + ('PROC', 'proc'), + ('NETSTAT', 'netstat'), + ('SS', 'ss'), + ('LSOF', 'lsof'), + ('SOCKSTAT', 'sockstat'), + ('BSD_SOCKSTAT', 'sockstat (bsd)'), + ('BSD_PROCSTAT', 'procstat (bsd)') +) FULL_IPv4_MASK = "255.255.255.255" FULL_IPv6_MASK = "FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF" +CRYPTOVARIABLE_EQUALITY_COMPARISON_NONCE = os.urandom(32) + + +def get_system_resolvers(system = None): + """ + Provides the types of connection resolvers likely to be available on this platform. + + :param str system: system to get resolvers for, this is determined by + platform.system() if not provided + + :returns: **list** of Resolvers likely to be available on this platform + """ + + if system is None: + system = platform.system() + + if system == 'Windows': + resolvers = [] + elif system in ('Darwin', 'OpenBSD'): + resolvers = [Resolver.LSOF] + elif system == 'FreeBSD': + resolvers = [Resolver.BSD_SOCKSTAT, Resolver.BSD_PROCSTAT, Resolver.LSOF] + else: + resolvers = [Resolver.NETSTAT, Resolver.SOCKSTAT, Resolver.LSOF, Resolver.SS] + + # proc resolution, by far, outperforms the others so defaults to this is able + + if stem.util.proc.is_available(): + resolvers = [Resolver.PROC] + resolvers + + return resolvers + def is_valid_ipv4_address(address): """ diff --git a/test/unit/util/connection.py b/test/unit/util/connection.py index 5d48f28..40a2e02 100644 --- a/test/unit/util/connection.py +++ b/test/unit/util/connection.py @@ -2,12 +2,39 @@ Unit tests for the stem.util.connection functions. """ +import platform import unittest +from mock import patch + import stem.util.connection +from stem.util.connection import Resolver class TestConnection(unittest.TestCase): + @patch('stem.util.proc.is_available') + def test_get_system_resolvers(self, proc_mock): + """ + Checks the get_system_resolvers function. + """ + + proc_mock.return_value = False + + self.assertEqual([], stem.util.connection.get_system_resolvers('Windows')) + self.assertEqual([Resolver.LSOF], stem.util.connection.get_system_resolvers('Darwin')) + self.assertEqual([Resolver.LSOF], stem.util.connection.get_system_resolvers('OpenBSD')) + self.assertEqual([Resolver.BSD_SOCKSTAT, Resolver.BSD_PROCSTAT, Resolver.LSOF], stem.util.connection.get_system_resolvers('FreeBSD')) + self.assertEqual([Resolver.NETSTAT, Resolver.SOCKSTAT, Resolver.LSOF, Resolver.SS], stem.util.connection.get_system_resolvers('Linux')) + + proc_mock.return_value = True + + self.assertEqual([Resolver.PROC, Resolver.NETSTAT, Resolver.SOCKSTAT, Resolver.LSOF, Resolver.SS], stem.util.connection.get_system_resolvers('Linux')) + + # check that calling without an argument is equivilant to calling for this + # platform + + self.assertEqual(stem.util.connection.get_system_resolvers(platform.system()), stem.util.connection.get_system_resolvers()) + def test_is_valid_ipv4_address(self): """ Checks the is_valid_ipv4_address function.

1 0