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

[tor/master] Update to trunnel 1.4.4 to fix 18373
by nickm＠torproject.org 22 Feb '16

22 Feb '16

commit a508119169388fbef84204cb7f8e25b84823b71e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 14:19:29 2016 -0500 Update to trunnel 1.4.4 to fix 18373 --- changes/trunnel_update | 5 +++++ src/ext/trunnel/trunnel-impl.h | 2 +- src/ext/trunnel/trunnel.c | 2 +- src/ext/trunnel/trunnel.h | 2 +- src/trunnel/ed25519_cert.c | 8 +++++--- src/trunnel/ed25519_cert.h | 2 +- src/trunnel/link_handshake.c | 20 +++++++++++++------- src/trunnel/link_handshake.h | 2 +- src/trunnel/pwbox.c | 14 +++++++++----- src/trunnel/pwbox.h | 2 +- 10 files changed, 38 insertions(+), 21 deletions(-) diff --git a/changes/trunnel_update b/changes/trunnel_update new file mode 100644 index 0000000..4f8c185 --- /dev/null +++ b/changes/trunnel_update @@ -0,0 +1,5 @@ + o Minor bugfixes (code correctness): + - Update to the latest version of Trunnel, which tries harder + to avoid generating code that can invoke memcpy(p,NULL,0). + Bug found by clang address sanitizer. Fixes bug 18373. Bugfix + on 0.2.7.2-alpha. diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h index a97caf2..dfe5f89 100644 --- a/src/ext/trunnel/trunnel-impl.h +++ b/src/ext/trunnel/trunnel-impl.h @@ -1,4 +1,4 @@ -/* trunnel-impl.h -- copied from Trunnel v1.4.3 +/* trunnel-impl.h -- copied from Trunnel v1.4.4 * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c index 25a46d9..0ed75aa 100644 --- a/src/ext/trunnel/trunnel.c +++ b/src/ext/trunnel/trunnel.c @@ -1,4 +1,4 @@ -/* trunnel.c -- copied from Trunnel v1.4.3 +/* trunnel.c -- copied from Trunnel v1.4.4 * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ diff --git a/src/ext/trunnel/trunnel.h b/src/ext/trunnel/trunnel.h index 6140a39..62e87ee 100644 --- a/src/ext/trunnel/trunnel.h +++ b/src/ext/trunnel/trunnel.h @@ -1,4 +1,4 @@ -/* trunnel.h -- copied from Trunnel v1.4.3 +/* trunnel.h -- copied from Trunnel v1.4.4 * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ diff --git a/src/trunnel/ed25519_cert.c b/src/trunnel/ed25519_cert.c index ee010db..f495743 100644 --- a/src/trunnel/ed25519_cert.c +++ b/src/trunnel/ed25519_cert.c @@ -1,4 +1,4 @@ -/* ed25519_cert.c -- generated by Trunnel v1.4.3. +/* ed25519_cert.c -- generated by Trunnel v1.4.4. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ @@ -289,7 +289,8 @@ ed25519_cert_extension_encode(uint8_t *output, const size_t avail, const ed25519 trunnel_assert(written <= avail); if (avail - written < elt_len) goto truncated; - memcpy(ptr, obj->un_unparsed.elts_, elt_len); + if (elt_len) + memcpy(ptr, obj->un_unparsed.elts_, elt_len); written += elt_len; ptr += elt_len; } break; @@ -374,7 +375,8 @@ ed25519_cert_extension_parse_into(ed25519_cert_extension_t *obj, const uint8_t * /* Parse u8 un_unparsed[] */ TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->un_unparsed, remaining, {}); obj->un_unparsed.n_ = remaining; - memcpy(obj->un_unparsed.elts_, ptr, remaining); + if (remaining) + memcpy(obj->un_unparsed.elts_, ptr, remaining); ptr += remaining; remaining -= remaining; break; } diff --git a/src/trunnel/ed25519_cert.h b/src/trunnel/ed25519_cert.h index face810..75a82d8 100644 --- a/src/trunnel/ed25519_cert.h +++ b/src/trunnel/ed25519_cert.h @@ -1,4 +1,4 @@ -/* ed25519_cert.h -- generated by by Trunnel v1.4.3. +/* ed25519_cert.h -- generated by by Trunnel v1.4.4. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ diff --git a/src/trunnel/link_handshake.c b/src/trunnel/link_handshake.c index f9b55f0..3ef7341 100644 --- a/src/trunnel/link_handshake.c +++ b/src/trunnel/link_handshake.c @@ -1,4 +1,4 @@ -/* link_handshake.c -- generated by Trunnel v1.4.3. +/* link_handshake.c -- generated by Trunnel v1.4.4. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ @@ -537,7 +537,8 @@ certs_cell_cert_encode(uint8_t *output, const size_t avail, const certs_cell_cer trunnel_assert(written <= avail); if (avail - written < elt_len) goto truncated; - memcpy(ptr, obj->body.elts_, elt_len); + if (elt_len) + memcpy(ptr, obj->body.elts_, elt_len); written += elt_len; ptr += elt_len; } @@ -589,7 +590,8 @@ certs_cell_cert_parse_into(certs_cell_cert_t *obj, const uint8_t *input, const s CHECK_REMAINING(obj->cert_len, truncated); TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->body, obj->cert_len, {}); obj->body.n_ = obj->cert_len; - memcpy(obj->body.elts_, ptr, obj->cert_len); + if (obj->cert_len) + memcpy(obj->body.elts_, ptr, obj->cert_len); ptr += obj->cert_len; remaining -= obj->cert_len; trunnel_assert(ptr + remaining == input + len_in); return len_in - remaining; @@ -840,7 +842,8 @@ rsa_ed_crosscert_encode(uint8_t *output, const size_t avail, const rsa_ed_crossc trunnel_assert(written <= avail); if (avail - written < elt_len) goto truncated; - memcpy(ptr, obj->sig.elts_, elt_len); + if (elt_len) + memcpy(ptr, obj->sig.elts_, elt_len); written += elt_len; ptr += elt_len; } @@ -899,7 +902,8 @@ rsa_ed_crosscert_parse_into(rsa_ed_crosscert_t *obj, const uint8_t *input, const CHECK_REMAINING(obj->sig_len, truncated); TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->sig, obj->sig_len, {}); obj->sig.n_ = obj->sig_len; - memcpy(obj->sig.elts_, ptr, obj->sig_len); + if (obj->sig_len) + memcpy(obj->sig.elts_, ptr, obj->sig_len); ptr += obj->sig_len; remaining -= obj->sig_len; trunnel_assert(ptr + remaining == input + len_in); return len_in - remaining; @@ -1467,7 +1471,8 @@ auth1_encode(uint8_t *output, const size_t avail, const auth1_t *obj, const auth trunnel_assert(written <= avail); if (avail - written < elt_len) goto truncated; - memcpy(ptr, obj->sig.elts_, elt_len); + if (elt_len) + memcpy(ptr, obj->sig.elts_, elt_len); written += elt_len; ptr += elt_len; } @@ -1576,7 +1581,8 @@ auth1_parse_into(auth1_t *obj, const uint8_t *input, const size_t len_in, const /* Parse u8 sig[] */ TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->sig, remaining, {}); obj->sig.n_ = remaining; - memcpy(obj->sig.elts_, ptr, remaining); + if (remaining) + memcpy(obj->sig.elts_, ptr, remaining); ptr += remaining; remaining -= remaining; trunnel_assert(ptr + remaining == input + len_in); return len_in - remaining; diff --git a/src/trunnel/link_handshake.h b/src/trunnel/link_handshake.h index 60bc28f..2749ec7 100644 --- a/src/trunnel/link_handshake.h +++ b/src/trunnel/link_handshake.h @@ -1,4 +1,4 @@ -/* link_handshake.h -- generated by by Trunnel v1.4.3. +/* link_handshake.h -- generated by by Trunnel v1.4.4. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ diff --git a/src/trunnel/pwbox.c b/src/trunnel/pwbox.c index a80fbb9..9b348a9 100644 --- a/src/trunnel/pwbox.c +++ b/src/trunnel/pwbox.c @@ -1,4 +1,4 @@ -/* pwbox.c -- generated by Trunnel v1.4.3. +/* pwbox.c -- generated by Trunnel v1.4.4. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ @@ -362,7 +362,8 @@ pwbox_encoded_encode(uint8_t *output, size_t avail, const pwbox_encoded_t *obj) trunnel_assert(written <= avail); if (avail - written < elt_len) goto truncated; - memcpy(ptr, obj->skey_header.elts_, elt_len); + if (elt_len) + memcpy(ptr, obj->skey_header.elts_, elt_len); written += elt_len; ptr += elt_len; } @@ -380,7 +381,8 @@ pwbox_encoded_encode(uint8_t *output, size_t avail, const pwbox_encoded_t *obj) trunnel_assert(written <= avail); if (avail - written < elt_len) goto truncated; - memcpy(ptr, obj->data.elts_, elt_len); + if (elt_len) + memcpy(ptr, obj->data.elts_, elt_len); written += elt_len; ptr += elt_len; } trunnel_assert(written <= avail); @@ -460,7 +462,8 @@ pwbox_encoded_parse_into(pwbox_encoded_t *obj, const uint8_t *input, const size_ CHECK_REMAINING(obj->header_len, truncated); TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->skey_header, obj->header_len, {}); obj->skey_header.n_ = obj->header_len; - memcpy(obj->skey_header.elts_, ptr, obj->header_len); + if (obj->header_len) + memcpy(obj->skey_header.elts_, ptr, obj->header_len); ptr += obj->header_len; remaining -= obj->header_len; /* Parse u8 iv[16] */ @@ -476,7 +479,8 @@ pwbox_encoded_parse_into(pwbox_encoded_t *obj, const uint8_t *input, const size_ /* Parse u8 data[] */ TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->data, remaining, {}); obj->data.n_ = remaining; - memcpy(obj->data.elts_, ptr, remaining); + if (remaining) + memcpy(obj->data.elts_, ptr, remaining); ptr += remaining; remaining -= remaining; if (remaining != 0) goto fail; diff --git a/src/trunnel/pwbox.h b/src/trunnel/pwbox.h index c357932..e69e2c1 100644 --- a/src/trunnel/pwbox.h +++ b/src/trunnel/pwbox.h @@ -1,4 +1,4 @@ -/* pwbox.h -- generated by by Trunnel v1.4.3. +/* pwbox.h -- generated by by Trunnel v1.4.4. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */

1 0

[trunnel/master] In generated code, never pass NULL to memcpy even with length 0
by nickm＠torproject.org 22 Feb '16

22 Feb '16

commit 4dfe3f98c031a05f2da84211ce857dbec514f4ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 14:12:00 2016 -0500 In generated code, never pass NULL to memcpy even with length 0 The C standard says that you can never say memcpy(x, NULL, 0), even though most libcs permit it. Found with asan. --- lib/trunnel/CodeGen.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/trunnel/CodeGen.py b/lib/trunnel/CodeGen.py index 038cdd8..16047b3 100644 --- a/lib/trunnel/CodeGen.py +++ b/lib/trunnel/CodeGen.py @@ -2190,7 +2190,8 @@ class EncodeFnGenerator(CodeGenerator): self.checkAvail("elt_len", sva) self.popIndent(2) self.format(""" - memcpy(ptr, obj->{c_name}.elts_, elt_len); + if (elt_len) + memcpy(ptr, obj->{c_name}.elts_, elt_len); written += elt_len; ptr += elt_len; }}""", c_name=sva.c_name) return @@ -2597,7 +2598,8 @@ class ParseFnGenerator(CodeGenerator): self.format(""" TRUNNEL_DYNARRAY_EXPAND({tp}, &obj->{c_name}, {w}, {{}}); obj->{c_name}.n_ = {w}; - memcpy({elt}, ptr, {w}); + if ({w}) + memcpy({elt}, ptr, {w}); """, w=w, elt=elt, tp=tp, c_name=sva.c_name) self.format('ptr += {w}; remaining -= {w};\n', w=w)

1 0

[trunnel/master] bump version to 1.4.4
by nickm＠torproject.org 22 Feb '16

22 Feb '16

commit 5c0c45ab8e66ec7299e553d2e7d92289a2796cf4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 14:13:03 2016 -0500 bump version to 1.4.4 --- lib/trunnel/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/trunnel/__init__.py b/lib/trunnel/__init__.py index 3078c7b..c875874 100644 --- a/lib/trunnel/__init__.py +++ b/lib/trunnel/__init__.py @@ -3,4 +3,4 @@ # a package. # -__version__ = "1.4.3" +__version__ = "1.4.4"

1 0

[tor/master] Add onion address to the HS_DESC UPLOADED event
by nickm＠torproject.org 22 Feb '16

22 Feb '16

commit 13a857183456307bf3e97aa8338219ca245b1040 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Feb 17 14:34:20 2016 -0500 Add onion address to the HS_DESC UPLOADED event Fixes #16023 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/bug16023 | 4 ++++ src/or/control.c | 14 ++++++++++---- src/or/control.h | 5 ++++- src/or/directory.c | 7 ++++++- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/changes/bug16023 b/changes/bug16023 new file mode 100644 index 0000000..7451e27 --- /dev/null +++ b/changes/bug16023 @@ -0,0 +1,4 @@ + o Minor feature (hidden service, control port) + - Add the onion address to the HS_DESC event for the UPLOADED action + both on success or failure. It was previously hardcoded with UNKNOWN. + Fixes #16023; diff --git a/src/or/control.c b/src/or/control.c index 2c0209e..55b287d 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -6384,6 +6384,7 @@ control_event_hs_descriptor_receive_end(const char *action, */ void control_event_hs_descriptor_upload_end(const char *action, + const char *onion_address, const char *id_digest, const char *reason) { @@ -6400,8 +6401,9 @@ control_event_hs_descriptor_upload_end(const char *action, } send_control_event(EVENT_HS_DESC, - "650 HS_DESC %s UNKNOWN UNKNOWN %s%s\r\n", + "650 HS_DESC %s %s UNKNOWN %s%s\r\n", action, + rend_hsaddress_str_or_unknown(onion_address), node_describe_longname_by_id(id_digest), reason_field ? reason_field : ""); @@ -6431,14 +6433,17 @@ control_event_hs_descriptor_received(const char *onion_address, * called when we successfully uploaded a hidden service descriptor. */ void -control_event_hs_descriptor_uploaded(const char *id_digest) +control_event_hs_descriptor_uploaded(const char *id_digest, + const char *onion_address) { if (!id_digest) { log_warn(LD_BUG, "Called with id_digest==%p", id_digest); return; } - control_event_hs_descriptor_upload_end("UPLOADED", id_digest, NULL); + + control_event_hs_descriptor_upload_end("UPLOADED", onion_address, + id_digest, NULL); } /** Send HS_DESC event to inform controller that query rend_query @@ -6500,6 +6505,7 @@ control_event_hs_descriptor_content(const char *onion_address, */ void control_event_hs_descriptor_upload_failed(const char *id_digest, + const char *onion_address, const char *reason) { if (!id_digest) { @@ -6507,7 +6513,7 @@ control_event_hs_descriptor_upload_failed(const char *id_digest, id_digest); return; } - control_event_hs_descriptor_upload_end("UPLOAD_FAILED", + control_event_hs_descriptor_upload_end("UPLOAD_FAILED", onion_address, id_digest, reason); } diff --git a/src/or/control.h b/src/or/control.h index 1f8e2bc..c5191f9 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -129,16 +129,19 @@ void control_event_hs_descriptor_receive_end(const char *action, const char *id_digest, const char *reason); void control_event_hs_descriptor_upload_end(const char *action, + const char *onion_address, const char *hs_dir, const char *reason); void control_event_hs_descriptor_received(const char *onion_address, const rend_data_t *rend_data, const char *id_digest); -void control_event_hs_descriptor_uploaded(const char *hs_dir); +void control_event_hs_descriptor_uploaded(const char *hs_dir, + const char *onion_address); void control_event_hs_descriptor_failed(const rend_data_t *rend_data, const char *id_digest, const char *reason); void control_event_hs_descriptor_upload_failed(const char *hs_dir, + const char *onion_address, const char *reason); void control_event_hs_descriptor_content(const char *onion_address, const char *desc_id, diff --git a/src/or/directory.c b/src/or/directory.c index ecf6da8..6c8b6a2 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2364,16 +2364,21 @@ connection_dir_client_reached_eof(dir_connection_t *conn) if (conn->base_.purpose == DIR_PURPOSE_UPLOAD_RENDDESC_V2) { #define SEND_HS_DESC_UPLOAD_FAILED_EVENT(reason) ( \ control_event_hs_descriptor_upload_failed(conn->identity_digest, \ + conn->rend_data->onion_address, \ reason) ) log_info(LD_REND,"Uploaded rendezvous descriptor (status %d " "(%s))", status_code, escaped(reason)); + /* Without the rend data, we'll have a problem identifying what has been + * uploaded for which service. */ + tor_assert(conn->rend_data); switch (status_code) { case 200: log_info(LD_REND, "Uploading rendezvous descriptor: finished with status " "200 (%s)", escaped(reason)); - control_event_hs_descriptor_uploaded(conn->identity_digest); + control_event_hs_descriptor_uploaded(conn->identity_digest, + conn->rend_data->onion_address); rend_service_desc_has_uploaded(conn->rend_data); break; case 400:

1 0

[tor/master] Merge branch 'bug16023_028_01_squashed'
by nickm＠torproject.org 22 Feb '16

22 Feb '16

commit 2240aa1269b0b72bff678eaa3f144f8ebb3d3931 Merge: a9993a9 13a8571 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 13:17:58 2016 -0500 Merge branch 'bug16023_028_01_squashed' changes/bug16023 | 4 ++++ src/or/control.c | 14 ++++++++++---- src/or/control.h | 5 ++++- src/or/directory.c | 7 ++++++- 4 files changed, 24 insertions(+), 6 deletions(-)

1 0

[stem/master] Ignore missing TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries
by atagar＠torproject.org 22 Feb '16

22 Feb '16

commit 1970e1b448120e276fc6c04bf86bf5e9f5686e67 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Feb 22 09:43:34 2016 -0800 Ignore missing TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries We've had a ticket about this for a couple month now. Lets stop failing our integ tests over it... https://trac.torproject.org/projects/tor/ticket/17913 --- test/integ/manual.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/integ/manual.py b/test/integ/manual.py index d20c407..d877c74 100644 --- a/test/integ/manual.py +++ b/test/integ/manual.py @@ -302,6 +302,9 @@ class TestManual(unittest.TestCase): missing_from_manual = config_options_in_tor.difference(config_options_in_manual) + if 'TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries' in missing_from_manual: + missing_from_manual.remove('TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries') # https://trac.torproject.org/projects/tor/ticket/17913 + if missing_from_manual: self.fail("The %s config options supported by tor isn't in its man page. Maybe we need to add them?" % ', '.join(missing_from_manual))

1 0

[stem/master] Fix couple online integ tests
by atagar＠torproject.org 22 Feb '16

22 Feb '16

commit a0fb3167b9a76f754a8d8293b58239197544c91a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Feb 22 09:11:00 2016 -0800 Fix couple online integ tests We don't run tests requiring our ONLINE target by default so they get a little less love. Fixing the following couple... ====================================================================== FAIL: test_authorities_are_up_to_date ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/runner.py", line 161, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/runner.py", line 178, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/integ/descriptor/remote.py", line 38, in test_authorities_are_up_to_date self.fail("%s isn't a recognized directory authority in stem" % auth.nickname) AssertionError: dannenberg-legacy isn't a recognized directory authority in stem ---------------------------------------------------------------------- ====================================================================== FAIL: test_attributes ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/integ/manual.py", line 198, in test_attributes assert_equal('commandline options', EXPECTED_CLI_OPTIONS, set(manual.commandline_options.keys())) File "/home/atagar/Desktop/stem/test/integ/manual.py", line 190, in assert_equal self.fail("Changed tor's man page? The %s changed as follows...\n\nexpected: %s\n\nactual: %s" % (category, expected, actual)) AssertionError: Changed tor's man page? The commandline options changed as follows... expected: set(['-f FILE', '--ignore-missing-torrc', '--list-fingerprint', '--defaults-torrc FILE', '--allow-missing-torrc', '--nt-service', '--verify-config', '--service remove|start|stop', '--quiet|--hush', '--list-torrc-options', '--service install [--options command-line options]', '--version', '--hash-password PASSWORD', '-h, -help']) actual: set([u'-f FILE', u'--hash-password PASSWORD', u'--ignore-missing-torrc', u'--list-fingerprint', u'--defaults-torrc FILE', u'--allow-missing-torrc', u'--nt-service', u'--verify-config', u'--service remove|start|stop', u'--keygen [--newpass]', u'--list-torrc-options', u'--service install [--options command-line options]', u'--quiet|--hush', u'--version', u'-h, -help']) I'm still getting a couple other failures but one is from #17913 and the rest are spurious. --- test/integ/control/controller.py | 2 +- test/integ/descriptor/remote.py | 3 +++ test/integ/manual.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index a755540..7f9edd3 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -1106,7 +1106,7 @@ class TestController(unittest.TestCase): # The response data for our request for request should be an IP address + '\n' ip_addr = response[response.find(b'\r\n\r\n'):].strip() - self.assertTrue(stem.util.connection.is_valid_ipv4_address(stem.util.str_tools._to_unicode(ip_addr))) + self.assertTrue(stem.util.connection.is_valid_ipv4_address(stem.util.str_tools._to_unicode(ip_addr)), "'%s' isn't an address" % ip_addr) @require_controller @require_online diff --git a/test/integ/descriptor/remote.py b/test/integ/descriptor/remote.py index 9ce9b8f..a73bb0e 100644 --- a/test/integ/descriptor/remote.py +++ b/test/integ/descriptor/remote.py @@ -32,6 +32,9 @@ class TestDescriptorDownloader(unittest.TestCase): consensus = downloader.get_consensus(document_handler = stem.descriptor.DocumentHandler.BARE_DOCUMENT).run()[0] for auth in consensus.directory_authorities: + if auth.nickname == 'dannenberg-legacy': + continue # skip due to https://trac.torproject.org/projects/tor/ticket/17906 + stem_auth = stem.descriptor.remote.get_authorities().get(auth.nickname) if not stem_auth: diff --git a/test/integ/manual.py b/test/integ/manual.py index fc679bb..d20c407 100644 --- a/test/integ/manual.py +++ b/test/integ/manual.py @@ -34,7 +34,7 @@ EXPECTED_CATEGORIES = set([ 'AUTHORS', ]) -EXPECTED_CLI_OPTIONS = set(['-h, -help', '-f FILE', '--allow-missing-torrc', '--defaults-torrc FILE', '--ignore-missing-torrc', '--hash-password PASSWORD', '--list-fingerprint', '--verify-config', '--service install [--options command-line options]', '--service remove|start|stop', '--nt-service', '--list-torrc-options', '--version', '--quiet|--hush']) +EXPECTED_CLI_OPTIONS = set(['-h, -help', '-f FILE', '--allow-missing-torrc', '--defaults-torrc FILE', '--ignore-missing-torrc', '--hash-password PASSWORD', '--list-fingerprint', '--verify-config', '--service install [--options command-line options]', '--service remove|start|stop', '--nt-service', '--keygen [--newpass]', '--list-torrc-options', '--version', '--quiet|--hush']) EXPECTED_SIGNALS = set(['SIGTERM', 'SIGINT', 'SIGHUP', 'SIGUSR1', 'SIGUSR2', 'SIGCHLD', 'SIGPIPE', 'SIGXFSZ']) EXPECTED_DESCRIPTION = """

1 0

[tor/master] fix two typos in comments
by arma＠torproject.org 22 Feb '16

22 Feb '16

commit a9993a92fba0e8632635f2423fc4cc30da130a53 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 22 02:34:50 2016 -0500 fix two typos in comments --- src/or/microdesc.c | 2 +- src/or/routerlist.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index dc23bcb..900a50e 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -840,7 +840,7 @@ microdesc_list_missing_digest256(networkstatus_t *ns, microdesc_cache_t *cache, /** Launch download requests for microdescriptors as appropriate. * * Specifically, we should launch download requests if we are configured to - * download mirodescriptors, and there are some microdescriptors listed the + * download mirodescriptors, and there are some microdescriptors listed in the * current microdesc consensus that we don't have, and either we never asked * for them, or we failed to download them but we're willing to retry. */ diff --git a/src/or/routerlist.c b/src/or/routerlist.c index f666270..13ef081 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4452,7 +4452,7 @@ clear_dir_servers(void) /** For every current directory connection whose purpose is purpose, * and where the resource being downloaded begins with prefix, split * rest of the resource into base16 fingerprints (or base64 fingerprints if - * purpose==DIR_PURPPOSE_FETCH_MICRODESC), decode them, and set the + * purpose==DIR_PURPOSE_FETCH_MICRODESC), decode them, and set the * corresponding elements of result to a nonzero value. */ static void

1 0

[stem/master] Example for using the FallbackDirectories
by atagar＠torproject.org 22 Feb '16

22 Feb '16

commit 4ba079906e7890c0df1ab9602ac8240a8c4158a9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 21 18:44:44 2016 -0800 Example for using the FallbackDirectories On reflection might as well include the example I just gave teor on #18177 in our pydocs as well. --- stem/descriptor/remote.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index dc40e41..e0923dc 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -819,6 +819,30 @@ class FallbackDirectory(Directory): Tor directories tor uses as alternates for the authorities. These relays are `hardcoded in tor <https://gitweb.torproject.org/tor.git/tree/src/or/fallback_dirs.inc>`_. + For example, following checks the performance of tor's fallback directories... + + :: + + import time + from stem.descriptor.remote import DescriptorDownloader, FallbackDirectory + + downloader = DescriptorDownloader() + + for fallback_directory in FallbackDirectory.from_cache().values(): + start = time.time() + downloader.get_consensus(endpoints = [(fallback_directory.address, fallback_directory.dir_port)]).run() + print('Downloading the consensus took %0.2f from %s' % (time.time() - start, fallback_directory.nickname)) + + :: + + % python example.py + Downloading the consensus took 5.07 from Doedel22 + Downloading the consensus took 3.59 from tornoderdednl + Downloading the consensus took 4.16 from Logforme + Downloading the consensus took 6.76 from Doedel21 + Downloading the consensus took 5.21 from kitten4 + ... + .. versionadded:: 1.5.0 """

1 0

[stem/master] Script for caching fallback directories
by atagar＠torproject.org 22 Feb '16

22 Feb '16

commit 9e3f6a2930893bcf4cd69a7e18c00efb2480ff10 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 21 18:19:16 2016 -0800 Script for caching fallback directories Oops! Forgot to add a couple new files to support fallback directories. --- cache_fallback_directories.py | 64 ++++++++++++++++++++++++ stem/descriptor/fallback_directories.cfg | 86 ++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+) diff --git a/cache_fallback_directories.py b/cache_fallback_directories.py new file mode 100755 index 0000000..d6a58a9 --- /dev/null +++ b/cache_fallback_directories.py @@ -0,0 +1,64 @@ +#!/usr/bin/env python +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + +""" +Caches tor's latest fallback directories. +""" + +import re +import sys + +import stem.descriptor.remote +import stem.util.conf +import stem.util.system + +try: + # account for urllib's change between python 2.x and 3.x + import urllib.request as urllib +except ImportError: + import urllib2 as urllib + +GITWEB_MAN_LOG = 'https://gitweb.torproject.org/tor.git/log/src/or/fallback_dirs.inc' +FALLBACK_DIR_LINK = "href='/tor.git/commit/src/or/fallback_dirs.inc\?id=([^']*)'" + +if __name__ == '__main__': + try: + fallback_dir_page = urllib.urlopen(GITWEB_MAN_LOG).read() + fallback_dir_commit = re.search(FALLBACK_DIR_LINK, fallback_dir_page).group(1) + except: + print("Unable to determine the latest commit to edit tor's fallback directories: %s" % sys.exc_info()[1]) + sys.exit(1) + + try: + stem_commit = stem.util.system.call('git rev-parse HEAD')[0] + except IOError as exc: + print("Unable to determine stem's current commit: %s" % exc) + sys.exit(1) + + print('Latest tor commit editing fallback directories: %s' % fallback_dir_commit) + print('Current stem commit: %s' % stem_commit) + print('') + + cached_fallback_directories = stem.descriptor.remote.FallbackDirectory.from_cache() + latest_fallback_directories = stem.descriptor.remote.FallbackDirectory.from_remote() + + if cached_fallback_directories == latest_fallback_directories: + print('Fallback directories are already up to date, nothing to do.') + sys.exit(0) + + print('Differences detected...\n') + print(stem.descriptor.remote._fallback_directory_differences(cached_fallback_directories, latest_fallback_directories)) + + conf = stem.util.conf.Config() + conf.set('tor_commit', fallback_dir_commit) + conf.set('stem_commit', stem_commit) + + for directory in latest_fallback_directories.values(): + nickname = directory.nickname + conf.set('%s.address' % nickname, directory.address) + conf.set('%s.or_port' % nickname, str(directory.or_port)) + conf.set('%s.dir_port' % nickname, str(directory.dir_port)) + conf.set('%s.fingerprint' % nickname, directory.fingerprint) + + conf.save(stem.descriptor.remote.CACHE_PATH) diff --git a/stem/descriptor/fallback_directories.cfg b/stem/descriptor/fallback_directories.cfg new file mode 100644 index 0000000..158378d --- /dev/null +++ b/stem/descriptor/fallback_directories.cfg @@ -0,0 +1,86 @@ +tor_commit ab3c86479a516073e0b445846a22b0e24ce8078e +stem_commit 645017a5f8c17b143e90602fdfe6c03a1a994a1c +Doedel22.address 178.254.44.135 +Doedel22.or_port 9001 +Doedel22.dir_port 9030 +Doedel22.fingerprint 8FA37B93397015B2BC5A525C908485260BE9F422 +tornoderdednl.address 178.62.199.226 +tornoderdednl.or_port 443 +tornoderdednl.dir_port 80 +tornoderdednl.fingerprint CBEFF7BA4A4062045133C053F2D70524D8BBE5BE +Logforme.address 84.219.173.60 +Logforme.or_port 443 +Logforme.dir_port 9030 +Logforme.fingerprint 855BC2DABE24C861CD887DB9B2E950424B49FC34 +Doedel21.address 178.254.44.135 +Doedel21.or_port 443 +Doedel21.dir_port 80 +Doedel21.fingerprint AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2 +BabylonNetwork02.address 149.202.98.161 +BabylonNetwork02.or_port 443 +BabylonNetwork02.dir_port 80 +BabylonNetwork02.fingerprint 54660C671B47E6986B465B80444414BD19E5A34B +fluxe3.address 78.47.18.110 +fluxe3.or_port 80 +fluxe3.dir_port 443 +fluxe3.fingerprint F8D27B163B9247B232A2EEE68DD8B698695C28DE +kili.address 178.62.173.203 +kili.or_port 9001 +kili.dir_port 9030 +kili.fingerprint DD85503F2D1F52EF9EAD621E942298F46CD2FC10 +wagner.address 5.175.233.86 +wagner.or_port 443 +wagner.dir_port 80 +wagner.fingerprint 5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33 +fluxe4.address 131.188.40.188 +fluxe4.or_port 80 +fluxe4.dir_port 443 +fluxe4.fingerprint EBE718E1A49EE229071702964F8DB1F318075FF8 +kitten2.address 62.210.124.124 +kitten2.or_port 9101 +kitten2.dir_port 9130 +kitten2.fingerprint 2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E +coby.address 51.255.33.237 +coby.or_port 9001 +coby.dir_port 9091 +coby.fingerprint A360C21FA87FFA2046D92C17086A6B47E5C68109 +GrmmlLitavis.address 5.39.88.19 +GrmmlLitavis.or_port 9001 +GrmmlLitavis.dir_port 9030 +GrmmlLitavis.fingerprint 7CB8C31432A796731EA7B6BF4025548DFEB25E0C +Doedel24.address 178.254.20.134 +Doedel24.or_port 9001 +Doedel24.dir_port 9030 +Doedel24.fingerprint 2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC +BabylonNetwork03.address 193.111.136.162 +BabylonNetwork03.or_port 443 +BabylonNetwork03.dir_port 80 +BabylonNetwork03.fingerprint C79552275DFCD486B942510EF663ED36ACA1A84B +Unnamed.address 217.12.199.208 +Unnamed.or_port 443 +Unnamed.dir_port 80 +Unnamed.fingerprint DF3AED4322B1824BF5539AE54B2D1B38E080FF05 +eriador.address 85.25.138.93 +eriador.or_port 4029 +eriador.dir_port 9030 +eriador.fingerprint 6DE61A6F72C1E5418A66BFED80DFB63E4C77668F +Doedel26.address 178.254.20.134 +Doedel26.or_port 443 +Doedel26.dir_port 80 +Doedel26.fingerprint 9F5068310818ED7C70B0BC4087AB55CB12CB4377 +PedicaboMundi.address 144.76.14.145 +PedicaboMundi.or_port 143 +PedicaboMundi.dir_port 110 +PedicaboMundi.fingerprint 14419131033443AE6E21DA82B0D307F7CAE42BDB +kitten1.address 62.210.124.124 +kitten1.or_port 9001 +kitten1.dir_port 9030 +kitten1.fingerprint 86E78DD3720C78DA8673182EF96C54B162CD660C +Binnacle.address 108.53.208.157 +Binnacle.or_port 443 +Binnacle.dir_port 80 +Binnacle.fingerprint 4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2 +kitten4.address 212.47.237.95 +kitten4.or_port 9101 +kitten4.dir_port 9130 +kitten4.fingerprint 6FB38EB22E57EF7ED5EF00238F6A48E553735D88

1 0