tor-commits September 2014

tor-commits@lists.torproject.org

22 participants
980 discussions

[torsocks/master] Add cscope files to gitignore
by dgoulet＠torproject.org 11 Sep '14

11 Sep '14

commit 61beff8c974f9c96016baa9d691c3e5d86d0f1d9 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Tue Sep 9 16:17:55 2014 -0400 Add cscope files to gitignore Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index cc74d05..ff6012e 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ ltmain.sh missing stamp-h1 tags +cscope.* config/ !config/ax_check_compile_flag.m4

1 0

[tor/master] Use tor_malloc_zero() in pt tests
by nickm＠torproject.org 11 Sep '14

11 Sep '14

commit 43a47ae7265e0030e0e275fbf01caf1c313710e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 11 09:17:13 2014 -0400 Use tor_malloc_zero() in pt tests Fixes for PT tests merged with 8402; patch from Yawning. --- src/test/test_pt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_pt.c b/src/test/test_pt.c index b45151e..05ba24e 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -33,7 +33,7 @@ test_pt_parsing(void) transport_t *transport = NULL; tor_addr_t test_addr; - managed_proxy_t *mp = tor_malloc(sizeof(managed_proxy_t)); + managed_proxy_t *mp = tor_malloc_zero(sizeof(managed_proxy_t)); mp->conf_state = PT_PROTO_INFANT; mp->transports = smartlist_new(); @@ -363,7 +363,7 @@ test_pt_configure_proxy(void *arg) control_testing_set_global_event_mask(EVENT_TRANSPORT_LAUNCHED); - mp = tor_malloc(sizeof(managed_proxy_t)); + mp = tor_malloc_zero(sizeof(managed_proxy_t)); mp->conf_state = PT_PROTO_ACCEPTING_METHODS; mp->transports = smartlist_new(); mp->transports_to_launch = smartlist_new();

1 0

[tor/release-0.2.5] Fold changes entries into 0.2.5.7 changelog
by nickm＠torproject.org 11 Sep '14

11 Sep '14

commit 2fbaa2f9d6ff84ba9666e488ba662bd66818e42f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 11 09:12:42 2014 -0400 Fold changes entries into 0.2.5.7 changelog --- ChangeLog | 17 +++++++++++++++++ changes/bug12160 | 4 ---- changes/bug12908 | 4 ---- changes/bug13096 | 4 ---- changes/bug13124 | 8 -------- 5 files changed, 17 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index a320320..b41a55b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,11 +12,17 @@ Changes in version 0.2.5.7-rc - 2014-09-1x her own HashedControlPassword in the torrc file while the controller generates a fresh session password for each run). Fixes bug 12948; bugfix on 0.2.5.1-alpha. + - Warn about attempts to run hidden services and relays in the same + process: that's probably not a good idea. Closes ticket 12908. o Major bugfixes (relay): - Avoid queuing or sending destroy cells for circuit ID zero when we fail to send a CREATE cell. Fixes bug 12848; bugfix on 0.0.8pre1. Found and fixed by "cypherpunks". + - Correctly update the "local" mark on the controlling channel when + changing the address of an or_connection_t after the handshake. + Before this fix, ORPort reachability detection would sometimes + fail. Fixes bug #12160; bugfix on 0.2.4.4-alpha. o Minor features (bridge): - Add an ExtORPortCookieAuthFileGroupReadable option to make the @@ -26,6 +32,14 @@ Changes in version 0.2.5.7-rc - 2014-09-1x - Update geoip and geoip6 to the August 7 2014 Maxmind GeoLite2 Country database. + o Minor bugfixes (client): + - 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. + o Minor bugfixes (relay): - Downgrade "Unexpected onionskin length after decryption" warning to a protocol-warn, since there's nothing relay operators can do @@ -56,6 +70,9 @@ Changes in version 0.2.5.7-rc - 2014-09-1x bugfix on 0.2.5.5-alpha. - Make the nmake make files work again. Fixes bug 13081. Bugfix on 0.2.5.1-alpha. Patch from "NewEraCracker". + - In routerlist_assert_ok(), don't take the address of a + routerinfo's cache_info member unless that routerinfo is non-NULL. + Fixes bug 13096; bugfix on 0.1.1.9-alpha. Patch by "teor". - Fix a large number of false positive warnings from the clang analyzer static analysis tool. This should make real warnings easier for clang analyzer to find. Patch from "teor". Closes diff --git a/changes/bug12160 b/changes/bug12160 deleted file mode 100644 index 2a7ace3..0000000 --- a/changes/bug12160 +++ /dev/null @@ -1,4 +0,0 @@ - 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/changes/bug12908 b/changes/bug12908 deleted file mode 100644 index bd6784c..0000000 --- a/changes/bug12908 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features: - - Warn about attempts to run hidden services and relays in the - same process: that's probably not a good idea. Closes ticket - 12908. diff --git a/changes/bug13096 b/changes/bug13096 deleted file mode 100644 index 521faaf..0000000 --- a/changes/bug13096 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (conformance): - - In routerlist_assert_ok(), don't take the address of a routerinfo's - cache_info member unless that routerinfo is non-NULL. Fixes bug - 13096; bugfix on 0.1.1.9-alpha. Patch by "teor". diff --git a/changes/bug13124 b/changes/bug13124 deleted file mode 100644 index be7df70..0000000 --- a/changes/bug13124 +++ /dev/null @@ -1,8 +0,0 @@ - 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. -

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'public/bug12908_025' into maint-0.2.5
by nickm＠torproject.org 11 Sep '14

11 Sep '14

commit a9b2e5eac6168a1eb09da8d6d3ff43b08cc51411 Merge: 8eed82b a3fe8b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 10 22:12:47 2014 -0400 Merge remote-tracking branch 'public/bug12908_025' into maint-0.2.5 changes/bug12908 | 4 ++++ src/or/config.c | 7 +++++++ 2 files changed, 11 insertions(+)

1 0

[tor/release-0.2.5] In routerlist_assert_ok(), check r2 before taking &(r2->cache_info)
by nickm＠torproject.org 11 Sep '14

11 Sep '14

commit 3c2c6a61163cd6a42cc0eeee9fc43200b9f08503 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 10 23:46:20 2014 -0400 In routerlist_assert_ok(), check r2 before taking &(r2->cache_info) Technically, we're not allowed to take the address of a member can't exist relative to the null pointer. That makes me wonder how any sane compliant system implements the offsetof macro, but let's let sleeping balrogs lie. Fixes 13096; patch on 0.1.1.9-alpha; patch from "teor", who was using clang -fsanitize=undefined-trap -fsanitize-undefined-trap-on-error -ftrapv --- changes/bug13096 | 4 ++++ src/or/routerlist.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug13096 b/changes/bug13096 new file mode 100644 index 0000000..521faaf --- /dev/null +++ b/changes/bug13096 @@ -0,0 +1,4 @@ + o Minor bugfixes (conformance): + - In routerlist_assert_ok(), don't take the address of a routerinfo's + cache_info member unless that routerinfo is non-NULL. Fixes bug + 13096; bugfix on 0.1.1.9-alpha. Patch by "teor". diff --git a/src/or/routerlist.c b/src/or/routerlist.c index b5e9245..32cbe19 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4938,7 +4938,7 @@ routerlist_assert_ok(const routerlist_t *rl) } SMARTLIST_FOREACH_END(r); SMARTLIST_FOREACH_BEGIN(rl->old_routers, signed_descriptor_t *, sd) { r2 = rimap_get(rl->identity_map, sd->identity_digest); - tor_assert(sd != &(r2->cache_info)); + tor_assert(!r2 || sd != &(r2->cache_info)); sd2 = sdmap_get(rl->desc_digest_map, sd->signed_descriptor_digest); tor_assert(sd == sd2); tor_assert(sd->routerlist_index == sd_sl_idx);

1 0

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

11 Sep '14

commit 8e7ee0e2c0cff0fc28479ebe6eca60cfb0f4f980 Merge: 351f245 6215ebb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 11 09:08:50 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5 changes/bug12160 | 4 +++ changes/bug12908 | 4 +++ changes/bug13096 | 4 +++ changes/bug13124 | 8 ++++++ src/or/channel.c | 17 +++++++++++++ src/or/channel.h | 1 + src/or/channeltls.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++-- src/or/channeltls.h | 1 + src/or/config.c | 11 +++++++-- src/or/connection_or.c | 9 +++++++ src/or/routerlist.c | 2 +- 11 files changed, 120 insertions(+), 5 deletions(-)

1 0

[tor/release-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/release-0.2.5] Warn if Tor is a relay and a HS
by nickm＠torproject.org 11 Sep '14

11 Sep '14

commit a3fe8b11663a32f1f007bd7cb0b9656825093544 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Mon Jul 21 21:16:58 2014 -0700 Warn if Tor is a relay and a HS Closes 12908; see #8742 --- changes/bug12908 | 4 ++++ src/or/config.c | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug12908 b/changes/bug12908 new file mode 100644 index 0000000..bd6784c --- /dev/null +++ b/changes/bug12908 @@ -0,0 +1,4 @@ + o Minor features: + - Warn about attempts to run hidden services and relays in the + same process: that's probably not a good idea. Closes ticket + 12908. diff --git a/src/or/config.c b/src/or/config.c index 6bb6209..c006bc2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2563,6 +2563,13 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("Can't use a relative path to torrc when RunAsDaemon is set."); #endif + if (server_mode(options) && options->RendConfigLines) + log_warn(LD_CONFIG, + "Tor is currently configured as a relay and a hidden service. " + "That's not very secure: you should probably run your hidden service " + "in a separate Tor process, at least -- see " + "https://trac.torproject.org/8742"); + /* XXXX require that the only port not be DirPort? */ /* XXXX require that at least one port be listened-upon. */ if (n_ports == 0 && !options->RendConfigLines)

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5
by nickm＠torproject.org 11 Sep '14

11 Sep '14

commit 8eed82b3d4bc8d15bd4ec7f229717f903dd6d6c7 Merge: dd22ab5 39a0178 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 11:04:54 2014 -0400 Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5 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(-)

1 0

[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

← Newer
1
...
57
58
59
60
61
62
63
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2014