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

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 18 Jun '17

18 Jun '17

commit 529f8a6f2210d5c11779b446799363c29348cde3 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 18 20:16:03 2017 +0000 Update translations for mat-gui_completed --- fi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi.po b/fi.po index ff3790e..7c3d6c1 100644 --- a/fi.po +++ b/fi.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-06-23 17:26+0000\n" +"PO-Revision-Date: 2017-06-18 20:03+0000\n" "Last-Translator: Thomas <lab777ee(a)hotmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 18 Jun '17

18 Jun '17

commit c4c025d2b39cd55b56295e5015d681473f520fec Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 18 20:16:00 2017 +0000 Update translations for mat-gui --- fi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi.po b/fi.po index ff3790e..7c3d6c1 100644 --- a/fi.po +++ b/fi.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-06-23 17:26+0000\n" +"PO-Revision-Date: 2017-06-18 20:03+0000\n" "Last-Translator: Thomas <lab777ee(a)hotmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 18 Jun '17

18 Jun '17

commit 5dee1ffe290752c555fcf6a8198b70558ecd1fb5 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 18 20:15:43 2017 +0000 Update translations for tails-greeter --- fi/fi.po | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/fi/fi.po b/fi/fi.po index bfe31fa..e7c7c54 100644 --- a/fi/fi.po +++ b/fi/fi.po @@ -4,15 +4,16 @@ # # Translators: # Jaakko Helleranta <jaakko(a)helleranta.com>, 2016 +# Sodoqo, 2017 # Jorma Karvonen <karvonen.jorma(a)gmail.com>, 2014 # Mikko Harhanen <gitti(a)mikkoharhanen.fi>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-10 08:28+0200\n" -"PO-Revision-Date: 2017-06-10 10:19+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2017-06-10 12:27+0200\n" +"PO-Revision-Date: 2017-06-18 20:08+0000\n" +"Last-Translator: Sodoqo\n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,7 +38,7 @@ msgstr "" #: ../data/greeter.ui.h:4 msgid "Confirm" -msgstr "" +msgstr "Vahvista" #: ../data/greeter.ui.h:5 msgid "Confirm your administration password" @@ -50,7 +51,7 @@ msgstr "" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:8 msgid "Windows Camouflage" -msgstr "" +msgstr "Windows-naamiointi" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:10 @@ -62,11 +63,11 @@ msgstr "" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:12 msgid "Microsoft Windows 10 camouflage" -msgstr "" +msgstr "Microsoft Windows 10 -naamiointi" #: ../data/greeter.ui.h:13 msgid "MAC Address Spoofing" -msgstr "" +msgstr "MAC-osoitteen Väärentäminen" #: ../data/greeter.ui.h:14 msgid "" @@ -78,11 +79,11 @@ msgstr "" #: ../data/greeter.ui.h:15 msgid "Spoof all MAC addresses (default)" -msgstr "" +msgstr "Väärennä kaikki MAC-osoitteet (oletus)" #: ../data/greeter.ui.h:16 msgid "Don't spoof MAC addresses" -msgstr "" +msgstr "Älä väärennä MAC-osoitteita" #: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532 msgid "Cannot unlock encrypted storage with this passphrase." @@ -96,7 +97,7 @@ msgstr "" #: ../data/greeter.ui.h:19 msgid "Welcome to Tails!" -msgstr "" +msgstr "Tervetuloa käyttämään Tailsia!" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:21 @@ -107,11 +108,11 @@ msgstr "" #: ../data/greeter.ui.h:22 msgid "Language & Region" -msgstr "" +msgstr "Kieli & Alue" #: ../data/greeter.ui.h:23 msgid "Default Settings" -msgstr "" +msgstr "Oletusasetukset" #: ../data/greeter.ui.h:24 msgid "Save Language & Region Settings" @@ -152,7 +153,7 @@ msgstr "" #: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478 #: ../tailsgreeter/gui.py:528 msgid "Unlock" -msgstr "" +msgstr "Poista lukitus" #: ../data/greeter.ui.h:34 msgid "Relock Persistent Storage" @@ -257,15 +258,15 @@ msgstr "" #: ../tailsgreeter/gui.py:608 msgid "Add" -msgstr "" +msgstr "Lisää" #: ../tailsgreeter/gui.py:616 msgid "Back" -msgstr "" +msgstr "Takaisin" #: ../tailsgreeter/gui.py:730 msgid "Shutdown" -msgstr "" +msgstr "Sammuta" #: ../tailsgreeter/gui.py:735 msgid "_Start Tails"

1 0

[stem/master] Add BSD_FSTAT resolver (for OpenBSD) and corresponding unit test
by atagar＠torproject.org 18 Jun '17

18 Jun '17

commit b84e18f888429586f7b97ef21f374a1c40e36814 Author: asv-github <asv-github(a)mit.edu> Date: Sat Jun 17 17:11:27 2017 -0400 Add BSD_FSTAT resolver (for OpenBSD) and corresponding unit test --- stem/util/connection.py | 14 ++++++++++++-- test/unit/util/connection.py | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/stem/util/connection.py b/stem/util/connection.py index ba45c8d..a5d1edc 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -42,6 +42,7 @@ Connection and networking based utility functions. **SOCKSTAT** sockstat command under \*nix **BSD_SOCKSTAT** sockstat command under FreeBSD **BSD_PROCSTAT** procstat command under FreeBSD + **BSD_FSTAT** fstat command under OpenBSD ==================== =========== """ @@ -72,7 +73,8 @@ Resolver = enum.Enum( ('LSOF', 'lsof'), ('SOCKSTAT', 'sockstat'), ('BSD_SOCKSTAT', 'sockstat (bsd)'), - ('BSD_PROCSTAT', 'procstat (bsd)') + ('BSD_PROCSTAT', 'procstat (bsd)'), + ('BSD_FSTAT', 'fstat (bsd)') ) FULL_IPv4_MASK = '255.255.255.255' @@ -105,6 +107,9 @@ RESOLVER_COMMAND = { # -f <pid> = process pid Resolver.BSD_PROCSTAT: 'procstat -f {pid}', + + # -p <pid> = process pid + Resolver.BSD_FSTAT: 'fstat -p {pid}', } RESOLVER_FILTER = { @@ -130,6 +135,9 @@ RESOLVER_FILTER = { # 3561 tor 4 s - rw---n-- 2 0 TCP 10.0.0.2:9050 10.0.0.1:22370 Resolver.BSD_PROCSTAT: '^\s*{pid}\s+{name}\s+.*\s+{protocol}\s+{local}\s+{remote}$', + + # _tor tor 15843 20* internet stream tcp 0x0 192.168.1.100:36174 --> 4.3.2.1:443 + Resolver.BSD_FSTAT: '^\S+\s+{name}\s+{pid}\s+.*\s+{protocol}\s+\S+\s+{local}\s+[-<]-[->]\s+{remote}$', } @@ -309,8 +317,10 @@ def system_resolvers(system = None): if system == 'Windows': resolvers = [Resolver.NETSTAT_WINDOWS] - elif system in ('Darwin', 'OpenBSD'): + elif system == 'Darwin': resolvers = [Resolver.LSOF] + elif system == 'OpenBSD': + resolvers = [Resolver.BSD_FSTAT] elif system == 'FreeBSD': # Netstat is available, but lacks a '-p' equivalent so we can't associate # the results to processes. The platform also has a ss command, but it diff --git a/test/unit/util/connection.py b/test/unit/util/connection.py index b7ca4c6..98d5c3f 100644 --- a/test/unit/util/connection.py +++ b/test/unit/util/connection.py @@ -144,6 +144,26 @@ BSD_PROCSTAT_OUTPUT = """\ 3561 tor 16 s - rw---n-- 2 0 TCP 10.0.0.2:47704 68.169.35.102:9001 """ +BSD_FSTAT_OUTPUT = """\ +USER CMD PID FD MOUNT INUM MODE R/W SZ|DV +_tor tor 15843 text /usr/local 207875 -rwxr-xr-x r 2421008 +_tor tor 15843 wd /var 623616 drwx------ r 512 +_tor tor 15843 0 / 1160 crw-rw-rw- rw null +_tor tor 15843 1 / 1160 crw-rw-rw- rw null +_tor tor 15843 2 / 1160 crw-rw-rw- rw null +_tor tor 15843 3 kqueue 0x0 0 state: W +_tor tor 15843 4* internet dgram udp *:6063 +_tor tor 15843 5* internet stream tcp 0x0 127.0.0.1:8443 +_tor tor 15843 6* internet stream tcp 0x0 127.0.0.1:8080 +_tor tor 15843 7 /var 623617 -rw------- rwe 0 +_tor tor 15843 8* internet dgram udp *:19515 +_tor tor 15843 9* internet dgram udp *:43052 +_tor tor 15843 10 pipe 0x0 state: +_tor tor 15843 11 pipe 0x0 state: +_tor tor 15843 12* internet stream tcp 0x0 127.0.0.1:8443 <-- 1.2.3.4:54581 +_tor tor 15843 20* internet stream tcp 0x0 192.168.1.100:36174 --> 4.3.2.1:443 +""" + class TestConnection(unittest.TestCase): @patch('os.access') @@ -160,7 +180,7 @@ class TestConnection(unittest.TestCase): 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_FSTAT], stem.util.connection.system_resolvers('OpenBSD')) self.assertEqual([Resolver.BSD_SOCKSTAT, Resolver.BSD_PROCSTAT, Resolver.LSOF], stem.util.connection.system_resolvers('FreeBSD')) self.assertEqual([Resolver.NETSTAT, Resolver.SOCKSTAT, Resolver.LSOF, Resolver.SS], stem.util.connection.system_resolvers('Linux')) @@ -397,6 +417,25 @@ class TestConnection(unittest.TestCase): call_mock.side_effect = OSError('Unable to call procstat') self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.BSD_PROCSTAT, process_pid = 1111) + @patch('stem.util.system.call') + def test_get_connections_by_fstat(self, call_mock): + """ + Checks the get_connections function with the fstat resolver. + """ + + call_mock.return_value = BSD_FSTAT_OUTPUT.split('\n') + expected = [ + Connection('127.0.0.1', 8443, '1.2.3.4', 54581, 'tcp', False), + Connection('192.168.1.100', 36174, '4.3.2.1', 443, 'tcp', False), + ] + self.assertEqual(expected, stem.util.connection.get_connections(Resolver.BSD_FSTAT, process_pid = 15843, process_name = 'tor')) + + self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.BSD_FSTAT, process_pid = 15843, process_name = 'stuff') + self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.BSD_FSTAT, process_pid = 1111, process_name = 'tor') + + call_mock.side_effect = OSError('Unable to call fstat') + self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.BSD_FSTAT, process_pid = 1111) + def test_is_valid_ipv4_address(self): """ Checks the is_valid_ipv4_address function.

1 0

[stem/master] Add integ test for BSD_FSTAT resolver
by atagar＠torproject.org 18 Jun '17

18 Jun '17

commit 4144f344cc5861a7b672b8739a244d2ce21afdb9 Author: asv-github <asv-github(a)mit.edu> Date: Sun Jun 18 02:14:40 2017 -0400 Add integ test for BSD_FSTAT resolver --- test/integ/util/connection.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/integ/util/connection.py b/test/integ/util/connection.py index 1fc08c4..9f2a9ae 100644 --- a/test/integ/util/connection.py +++ b/test/integ/util/connection.py @@ -56,6 +56,9 @@ class TestConnection(unittest.TestCase): def test_connections_by_bsd_procstat(self): self.check_resolver(Resolver.BSD_PROCSTAT) + def test_connections_by_bsd_fstat(self): + self.check_resolver(Resolver.BSD_FSTAT) + def test_that_we_are_checking_all_resolvers(self): # Quick check to confirm that if we add a new Resolver, we include a test # for it here. @@ -69,6 +72,7 @@ class TestConnection(unittest.TestCase): Resolver.SOCKSTAT, Resolver.BSD_SOCKSTAT, Resolver.BSD_PROCSTAT, + Resolver.BSD_FSTAT, ) for resolver in Resolver:

1 0

[stem/master] Changelog entry for fstat resolution
by atagar＠torproject.org 18 Jun '17

18 Jun '17

commit 17548ab2fcde245f9b6671e7881884003985e290 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 18 11:07:13 2017 -0700 Changelog entry for fstat resolution --- docs/change_log.rst | 1 + test/settings.cfg | 2 ++ 2 files changed, 3 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index 50158ca..06341b4 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -66,6 +66,7 @@ The following are only available within Stem's `git repository * **Utilities** + * Support connection resolution on OpenBSD using fstat (:trac:`13807`) * Added timeout argument to :func:`~stem.util.system.call` * Added cwd argument to :func:`~stem.util.system.call` * Added :class:`~stem.util.test_tools.TimedTestRunner` and :func:`~stem.util.test_tools.test_runtimes` diff --git a/test/settings.cfg b/test/settings.cfg index 52bd013..128e987 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -135,6 +135,8 @@ pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.n pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.microdescriptor pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.tordnsel pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.hidden_service_descriptor +pycodestyle.ignore test/unit/util/connection.py => W291: _tor tor 15843 10 pipe 0x0 state: +pycodestyle.ignore test/unit/util/connection.py => W291: _tor tor 15843 11 pipe 0x0 state: # False positives from pyflakes. These are mappings between the path and the # issue.

1 0

[stem/master] 'Interrupted system call' error when running unit tests
by atagar＠torproject.org 18 Jun '17

18 Jun '17

commit 77527ddea6575f26f6b2c7dd12ecde2309202404 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 18 11:22:23 2017 -0700 'Interrupted system call' error when running unit tests Huh. Not entirely sure what's up but when I run unit tests it fails with... Traceback (most recent call last): File "./run_tests.py", line 451, in <module> main() File "./run_tests.py", line 324, in main task.join() File "/home/atagar/Desktop/stem/test/task.py", line 218, in join self.result = self._background_pipe.recv() IOError: [Errno 4] Interrupted system call I suspect this is related to the unit tests finishing before the static tests do but not quite sure. Quick search seems to indicate it may be a python bug... https://bugs.python.org/issue17097 --- test/task.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/task.py b/test/task.py index ada9062..f764fe9 100644 --- a/test/task.py +++ b/test/task.py @@ -215,8 +215,11 @@ class Task(object): def join(self): if self._background_process: - self.result = self._background_pipe.recv() - self._background_process.join() + try: + self.result = self._background_pipe.recv() + self._background_process.join() + except IOError: + pass class ModuleVersion(Task):

1 0

[stem/master] Connection resolution on OpenBSD using fstat
by atagar＠torproject.org 18 Jun '17

18 Jun '17

commit 496d1907bacc5ad65503d4088a13222693d877c4 Merge: 77527dd 17548ab Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 18 11:33:43 2017 -0700 Connection resolution on OpenBSD using fstat Great patch from cnidaria adding support for connection on OpenBSD using fstat... https://trac.torproject.org/projects/tor/ticket/13807 docs/change_log.rst | 1 + stem/util/connection.py | 14 ++++++++++++-- test/integ/util/connection.py | 4 ++++ test/settings.cfg | 2 ++ test/unit/util/connection.py | 41 ++++++++++++++++++++++++++++++++++++++++- 5 files changed, 59 insertions(+), 3 deletions(-)

1 0

[stem/master] Check for lingering threads after terminating controller
by atagar＠torproject.org 18 Jun '17

18 Jun '17

commit 8a146fd042d01d8363fd1702dfd72b03281f5abc Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 18 10:52:42 2017 -0700 Check for lingering threads after terminating controller Oops, we were checking for lingering threads before closing our controller causing us to mistakenly report those. --- run_tests.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/run_tests.py b/run_tests.py index bf5a191..61f526d 100755 --- a/run_tests.py +++ b/run_tests.py @@ -281,19 +281,6 @@ def main(): for test_class in get_integ_tests(args.specific_test): run_result = _run_test(args, test_class, output_filters, logging_buffer) skipped_tests += len(getattr(run_result, 'skipped', [])) - - # We should have joined on all threads. If not then that indicates a - # leak that could both likely be a bug and disrupt further targets. - - active_threads = threading.enumerate() - - if len(active_threads) > 1: - println('Threads lingering after test run:', ERROR) - - for lingering_thread in active_threads: - println(' %s' % lingering_thread, ERROR) - - break except KeyboardInterrupt: println(' aborted starting tor: keyboard interrupt\n', ERROR) break @@ -309,6 +296,19 @@ def main(): integ_runner.stop() println() + # We should have joined on all threads. If not then that indicates a + # leak that could both likely be a bug and disrupt further targets. + + active_threads = threading.enumerate() + + if len(active_threads) > 1: + println('Threads lingering after test run:', ERROR) + + for lingering_thread in active_threads: + println(' %s' % lingering_thread, ERROR) + + break + if skipped_targets: println()

1 0

[stem/master] Move test's ownership connection into runner
by atagar＠torproject.org 18 Jun '17

18 Jun '17

commit dd9252f716ba54d556f032611b6c1509d414b0a1 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 17 13:24:35 2017 -0700 Move test's ownership connection into runner To ensure our integ test's tor instance is promptly terminated when the tests end we establish ownership over the process. As such we need to ensure our first controller connection lasts until we're all done. Moving this into the runner so our run_tests.py don't need to worry about it. --- run_tests.py | 8 -------- test/runner.py | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/run_tests.py b/run_tests.py index 9701178..bf5a191 100755 --- a/run_tests.py +++ b/run_tests.py @@ -278,18 +278,10 @@ def main(): println('Running tests...\n', STATUS) - owner = None - - if integ_runner.is_accessible(): - owner = integ_runner.get_tor_controller(True) # controller to own our main Tor process - for test_class in get_integ_tests(args.specific_test): run_result = _run_test(args, test_class, output_filters, logging_buffer) skipped_tests += len(getattr(run_result, 'skipped', [])) - if owner: - owner.close() - # We should have joined on all threads. If not then that indicates a # leak that could both likely be a bug and disrupt further targets. diff --git a/test/runner.py b/test/runner.py index b40ca19..14795ce 100644 --- a/test/runner.py +++ b/test/runner.py @@ -163,6 +163,12 @@ class Runner(object): self._original_recv_message = None + # The first controller to attach takes ownership so tor will promptly + # terminate if the tests do. As such we need to ensure that first + # connection is our runner's. + + self._owner_controller = None + def start(self, attribute_targets, tor_cmd, extra_torrc_opts): """ Makes temporary testing resources and starts tor, blocking until it @@ -234,9 +240,11 @@ class Runner(object): stem.socket.recv_message = _chroot_recv_message - # revert our cwd back to normal + if self.is_accessible(): + self._owner_controller = self.get_tor_controller(True) + if test.Target.RELATIVE in self.attribute_targets: - os.chdir(original_cwd) + os.chdir(original_cwd) # revert our cwd back to normal except OSError as exc: raise exc @@ -248,6 +256,10 @@ class Runner(object): with self._runner_lock: println('Shutting down tor... ', STATUS, NO_NL) + if self._owner_controller: + self._owner_controller.close() + self._owner_controller = None + if self._tor_process: # if the tor process has stopped on its own then the following raises # an OSError ([Errno 3] No such process)

1 0