September 2014 - tor-commits - lists.torproject.org

[tor/release-0.2.5] Correctly update channel local mark when address of incoming connection changes after handshake; fixes bug #12160
by nickm＠torproject.org 11 Sep '14

11 Sep '14

commit 39a017809b6e7f8f779cfa0b4ebea3c0209bef0c Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Sep 5 11:08:46 2014 -0700 Correctly update channel local mark when address of incoming connection changes after handshake; fixes bug #12160 --- changes/bug12160 | 4 +++ src/or/channel.c | 17 +++++++++++++ src/or/channel.h | 1 + src/or/channeltls.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++-- src/or/channeltls.h | 1 + src/or/connection_or.c | 9 +++++++ 6 files changed, 94 insertions(+), 2 deletions(-) diff --git a/changes/bug12160 b/changes/bug12160 new file mode 100644 index 0000000..2a7ace3 --- /dev/null +++ b/changes/bug12160 @@ -0,0 +1,4 @@ + o Bugfixes + - Correctly update the local mark on the controlling channel when changing + the address of an or_connection_t after the handshake. Fixes bug #12160; + bugfix on 0.2.4.4-alpha. diff --git a/src/or/channel.c b/src/or/channel.c index ffd6849..b2b670e 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -3760,6 +3760,23 @@ channel_mark_local(channel_t *chan) } /** + * Mark a channel as remote + * + * This internal-only function should be called by the lower layer if the + * channel is not to a local address but has previously been marked local. + * See channel_is_local() above or the description of the is_local bit in + * channel.h + */ + +void +channel_mark_remote(channel_t *chan) +{ + tor_assert(chan); + + chan->is_local = 0; +} + +/** * Test outgoing flag * * This function gets the outgoing flag; this is the inverse of the incoming diff --git a/src/or/channel.h b/src/or/channel.h index 3e164c6..1481992 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -349,6 +349,7 @@ void channel_clear_remote_end(channel_t *chan); void channel_mark_local(channel_t *chan); void channel_mark_incoming(channel_t *chan); void channel_mark_outgoing(channel_t *chan); +void channel_mark_remote(channel_t *chan); void channel_set_identity_digest(channel_t *chan, const char *identity_digest); void channel_set_remote_end(channel_t *chan, diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 632bc32..245e335 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -156,7 +156,18 @@ channel_tls_connect(const tor_addr_t *addr, uint16_t port, tlschan, U64_PRINTF_ARG(chan->global_identifier)); - if (is_local_addr(addr)) channel_mark_local(chan); + if (is_local_addr(addr)) { + log_debug(LD_CHANNEL, + "Marking new outgoing channel " U64_FORMAT " at %p as local", + U64_PRINTF_ARG(chan->global_identifier), chan); + channel_mark_local(chan); + } else { + log_debug(LD_CHANNEL, + "Marking new outgoing channel " U64_FORMAT " at %p as remote", + U64_PRINTF_ARG(chan->global_identifier), chan); + channel_mark_remote(chan); + } + channel_mark_outgoing(chan); /* Set up or_connection stuff */ @@ -286,7 +297,18 @@ channel_tls_handle_incoming(or_connection_t *orconn) tlschan->conn = orconn; orconn->chan = tlschan; - if (is_local_addr(&(TO_CONN(orconn)->addr))) channel_mark_local(chan); + if (is_local_addr(&(TO_CONN(orconn)->addr))) { + log_debug(LD_CHANNEL, + "Marking new incoming channel " U64_FORMAT " at %p as local", + U64_PRINTF_ARG(chan->global_identifier), chan); + channel_mark_local(chan); + } else { + log_debug(LD_CHANNEL, + "Marking new incoming channel " U64_FORMAT " at %p as remote", + U64_PRINTF_ARG(chan->global_identifier), chan); + channel_mark_remote(chan); + } + channel_mark_incoming(chan); /* Register it */ @@ -1209,6 +1231,44 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, or_connection_t *conn) } /** + * Update channel marks after connection_or.c has changed an address + * + * This is called from connection_or_init_conn_from_address() after the + * connection's _base.addr or real_addr fields have potentially been changed + * so we can recalculate the local mark. Notably, this happens when incoming + * connections are reverse-proxied and we only learn the real address of the + * remote router by looking it up in the consensus after we finish the + * handshake and know an authenticated identity digest. + */ + +void +channel_tls_update_marks(or_connection_t *conn) +{ + channel_t *chan = NULL; + + tor_assert(conn); + tor_assert(conn->chan); + + chan = TLS_CHAN_TO_BASE(conn->chan); + + if (is_local_addr(&(TO_CONN(conn)->addr))) { + if (!channel_is_local(chan)) { + log_debug(LD_CHANNEL, + "Marking channel " U64_FORMAT " at %p as local", + U64_PRINTF_ARG(chan->global_identifier), chan); + channel_mark_local(chan); + } + } else { + if (channel_is_local(chan)) { + log_debug(LD_CHANNEL, + "Marking channel " U64_FORMAT " at %p as remote", + U64_PRINTF_ARG(chan->global_identifier), chan); + channel_mark_remote(chan); + } + } +} + +/** * Check if this cell type is allowed before the handshake is finished * * Return true if <b>command</b> is a cell command that's allowed to start a diff --git a/src/or/channeltls.h b/src/or/channeltls.h index b4a7e2b..c872a09 100644 --- a/src/or/channeltls.h +++ b/src/or/channeltls.h @@ -49,6 +49,7 @@ void channel_tls_handle_state_change_on_orconn(channel_tls_t *chan, uint8_t state); void channel_tls_handle_var_cell(var_cell_t *var_cell, or_connection_t *conn); +void channel_tls_update_marks(or_connection_t *conn); /* Cleanup at shutdown */ void channel_tls_free_all(void); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 16f8734..c372270 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -923,6 +923,15 @@ connection_or_init_conn_from_address(or_connection_t *conn, tor_free(conn->base_.address); conn->base_.address = tor_dup_addr(addr); } + + /* + * We have to tell channeltls.c to update the channel marks (local, in + * particular), since we may have changed the address. + */ + + if (conn->chan) { + channel_tls_update_marks(conn); + } } /** These just pass all the is_bad_for_new_circs manipulation on to

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
by nickm＠torproject.org 11 Sep '14

11 Sep '14

commit 2914d56ea4c767bbfa956afba64032c90a27f4eb Merge: 121f4a9 6215ebb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 11 08:59:24 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug13124 | 8 ++++++++ src/or/config.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/master] Reduce log severity for unused ClientTransportPlugin lines
by nickm＠torproject.org 11 Sep '14

11 Sep '14

commit 6215ebb26676e3fa5d18ddce114f273d9a5dee2a Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Sep 11 08:02:37 2014 -0400 Reduce log severity for unused ClientTransportPlugin lines Tor Browser includes several ClientTransportPlugin lines in its torrc-defaults file, leading every Tor Browser user who looks at her logs to see these notices and wonder if they're dangerous. Resolves bug 13124; bugfix on 0.2.5.3-alpha. --- changes/bug13124 | 8 ++++++++ src/or/config.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug13124 b/changes/bug13124 new file mode 100644 index 0000000..be7df70 --- /dev/null +++ b/changes/bug13124 @@ -0,0 +1,8 @@ + o Minor bugfixes: + - Reduce the log severity of the "Pluggable transport proxy does + not provide any needed transports and will not be launched." + message, since Tor Browser includes several ClientTransportPlugin + lines in its torrc-defaults file, leading every Tor Browser user + who looks at her logs to see these notices and wonder if they're + dangerous. Resolves bug 13124; bugfix on 0.2.5.3-alpha. + diff --git a/src/or/config.c b/src/or/config.c index c4fc8dd..31a3586 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4827,8 +4827,8 @@ parse_client_transport_line(const or_options_t *options, if (is_managed) { /* managed */ if (!validate_only && is_useless_proxy) { - log_notice(LD_GENERAL, "Pluggable transport proxy (%s) does not provide " - "any needed transports and will not be launched.", line); + log_info(LD_GENERAL, "Pluggable transport proxy (%s) does not provide " + "any needed transports and will not be launched.", line); } /* If we are not just validating, use the rest of the line as the

1 0

[tor/maint-0.2.5] Reduce log severity for unused ClientTransportPlugin lines
by nickm＠torproject.org 11 Sep '14

11 Sep '14

commit 6215ebb26676e3fa5d18ddce114f273d9a5dee2a Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Sep 11 08:02:37 2014 -0400 Reduce log severity for unused ClientTransportPlugin lines Tor Browser includes several ClientTransportPlugin lines in its torrc-defaults file, leading every Tor Browser user who looks at her logs to see these notices and wonder if they're dangerous. Resolves bug 13124; bugfix on 0.2.5.3-alpha. --- changes/bug13124 | 8 ++++++++ src/or/config.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug13124 b/changes/bug13124 new file mode 100644 index 0000000..be7df70 --- /dev/null +++ b/changes/bug13124 @@ -0,0 +1,8 @@ + o Minor bugfixes: + - Reduce the log severity of the "Pluggable transport proxy does + not provide any needed transports and will not be launched." + message, since Tor Browser includes several ClientTransportPlugin + lines in its torrc-defaults file, leading every Tor Browser user + who looks at her logs to see these notices and wonder if they're + dangerous. Resolves bug 13124; bugfix on 0.2.5.3-alpha. + diff --git a/src/or/config.c b/src/or/config.c index c4fc8dd..31a3586 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4827,8 +4827,8 @@ parse_client_transport_line(const or_options_t *options, if (is_managed) { /* managed */ if (!validate_only && is_useless_proxy) { - log_notice(LD_GENERAL, "Pluggable transport proxy (%s) does not provide " - "any needed transports and will not be launched.", line); + log_info(LD_GENERAL, "Pluggable transport proxy (%s) does not provide " + "any needed transports and will not be launched.", line); } /* If we are not just validating, use the rest of the line as the

1 0

[tor/master] Merge remote-tracking branch 'public/bug13104_025'
by nickm＠torproject.org 11 Sep '14

11 Sep '14

commit 121f4a9ca43fa88282778adac4597fac8d9deafc Merge: 48558ed d02937a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 11 08:30:41 2014 -0400 Merge remote-tracking branch 'public/bug13104_025' src/test/test_util.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)

1 0

[tor/master] Fix "comparison is always false" warnings in new test_util_di_ops
by nickm＠torproject.org 11 Sep '14

11 Sep '14

commit d02937a20399a3b1c49a3503cabc5b07dc6b5e99 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 11 08:28:46 2014 -0400 Fix "comparison is always false" warnings in new test_util_di_ops Having a constant zero means that unsigned < 0 is always false. --- src/test/test_util.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index e105435..09a27b7 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -3278,20 +3278,24 @@ test_util_di_ops(void) * against each possible (single-byte) bit difference * some arithmetic bugs only appear with certain bit patterns */ { - const uint8_t z = 0; + uint8_t zz = 0; uint8_t ii = 0; + int z; for (i = 0; i < 256; i++) { ii = (uint8_t)i; - test_eq(tor_memeq(&z, &ii, 1), z == ii); + test_eq(tor_memeq(&zz, &ii, 1), zz == ii); } /* exhaustively white-box test tor_memcmp * against each possible single-byte numeric difference * some arithmetic bugs only appear with certain bit patterns */ - for (i = 0; i < 256; i++) { - ii = (uint8_t)i; - test_eq(tor_memcmp(&z, &ii, 1) > 0 ? GT : EQ, z > ii ? GT : EQ); - test_eq(tor_memcmp(&ii, &z, 1) < 0 ? LT : EQ, ii < z ? LT : EQ); + for (z = 0; z < 256; z++) { + for (i = 0; i < 256; i++) { + ii = (uint8_t)i; + zz = (uint8_t)z; + test_eq(tor_memcmp(&zz, &ii, 1) > 0 ? GT : EQ, zz > ii ? GT : EQ); + test_eq(tor_memcmp(&ii, &zz, 1) < 0 ? LT : EQ, ii < zz ? LT : EQ); + } } }

1 0

[tor-browser-bundle/master] No need to apply the patch for bug 8402 anymore.
by gk＠torproject.org 11 Sep '14

11 Sep '14

commit 416e13ed4e32164d9fa56173cd517c4b2be45b6e Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 11 13:10:53 2014 +0000 No need to apply the patch for bug 8402 anymore. Bug 8402 landed on tor master recently which breaks compilation if we'd still apply the patch for it when building nightlies. --- gitian/descriptors/linux/gitian-tor.yml | 2 -- gitian/descriptors/mac/gitian-tor.yml | 2 -- gitian/descriptors/windows/gitian-tor.yml | 2 -- 3 files changed, 6 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index bb99d02..3678913 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -87,8 +87,6 @@ script: | then git am ~/build/bug8402-master.patch git am ~/build/bug11200-hang-0.2.5.patch - else - git am ~/build/bug8402-master.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 7a75287..88fb40f 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -82,8 +82,6 @@ script: | then git am ~/build/bug8402-master.patch git am ~/build/bug11200-hang-0.2.5.patch - else - git am ~/build/bug8402-master.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 277f2d0..ad218f5 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -82,8 +82,6 @@ script: | then git am ~/build/bug8402-master.patch git am ~/build/bug11200-hang-0.2.5.patch - else - git am ~/build/bug8402-master.patch fi fi mkdir -p $OUTDIR/src

1 0

[tor-browser-bundle/master] Bug 13091: Use "Tor Browser" everywhere (space included)
by gk＠torproject.org 11 Sep '14

11 Sep '14

commit 41b90eae7d3d1a3664bc0d482862961a8ed3fcad Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Sep 10 09:52:33 2014 -0400 Bug 13091: Use "Tor Browser" everywhere (space included) Use "TorBrowser" instead "Tor Browser" in Info.plist on Mac OS. --- gitian/build-helpers/fix-info-plist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/build-helpers/fix-info-plist.py b/gitian/build-helpers/fix-info-plist.py index ccb6c68..ac531ec 100755 --- a/gitian/build-helpers/fix-info-plist.py +++ b/gitian/build-helpers/fix-info-plist.py @@ -25,7 +25,7 @@ COPYRIGHT = "Tor Browser %s Copyright %s The Tor Project" % (TORBROWSER_VERSION, plist = plistlib.readPlist(sys.stdin) -plist["CFBundleGetInfoString"] = "TorBrowser %s" % TORBROWSER_VERSION +plist["CFBundleGetInfoString"] = "Tor Browser %s" % TORBROWSER_VERSION plist["CFBundleShortVersionString"] = TORBROWSER_VERSION plist["NSHumanReadableCopyright"] = COPYRIGHT

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'pc/bug13091'
by gk＠torproject.org 11 Sep '14

11 Sep '14

commit e21bb4837a7affd469e413a2664f4a2bb5c2de4e Merge: b5f07db 41b90ea Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 11 10:38:02 2014 +0000 Merge remote-tracking branch 'pc/bug13091' gitian/build-helpers/fix-info-plist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Avoid divide by zero and NaNs in scale_array_elements_to_u64
by nickm＠torproject.org 11 Sep '14

11 Sep '14

commit 59f9a5c78695213442599e8f2e8a535e8a9cc666 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 10 23:59:21 2014 -0400 Avoid divide by zero and NaNs in scale_array_elements_to_u64 Patch from teor; part of 13104 --- src/or/routerlist.c | 5 +++-- src/test/test_dir.c | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 32cbe19..0df411b 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1802,7 +1802,7 @@ scale_array_elements_to_u64(u64_dbl_t *entries, int n_entries, uint64_t *total_out) { double total = 0.0; - double scale_factor; + double scale_factor = 0.0; int i; /* big, but far away from overflowing an int64_t */ #define SCALE_TO_U64_MAX (INT64_MAX / 4) @@ -1810,7 +1810,8 @@ scale_array_elements_to_u64(u64_dbl_t *entries, int n_entries, for (i = 0; i < n_entries; ++i) total += entries[i].dbl; - scale_factor = SCALE_TO_U64_MAX / total; + if (total > 0.0) + scale_factor = SCALE_TO_U64_MAX / total; for (i = 0; i < n_entries; ++i) entries[i].u64 = tor_llround(entries[i].dbl * scale_factor); diff --git a/src/test/test_dir.c b/src/test/test_dir.c index c03b63b..1b56bcd 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1749,10 +1749,37 @@ test_dir_scale_bw(void *testdata) tt_assert(total <= (U64_LITERAL(1)<<62)); for (i=0; i<8; ++i) { + /* vals[2].u64 is the scaled value of 1.0 */ double ratio = ((double)vals[i].u64) / vals[2].u64; tt_double_op(fabs(ratio - v[i]), <, .00001); } + /* test handling of no entries */ + total = 1; + scale_array_elements_to_u64(vals, 0, &total); + tt_assert(total == 0); + + /* make sure we don't read the array when we have no entries + * may require compiler flags to catch NULL dereferences */ + total = 1; + scale_array_elements_to_u64(NULL, 0, &total); + tt_assert(total == 0); + + scale_array_elements_to_u64(NULL, 0, NULL); + + /* test handling of zero totals */ + total = 1; + vals[0].dbl = 0.0; + scale_array_elements_to_u64(vals, 1, &total); + tt_assert(total == 0); + tt_assert(vals[0].u64 == 0); + + vals[0].dbl = 0.0; + vals[1].dbl = 0.0; + scale_array_elements_to_u64(vals, 2, NULL); + tt_assert(vals[0].u64 == 0); + tt_assert(vals[1].u64 == 0); + done: ; }

1 0