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

[stem/master] Rather than error, keep the default target when none are provided
by atagar＠torproject.org 09 Feb '15

09 Feb '15

commit c9dcc48de7222f8e1819fdef4e324ac7d9176839 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Feb 9 08:37:54 2015 -0800 Rather than error, keep the default target when none are provided Actually, on reflection if the user only provides attribute targets (ex. '--target ONLINE') there's no point in erroring. They clearly want to keep the default. --- run_tests.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/run_tests.py b/run_tests.py index c696b1d..0d45175 100755 --- a/run_tests.py +++ b/run_tests.py @@ -385,11 +385,13 @@ def _get_args(argv): attribute_targets.remove(Target.RUN_ALL) run_targets = all_run_targets - args['run_targets'] = run_targets - args['attribute_targets'] = attribute_targets + # if no RUN_* targets are provided then keep the default (otherwise we + # won't have any tests to run) + + if run_targets: + args['run_targets'] = run_targets - if not args['run_targets']: - raise ValueError("This wouldn't run anything. You need to provide at least one target that starts with 'RUN_'.") + args['attribute_targets'] = attribute_targets elif opt == '--test': args['specific_test'] = arg elif opt in ('-l', '--log'):

1 0

[stem/master] Warn if user doesn't provide any runnable integ targets
by atagar＠torproject.org 09 Feb '15

09 Feb '15

commit b9d66c4dfb0e50466872208c7f8bb22600eb8c06 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Feb 9 08:30:20 2015 -0800 Warn if user doesn't provide any runnable integ targets Sebastian was understandably confused on ticket 14804 when running '--target ONLINE' didn't run anything. --- run_tests.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/run_tests.py b/run_tests.py index 63102a4..c696b1d 100755 --- a/run_tests.py +++ b/run_tests.py @@ -387,6 +387,9 @@ def _get_args(argv): args['run_targets'] = run_targets args['attribute_targets'] = attribute_targets + + if not args['run_targets']: + raise ValueError("This wouldn't run anything. You need to provide at least one target that starts with 'RUN_'.") elif opt == '--test': args['specific_test'] = arg elif opt in ('-l', '--log'):

1 0

[stem/master] Don't hardcode /tmp/foo as a test path
by atagar＠torproject.org 09 Feb '15

09 Feb '15

commit 2644ec5ab18ae24d4bc0480c98444483dccc7ab9 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Feb 9 07:53:12 2015 -0800 Don't hardcode /tmp/foo as a test path Turns out I make foo test paths a lot. Running 'mkdir /tmp/foo' for something else broke the unit tests for me. Easy enough to do the proper thing and pick a random unused path. --- test/unit/descriptor/reader.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/unit/descriptor/reader.py b/test/unit/descriptor/reader.py index a699af2..debb88a 100644 --- a/test/unit/descriptor/reader.py +++ b/test/unit/descriptor/reader.py @@ -232,15 +232,16 @@ class TestDescriptorReader(unittest.TestCase): missing_filename = {'': 123} relative_filename = {'foobar': 123} string_timestamp = {'/tmp': '123a'} + temp_path = tempfile.mkstemp(prefix = 'stem-unit-tests-', text = True)[1] for listing in (missing_filename, relative_filename, string_timestamp): - self.assertRaises(TypeError, stem.descriptor.reader.save_processed_files, '/tmp/foo', listing) + self.assertRaises(TypeError, stem.descriptor.reader.save_processed_files, temp_path, listing) # Though our attempts to save the processed files fail we'll write an empty # file. Cleaning it up. try: - os.remove('/tmp/foo') + os.remove(temp_path) except: pass

1 0

[stem/master] The run_tests.py's -t argument aliased to two things
by atagar＠torproject.org 09 Feb '15

09 Feb '15

commit 34a900b5affc967f6d9717e527d32ad63a56d1c9 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Feb 9 08:01:11 2015 -0800 The run_tests.py's -t argument aliased to two things The '-t' argument was an alias for '--target' and '--test'. In practice and according to the help output it was actually just the former. This souldn't actually change anything, just clarifying the code. Found as part of... https://trac.torproject.org/projects/tor/ticket/14804 --- run_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run_tests.py b/run_tests.py index c0fa4be..dbead2d 100755 --- a/run_tests.py +++ b/run_tests.py @@ -378,7 +378,7 @@ def _get_args(argv): args['run_targets'] = run_targets args['attribute_targets'] = attribute_targets - elif opt in ('-t', '--test'): + elif opt == '--test': args['specific_test'] = arg elif opt in ('-l', '--log'): arg = arg.upper()

1 0

[stem/master] Don't run test for 'tor --version' when using the RUN_NONE target
by atagar＠torproject.org 09 Feb '15

09 Feb '15

commit ba47de68650c0d9f6735ad8b463b2148e268f6d2 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Feb 9 07:58:31 2015 -0800 Don't run test for 'tor --version' when using the RUN_NONE target This test compares the output to 'GETINFO version' so being unable to connect to tor breaks the test. --- test/integ/process.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/integ/process.py b/test/integ/process.py index b1fbe73..b935d46 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -49,6 +49,9 @@ class TestProcess(unittest.TestCase): Check that 'tor --version' matches 'GETINFO version'. """ + if test.runner.require_control(self): + return + with test.runner.get_runner().get_tor_controller() as controller: self.assertEqual('Tor version %s.\n' % controller.get_version(), self.run_tor('--version'))

1 0

[stem/master] Balk if an unrecognized argument is provided
by atagar＠torproject.org 09 Feb '15

09 Feb '15

commit 7753976dc7477a86fa8bc923292af3a09da7d660 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Feb 9 08:18:22 2015 -0800 Balk if an unrecognized argument is provided Interesting, thought getopt did this. For both run_tests.py and the tor-prompt providing an error when unrecognized arguments are provided. Caught by Sebastian on... https://trac.torproject.org/projects/tor/ticket/14804 --- run_tests.py | 11 ++++++++++- stem/interpreter/arguments.py | 8 ++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/run_tests.py b/run_tests.py index dbead2d..63102a4 100755 --- a/run_tests.py +++ b/run_tests.py @@ -343,7 +343,16 @@ def _get_args(argv): args = dict(ARGS) - for opt, arg in getopt.getopt(argv, OPT, OPT_EXPANDED)[0]: + try: + recognized_args, unrecognized_args = getopt.getopt(argv, OPT, OPT_EXPANDED) + + if unrecognized_args: + error_msg = "aren't recognized arguments" if len(unrecognized_args) > 1 else "isn't a recognized argument" + raise ValueError("'%s' %s" % ("', '".join(unrecognized_args), error_msg)) + except getopt.GetoptError as exc: + raise ValueError('%s (for usage provide --help)' % exc) + + for opt, arg in recognized_args: if opt in ('-a', '--all'): args['run_unit'] = True args['run_integ'] = True diff --git a/stem/interpreter/arguments.py b/stem/interpreter/arguments.py index d62a386..acf6d42 100644 --- a/stem/interpreter/arguments.py +++ b/stem/interpreter/arguments.py @@ -45,11 +45,15 @@ def parse(argv): args = dict(DEFAULT_ARGS) try: - getopt_results = getopt.getopt(argv, OPT, OPT_EXPANDED)[0] + recognized_args, unrecognized_args = getopt.getopt(argv, OPT, OPT_EXPANDED) + + if unrecognized_args: + error_msg = "aren't recognized arguments" if len(unrecognized_args) > 1 else "isn't a recognized argument" + raise ValueError("'%s' %s" % ("', '".join(unrecognized_args), error_msg)) except getopt.GetoptError as exc: raise ValueError('%s (for usage provide --help)' % exc) - for opt, arg in getopt_results: + for opt, arg in recognized_args: if opt in ('-i', '--interface'): if ':' in arg: address, port = arg.split(':', 1)

1 0

[tor/master] Avoid use-after-free of circ belonging to cancelled job
by nickm＠torproject.org 09 Feb '15

09 Feb '15

commit 733751009058a8ff140c15ddd8b022da6a77afdd Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Feb 9 16:04:51 2015 +0100 Avoid use-after-free of circ belonging to cancelled job This fixes a bug where we decide to free the circuit because it isn't on any workqueue anymore, and then the job finishes and the circuit gets freed again. Fixes bug #14815, not in any released version of Tor. --- src/or/cpuworker.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 5e8b32d..7fe2351 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -556,8 +556,7 @@ cpuworker_cancel_circ_handshake(or_circuit_t *circ) tor_free(job); tor_assert(total_pending_tasks > 0); --total_pending_tasks; + circ->workqueue_entry = NULL; } - - circ->workqueue_entry = NULL; }

1 0

[tor/master] Add some comments to or_circuit_t.workqueue_entry
by nickm＠torproject.org 09 Feb '15

09 Feb '15

commit 9667b2b88a1f8e9af08704c8bc95b8399a6e4145 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Feb 9 16:11:45 2015 +0100 Add some comments to or_circuit_t.workqueue_entry These were suggested by dgoulet, thanks! --- src/or/cpuworker.c | 1 + src/or/or.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 7fe2351..c5e78ed 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -556,6 +556,7 @@ cpuworker_cancel_circ_handshake(or_circuit_t *circ) tor_free(job); tor_assert(total_pending_tasks > 0); --total_pending_tasks; + /* if (!job), this is done in cpuworker_onion_handshake_replyfn. */ circ->workqueue_entry = NULL; } } diff --git a/src/or/or.h b/src/or/or.h index 520b7db..5d70798 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3126,7 +3126,8 @@ typedef struct or_circuit_t { * chance to give an onionskin to a cpuworker. Used only in onion.c */ struct onion_queue_t *onionqueue_entry; /** Pointer to a workqueue entry, if this circuit has given an onionskin to - * a cpuworker and is waiting for a response. Used only in cpuworker.c */ + * a cpuworker and is waiting for a response. Used to decide whether it is + * safe to free a circuit or if it is still in use by a cpuworker. */ struct workqueue_entry_s *workqueue_entry; /** The circuit_id used in the previous (backward) hop of this circuit. */

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 09 Feb '15

09 Feb '15

commit aa5340b3b221e18be373cb126f6cafd0682b0a18 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 9 12:45:39 2015 +0000 Update translations for tails-misc_completed --- hr_HR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hr_HR.po b/hr_HR.po index 2072c25..5aee662 100644 --- a/hr_HR.po +++ b/hr_HR.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-14 16:01+0100\n" -"PO-Revision-Date: 2015-02-09 12:13+0000\n" +"PO-Revision-Date: 2015-02-09 12:32+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" @@ -298,7 +298,7 @@ msgstr "MAC maskiranje nije uspjelo za mržnu karticu ${nic_name} (${nic}) tako #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:47 msgid "All networking disabled" -msgstr "Sve mreže onemogućene" +msgstr "Sav mrežni rad onemogućen" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:48 #, sh-format

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 09 Feb '15

09 Feb '15

commit 9cd8d6f002e3d93a6c6867196cfee02152e84b5d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 9 12:45:35 2015 +0000 Update translations for tails-misc --- hr_HR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hr_HR.po b/hr_HR.po index 2072c25..5aee662 100644 --- a/hr_HR.po +++ b/hr_HR.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-14 16:01+0100\n" -"PO-Revision-Date: 2015-02-09 12:13+0000\n" +"PO-Revision-Date: 2015-02-09 12:32+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" @@ -298,7 +298,7 @@ msgstr "MAC maskiranje nije uspjelo za mržnu karticu ${nic_name} (${nic}) tako #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:47 msgid "All networking disabled" -msgstr "Sve mreže onemogućene" +msgstr "Sav mrežni rad onemogućen" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:48 #, sh-format

1 0