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

[tor/master] more generic scan-build script
by nickm＠torproject.org 29 May '15

29 May '15

commit e71c8801cfd25dd0576c1dccb34ad8ad399e9f61 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 29 13:50:05 2015 -0400 more generic scan-build script --- scripts/test/scan-build.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/test/scan-build.sh b/scripts/test/scan-build.sh index 623b227..2375ab6 100644 --- a/scripts/test/scan-build.sh +++ b/scripts/test/scan-build.sh @@ -25,15 +25,13 @@ CHECKERS="\ -enable-checker security.insecureAPI.strcpy " -/opt/clang-3.4/bin/scan-build/scan-build \ +scan-build \ $CHECKERS \ - --use-analyzer=/opt/clang-3.4/bin/clang \ ./configure -/opt/clang-3.4/bin/scan-build/scan-build \ +scan-build \ $CHECKERS \ - --use-analyzer=/opt/clang-3.4/bin/clang \ - make -j2 + make -j2 -k # Haven't tried this yet.

1 0

[tor/master] Fix a sizeof(ptr) mistake in test-memwipe.c
by nickm＠torproject.org 29 May '15

29 May '15

commit 27bc0da14d1c9c91bfe31d88c862cd00972ab187 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 29 13:50:12 2015 -0400 Fix a sizeof(ptr) mistake in test-memwipe.c --- src/test/test-memwipe.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index cd3900e..a39bad1 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -19,25 +19,27 @@ static unsigned check_a_buffer(void) __attribute__((noinline)); const char *s = NULL; +#define BUF_LEN 2048 + #define FILL_BUFFER_IMPL() \ unsigned int i; \ unsigned sum = 0; \ \ /* Fill up a 1k buffer with a recognizable pattern. */ \ - for (i = 0; i < 2048; i += strlen(s)) { \ - memcpy(buf+i, s, MIN(strlen(s), 2048-i)); \ + for (i = 0; i < BUF_LEN; i += strlen(s)) { \ + memcpy(buf+i, s, MIN(strlen(s), BUF_LEN-i)); \ } \ \ /* Use the buffer as input to a computation so the above can't get */ \ /* optimized away. */ \ - for (i = 0; i < 2048; ++i) { \ + for (i = 0; i < BUF_LEN; ++i) { \ sum += (unsigned char)buf[i]; \ } static unsigned fill_a_buffer_memset(void) { - char buf[2048]; + char buf[BUF_LEN]; FILL_BUFFER_IMPL() memset(buf, 0, sizeof(buf)); return sum; @@ -46,7 +48,7 @@ fill_a_buffer_memset(void) static unsigned fill_a_buffer_memwipe(void) { - char buf[2048]; + char buf[BUF_LEN]; FILL_BUFFER_IMPL() memwipe(buf, 0, sizeof(buf)); return sum; @@ -55,7 +57,7 @@ fill_a_buffer_memwipe(void) static unsigned fill_a_buffer_nothing(void) { - char buf[2048]; + char buf[BUF_LEN]; FILL_BUFFER_IMPL() return sum; } @@ -85,7 +87,7 @@ check_a_buffer(void) If you know a better way to figure out whether the compiler eliminated the memset/memwipe calls or not, please let me know. */ - for (i = 0; i < sizeof(buf); ++i) { + for (i = 0; i < BUF_LEN - strlen(s); ++i) { if (vmemeq(buf+i, s, strlen(s))) ++sum; } @@ -98,9 +100,9 @@ static char *heap_buf = NULL; static unsigned fill_heap_buffer_memset(void) { - char *buf = heap_buf = malloc(2048); + char *buf = heap_buf = malloc(BUF_LEN); FILL_BUFFER_IMPL() - memset(buf, 0, 2048); + memset(buf, 0, BUF_LEN); free(buf); return sum; } @@ -108,9 +110,9 @@ fill_heap_buffer_memset(void) static unsigned fill_heap_buffer_memwipe(void) { - char *buf = heap_buf = malloc(2048); + char *buf = heap_buf = malloc(BUF_LEN); FILL_BUFFER_IMPL() - memwipe(buf, 0, 2048); + memwipe(buf, 0, BUF_LEN); free(buf); return sum; } @@ -118,7 +120,7 @@ fill_heap_buffer_memwipe(void) static unsigned fill_heap_buffer_nothing(void) { - char *buf = heap_buf = malloc(2048); + char *buf = heap_buf = malloc(BUF_LEN); FILL_BUFFER_IMPL() free(buf); return sum; @@ -138,7 +140,7 @@ check_heap_buffer(void) If you know a better way to figure out whether the compiler eliminated the memset/memwipe calls or not, please let me know. */ - for (i = 0; i < sizeof(buf); ++i) { + for (i = 0; i < BUF_LEN - strlen(s); ++i) { if (vmemeq(buf+i, s, strlen(s))) ++sum; }

1 0

[metrics-db/master] Update to even newer metrics-lib.
by karsten＠torproject.org 29 May '15

29 May '15

commit 0065f0f931a976e70b97a4d72bdfd91e718d9787 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 29 18:33:47 2015 +0200 Update to even newer metrics-lib. --- deps/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/metrics-lib b/deps/metrics-lib index a8d9e1b..bd18dd0 160000 --- a/deps/metrics-lib +++ b/deps/metrics-lib @@ -1 +1 @@ -Subproject commit a8d9e1beef3d0412684d4932354e6dd973bc7cc3 +Subproject commit bd18dd0d2f788d1d4ee7acbac5032e97264bb855

1 0

[stem/master] Doc example unit tests used relative paths
by atagar＠torproject.org 29 May '15

29 May '15

commit 63c08cc70c69776e55197d0a9b6bb86d6b644c6b Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 29 09:11:15 2015 -0700 Doc example unit tests used relative paths Recently we changed our unit tests for tutorial examples to test the docs rather than a copy of the code (yay, no more duplication!). However, we used relative paths so our unit tests failed if executed outside of our base stem directory. Caught by toralf. --- run_tests.py | 11 +++++++---- test/unit/__init__.py | 12 ++++++++++++ test/unit/tutorial.py | 15 +++++---------- test/unit/tutorial_examples.py | 19 +++++++------------ 4 files changed, 31 insertions(+), 26 deletions(-) diff --git a/run_tests.py b/run_tests.py index c7ac574..d988900 100755 --- a/run_tests.py +++ b/run_tests.py @@ -357,10 +357,13 @@ def _run_test(args, test_class, output_filters, logging_buffer): try: suite = unittest.TestLoader().loadTestsFromName(test_class) - except AttributeError: - # should only come up if user provided '--test' for something that doesn't exist - println(' no such test', ERROR) - return None + except AttributeError as exc: + if args.specific_test: + # should only come up if user provided '--test' for something that doesn't exist + println(' no such test', ERROR) + return None + else: + raise exc except Exception as exc: println(' failed', ERROR) traceback.print_exc(exc) diff --git a/test/unit/__init__.py b/test/unit/__init__.py index 9a83be9..d76ecfe 100644 --- a/test/unit/__init__.py +++ b/test/unit/__init__.py @@ -11,3 +11,15 @@ __all__ = [ 'util', 'version', ] + + +import os +import test.util + + +def exec_documentation_example(filename): + path = os.path.join(test.util.STEM_BASE, 'docs', '_static', 'example', filename) + + with open(path) as f: + code = compile(f.read(), path, 'exec') + exec(code) diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py index 95634dc..3c5bfd6 100644 --- a/test/unit/tutorial.py +++ b/test/unit/tutorial.py @@ -9,6 +9,7 @@ from stem.control import Controller from stem.descriptor.reader import DescriptorReader from stem.descriptor.server_descriptor import RelayDescriptor from test import mocking +from test.unit import exec_documentation_example try: from StringIO import StringIO @@ -36,12 +37,6 @@ MIRROR_MIRROR_OUTPUT = """\ """ -def exec_file(path): - with open(path) as f: - code = compile(f.read(), path, 'exec') - exec(code) - - class TestTutorial(unittest.TestCase): @patch('sys.stdout', new_callable = StringIO) @patch('stem.control.Controller.from_port', spec = Controller) @@ -52,7 +47,7 @@ class TestTutorial(unittest.TestCase): 'traffic/written': '29649', }[arg] - exec_file('docs/_static/example/hello_world.py') + exec_documentation_example('hello_world.py') self.assertEqual('My Tor relay has read 33406 bytes and written 29649.\n', stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -126,7 +121,7 @@ class TestTutorial(unittest.TestCase): def test_mirror_mirror_on_the_wall_1(self, downloader_mock, stdout_mock): downloader_mock().get_consensus().run.return_value = [mocking.get_router_status_entry_v2()] - exec_file('docs/_static/example/current_descriptors.py') + exec_documentation_example('current_descriptors.py') self.assertEqual('found relay caerSidi (A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB)\n', stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -135,7 +130,7 @@ class TestTutorial(unittest.TestCase): controller = from_port_mock().__enter__() controller.get_network_statuses.return_value = [mocking.get_router_status_entry_v2()] - exec_file('docs/_static/example/descriptor_from_tor_control_socket.py') + exec_documentation_example('descriptor_from_tor_control_socket.py') self.assertEqual('found relay caerSidi (A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB)\n', stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -164,7 +159,7 @@ class TestTutorial(unittest.TestCase): reader = reader_mock().__enter__() reader.__iter__.return_value = iter([mocking.get_relay_server_descriptor()]) - exec_file('docs/_static/example/past_descriptors.py') + exec_documentation_example('past_descriptors.py') self.assertEqual('found relay caerSidi (None)\n', stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index 246b483..c102c1a 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -19,6 +19,7 @@ from stem.control import Controller from stem.descriptor.remote import DIRECTORY_AUTHORITIES from test import mocking +from test.unit import exec_documentation_example from test.mocking import ( get_relay_server_descriptor, get_router_status_entry_v3, @@ -101,12 +102,6 @@ A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB: caerSidi """ -def exec_file(path): - with OPEN_FUNCTION(path, 'rb') as f: - code = compile(f.read(), path, 'exec') - exec(code) - - def _get_event(content): controller_event = mocking.get_message(content) stem.response.convert('EVENT', controller_event) @@ -175,7 +170,7 @@ class TestTutorialExamples(unittest.TestCase): path_7[0]: _get_router_status('176.67.169.171') }[fingerprint] - exec_file('docs/_static/example/list_circuits.py') + exec_documentation_example('list_circuits.py') self.assert_equal_unordered(LIST_CIRCUITS_OUTPUT, stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -239,7 +234,7 @@ class TestTutorialExamples(unittest.TestCase): get_relay_server_descriptor({'opt': 'contact Sambuddha Basu', 'platform': 'node-Tor 0.1.0 on Linux x86_64'}), ] - exec_file('docs/_static/example/outdated_relays.py') + exec_documentation_example('outdated_relays.py') self.assert_equal_unordered(OUTDATED_RELAYS_OUTPUT, stdout_mock.getvalue()) @@ -280,7 +275,7 @@ class TestTutorialExamples(unittest.TestCase): [get_network_status_document_v3(routers = (entry[5], entry[6], entry[7], entry[8], entry[9]))], ] - exec_file('docs/_static/example/compare_flags.py') + exec_documentation_example('compare_flags.py') self.assert_equal_unordered(COMPARE_FLAGS_OUTPUT, stdout_mock.getvalue()) @@ -319,7 +314,7 @@ class TestTutorialExamples(unittest.TestCase): query_mock.side_effect = [query1, query2, query3, query4] - exec_file('docs/_static/example/votes_by_bandwidth_authorities.py') + exec_documentation_example('votes_by_bandwidth_authorities.py') self.assert_equal_unordered(VOTES_BY_BANDWIDTH_AUTHORITIES_OUTPUT, stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -343,7 +338,7 @@ class TestTutorialExamples(unittest.TestCase): query_mock().run.return_value = [network_status] parse_file_mock.return_value = itertools.cycle([network_status]) - exec_file('docs/_static/example/persisting_a_consensus.py') - exec_file('docs/_static/example/persisting_a_consensus_with_parse_file.py') + exec_documentation_example('persisting_a_consensus.py') + exec_documentation_example('persisting_a_consensus_with_parse_file.py') self.assertEqual(PERSISTING_A_CONSENSUS_OUTPUT, stdout_mock.getvalue())

1 0

[stem/master] 'extra-info-digest line had an invalid value' from additions in proposal 228
by atagar＠torproject.org 29 May '15

29 May '15

commit ba8cee36a0348c1509ad3562051723b7948e19ce Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 29 08:45:30 2015 -0700 'extra-info-digest line had an invalid value' from additions in proposal 228 Proposal 228 adds additional content to the extra-info-digest line of server descriptors, causing validation to fail with... ValueError: extra-info-digest line had an invalid value (should be 40 hex characters): extra-info-digest 0879DB7B765218D7B3AE7557669D20307BB21CAA V609l+N6ActBveebfNbH5lQ6wHDNstDkFgyqEhBHwtA Honestly Stem is probably being a bit too strict here. Following is tracking spec clarifications... https://trac.torproject.org/projects/tor/ticket/16227 And as for proposal 228 itself awaiting its dir-spec addition... https://trac.torproject.org/projects/tor/ticket/16235 --- docs/change_log.rst | 4 ++ stem/descriptor/server_descriptor.py | 11 ++++- .../descriptor/data/server_descriptor_with_ed25519 | 50 ++++++++++++++++++++ test/unit/descriptor/server_descriptor.py | 39 +++++++++++++++ 4 files changed, 103 insertions(+), 1 deletion(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 643f5bd..aea62a2 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -49,6 +49,10 @@ The following are only available within Stem's `git repository * Added `support for NETWORK_LIVENESS events <api/response.html#stem.response.events.NetworkLivenessEvent>`_ (:spec:`44aac63`) * IPv6 addresses could trigger errors in :func:`~stem.control.Controller.get_listeners`, :class:`~stem.response.events.ORConnEvent`, and quite a few other things (:trac:`16174`) + * **Descriptors** + + * Server descriptor validation fails with 'extra-info-digest line had an invalid value' from additions in proposal 228 (:trac:`16227`) + * **Website** * Example for `custom path selection for circuits <tutorials/to_russia_with_love.html#custom-path-selection>`_ (:trac:`8728`) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index b375066..22e6f40 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -265,6 +265,16 @@ def _parse_fingerprint_line(descriptor, entries): descriptor.fingerprint = fingerprint +def _parse_extrainfo_digest_line(descriptor, entries): + value = _value('extra-info-digest', entries) + value = value.split(' ')[0] # lines have additional content from propsal 228, waiting for it to be documented: #16227 + + if not stem.util.tor_tools.is_hex_digits(value, 40): + raise ValueError('extra-info-digest should be 40 hex characters: %s' % value) + + descriptor.extra_info_digest = value + + def _parse_hibernating_line(descriptor, entries): # "hibernating" 0|1 (in practice only set if one) @@ -374,7 +384,6 @@ def _parse_exit_policy(descriptor, entries): _parse_contact_line = _parse_bytes_line('contact', 'contact') _parse_published_line = _parse_timestamp_line('published', 'published') -_parse_extrainfo_digest_line = _parse_forty_character_hex('extra-info-digest', 'extra_info_digest') _parse_read_history_line = functools.partial(_parse_history_line, 'read-history', 'read_history_end', 'read_history_interval', 'read_history_values') _parse_write_history_line = functools.partial(_parse_history_line, 'write-history', 'write_history_end', 'write_history_interval', 'write_history_values') _parse_ipv6_policy_line = lambda descriptor, entries: setattr(descriptor, 'exit_policy_v6', stem.exit_policy.MicroExitPolicy(_value('ipv6-policy', entries))) diff --git a/test/unit/descriptor/data/server_descriptor_with_ed25519 b/test/unit/descriptor/data/server_descriptor_with_ed25519 new file mode 100644 index 0000000..2f43ced --- /dev/null +++ b/test/unit/descriptor/data/server_descriptor_with_ed25519 @@ -0,0 +1,50 @@ +@type server-descriptor 1.0 +router Truie 198.50.156.78 9001 0 9030 +identity-ed25519 +-----BEGIN ED25519 CERT----- +AQQABhWIAZTz0r0KRagr6X9SHfm4oiIuMLVhJQQmNchtkBuR5SuFAQAgBAAVkw7m +0YJgO/A8VMioco097sIOutDiM7UqqPvoIyKErk1akOm3f6VAO/juOzxEeAgzgfA7 +DiRsSjeVjp0xUdE43bXhK/8Uh+SPMwYKj47drjgTHGgzjTmlY9B/jFJ1Wgs= +-----END ED25519 CERT----- +platform Tor 0.2.7.1-alpha-dev on Linux +protocols Link 1 2 Circuit 1 +published 2015-05-28 15:44:47 +fingerprint A692 21A7 EC74 98D2 F88A 0FB7 9526 1013 FA36 CAAE +uptime 61 +bandwidth 1073741824 1073741824 9506816 +extra-info-digest 0879DB7B765218D7B3AE7557669D20307BB21CAA V609l+N6ActBveebfNbH5lQ6wHDNstDkFgyqEhBHwtA +onion-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBALbTpnPvhaGET+2ACtLdG6jhQXN8uVJ0iF9RwMh2hwu351yp3eVPt7os +ditUF6w7KV+6emkvLu9EBpNN7vWrpDAhRNOGTOZhZKLnGFaxp+eGNX6+5AhmiWYt +/+w+f6dvVKEjsaX3XZsMqcTBjw2hzVpHxh/AjgDx/b9mJKC85vENAgMBAAE= +-----END RSA PUBLIC KEY----- +signing-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBALDSt2G+Zjl20a59HZsuag913ONdnnNa/uVMRbsZZkbnNRONf2aXBGgu +wrW7XtPLeAKl+d0d5g9XnePVvefcEdKvoKNCFv6s8s3S2KB/CEkeyE7Lxx1Pc6Qx +f/jgS3T3TFHUlvtZvHLZ/3WaXMyuTTRlGadpzDkQx5oWR6aNn065AgMBAAE= +-----END RSA PUBLIC KEY----- +onion-key-crosscert +-----BEGIN CROSSCERT----- +TCcCIv38fGcSzUO+DKxudFme2XBRuDkf5FjEr+6UbtDyuDjvjJDFYagN+zMJf/4K +RyBScjyKYK6MVMxAmf25QjAGx3KHV00ozVSzlN3WDAS2iicuKYvBsehG9g/tr6mI +luS5EoSKJIlmM2jOhN1QyR+Rpi37z/E6VTksk/bd69A= +-----END CROSSCERT----- +ntor-onion-key-crosscert 0 +-----BEGIN ED25519 CERT----- +AQoABhNgARWTDubRgmA78DxUyKhyjT3uwg660OIztSqo++gjIoSuAEW8gwMcFUSD +mfkijKN6KyZxHloENGcgJMeJsR9kvfYp/u7O+VoPQ1kTxaw1lajTrnGQF+PV1MlK +niid4Nq5ZgM= +-----END ED25519 CERT----- +hidden-service-dir +contact 0x11F48D36 David Goulet <dgoulet AT ev0ke dot net> +ntor-onion-key qDcuoDpDD36bIapIbXBVhkIoiuMIXD9jNfjF1+7Vaks= +reject *:* +router-sig-ed25519 AxqrLz7QL/e+xGhhihs/rNzWsBW0Qla7Cwru1q88A5i+pcQBgfzfECiecptqYbDAsUPXMtwFsLp7Ls2BMOzvCQ +router-signature +-----BEGIN SIGNATURE----- +mSkveaqx79vzXLc6yC2+x8yZMQPe74ihw9tZJDdSOK5VqhzZOKHFM+JoD12noxQd +wgxa+IX0RG65KlguYE7NEZ7M6JOwr6r0zK/pWSZE8ZeHyt7FDx9ygc3k2ybQ6RWE +Hd7QXPiyVgs9cIgnvGFVt/5vzjMV+BELpOtehBrUJbs= +-----END SIGNATURE----- diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index 226cdcd..4ee60f3 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -236,6 +236,45 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertTrue(isinstance(str(desc), str)) + def test_with_ed25519(self): + """ + Parses a descriptor with a ed25519 identity key, as added by proposal 228 + (cross certification onionkeys). + """ + + with open(get_resource('server_descriptor_with_ed25519'), 'rb') as descriptor_file: + desc = next(stem.descriptor.parse_file(descriptor_file, 'server-descriptor 1.0', validate = True)) + + self.assertEqual('Truie', desc.nickname) + self.assertEqual('A69221A7EC7498D2F88A0FB795261013FA36CAAE', desc.fingerprint) + self.assertEqual('198.50.156.78', desc.address) + self.assertEqual(9001, desc.or_port) + self.assertEqual(None, desc.socks_port) + self.assertEqual(9030, desc.dir_port) + self.assertEqual(b'Tor 0.2.7.1-alpha-dev on Linux', desc.platform) + self.assertEqual(stem.version.Version('0.2.7.1-alpha-dev'), desc.tor_version) + self.assertEqual('Linux', desc.operating_system) + self.assertEqual(61, desc.uptime) + self.assertEqual(datetime.datetime(2015, 5, 28, 15, 44, 47), desc.published) + self.assertEqual(b'0x11F48D36 David Goulet <dgoulet AT ev0ke dot net>', desc.contact) + self.assertEqual(['1', '2'], desc.link_protocols) + self.assertEqual(['1'], desc.circuit_protocols) + self.assertEqual(False, desc.hibernating) + self.assertEqual(False, desc.allow_single_hop_exits) + self.assertEqual(False, desc.extra_info_cache) + self.assertEqual('0879DB7B765218D7B3AE7557669D20307BB21CAA', desc.extra_info_digest) + self.assertEqual(['2'], desc.hidden_service_dir) + self.assertEqual(set(), desc.family) + self.assertEqual(1073741824, desc.average_bandwidth) + self.assertEqual(1073741824, desc.burst_bandwidth) + self.assertEqual(9506816, desc.observed_bandwidth) + self.assertEqual(stem.exit_policy.ExitPolicy('reject *:*'), desc.exit_policy) + self.assertTrue('MIGJAoGBALbTpn' in desc.onion_key) + self.assertTrue('MIGJAoGBALDSt2' in desc.signing_key) + self.assertTrue('mSkveaqx79vzX' in desc.signature) + self.assertEqual(4, len(desc.get_unrecognized_lines())) + self.assertEqual('B0445BC590F004B8FD3BE922EB19EC490DBA9077', desc.digest()) + def test_cr_in_contact_line(self): """ Parses a descriptor with a huge contact line containing anomalous carriage

1 0

[onionoo/master] Update to even newer metrics-lib.
by karsten＠torproject.org 29 May '15

29 May '15

commit e1416c61ae3b688ea7fdfdf4476590811791962e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 29 17:17:23 2015 +0200 Update to even newer metrics-lib. --- deps/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/metrics-lib b/deps/metrics-lib index a8d9e1b..bd18dd0 160000 --- a/deps/metrics-lib +++ b/deps/metrics-lib @@ -1 +1 @@ -Subproject commit a8d9e1beef3d0412684d4932354e6dd973bc7cc3 +Subproject commit bd18dd0d2f788d1d4ee7acbac5032e97264bb855

1 0

[metrics-lib/master] Accept extra-info-digest lines with additional digests.
by karsten＠torproject.org 29 May '15

29 May '15

commit bd18dd0d2f788d1d4ee7acbac5032e97264bb855 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 29 15:24:00 2015 +0200 Accept extra-info-digest lines with additional digests. --- .../torproject/descriptor/impl/ServerDescriptorImpl.java | 2 +- .../descriptor/impl/ServerDescriptorImplTest.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java index cf24904..c070cc1 100644 --- a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -401,7 +401,7 @@ public class ServerDescriptorImpl extends DescriptorImpl private void parseExtraInfoDigestLine(String line, String lineNoOpt, String[] partsNoOpt) throws DescriptorParseException { - if (partsNoOpt.length != 2) { + if (partsNoOpt.length < 2) { throw new DescriptorParseException("Illegal line '" + line + "'."); } this.extraInfoDigest = ParseHelper.parseTwentyByteHexString(line, diff --git a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index b593e21..c7f9df4 100644 --- a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -709,6 +709,19 @@ public class ServerDescriptorImplTest { } @Test() + public void testExtraInfoDigestAdditionalDigest() + throws DescriptorParseException { + String extraInfoDigest = "0879DB7B765218D7B3AE7557669D20307BB21CAA"; + String additionalExtraInfoDigest = + "V609l+N6ActBveebfNbH5lQ6wHDNstDkFgyqEhBHwtA"; + String extraInfoDigestLine = String.format("extra-info-digest %s %s", + extraInfoDigest, additionalExtraInfoDigest); + ServerDescriptor descriptor = DescriptorBuilder. + createWithExtraInfoDigestLine(extraInfoDigestLine); + assertEquals(extraInfoDigest, descriptor.getExtraInfoDigest()); + } + + @Test() public void testOnionKeyOpt() throws DescriptorParseException { DescriptorBuilder.createWithOnionKeyLines("opt onion-key\n" + "-----BEGIN RSA PUBLIC KEY-----\n"

1 0

[onionoo/master] Update to latest metrics-lib.
by karsten＠torproject.org 29 May '15

29 May '15

commit 6739ae4e85dd404d8b4fe0dc453006459c4ac7f6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 29 12:07:51 2015 +0200 Update to latest metrics-lib. --- deps/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/metrics-lib b/deps/metrics-lib index 7b026cf..a8d9e1b 160000 --- a/deps/metrics-lib +++ b/deps/metrics-lib @@ -1 +1 @@ -Subproject commit 7b026cf44ac775a990e42762c1151f973832ca8a +Subproject commit a8d9e1beef3d0412684d4932354e6dd973bc7cc3

1 0

[metrics-db/master] Update to latest metrics-lib.
by karsten＠torproject.org 29 May '15

29 May '15

commit 354e3554daa1a0aff775f0d1b6903ccabe36c214 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 29 11:39:13 2015 +0200 Update to latest metrics-lib. --- deps/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/metrics-lib b/deps/metrics-lib index 73e5a69..a8d9e1b 160000 --- a/deps/metrics-lib +++ b/deps/metrics-lib @@ -1 +1 @@ -Subproject commit 73e5a6989df19923775978428cd9bb21e0a96dc4 +Subproject commit a8d9e1beef3d0412684d4932354e6dd973bc7cc3

1 0

[metrics-lib/master] Rename method while it's not in wide use.
by karsten＠torproject.org 29 May '15

29 May '15

commit be5b9e3ae6d3a781e81944834b6f1a3e781d2035 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 29 11:33:32 2015 +0200 Rename method while it's not in wide use. --- src/org/torproject/descriptor/DescriptorCollector.java | 2 +- src/org/torproject/descriptor/impl/DescriptorCollectorImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/descriptor/DescriptorCollector.java b/src/org/torproject/descriptor/DescriptorCollector.java index bd29fb0..18e594d 100644 --- a/src/org/torproject/descriptor/DescriptorCollector.java +++ b/src/org/torproject/descriptor/DescriptorCollector.java @@ -27,7 +27,7 @@ public interface DescriptorCollector { * @param deleteExtraneousLocalFiles Whether to delete all local files * that do not exist remotely anymore. */ - public void collectRemoteFiles(String collecTorBaseUrl, + public void collectDescriptors(String collecTorBaseUrl, String[] remoteDirectories, long minLastModified, File localDirectory, boolean deleteExtraneousLocalFiles); } diff --git a/src/org/torproject/descriptor/impl/DescriptorCollectorImpl.java b/src/org/torproject/descriptor/impl/DescriptorCollectorImpl.java index ed88906..e5f2f9c 100644 --- a/src/org/torproject/descriptor/impl/DescriptorCollectorImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorCollectorImpl.java @@ -30,7 +30,7 @@ import org.torproject.descriptor.DescriptorCollector; public class DescriptorCollectorImpl implements DescriptorCollector { @Override - public void collectRemoteFiles(String collecTorBaseUrl, + public void collectDescriptors(String collecTorBaseUrl, String[] remoteDirectories, long minLastModified, File localDirectory, boolean deleteExtraneousLocalFiles) { collecTorBaseUrl = collecTorBaseUrl.endsWith("/")

1 0