February 2015 - tor-commits - lists.torproject.org

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 17 Feb '15

17 Feb '15

commit 0485e1ecb551865e929ef813499ad6ca501bef14 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 17 22:15:04 2015 +0000 Update translations for bridgedb --- fa/LC_MESSAGES/bridgedb.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po index 1b2c774..5e9ebc8 100644 --- a/fa/LC_MESSAGES/bridgedb.po +++ b/fa/LC_MESSAGES/bridgedb.po @@ -6,7 +6,7 @@ # arashaalaei <aalaeiarash(a)gmail.com>, 2011 # signal89 <ali.faraji90(a)gmail.com>, 2014 # ardeshir, 2013 -# Gilberto, 2014 +# Gilberto, 2014-2015 # johnholzer <johnholtzer123(a)gmail.com>, 2014 # Mohammad Hossein <desmati(a)gmail.com>, 2014 # perspolis <rezarms(a)yahoo.com>, 2011 @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-02-14 08:51+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-02-17 22:11+0000\n" +"Last-Translator: Gilberto\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -283,11 +283,11 @@ msgstr "انتخاب همه" #: lib/bridgedb/templates/bridges.html:87 msgid "Show QRCode" -msgstr "" +msgstr "نمایش QRCode" #: lib/bridgedb/templates/bridges.html:100 msgid "QRCode for your bridge lines" -msgstr "" +msgstr "QRCode برای خطوط پل خود" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -300,13 +300,13 @@ msgstr "اوه اوه، کنسرو اسپاگتی!" #: lib/bridgedb/templates/bridges.html:116 msgid "It seems there was an error getting your QRCode." -msgstr "" +msgstr "به نظر می رسد یک خطا در گرفتن QRCode شما وجود دارد." #: lib/bridgedb/templates/bridges.html:121 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "" +msgstr "این QRCode شامل خطوط پل خود. اسکن آن را با یک خواننده QRCode برای کپی خطوط پل خود بر روی تلفن همراه و دستگاه های دیگر." #: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..."

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 17 Feb '15

17 Feb '15

commit e73e58b07a3540484892b6ef495222b377862f2b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 17 21:45:12 2015 +0000 Update translations for torcheck_completed --- hr_HR/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr_HR/torcheck.po b/hr_HR/torcheck.po index 0c66d17..982fc8a 100644 --- a/hr_HR/torcheck.po +++ b/hr_HR/torcheck.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-02-17 13:58+0000\n" +"PO-Revision-Date: 2015-02-17 21:38+0000\n" "Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 17 Feb '15

17 Feb '15

commit 8d733e3f36960308ca27d6f6cb66bd9be9dc4246 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 17 21:45:08 2015 +0000 Update translations for torcheck --- ca/torcheck.po | 2 +- hr_HR/torcheck.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ca/torcheck.po b/ca/torcheck.po index a02a8a4..17dad87 100644 --- a/ca/torcheck.po +++ b/ca/torcheck.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-02-17 17:00+0000\n" +"PO-Revision-Date: 2015-02-17 21:38+0000\n" "Last-Translator: Bartges90\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n" diff --git a/hr_HR/torcheck.po b/hr_HR/torcheck.po index 0c66d17..982fc8a 100644 --- a/hr_HR/torcheck.po +++ b/hr_HR/torcheck.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-02-17 13:58+0000\n" +"PO-Revision-Date: 2015-02-17 21:38+0000\n" "Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n"

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! Omnibox: Add disconnect, youtube; remove Amazon and eBay
by mikeperry＠torproject.org 17 Feb '15

17 Feb '15

commit 0cc27667bfb1cc641f7abc87c3d9e252c4ca0162 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Feb 17 12:44:51 2015 -0800 fixup! Omnibox: Add disconnect, youtube; remove Amazon and eBay Also remove bing. --- browser/locales/en-US/searchplugins/list.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/locales/en-US/searchplugins/list.txt b/browser/locales/en-US/searchplugins/list.txt index 0d07ea6..956fb8e 100644 --- a/browser/locales/en-US/searchplugins/list.txt +++ b/browser/locales/en-US/searchplugins/list.txt @@ -4,6 +4,5 @@ twitter wikipedia startpage yahoo -bing google duckduckgo

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 17 Feb '15

17 Feb '15

commit ac18e462349bd2c4fb4d0aee9d8de88d62b7ef34 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 17 19:15:33 2015 +0000 Update translations for tor-launcher-properties_completed --- de/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de/torlauncher.properties b/de/torlauncher.properties index 5a24e5d..0da42da 100644 --- a/de/torlauncher.properties +++ b/de/torlauncher.properties @@ -46,9 +46,9 @@ torlauncher.bootstrapStatus.loading_status=Netzwerkstatus wird geladen torlauncher.bootstrapStatus.loading_keys=Autorisierungszertifikate werden geladen torlauncher.bootstrapStatus.requesting_descriptors=Relaisinformationen werden angefordert torlauncher.bootstrapStatus.loading_descriptors=Relaisinformationen werden geladen -torlauncher.bootstrapStatus.conn_or=Zum Tor-Netzwerk wird verbinden +torlauncher.bootstrapStatus.conn_or=Zum Tor-Netzwerk wird verbunden torlauncher.bootstrapStatus.handshake_or=Tor-Verbindung wird hergestellt -torlauncher.bootstrapStatus.done=Zum Tor-Netzwerk wird verbunden! +torlauncher.bootstrapStatus.done=Zum Tor-Netzwerk wurde verbunden! torlauncher.bootstrapWarning.done=abgeschlossen torlauncher.bootstrapWarning.connectrefused=Verbindung verweigert

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 17 Feb '15

17 Feb '15

commit 777dfdd5e714a713c0b77cd1755527d25f2e1689 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 17 19:15:29 2015 +0000 Update translations for tor-launcher-properties --- de/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de/torlauncher.properties b/de/torlauncher.properties index 5a24e5d..0da42da 100644 --- a/de/torlauncher.properties +++ b/de/torlauncher.properties @@ -46,9 +46,9 @@ torlauncher.bootstrapStatus.loading_status=Netzwerkstatus wird geladen torlauncher.bootstrapStatus.loading_keys=Autorisierungszertifikate werden geladen torlauncher.bootstrapStatus.requesting_descriptors=Relaisinformationen werden angefordert torlauncher.bootstrapStatus.loading_descriptors=Relaisinformationen werden geladen -torlauncher.bootstrapStatus.conn_or=Zum Tor-Netzwerk wird verbinden +torlauncher.bootstrapStatus.conn_or=Zum Tor-Netzwerk wird verbunden torlauncher.bootstrapStatus.handshake_or=Tor-Verbindung wird hergestellt -torlauncher.bootstrapStatus.done=Zum Tor-Netzwerk wird verbunden! +torlauncher.bootstrapStatus.done=Zum Tor-Netzwerk wurde verbunden! torlauncher.bootstrapWarning.done=abgeschlossen torlauncher.bootstrapWarning.connectrefused=Verbindung verweigert

1 0

[stem/master] Fixed Method Name
by atagar＠torproject.org 17 Feb '15

17 Feb '15

commit debc483b372bd396e625deca55161dda4e290b70 Author: icodemachine <gauthamnekk(a)gmail.com> Date: Sat Feb 14 12:25:21 2015 +0530 Fixed Method Name --- stem/util/system.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index 47c6767..ea8d8a1 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -79,7 +79,7 @@ GET_PID_BY_NAME_PIDOF = 'pidof %s' GET_PID_BY_NAME_PS_LINUX = 'ps -o pid -C %s' GET_PID_BY_NAME_PS_BSD = 'ps axc' GET_PID_BY_NAME_LSOF = 'lsof -tc %s' -GET_PID_BY_NAME_NETSTAT_WINDOWS = 'tasklist | findstr %s.exe' +GET_PID_BY_NAME_TASKLIST = 'tasklist | findstr %s.exe' GET_PID_BY_PORT_NETSTAT = 'netstat -npltu' GET_PID_BY_PORT_SOCKSTAT = 'sockstat -4l -P tcp -p %s' GET_PID_BY_PORT_LSOF = 'lsof -wnP -iTCP -sTCP:LISTEN' @@ -446,7 +446,7 @@ def pid_by_name(process_name, multiple = False): if process_name.find(".exe") == -1: process_name = process_name + '.exe' - command = GET_PID_BY_NAME_NETSTAT_WINDOWS % process_name + command = GET_PID_BY_NAME_TASKLIST % process_name process_ids = [] try:

1 0

[stem/master] Added Windows Resolver support for get_connections as well as pid_by_name
by atagar＠torproject.org 17 Feb '15

17 Feb '15

commit b3aa2fb6fbf2159f56b1bab64fa2d9c1ba238947 Author: icodemachine <gauthamnekk(a)gmail.com> Date: Mon Feb 16 22:17:40 2015 +0530 Added Windows Resolver support for get_connections as well as pid_by_name --- stem/util/connection.py | 11 ++++++++--- stem/util/system.py | 13 ++++++++++--- test/integ/util/system.py | 23 +++++++++++++++++++---- test/unit/util/connection.py | 36 +++++++++++++++++++++++++++++++----- test/unit/util/system.py | 26 +++++++++++++++++++++++++- 5 files changed, 93 insertions(+), 16 deletions(-) diff --git a/stem/util/connection.py b/stem/util/connection.py index 70ba609..93e137a 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -64,7 +64,7 @@ LOG_CONNECTION_RESOLUTION = False Resolver = enum.Enum( ('PROC', 'proc'), ('NETSTAT', 'netstat'), - ('NETSTAT_WINDOWS', 'netstat'), + ('NETSTAT_WINDOWS', 'netstat (windows)'), ('SS', 'ss'), ('LSOF', 'lsof'), ('SOCKSTAT', 'sockstat'), @@ -187,12 +187,17 @@ def get_connections(resolver, process_pid = None, process_name = None): return [Connection(*conn) for conn in stem.util.proc.connections(process_pid)] resolver_command = RESOLVER_COMMAND[resolver].format(pid = process_pid) - + + #In case, process_name is only specified + if resolver == Resolver.NETSTAT_WINDOWS: + if not process_pid and process_name: + process_pid = stem.util.system.pid_by_name(process_name)[0] + try: results = stem.util.system.call(resolver_command) except OSError as exc: raise IOError("Unable to query '%s': %s" % (resolver_command, exc)) - + resolver_regex_str = RESOLVER_FILTER[resolver].format( protocol = '(?P<protocol>\S+)', local_address = '(?P<local_address>[0-9.]+)', diff --git a/stem/util/system.py b/stem/util/system.py index ea8d8a1..98b64f7 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -454,6 +454,9 @@ def pid_by_name(process_name, multiple = False): tasklist_regex_str = '^\s*' + process_name + '\s+(?P<pid>[0-9]*)' tasklist_regex = re.compile(tasklist_regex_str) + if not results: + raise IOError("No results found for tasklist") + for line in results: match = tasklist_regex.search(line) if match: @@ -461,13 +464,17 @@ def pid_by_name(process_name, multiple = False): id = int(attr['pid']) process_ids.append(id) - return process_ids + if process_ids == []: + raise IOError("Process Name not Found : %s" % process_name) + + if multiple: + return process_ids + elif len(process_ids) > 0: + return process_ids[0] except OSError as exc: log.debug("failed to query '%s': %s" % (command, exc)) raise IOError("Unable to query '%s': %s" % (command, exc)) - - log.debug("failed to resolve a pid for '%s'" % process_name) diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 1ffe7cd..3971e61 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -79,10 +79,7 @@ class TestSystem(unittest.TestCase): will fail if there's other tor instances running. """ - if stem.util.system.is_windows(): - test.runner.skip(self, '(unavailable on windows)') - return - elif self._is_extra_tor_running(): + if self._is_extra_tor_running(): test.runner.skip(self, '(multiple tor instances)') return @@ -218,6 +215,24 @@ class TestSystem(unittest.TestCase): if len(all_tor_pids) == 1: self.assertEqual(our_tor_pid, all_tor_pids[0]) + + def test_pid_by_name_tasklist(self): + """ + Tests the pid_by_name function with a tasklist response. + """ + + runner = test.runner.get_runner() + if self._is_extra_tor_running(): + test.runner.skip(self, '(multiple tor instances)') + return + elif not stem.util.system.is_available('tasklist'): + test.runner.skip(self, '(tasklist unavailable)') + return + + tor_pid = test.runner.get_runner().get_pid() + tor_cmd = test.runner.get_runner().get_tor_command(True) + self.assertEqual(tor_pid, stem.util.system.pid_by_name(tor_cmd)) + def test_pid_by_port(self): """ diff --git a/test/unit/util/connection.py b/test/unit/util/connection.py index 731fa5b..233cb29 100644 --- a/test/unit/util/connection.py +++ b/test/unit/util/connection.py @@ -32,6 +32,18 @@ unix 3 [ ] STREAM CONNECTED 34164276 15843/tor unix 3 [ ] STREAM CONNECTED 7951 - """ +NETSTAT_WINDOWS_OUTPUT = """\ +Active Connections + + Proto Local Address Foreign Address State PID + TCP 0.0.0.0:135 0.0.0.0:0 LISTENING 852 + TCP 0.0.0.0:445 0.0.0.0:0 LISTENING 4 + TCP 0.0.0.0:902 0.0.0.0:0 LISTENING 2076 + TCP 0.0.0.0:912 0.0.0.0:0 LISTENING 2076 + TCP 192.168.0.1:44284 38.229.79.2:443 ESTABLISHED 15843 + TCP 0.0.0.0:37782 0.0.0.0:0 LISTENING 4128 +""" + SS_OUTPUT = """\ Netid State Recv-Q Send-Q Local Address:Port Peer Address:Port tcp CLOSE-WAIT 1 0 192.168.0.1:43780 53.203.145.45:443 users:(("firefox",20586,118)) @@ -105,19 +117,17 @@ BSD_PROCSTAT_OUTPUT = """\ class TestConnection(unittest.TestCase): - @patch('os.access') @patch('stem.util.system.is_available') @patch('stem.util.proc.is_available') - def test_system_resolvers(self, proc_mock, is_available_mock, os_mock): + def test_system_resolvers(self, proc_mock, is_available_mock): """ Checks the system_resolvers function. """ is_available_mock.return_value = True proc_mock.return_value = False - os_mock.return_value = True - self.assertEqual([], stem.util.connection.system_resolvers('Windows')) + self.assertEqual([Resolver.NETSTAT_WINDOWS], stem.util.connection.system_resolvers('Windows')) self.assertEqual([Resolver.LSOF], stem.util.connection.system_resolvers('Darwin')) self.assertEqual([Resolver.LSOF], stem.util.connection.system_resolvers('OpenBSD')) self.assertEqual([Resolver.BSD_SOCKSTAT, Resolver.BSD_PROCSTAT, Resolver.LSOF], stem.util.connection.system_resolvers('FreeBSD')) @@ -126,7 +136,7 @@ class TestConnection(unittest.TestCase): proc_mock.return_value = True self.assertEqual([Resolver.PROC, Resolver.NETSTAT, Resolver.SOCKSTAT, Resolver.LSOF, Resolver.SS], stem.util.connection.system_resolvers('Linux')) - # check that calling without an argument is equivalent to calling for this + # check that calling without an argument is equivilant to calling for this # platform self.assertEqual(stem.util.connection.system_resolvers(platform.system()), stem.util.connection.system_resolvers()) @@ -185,6 +195,22 @@ class TestConnection(unittest.TestCase): self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.NETSTAT, process_pid = 1111) @patch('stem.util.system.call') + def test_get_connections_by_windows_netstat(self, call_mock): + """ + Checks the get_connections function with the Windows netstat resolver. + """ + + call_mock.return_value = NETSTAT_WINDOWS_OUTPUT.split('\n') + expected = [Connection('192.168.0.1', 44284, '38.229.79.2', 443, 'tcp')] + self.assertEqual(expected, stem.util.connection.get_connections(Resolver.NETSTAT_WINDOWS, process_pid = 15843, process_name = 'tor')) + + #self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.NETSTAT, process_pid = 15843, process_name = 'stuff') + self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.NETSTAT_WINDOWS, process_pid = 1111, process_name = 'tor') + + call_mock.side_effect = OSError('Unable to call netstat') + self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.NETSTAT_WINDOWS, process_pid = 1111) + + @patch('stem.util.system.call') def test_get_connections_by_ss(self, call_mock): """ Checks the get_connections function with the ss resolver. diff --git a/test/unit/util/system.py b/test/unit/util/system.py index 3b4f035..94bb7fa 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -45,6 +45,16 @@ GET_PID_BY_NAME_PS_BSD_MULTIPLE = [ ' 10 ?? Ss 0:09.97 kextd', ' 41 ?? Ss 9:00.22 launchd'] + +GET_PID_BY_NAME_TASKLIST_RESULTS = [ + 'Image Name PID Session Name Session# Mem Usage', + 'System Idle Process 0 Services 0 20 K', + 'svchost.exe 872 Services 0 8,744 K', + 'hpservice.exe 1112 Services 0 3,828 K', + 'tor.exe 3712 Console 1 29,976 K', + 'tor.exe 3713 Console 1 21,976 K', + 'conhost.exe 3012 Console 1 4,652 K'] + GET_PID_BY_PORT_NETSTAT_RESULTS = [ 'Active Internet connections (only servers)', 'Proto Recv-Q Send-Q Local Address Foreign Address State PID/Program name', @@ -53,7 +63,7 @@ GET_PID_BY_PORT_NETSTAT_RESULTS = [ 'tcp6 0 0 ::1:631 :::* LISTEN - ', 'udp 0 0 0.0.0.0:5353 0.0.0.0:* - ', 'udp6 0 0 fe80::7ae4:ff:fe2f::123 :::* - '] - + GET_PID_BY_PORT_SOCKSTAT_RESULTS = [ '_tor tor 4397 7 tcp4 51.64.7.84:9051 *:*', '_tor tor 4397 12 tcp4 51.64.7.84:54011 80.3.121.7:9051', @@ -252,6 +262,20 @@ class TestSystem(unittest.TestCase): @patch('stem.util.system.call') @patch('stem.util.system.is_available', Mock(return_value = True)) + def test_pid_by_name_tasklist(self, call_mock): + """ + Tests the pid_by_name function with tasklist responses. + """ + + call_mock.return_value = GET_PID_BY_NAME_TASKLIST_RESULTS + self.assertEqual(3712, system.pid_by_name('tor')) + self.assertEqual(None, system.pid_by_name('DirectoryService')) + self.assertEqual(None, system.pid_by_name('blarg')) + + self.assertEqual([3712, 3713], system.pid_by_name('tor', multiple = True)) + + @patch('stem.util.system.call') + @patch('stem.util.system.is_available', Mock(return_value = True)) def test_pid_by_port_netstat(self, call_mock): """ Tests the pid_by_port function with a netstat response.

1 0

[stem/master] Added pid_by_name support for Windows
by atagar＠torproject.org 17 Feb '15

17 Feb '15

commit 9e62269cc6ee9ace940f4ae171394db11520601f Author: icodemachine <gauthamnekk(a)gmail.com> Date: Sat Feb 14 12:18:46 2015 +0530 Added pid_by_name support for Windows --- stem/util/connection.py | 1 - stem/util/system.py | 53 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 44 insertions(+), 10 deletions(-) diff --git a/stem/util/connection.py b/stem/util/connection.py index cf9d442..70ba609 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -257,7 +257,6 @@ def system_resolvers(system = None): :returns: **list** of :data:`~stem.util.connection.Resolver` instances available on this platform """ - if system is None: if stem.util.system.is_gentoo(): system = 'Gentoo' diff --git a/stem/util/system.py b/stem/util/system.py index 45595e9..47c6767 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -50,11 +50,12 @@ import platform import subprocess import tarfile import time +import re import stem.util.proc import stem.util.str_tools -from stem import UNDEFINED, str_type +from stem import UNDEFINED from stem.util import log # Mapping of commands to if they're available or not. @@ -78,6 +79,7 @@ GET_PID_BY_NAME_PIDOF = 'pidof %s' GET_PID_BY_NAME_PS_LINUX = 'ps -o pid -C %s' GET_PID_BY_NAME_PS_BSD = 'ps axc' GET_PID_BY_NAME_LSOF = 'lsof -tc %s' +GET_PID_BY_NAME_NETSTAT_WINDOWS = 'tasklist | findstr %s.exe' GET_PID_BY_PORT_NETSTAT = 'netstat -npltu' GET_PID_BY_PORT_SOCKSTAT = 'sockstat -4l -P tcp -p %s' GET_PID_BY_PORT_LSOF = 'lsof -wnP -iTCP -sTCP:LISTEN' @@ -242,7 +244,7 @@ def is_running(command): command_listing = call(secondary_resolver, None) if command_listing: - command_listing = map(str_type.strip, command_listing) + command_listing = map(unicode.strip, command_listing) return command in command_listing return None @@ -302,6 +304,7 @@ def pid_by_name(process_name, multiple = False): 3. ps -o pid -C <name> (linux) ps axc | egrep " <name>$" (bsd) 4. lsof -tc <name> + 5. tasklist | str <name>.exe :param str process_name: process name for which to fetch the pid :param bool multiple: provides a list of all pids if **True**, otherwise @@ -327,7 +330,7 @@ def pid_by_name(process_name, multiple = False): if results: try: - pids = list(map(int, results)) + pids = map(int, results) if multiple: return pids @@ -348,7 +351,7 @@ def pid_by_name(process_name, multiple = False): if results and len(results) == 1: try: - pids = list(map(int, results[0].split())) + pids = map(int, results[0].split()) if multiple: return pids @@ -380,7 +383,7 @@ def pid_by_name(process_name, multiple = False): if results: try: - pids = list(map(int, results[1:])) + pids = map(int, results[1:]) if multiple: return pids @@ -398,7 +401,7 @@ def pid_by_name(process_name, multiple = False): results = [r.split()[0] for r in results if r.endswith(' %s' % process_name)] try: - pids = list(map(int, results)) + pids = map(int, results) if multiple: return pids @@ -426,7 +429,7 @@ def pid_by_name(process_name, multiple = False): if results: try: - pids = list(map(int, results)) + pids = map(int, results) if multiple: return pids @@ -435,6 +438,38 @@ def pid_by_name(process_name, multiple = False): except ValueError: pass + #Calling and Parsing tasklist command on Windows (Because call method doesn't work properly with it) + #Process name may or may not include .exe + + if is_available('netstat -ano'): + + if process_name.find(".exe") == -1: + process_name = process_name + '.exe' + + command = GET_PID_BY_NAME_NETSTAT_WINDOWS % process_name + process_ids = [] + + try: + results = stem.util.system.call('tasklist') + tasklist_regex_str = '^\s*' + process_name + '\s+(?P<pid>[0-9]*)' + tasklist_regex = re.compile(tasklist_regex_str) + + for line in results: + match = tasklist_regex.search(line) + if match: + attr = match.groupdict() + id = int(attr['pid']) + process_ids.append(id) + + return process_ids + + except OSError as exc: + log.debug("failed to query '%s': %s" % (command, exc)) + raise IOError("Unable to query '%s': %s" % (command, exc)) + + + + log.debug("failed to resolve a pid for '%s'" % process_name) return [] if multiple else None @@ -966,7 +1001,7 @@ def get_process_name(): args, argc = [], argc_t() - for i in range(100): + for i in xrange(100): # The ending index can be either None or raise a ValueError when # accessed... # @@ -1098,4 +1133,4 @@ get_cwd = cwd get_user = user get_start_time = start_time get_bsd_jail_id = bsd_jail_id -get_bsd_jail_path = bsd_jail_path +get_bsd_jail_path = bsd_jail_path \ No newline at end of file

1 0

[stem/master] Fixed tests
by atagar＠torproject.org 17 Feb '15

17 Feb '15

commit c24c6b7bb915d5c892cc6b9f58a2db704757446b Author: icodemachine <gauthamnekk(a)gmail.com> Date: Tue Feb 17 14:02:42 2015 +0530 Fixed tests --- stem/util/connection.py | 24 ++++++++++++------------ stem/util/system.py | 37 +++++++++++++++++-------------------- test/integ/test - Shortcut.lnk | Bin 0 -> 1155 bytes test/integ/util/connection.py | 4 ++-- test/integ/util/system.py | 4 +--- test/unit/util/connection.py | 5 ++--- test/unit/util/system.py | 18 ++++++++++-------- 7 files changed, 44 insertions(+), 48 deletions(-) diff --git a/stem/util/connection.py b/stem/util/connection.py index 93e137a..c863d97 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -31,7 +31,7 @@ Connection and networking based utility functions. Resolver Description ================= =========== **PROC** /proc contents - **NETSTAT** netstat + **NETSTAT** netstat **NETSTAT_WINDOWS** netstat command under Windows **SS** ss command **LSOF** lsof command @@ -93,9 +93,9 @@ RESOLVER_COMMAND = { # -n = prevents dns lookups, -p = include process Resolver.NETSTAT: 'netstat -np', - #-ano is a Windows variant for netstat including pid + # -ano is a Windows variant for netstat including pid Resolver.NETSTAT_WINDOWS: 'netstat -ano', - + # -n = numeric ports, -p = include process, -t = tcp sockets, -u = udp sockets Resolver.SS: 'ss -nptu', @@ -117,10 +117,10 @@ RESOLVER_FILTER = { # tcp 0 586 192.168.0.1:44284 38.229.79.2:443 ESTABLISHED 15843/tor Resolver.NETSTAT: '^{protocol}\s+.*\s+{local_address}:{local_port}\s+{remote_address}:{remote_port}\s+ESTABLISHED\s+{pid}/{name}\s*$', - + # tcp 586 192.168.0.1:44284 38.229.79.2:443 ESTABLISHED 15843 - - Resolver.NETSTAT_WINDOWS: '^\s*{protocol}\s+{local_address}:{local_port}\s+{remote_address}:{remote_port}\s+ESTABLISHED\s+{pid}\s*$', + + Resolver.NETSTAT_WINDOWS: '^\s*{protocol}\s+{local_address}:{local_port}\s+{remote_address}:{remote_port}\s+ESTABLISHED\s+{pid}\s*$', # tcp ESTAB 0 0 192.168.0.20:44415 38.229.79.2:443 users:(("tor",15843,9)) Resolver.SS: '^{protocol}\s+ESTAB\s+.*\s+{local_address}:{local_port}\s+{remote_address}:{remote_port}\s+users:$\("{name}",{pid},[0-9]+$\)$', @@ -187,17 +187,17 @@ def get_connections(resolver, process_pid = None, process_name = None): return [Connection(*conn) for conn in stem.util.proc.connections(process_pid)] resolver_command = RESOLVER_COMMAND[resolver].format(pid = process_pid) - - #In case, process_name is only specified + + # In case, process_name is only specified if resolver == Resolver.NETSTAT_WINDOWS: if not process_pid and process_name: - process_pid = stem.util.system.pid_by_name(process_name)[0] - + process_pid = stem.util.system.pid_by_name(process_name) + try: results = stem.util.system.call(resolver_command) except OSError as exc: raise IOError("Unable to query '%s': %s" % (resolver_command, exc)) - + resolver_regex_str = RESOLVER_FILTER[resolver].format( protocol = '(?P<protocol>\S+)', local_address = '(?P<local_address>[0-9.]+)', @@ -649,4 +649,4 @@ def _cryptovariables_equal(x, y): # We renamed our methods to drop a redundant 'get_*' prefix, so alias the old # names for backward compatability. -get_system_resolvers = system_resolvers \ No newline at end of file +get_system_resolvers = system_resolvers diff --git a/stem/util/system.py b/stem/util/system.py index 98b64f7..efe8663 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -79,7 +79,7 @@ GET_PID_BY_NAME_PIDOF = 'pidof %s' GET_PID_BY_NAME_PS_LINUX = 'ps -o pid -C %s' GET_PID_BY_NAME_PS_BSD = 'ps axc' GET_PID_BY_NAME_LSOF = 'lsof -tc %s' -GET_PID_BY_NAME_TASKLIST = 'tasklist | findstr %s.exe' +GET_PID_BY_NAME_TASKLIST = 'tasklist | findstr %s' GET_PID_BY_PORT_NETSTAT = 'netstat -npltu' GET_PID_BY_PORT_SOCKSTAT = 'sockstat -4l -P tcp -p %s' GET_PID_BY_PORT_LSOF = 'lsof -wnP -iTCP -sTCP:LISTEN' @@ -304,7 +304,7 @@ def pid_by_name(process_name, multiple = False): 3. ps -o pid -C <name> (linux) ps axc | egrep " <name>$" (bsd) 4. lsof -tc <name> - 5. tasklist | str <name>.exe + 5. tasklist | str <name>.exe :param str process_name: process name for which to fetch the pid :param bool multiple: provides a list of all pids if **True**, otherwise @@ -438,51 +438,48 @@ def pid_by_name(process_name, multiple = False): except ValueError: pass - #Calling and Parsing tasklist command on Windows (Because call method doesn't work properly with it) - #Process name may or may not include .exe - - if is_available('netstat -ano'): - + # Calling and Parsing tasklist command on Windows (Because call method doesn't work properly with it) + # Process name may or may not include .exe + if is_available('netstat -ano') and is_windows(): + if process_name.find(".exe") == -1: - process_name = process_name + '.exe' - + process_name = process_name + '.exe' + command = GET_PID_BY_NAME_TASKLIST % process_name process_ids = [] - + try: results = stem.util.system.call('tasklist') tasklist_regex_str = '^\s*' + process_name + '\s+(?P<pid>[0-9]*)' tasklist_regex = re.compile(tasklist_regex_str) - + if not results: raise IOError("No results found for tasklist") - + for line in results: match = tasklist_regex.search(line) if match: attr = match.groupdict() id = int(attr['pid']) process_ids.append(id) - - if process_ids == []: - raise IOError("Process Name not Found : %s" % process_name) - + if multiple: return process_ids elif len(process_ids) > 0: return process_ids[0] - + except OSError as exc: log.debug("failed to query '%s': %s" % (command, exc)) - raise IOError("Unable to query '%s': %s" % (command, exc)) - + raise IOError("Unable to query '%s': %s" % (command, exc)) log.debug("failed to resolve a pid for '%s'" % process_name) return [] if multiple else None def pid_by_port(port): + """ + Attempts to determine the process id for a process with the given port, using... @@ -1140,4 +1137,4 @@ get_cwd = cwd get_user = user get_start_time = start_time get_bsd_jail_id = bsd_jail_id -get_bsd_jail_path = bsd_jail_path \ No newline at end of file +get_bsd_jail_path = bsd_jail_path diff --git a/test/integ/test - Shortcut.lnk b/test/integ/test - Shortcut.lnk new file mode 100644 index 0000000..f8568cd Binary files /dev/null and b/test/integ/test - Shortcut.lnk differ diff --git a/test/integ/util/connection.py b/test/integ/util/connection.py index 391869e..64653d1 100644 --- a/test/integ/util/connection.py +++ b/test/integ/util/connection.py @@ -40,7 +40,7 @@ class TestConnection(unittest.TestCase): self.check_resolver(Resolver.NETSTAT) def test_get_connections_by_windows_netstat(self): - self.check_resolver(Resolver.NETSTAT_WINDOWS) + self.check_resolver(Resolver.NETSTAT_WINDOWS) def test_get_connections_by_ss(self): self.check_resolver(Resolver.SS) @@ -64,7 +64,7 @@ class TestConnection(unittest.TestCase): recognized_resolvers = ( Resolver.PROC, Resolver.NETSTAT, - Resolver.NETSTAT_WINDOWS, + Resolver.NETSTAT_WINDOWS, Resolver.SS, Resolver.LSOF, Resolver.SOCKSTAT, diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 3971e61..aa18f45 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -215,7 +215,7 @@ class TestSystem(unittest.TestCase): if len(all_tor_pids) == 1: self.assertEqual(our_tor_pid, all_tor_pids[0]) - + def test_pid_by_name_tasklist(self): """ Tests the pid_by_name function with a tasklist response. @@ -233,12 +233,10 @@ class TestSystem(unittest.TestCase): tor_cmd = test.runner.get_runner().get_tor_command(True) self.assertEqual(tor_pid, stem.util.system.pid_by_name(tor_cmd)) - def test_pid_by_port(self): """ Checks general usage of the stem.util.system.pid_by_port function. """ - runner = test.runner.get_runner() if stem.util.system.is_windows(): test.runner.skip(self, '(unavailable on windows)') diff --git a/test/unit/util/connection.py b/test/unit/util/connection.py index 233cb29..eba0f03 100644 --- a/test/unit/util/connection.py +++ b/test/unit/util/connection.py @@ -204,12 +204,11 @@ class TestConnection(unittest.TestCase): expected = [Connection('192.168.0.1', 44284, '38.229.79.2', 443, 'tcp')] self.assertEqual(expected, stem.util.connection.get_connections(Resolver.NETSTAT_WINDOWS, process_pid = 15843, process_name = 'tor')) - #self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.NETSTAT, process_pid = 15843, process_name = 'stuff') self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.NETSTAT_WINDOWS, process_pid = 1111, process_name = 'tor') - call_mock.side_effect = OSError('Unable to call netstat') + self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.NETSTAT_WINDOWS, process_pid = 1111) - + @patch('stem.util.system.call') def test_get_connections_by_ss(self, call_mock): """ diff --git a/test/unit/util/system.py b/test/unit/util/system.py index 94bb7fa..b733769 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -52,9 +52,9 @@ GET_PID_BY_NAME_TASKLIST_RESULTS = [ 'svchost.exe 872 Services 0 8,744 K', 'hpservice.exe 1112 Services 0 3,828 K', 'tor.exe 3712 Console 1 29,976 K', - 'tor.exe 3713 Console 1 21,976 K', + 'tor.exe 3713 Console 1 21,976 K', 'conhost.exe 3012 Console 1 4,652 K'] - + GET_PID_BY_PORT_NETSTAT_RESULTS = [ 'Active Internet connections (only servers)', 'Proto Recv-Q Send-Q Local Address Foreign Address State PID/Program name', @@ -63,7 +63,7 @@ GET_PID_BY_PORT_NETSTAT_RESULTS = [ 'tcp6 0 0 ::1:631 :::* LISTEN - ', 'udp 0 0 0.0.0.0:5353 0.0.0.0:* - ', 'udp6 0 0 fe80::7ae4:ff:fe2f::123 :::* - '] - + GET_PID_BY_PORT_SOCKSTAT_RESULTS = [ '_tor tor 4397 7 tcp4 51.64.7.84:9051 *:*', '_tor tor 4397 12 tcp4 51.64.7.84:54011 80.3.121.7:9051', @@ -172,6 +172,7 @@ class TestSystem(unittest.TestCase): @patch('stem.util.system.call') @patch('stem.util.system.is_available', Mock(return_value = True)) + @patch('stem.util.system.is_windows', Mock(return_value = False)) def test_pid_by_name_pgrep(self, call_mock): """ Tests the pid_by_name function with pgrep responses. @@ -190,6 +191,7 @@ class TestSystem(unittest.TestCase): @patch('stem.util.system.call') @patch('stem.util.system.is_available', Mock(return_value = True)) + @patch('stem.util.system.is_windows', Mock(return_value = False)) def test_pid_by_name_pidof(self, call_mock): """ Tests the pid_by_name function with pidof responses. @@ -208,6 +210,7 @@ class TestSystem(unittest.TestCase): @patch('stem.util.system.call') @patch('stem.util.system.is_bsd', Mock(return_value = False)) + @patch('stem.util.system.is_windows', Mock(return_value = False)) @patch('stem.util.system.is_available', Mock(return_value = True)) def test_pid_by_name_ps_linux(self, call_mock): """ @@ -227,6 +230,7 @@ class TestSystem(unittest.TestCase): @patch('stem.util.system.call') @patch('stem.util.system.is_bsd', Mock(return_value = True)) + @patch('stem.util.system.is_windows', Mock(return_value = False)) @patch('stem.util.system.is_available', Mock(return_value = True)) def test_pid_by_name_ps_bsd(self, call_mock): """ @@ -244,6 +248,7 @@ class TestSystem(unittest.TestCase): @patch('stem.util.system.call') @patch('stem.util.system.is_available', Mock(return_value = True)) + @patch('stem.util.system.is_windows', Mock(return_value = False)) def test_pid_by_name_lsof(self, call_mock): """ Tests the pid_by_name function with lsof responses. @@ -267,13 +272,12 @@ class TestSystem(unittest.TestCase): Tests the pid_by_name function with tasklist responses. """ - call_mock.return_value = GET_PID_BY_NAME_TASKLIST_RESULTS + call_mock.return_value = GET_PID_BY_NAME_TASKLIST_RESULTS self.assertEqual(3712, system.pid_by_name('tor')) self.assertEqual(None, system.pid_by_name('DirectoryService')) self.assertEqual(None, system.pid_by_name('blarg')) - self.assertEqual([3712, 3713], system.pid_by_name('tor', multiple = True)) - + @patch('stem.util.system.call') @patch('stem.util.system.is_available', Mock(return_value = True)) def test_pid_by_port_netstat(self, call_mock): @@ -293,7 +297,6 @@ class TestSystem(unittest.TestCase): """ Tests the pid_by_port function with a sockstat response. """ - call_mock.side_effect = mock_call(system.GET_PID_BY_PORT_SOCKSTAT % 9051, GET_PID_BY_PORT_SOCKSTAT_RESULTS) self.assertEqual(4397, system.pid_by_port(9051)) self.assertEqual(4397, system.pid_by_port('9051')) @@ -334,7 +337,6 @@ class TestSystem(unittest.TestCase): """ Tests the cwd function with a pwdx response. """ - responses = { '3799': ['3799: /home/atagar'], '5839': ['5839: No such process'],

1 0