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

[tor/master] testing_common.c: avoid side-effects of tor_assert
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit d39ede7f202b931506c1126b63665eaed4676abf Author: Tom van der Woerdt <info(a)tvdw.eu> Date: Sun Mar 8 19:20:56 2015 +0100 testing_common.c: avoid side-effects of tor_assert --- src/test/testing_common.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/test/testing_common.c b/src/test/testing_common.c index d7d6dac..403c83b 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -165,18 +165,21 @@ static crypto_pk_t *pregen_keys[5] = {NULL, NULL, NULL, NULL, NULL}; crypto_pk_t * pk_generate(int idx) { + int res; #ifdef CACHE_GENERATED_KEYS tor_assert(idx < N_PREGEN_KEYS); if (! pregen_keys[idx]) { pregen_keys[idx] = crypto_pk_new(); - tor_assert(!crypto_pk_generate_key(pregen_keys[idx])); + res = crypto_pk_generate_key(pregen_keys[idx]); + tor_assert(!res); } return crypto_pk_dup_key(pregen_keys[idx]); #else crypto_pk_t *result; (void) idx; result = crypto_pk_new(); - tor_assert(!crypto_pk_generate_key(result)); + res = crypto_pk_generate_key(result); + tor_assert(!res); return result; #endif }

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 0ec135b6965b4b02de7dd6f695293df6e179a4a8 Merge: bd80ba9 42d877f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 11:14:03 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/15188 | 3 +++ src/test/testing_common.c | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 09 Mar '15

09 Mar '15

commit f277bd6926147ce0fc28899aa72df51e7d21696d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 9 16:15:17 2015 +0000 Update translations for https_everywhere_completed --- sq/ssl-observatory.dtd | 101 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/sq/ssl-observatory.dtd b/sq/ssl-observatory.dtd new file mode 100644 index 0000000..770d613 --- /dev/null +++ b/sq/ssl-observatory.dtd @@ -0,0 +1,101 @@ + +<!ENTITY ssl-observatory.popup.details "Hollësi dhe Informacion Privatësie"> +<!ENTITY ssl-observatory.popup.later "Më Pyesni Më Vonë"> +<!ENTITY ssl-observatory.popup.no "Jo"> + +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere mund të zbulojë sulmet +kundër shfletuesit tuaj, duke dërguar çdo certifikatë që ju merrni, tek +Observatori. Ta aktivizojmë?"> + + + +<!ENTITY ssl-observatory.popup.title +"A duhet që HTTPS Everywhere të përdorë Observatorin SSL?"> + +<!ENTITY ssl-observatory.popup.yes "Po"> + + + +<!ENTITY ssl-observatory.prefs.adv_priv_opts1 +"Aktivizimi i kësaj është i sigurt, përveç nëse përdorni një +rrjet korporate shumë ndërhyrës:"> + +<!ENTITY ssl-observatory.prefs.adv_priv_opts2 +"I sigurt, përveç nëse përdorni një rrjet korporate, me emra të fshehtë të shërbyesve të intranetit:"> + +<!ENTITY ssl-observatory.prefs.alt_roots +"Paraqitni dhe kontrolloni certifikatat e nënshkruara nga root CA jostandarde"> + +<!ENTITY ssl-observatory.prefs.alt_roots_tooltip +"Është e sigurt (dhe një ide e mirë) të aftësosh këtë opsion, veç nëse përdorni një rrjet korporate ndërhyrës, ose programin e antivirusit Kaspersky, që vëzhgon shfletimin tuaj me një proxy TLS dhe një root Certificate Authority private. Nëse aftësohet në një rrjet të tillë, ky opsion mund të publikojë prova se cilat domene https:// janë vizituar përmes atij proxy, për shkak të certifikatave unike që ai mund të prodhojë. Kësisoj, e kemi parazgjedhur që ai të rrijë i fikur."> + +<!ENTITY ssl-observatory.prefs.anonymous "Kontrolloni certifikatat duke përdorur Tor për anonimitetin"> +<!ENTITY ssl-observatory.prefs.anonymous_unavailable +"Kontrolloni certifikatat duke përdorur Tor për anonimitetin (kërkon Tor)"> +<!ENTITY ssl-observatory.prefs.anonymous_tooltip +"Ky opsion kërkon që Tor të jetë instaluar, si dhe duke u ekzekutuar"> + +<!ENTITY ssl-observatory.prefs.asn +"Kur shihni një certifikatë të re, tregojini Observatorit se me cilën ISP ju jeni lidhur"> + +<!ENTITY ssl-observatory.prefs.asn_tooltip +"Kjo do të lëshojë dhe do të dërgojë e "numrin e Sistemit Autonom" të rrjetit tuaj. Kjo do të na ndihmojë që të lokalizojmë sulmet kundër HTTPS, si dhe për të përcaktuar nëse kemi vëzhgime nga rrjetet në vendet si Irani dhe Siria, ku sulmet janë relativisht të zakonshme."> + +<!ENTITY ssl-observatory.prefs.show_cert_warning +"Shfaqni një paralajmërim kur Observatori zbulon një certifikatë të revokuar, të pakapur nga shfletuesi juaj"> + +<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip +"Kjo do të kontrollojë certifikatat e paraqitura kundër Listave të njohura të Revokimit të Certifikatave. Fatkeqësisht ne nuk garantojmë se do mund të shënojmë me flamurth çdo certifikatë të revokuar, por nëse shihni një paralajmërim, me shumë gjasë diçka nuk shkon mirë."> + +<!ENTITY ssl-observatory.prefs.done "Kryer"> + +<!ENTITY ssl-observatory.prefs.explanation +"HTTPS Everywhere mund të përdorë Observatorin SSL të EFF. Kjo bën dy gjëra: (1) +dërgon kopje të certifikatave HTTPS tek Observatori, që të na ndihmojë +për të zbuluar sulmet "njeriu në qendër" dhe për të përmirësuar sigurinë e web-it; si dhe(2) +na lejon t'ju paralajmërojmë rreth lidhjeve të pasigurta apo sulmeve në shfletuesin tuaj."> + + + +<!ENTITY ssl-observatory.prefs.explanation2 + +"Për shembull, kur ju vizitoni https://www.something.com, certifikata +e marrë nga Observatori do të tregojë që dikush vizitoi +www.something.com, por jo kush e vizitoi webfaqen, ose se cilën faqe specifike +ka parë. Kaloni miun mbi opsionet për hollësi të mëtejshme:"> + +<!ENTITY ssl-observatory.prefs.hide "Fshihini opsionet e përparuara"> + +<!ENTITY ssl-observatory.prefs.nonanon +"Kontrollojini certifikatat edhe nëse Tor nuk është i disponibël"> + +<!ENTITY ssl-observatory.prefs.nonanon_tooltip +"Ne do të vijojmë t'i mbajmë të dhënat anonime, por ky opsion është më pak i sigurt"> + +<!ENTITY ssl-observatory.prefs.priv_dns +"Paraqitni dhe kontrolloni certifikatat për emrat e DNS jopublike"> + +<!ENTITY ssl-observatory.prefs.priv_dns_tooltip +"Veç nëse ky opsion është i kontrolluar, Observatori nuk do të regjistrojnë certifikata për emrat që ai nuk mund t'i zgjidhë përmes sistemit DNS."> + +<!ENTITY ssl-observatory.prefs.show "Tregomëni vetitë e përparuara"> + +<!ENTITY ssl-observatory.prefs.title "Parapëlqimet për Vëzhguesin SSL"> + +<!ENTITY ssl-observatory.prefs.use "Do ta përdorni Vëzhguesin?"> +<!ENTITY ssl-observatory.warning.title "KUJDES nga Observatori SSL i EFF "> +<!ENTITY ssl-observatory.warning.showcert "Shfaqeni zinxhirin e certifikatave"> +<!ENTITY ssl-observatory.warning.okay "Kuptoj"> +<!ENTITY ssl-observatory.warning.text "Observatori SSL i EFF ka lëshuar një paralajmërim rreth certifikatës(ave) të HTTPS, për këtë webfaqe:"> +<!ENTITY ssl-observatory.warning.defense "Nëse jeni i futur në këtë webfaqe, mund të jetë e këshillueshme që ta ndryshoni fjalëkalimin tuaj, kur të keni një lidhje të sigurt. (Këto paralajmërime mund të paaftësohen tek skeda e "Observatorit SSL" të dialogut të parapëlqimeve për HTTPS Everywhere.)"> + +<!ENTITY ssl-observatory.prefs.self_signed +"Paraqitni dhe kontrolloni certifikatat e vetë nënshkruara"> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"Kjo rekomandohet; problemet kryptografike janë veçanërisht të zakonshme tek pajisjet e ngulitura e të vetënënshkruara">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 09 Mar '15

09 Mar '15

commit ee6c6b9b5b7b08ec86ed34aae155632c6fd4dbf9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 9 16:15:12 2015 +0000 Update translations for https_everywhere --- sq/ssl-observatory.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sq/ssl-observatory.dtd b/sq/ssl-observatory.dtd index d4350eb..770d613 100644 --- a/sq/ssl-observatory.dtd +++ b/sq/ssl-observatory.dtd @@ -20,11 +20,11 @@ to turn it on?">-->  <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -"Aktivizimi i kësaj është i sigurt, veç nëse përdorni një +"Aktivizimi i kësaj është i sigurt, përveç nëse përdorni një rrjet korporate shumë ndërhyrës:"> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 -"I sigurt, veç nëse përdorni një rrjet korporate, me emra të fshehtë të shërbyesve të intranetit:"> +"I sigurt, përveç nëse përdorni një rrjet korporate, me emra të fshehtë të shërbyesve të intranetit:"> <!ENTITY ssl-observatory.prefs.alt_roots "Paraqitni dhe kontrolloni certifikatat e nënshkruara nga root CA jostandarde"> @@ -48,15 +48,15 @@ rrjet korporate shumë ndërhyrës:"> "Shfaqni një paralajmërim kur Observatori zbulon një certifikatë të revokuar, të pakapur nga shfletuesi juaj"> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip -"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong."> +"Kjo do të kontrollojë certifikatat e paraqitura kundër Listave të njohura të Revokimit të Certifikatave. Fatkeqësisht ne nuk garantojmë se do mund të shënojmë me flamurth çdo certifikatë të revokuar, por nëse shihni një paralajmërim, me shumë gjasë diçka nuk shkon mirë."> <!ENTITY ssl-observatory.prefs.done "Kryer"> <!ENTITY ssl-observatory.prefs.explanation -"HTTPS Everywhere can use EFF's SSL Observatory. This does two things: (1) -sends copies of HTTPS certificates to the Observatory, to help us -detect 'man in the middle' attacks and improve the Web's security; and (2) -lets us warn you about insecure connections or attacks on your browser."> +"HTTPS Everywhere mund të përdorë Observatorin SSL të EFF. Kjo bën dy gjëra: (1) +dërgon kopje të certifikatave HTTPS tek Observatori, që të na ndihmojë +për të zbuluar sulmet "njeriu në qendër" dhe për të përmirësuar sigurinë e web-it; si dhe(2) +na lejon t'ju paralajmërojmë rreth lidhjeve të pasigurta apo sulmeve në shfletuesin tuaj.">  "Për shembull, kur ju vizitoni https://www.something.com, certifikata e marrë nga Observatori do të tregojë që dikush vizitoi -www.something.com, por jo lush e vizitoi webfaqen, ose se cilën faqe specifike +www.something.com, por jo kush e vizitoi webfaqen, ose se cilën faqe specifike ka parë. Kaloni miun mbi opsionet për hollësi të mëtejshme:"> <!ENTITY ssl-observatory.prefs.hide "Fshihini opsionet e përparuara"> @@ -92,8 +92,8 @@ ka parë. Kaloni miun mbi opsionet për hollësi të mëtejshme:"> <!ENTITY ssl-observatory.warning.title "KUJDES nga Observatori SSL i EFF "> <!ENTITY ssl-observatory.warning.showcert "Shfaqeni zinxhirin e certifikatave"> <!ENTITY ssl-observatory.warning.okay "Kuptoj"> -<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:"> -<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection. (These warnings can be disabled in the "SSL Observatory" tab of the HTTPS Everywhere preferences dialog.)"> +<!ENTITY ssl-observatory.warning.text "Observatori SSL i EFF ka lëshuar një paralajmërim rreth certifikatës(ave) të HTTPS, për këtë webfaqe:"> +<!ENTITY ssl-observatory.warning.defense "Nëse jeni i futur në këtë webfaqe, mund të jetë e këshillueshme që ta ndryshoni fjalëkalimin tuaj, kur të keni një lidhje të sigurt. (Këto paralajmërime mund të paaftësohen tek skeda e "Observatorit SSL" të dialogut të parapëlqimeve për HTTPS Everywhere.)"> <!ENTITY ssl-observatory.prefs.self_signed "Paraqitni dhe kontrolloni certifikatat e vetë nënshkruara">

1 0

[stem/master] Move run_tests.py argument handling to its own file
by atagar＠torproject.org 09 Mar '15

09 Mar '15

commit 287f7d64c617bdfa4646184782ed22421d5cab3b Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 9 09:10:21 2015 -0700 Move run_tests.py argument handling to its own file This is a pattern I like that we used for our interpreter. Our run_tests.py was getting a bit long, and this is funtionality that really does belong in its own file. --- run_tests.py | 136 ++----------------------------------- stem/interpreter/arguments.py | 10 +-- test/arguments.py | 149 +++++++++++++++++++++++++++++++++++++++++ test/util.py | 34 +++------- 4 files changed, 165 insertions(+), 164 deletions(-) diff --git a/run_tests.py b/run_tests.py index 876b296..ce732f7 100755 --- a/run_tests.py +++ b/run_tests.py @@ -6,8 +6,6 @@ Runs unit and integration tests. For usage information run this with '--help'. """ -import collections -import getopt import os import sys import threading @@ -26,43 +24,15 @@ import stem.util.log import stem.util.system import stem.util.test_tools +import test.arguments import test.output import test.runner import test.util from test.output import STATUS, SUCCESS, ERROR, NO_NL, STDERR, println -from test.util import STEM_BASE, Target, Task - -# Our default arguments. The _get_args() function provides a named tuple of -# this merged with our argv. -# -# Integration targets fall into two categories: -# -# * Run Targets (like RUN_COOKIE and RUN_PTRACE) which customize our torrc. -# We do an integration test run for each run target we get. -# -# * Attribute Target (like CHROOT and ONLINE) which indicates -# non-configuration changes to your test runs. These are applied to all -# integration runs that we perform. - -ARGS = { - 'run_unit': False, - 'run_integ': False, - 'specific_test': None, - 'logging_runlevel': None, - 'tor_path': 'tor', - 'run_targets': [Target.RUN_OPEN], - 'attribute_targets': [], - 'quiet': False, - 'verbose': False, - 'print_help': False, -} - -OPT = 'auit:l:qvh' -OPT_EXPANDED = ['all', 'unit', 'integ', 'targets=', 'test=', 'log=', 'tor=', 'quiet', 'verbose', 'help'] +from test.util import STEM_BASE, Task CONFIG = stem.util.conf.config_dict('test', { - 'target.torrc': {}, 'integ.test_directory': './test/data', }) @@ -74,11 +44,6 @@ SRC_PATHS = [os.path.join(STEM_BASE, path) for path in ( os.path.join('docs', 'roles.py'), )] -LOG_TYPE_ERROR = """\ -'%s' isn't a logging runlevel, use one of the following instead: - TRACE, DEBUG, INFO, NOTICE, WARN, ERROR -""" - MOCK_UNAVAILABLE_MSG = """\ To run stem's tests you'll need mock... @@ -122,10 +87,7 @@ def main(): test_config.load(os.path.join(STEM_BASE, 'test', 'settings.cfg')) try: - args = _get_args(sys.argv[1:]) - except getopt.GetoptError as exc: - println('%s (for usage provide --help)' % exc) - sys.exit(1) + args = test.arguments.parse(sys.argv[1:]) except ValueError as exc: println(str(exc)) sys.exit(1) @@ -134,7 +96,7 @@ def main(): test.output.SUPPRESS_STDOUT = True if args.print_help: - println(test.util.get_help_message()) + println(test.arguments.get_help()) sys.exit() elif not args.run_unit and not args.run_integ: println('Nothing to run (for usage provide --help)\n') @@ -328,94 +290,6 @@ def main(): sys.exit(1 if error_tracker.has_errors_occured() else 0) -def _get_args(argv): - """ - Parses our arguments, providing a named tuple with their values. - - :param list argv: input arguments to be parsed - - :returns: a **named tuple** with our parsed arguments - - :raises: **ValueError** if we got an invalid argument - :raises: **getopt.GetoptError** if the arguments don't conform with what we - accept - """ - - args = dict(ARGS) - - 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 getopt.GetoptError("'%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 - elif opt in ('-u', '--unit'): - args['run_unit'] = True - elif opt in ('-i', '--integ'): - args['run_integ'] = True - elif opt in ('-t', '--targets'): - run_targets, attribute_targets = [], [] - - integ_targets = arg.split(',') - all_run_targets = [t for t in Target if CONFIG['target.torrc'].get(t) is not None] - - # validates the targets and split them into run and attribute targets - - if not integ_targets: - raise ValueError('No targets provided') - - for target in integ_targets: - if target not in Target: - raise ValueError('Invalid integration target: %s' % target) - elif target in all_run_targets: - run_targets.append(target) - else: - attribute_targets.append(target) - - # check if we were told to use all run targets - - if Target.RUN_ALL in attribute_targets: - attribute_targets.remove(Target.RUN_ALL) - run_targets = all_run_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 - - args['attribute_targets'] = attribute_targets - elif opt == '--test': - args['specific_test'] = arg - elif opt in ('-l', '--log'): - arg = arg.upper() - - if arg not in stem.util.log.LOG_VALUES: - raise ValueError(LOG_TYPE_ERROR % arg) - - args['logging_runlevel'] = arg - elif opt in ('--tor'): - args['tor_path'] = arg - elif opt in ('-q', '--quiet'): - args['quiet'] = True - elif opt in ('-v', '--verbose'): - args['verbose'] = True - elif opt in ('-h', '--help'): - args['print_help'] = True - - # translates our args dict into a named tuple - - Args = collections.namedtuple('Args', args.keys()) - return Args(**args) - - def _print_static_issues(static_check_issues): if static_check_issues: println('STATIC CHECKS', STATUS) @@ -465,7 +339,7 @@ def _run_test(args, test_class, output_filters, logging_buffer): try: suite = unittest.TestLoader().loadTestsFromName(test_class) - except AttributeError, e: + except AttributeError: # should only come up if user provided '--test' for something that doesn't exist println(" no such test", ERROR) return None diff --git a/stem/interpreter/arguments.py b/stem/interpreter/arguments.py index d177b83..eadd043 100644 --- a/stem/interpreter/arguments.py +++ b/stem/interpreter/arguments.py @@ -22,13 +22,7 @@ DEFAULT_ARGS = { } OPT = 'i:s:h' - -OPT_EXPANDED = [ - 'interface=', - 'socket=', - 'no-color', - 'help', -] +OPT_EXPANDED = ['interface=', 'socket=', 'no-color', 'help'] def parse(argv): @@ -50,7 +44,7 @@ def parse(argv): if unrecognized_args: error_msg = "aren't recognized arguments" if len(unrecognized_args) > 1 else "isn't a recognized argument" raise getopt.GetoptError("'%s' %s" % ("', '".join(unrecognized_args), error_msg)) - except getopt.GetoptError as exc: + except Exception as exc: raise ValueError('%s (for usage provide --help)' % exc) for opt, arg in recognized_args: diff --git a/test/arguments.py b/test/arguments.py new file mode 100644 index 0000000..48cd383 --- /dev/null +++ b/test/arguments.py @@ -0,0 +1,149 @@ +# Copyright 2015, Damian Johnson and The Tor Project +# See LICENSE for licensing information + +""" +Commandline argument parsing for our test runner. +""" + +import collections +import getopt + +import stem.util.conf +import stem.util.log + +from test.util import Target + +LOG_TYPE_ERROR = """\ +'%s' isn't a logging runlevel, use one of the following instead: + TRACE, DEBUG, INFO, NOTICE, WARN, ERROR +""" + +CONFIG = stem.util.conf.config_dict('test', { + 'msg.help': '', + 'target.description': {}, + 'target.torrc': {}, +}) + +DEFAULT_ARGS = { + 'run_unit': False, + 'run_integ': False, + 'specific_test': None, + 'logging_runlevel': None, + 'tor_path': 'tor', + 'run_targets': [Target.RUN_OPEN], + 'attribute_targets': [], + 'quiet': False, + 'verbose': False, + 'print_help': False, +} + +OPT = 'auit:l:qvh' +OPT_EXPANDED = ['all', 'unit', 'integ', 'targets=', 'test=', 'log=', 'tor=', 'quiet', 'verbose', 'help'] + + +def parse(argv): + """ + Parses our arguments, providing a named tuple with their values. + + :param list argv: input arguments to be parsed + + :returns: a **named tuple** with our parsed arguments + + :raises: **ValueError** if we got an invalid argument + """ + + args = dict(DEFAULT_ARGS) + + 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 getopt.GetoptError("'%s' %s" % ("', '".join(unrecognized_args), error_msg)) + except Exception 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 + elif opt in ('-u', '--unit'): + args['run_unit'] = True + elif opt in ('-i', '--integ'): + args['run_integ'] = True + elif opt in ('-t', '--targets'): + run_targets, attribute_targets = [], [] + + integ_targets = arg.split(',') + all_run_targets = [t for t in Target if CONFIG['target.torrc'].get(t) is not None] + + # validates the targets and split them into run and attribute targets + + if not integ_targets: + raise ValueError('No targets provided') + + for target in integ_targets: + if target not in Target: + raise ValueError('Invalid integration target: %s' % target) + elif target in all_run_targets: + run_targets.append(target) + else: + attribute_targets.append(target) + + # check if we were told to use all run targets + + if Target.RUN_ALL in attribute_targets: + attribute_targets.remove(Target.RUN_ALL) + run_targets = all_run_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 + + args['attribute_targets'] = attribute_targets + elif opt == '--test': + args['specific_test'] = arg + elif opt in ('-l', '--log'): + arg = arg.upper() + + if arg not in stem.util.log.LOG_VALUES: + raise ValueError(LOG_TYPE_ERROR % arg) + + args['logging_runlevel'] = arg + elif opt in ('--tor'): + args['tor_path'] = arg + elif opt in ('-q', '--quiet'): + args['quiet'] = True + elif opt in ('-v', '--verbose'): + args['verbose'] = True + elif opt in ('-h', '--help'): + args['print_help'] = True + + # translates our args dict into a named tuple + + Args = collections.namedtuple('Args', args.keys()) + return Args(**args) + + +def get_help(): + """ + Provides usage information, as provided by the '--help' argument. This + includes a listing of the valid integration targets. + + :returns: **str** with our usage information + """ + + help_msg = CONFIG['msg.help'] + + # gets the longest target length so we can show the entries in columns + target_name_length = max(map(len, Target)) + description_format = '\n %%-%is - %%s' % target_name_length + + for target in Target: + help_msg += description_format % (target, CONFIG['target.description'].get(target, '')) + + help_msg += '\n' + + return help_msg diff --git a/test/util.py b/test/util.py index 55243a3..5614e4f 100644 --- a/test/util.py +++ b/test/util.py @@ -11,7 +11,6 @@ Helper functions for our test framework. get_prereq - provides the tor version required to run the given target get_torrc_entries - provides the torrc entries for a given target - get_help_message - provides usage information for running our tests Sets of :class:`~test.util.Task` instances can be ran with :func:`~test.util.run_tasks`. Functions that are intended for easy use with @@ -45,8 +44,6 @@ import test.output from test.output import STATUS, ERROR, NO_NL, println CONFIG = stem.util.conf.config_dict('test', { - 'msg.help': '', - 'target.description': {}, 'target.prereq': {}, 'target.torrc': {}, 'integ.test_directory': './test/data', @@ -54,6 +51,15 @@ CONFIG = stem.util.conf.config_dict('test', { 'test.integ_tests': '', }) +# Integration targets fall into two categories: +# +# * Run Targets (like RUN_COOKIE and RUN_PTRACE) which customize our torrc. +# We do an integration test run for each run target we get. +# +# * Attribute Target (like CHROOT and ONLINE) which indicates +# non-configuration changes to your test runs. These are applied to all +# integration runs that we perform. + Target = stem.util.enum.UppercaseEnum( 'ONLINE', 'RELATIVE', @@ -121,28 +127,6 @@ def _get_tests(modules, module_prefix): yield '%s.%s' % (import_name, test) -def get_help_message(): - """ - Provides usage information, as provided by the '--help' argument. This - includes a listing of the valid integration targets. - - :returns: **str** with our usage information - """ - - help_msg = CONFIG['msg.help'] - - # gets the longest target length so we can show the entries in columns - target_name_length = max(map(len, Target)) - description_format = '\n %%-%is - %%s' % target_name_length - - for target in Target: - help_msg += description_format % (target, CONFIG['target.description'].get(target, '')) - - help_msg += '\n' - - return help_msg - - def get_prereq(target): """ Provides the tor version required to run the given target. If the target

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 09 Mar '15

09 Mar '15

commit 9d91f2a9df656ef0ffc77cab22168a084566fbc8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 9 15:45:13 2015 +0000 Update translations for https_everywhere --- sq/ssl-observatory.dtd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sq/ssl-observatory.dtd b/sq/ssl-observatory.dtd index bb4af62..d4350eb 100644 --- a/sq/ssl-observatory.dtd +++ b/sq/ssl-observatory.dtd @@ -42,10 +42,10 @@ rrjet korporate shumë ndërhyrës:"> "Kur shihni një certifikatë të re, tregojini Observatorit se me cilën ISP ju jeni lidhur"> <!ENTITY ssl-observatory.prefs.asn_tooltip -"This will fetch and send the "Autonomous System number" of your network. This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common."> +"Kjo do të lëshojë dhe do të dërgojë e "numrin e Sistemit Autonom" të rrjetit tuaj. Kjo do të na ndihmojë që të lokalizojmë sulmet kundër HTTPS, si dhe për të përcaktuar nëse kemi vëzhgime nga rrjetet në vendet si Irani dhe Siria, ku sulmet janë relativisht të zakonshme."> <!ENTITY ssl-observatory.prefs.show_cert_warning -"Show a warning when the Observatory detects a revoked certificate not caught by your browser"> +"Shfaqni një paralajmërim kur Observatori zbulon një certifikatë të revokuar, të pakapur nga shfletuesi juaj"> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip "This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong."> @@ -65,10 +65,10 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.prefs.explanation2 -"For example, when you visit https://www.something.com, the certificate -received by the Observatory will indicate that somebody visited -www.something.com, but not who visited the site, or what specific page they -looked at. Mouseover the options for further details:"> +"Për shembull, kur ju vizitoni https://www.something.com, certifikata +e marrë nga Observatori do të tregojë që dikush vizitoi +www.something.com, por jo lush e vizitoi webfaqen, ose se cilën faqe specifike +ka parë. Kaloni miun mbi opsionet për hollësi të mëtejshme:"> <!ENTITY ssl-observatory.prefs.hide "Fshihini opsionet e përparuara"> @@ -90,12 +90,12 @@ looked at. Mouseover the options for further details:"> <!ENTITY ssl-observatory.prefs.use "Do ta përdorni Vëzhguesin?"> <!ENTITY ssl-observatory.warning.title "KUJDES nga Observatori SSL i EFF "> -<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain"> +<!ENTITY ssl-observatory.warning.showcert "Shfaqeni zinxhirin e certifikatave"> <!ENTITY ssl-observatory.warning.okay "Kuptoj"> <!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:"> <!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection. (These warnings can be disabled in the "SSL Observatory" tab of the HTTPS Everywhere preferences dialog.)"> <!ENTITY ssl-observatory.prefs.self_signed -"Submit and check self-signed certificates"> +"Paraqitni dhe kontrolloni certifikatat e vetë nënshkruara"> <!ENTITY ssl-observatory.prefs.self_signed_tooltip -"This is recommended; cryptographic problems are especially common in self-signed embedded devices"> +"Kjo rekomandohet; problemet kryptografike janë veçanërisht të zakonshme tek pajisjet e ngulitura e të vetënënshkruara">

1 0

[tor/maint-0.2.6] testing_common.c: avoid side-effects of tor_assert
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit d39ede7f202b931506c1126b63665eaed4676abf Author: Tom van der Woerdt <info(a)tvdw.eu> Date: Sun Mar 8 19:20:56 2015 +0100 testing_common.c: avoid side-effects of tor_assert --- src/test/testing_common.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/test/testing_common.c b/src/test/testing_common.c index d7d6dac..403c83b 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -165,18 +165,21 @@ static crypto_pk_t *pregen_keys[5] = {NULL, NULL, NULL, NULL, NULL}; crypto_pk_t * pk_generate(int idx) { + int res; #ifdef CACHE_GENERATED_KEYS tor_assert(idx < N_PREGEN_KEYS); if (! pregen_keys[idx]) { pregen_keys[idx] = crypto_pk_new(); - tor_assert(!crypto_pk_generate_key(pregen_keys[idx])); + res = crypto_pk_generate_key(pregen_keys[idx]); + tor_assert(!res); } return crypto_pk_dup_key(pregen_keys[idx]); #else crypto_pk_t *result; (void) idx; result = crypto_pk_new(); - tor_assert(!crypto_pk_generate_key(result)); + res = crypto_pk_generate_key(result); + tor_assert(!res); return result; #endif }

1 0

[tor/maint-0.2.6] Changes file for 15188
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 42d877f0847f5541108328c52fb671740b888a18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 11:13:57 2015 -0400 Changes file for 15188 --- changes/15188 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/15188 b/changes/15188 new file mode 100644 index 0000000..2065b39 --- /dev/null +++ b/changes/15188 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing): + - Avoid a side-effect in a tor_assert() in the unit tests. Fixes bug + 15188; bugfix on 0.1.2.3-alpha. Patch from Tom van der Woerdt.

1 0

[tor/master] Make the assert related to 15083 a tiny bit more tolerant
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 81a994ce77038721df3aa2f77b783db9a52da79e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 3 22:25:26 2015 +0100 Make the assert related to 15083 a tiny bit more tolerant --- changes/bug15083 | 6 +++++- src/or/buffers.c | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changes/bug15083 b/changes/bug15083 index 98d1d0e..2bd0715 100644 --- a/changes/bug15083 +++ b/changes/bug15083 @@ -3,4 +3,8 @@ failure if a buffer of exactly the wrong layout was passed to buf_pullup() at exactly the wrong time. Fixes bug 15083; bugfix on 0.2.0.10-alpha. Patch from 'cypherpunks'. - + + - Do not assert if the 'data' pointer on a buffer is advanced to the very + end of the buffer; log a BUG message instead. Only assert if it is + past that point. Fixes bug 15083; bugfix on 0.2.0.10-alpha. + diff --git a/src/or/buffers.c b/src/or/buffers.c index 7976432..9dfed00 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -2483,7 +2483,14 @@ assert_buf_ok(buf_t *buf) total += ch->datalen; tor_assert(ch->datalen <= ch->memlen); tor_assert(ch->data >= &ch->mem[0]); - tor_assert(ch->data < &ch->mem[0]+ch->memlen); + tor_assert(ch->data <= &ch->mem[0]+ch->memlen); + if (ch->data == &ch->mem[0]+ch->memlen) { + static int warned = 0; + if (! warned) { + log_warn(LD_BUG, "Invariant violation in buf.c related to #15083"); + warned = 1; + } + } tor_assert(ch->data+ch->datalen <= &ch->mem[0] + ch->memlen); if (!ch->next) tor_assert(ch == buf->tail);

1 0

[tor/master] Do not leave empty, invalid chunks in buffers during buf_pullup
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 71ee53fe9bdf3f64eef9b38de55960185e8be1b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 3 22:20:17 2015 +0100 Do not leave empty, invalid chunks in buffers during buf_pullup This fixes an assertion failure bug in 15083; bugfix on 0.2.0.10-alpha. Patch from 'cypherpunks' --- changes/bug15083 | 6 ++++++ src/or/buffers.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug15083 b/changes/bug15083 new file mode 100644 index 0000000..98d1d0e --- /dev/null +++ b/changes/bug15083 @@ -0,0 +1,6 @@ + o Major bugfixes (relay, stability): + - Fix a bug that could lead to a relay crashing with an assertion + failure if a buffer of exactly the wrong layout was passed + to buf_pullup() at exactly the wrong time. Fixes bug 15083; + bugfix on 0.2.0.10-alpha. Patch from 'cypherpunks'. + diff --git a/src/or/buffers.c b/src/or/buffers.c index 9be0476..7976432 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -426,7 +426,7 @@ buf_pullup(buf_t *buf, size_t bytes, int nulterminate) size_t n = bytes - dest->datalen; src = dest->next; tor_assert(src); - if (n > src->datalen) { + if (n >= src->datalen) { memcpy(CHUNK_WRITE_PTR(dest), src->data, src->datalen); dest->datalen += src->datalen; dest->next = src->next;

1 0