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

[tor/master] Added a comment to tor.service.in
by nickm＠torproject.org 13 Mar '15

13 Mar '15

commit 0f628d6560794b34288963d6e6d974b4273f6421 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 13:11:53 2015 -0400 Added a comment to tor.service.in This explains that if you change your torrc to do more, you might need to change tor.service.in to allow it. See #15195. --- contrib/dist/tor.service.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in index c251158..ae339ff 100644 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@ -1,3 +1,9 @@ +# tor.service -- this systemd configuration file for Tor sets up a +# relatively conservative, hardened Tor service. You may need to +# edit it if you are making changes to your Tor configuration that it +# does not allow. Package maintainers: this should be a starting point +# for your tor.service; it is not the last point. + [Unit] Description = Anonymizing overlay network for TCP After = syslog.target network.target nss-lookup.target

1 0

[tor/master] Initialize the extorport auth cookie before launching PTs.
by nickm＠torproject.org 13 Mar '15

13 Mar '15

commit b3281fc6d634ac32c6ce591313600b0ed56a9347 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Mar 12 15:37:48 2015 +0000 Initialize the extorport auth cookie before launching PTs. PTs expect the auth cookie to be available immedieately after launch, leading to a race condition when PTs opt to cache the extorport cookie once immediately after startup. Fixes #15240. --- changes/bug15240 | 6 ++++++ src/or/config.c | 13 +++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/changes/bug15240 b/changes/bug15240 new file mode 100644 index 0000000..e11f804 --- /dev/null +++ b/changes/bug15240 @@ -0,0 +1,6 @@ + o Minor bugfixes (pluggable transports): + - Initialize the extended OR Port authentication cookie before launching + pluggable transports. This prevents a race condition that occured when + server-side pluggable transports would cache the authentication cookie + before it has been (re)generated. Fixes bug 15240; bugfix on + 0.2.5.1-alpha. diff --git a/src/or/config.c b/src/or/config.c index 5ba8c99..fca350c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1451,6 +1451,13 @@ options_act(const or_options_t *old_options) rep_hist_load_mtbf_data(time(NULL)); } + /* If we have an ExtORPort, initialize its auth cookie. */ + if (running_tor && + init_ext_or_cookie_authentication(!!options->ExtORPort_lines) < 0) { + log_warn(LD_CONFIG,"Error creating Extended ORPort cookie file."); + return -1; + } + mark_transport_list(); pt_prepare_proxy_list_for_config_read(); if (!options->DisableNetwork) { @@ -1555,12 +1562,6 @@ options_act(const or_options_t *old_options) return -1; } - /* If we have an ExtORPort, initialize its auth cookie. */ - if (init_ext_or_cookie_authentication(!!options->ExtORPort_lines) < 0) { - log_warn(LD_CONFIG,"Error creating Extended ORPort cookie file."); - return -1; - } - monitor_owning_controller_process(options->OwningControllerProcess); /* reload keys as needed for rendezvous services. */

1 0

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

13 Mar '15

commit 16b1b2199d1e23968ab74a8ab08d59e8aae90423 Merge: 0f628d6 b3281fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 13:13:06 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/bug15240 | 6 ++++++ src/or/config.c | 13 +++++++------ 2 files changed, 13 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.2.6] Initialize the extorport auth cookie before launching PTs.
by nickm＠torproject.org 13 Mar '15

13 Mar '15

commit b3281fc6d634ac32c6ce591313600b0ed56a9347 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Mar 12 15:37:48 2015 +0000 Initialize the extorport auth cookie before launching PTs. PTs expect the auth cookie to be available immedieately after launch, leading to a race condition when PTs opt to cache the extorport cookie once immediately after startup. Fixes #15240. --- changes/bug15240 | 6 ++++++ src/or/config.c | 13 +++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/changes/bug15240 b/changes/bug15240 new file mode 100644 index 0000000..e11f804 --- /dev/null +++ b/changes/bug15240 @@ -0,0 +1,6 @@ + o Minor bugfixes (pluggable transports): + - Initialize the extended OR Port authentication cookie before launching + pluggable transports. This prevents a race condition that occured when + server-side pluggable transports would cache the authentication cookie + before it has been (re)generated. Fixes bug 15240; bugfix on + 0.2.5.1-alpha. diff --git a/src/or/config.c b/src/or/config.c index 5ba8c99..fca350c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1451,6 +1451,13 @@ options_act(const or_options_t *old_options) rep_hist_load_mtbf_data(time(NULL)); } + /* If we have an ExtORPort, initialize its auth cookie. */ + if (running_tor && + init_ext_or_cookie_authentication(!!options->ExtORPort_lines) < 0) { + log_warn(LD_CONFIG,"Error creating Extended ORPort cookie file."); + return -1; + } + mark_transport_list(); pt_prepare_proxy_list_for_config_read(); if (!options->DisableNetwork) { @@ -1555,12 +1562,6 @@ options_act(const or_options_t *old_options) return -1; } - /* If we have an ExtORPort, initialize its auth cookie. */ - if (init_ext_or_cookie_authentication(!!options->ExtORPort_lines) < 0) { - log_warn(LD_CONFIG,"Error creating Extended ORPort cookie file."); - return -1; - } - monitor_owning_controller_process(options->OwningControllerProcess); /* reload keys as needed for rendezvous services. */

1 0

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

13 Mar '15

commit d5cbc58094ec740e768d5fa88a51c20c645ed70e Merge: 689562a c2dcd9b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 12:53:31 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6'

1 0

[tor/master] Revert "Make TransProxyType ipfw work correctly"
by nickm＠torproject.org 13 Mar '15

13 Mar '15

commit 9063f29160615b379f907009e7158f1fcf1ed84c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 12:49:08 2015 -0400 Revert "Make TransProxyType ipfw work correctly" This reverts commit 681802817deb6fb93b95f8284856fd42f3556600. (I didn't mean to backport this, but somehow I had based my branch for #15205 on it.) --- changes/bug15064 | 4 ---- src/or/connection_edge.c | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/changes/bug15064 b/changes/bug15064 deleted file mode 100644 index e6bd747..0000000 --- a/changes/bug15064 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes (FreeBSD IPFW transparent proxy): - - Fix address detection with FreeBSD transparent proxies, - when "TransProxyType ipfw" is in use. - Fixes bug 15064; bugfix on 0.2.5.4-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 1eeb22f..49f9ba4 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1531,8 +1531,7 @@ connection_ap_get_original_destination(entry_connection_t *conn, if (options->TransProxyType_parsed == TPT_PF_DIVERT) return destination_from_socket(conn, req); - if (options->TransProxyType_parsed == TPT_DEFAULT || - options->TransProxyType_parsed == TPT_IPFW) + if (options->TransProxyType_parsed == TPT_DEFAULT) return destination_from_pf(conn, req); (void)conn;

1 0

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

13 Mar '15

commit c2dcd9b703b494b404200c6330ef9f0511b79925 Merge: 8a060d8 9063f29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 12:50:41 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 ("-s ours" merge to avoid taking reversion of #15064)

1 0

[tor/release-0.2.5] Don't use checked strl{cat, cpy} on OSX.
by nickm＠torproject.org 13 Mar '15

13 Mar '15

commit 24c031b1a28658c921a746f4d58f3ca5e9994108 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 15:09:49 2015 -0400 Don't use checked strl{cat,cpy} on OSX. There is a bug in the overlap-checking in strlcat that can crash Tor servers. Fixes bug 15205; this is an OSX bug, not a Tor bug. --- changes/bug15205 | 5 +++++ src/common/compat.h | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/changes/bug15205 b/changes/bug15205 new file mode 100644 index 0000000..0cb9f3f --- /dev/null +++ b/changes/bug15205 @@ -0,0 +1,5 @@ + o Major bugfixes (crash, OSX, security): + - Fix a remote denial-of-service opportunity caused by a bug + in OSX's _strlcat_chk() function. Fixes bug 15205; bug first + appeared in OSX 10.9. + diff --git a/src/common/compat.h b/src/common/compat.h index ec7d241..531e88f 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -224,6 +224,18 @@ extern INLINE double U64_TO_DBL(uint64_t x) { #define strncasecmp _strnicmp #define strcasecmp _stricmp #endif + +#if defined __APPLE__ +/* On OSX 10.9 and later, the overlap-checking code for strlcat would + * appear to have a severe bug that can sometimes cause aborts in Tor. + * Instead, use the non-checking variants. This is sad. + * + * See https://trac.torproject.org/projects/tor/ticket/15205 + */ +#undef strlcat +#undef strlcpy +#endif + #ifndef HAVE_STRLCAT size_t strlcat(char *dst, const char *src, size_t siz) ATTR_NONNULL((1,2)); #endif

1 0

[tor/release-0.2.5] Make TransProxyType ipfw work correctly
by nickm＠torproject.org 13 Mar '15

13 Mar '15

commit 681802817deb6fb93b95f8284856fd42f3556600 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 12:24:51 2015 +0100 Make TransProxyType ipfw work correctly Fixes bug 15064; bugfix on 0.2.5.4-alpha. --- changes/bug15064 | 4 ++++ src/or/connection_edge.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug15064 b/changes/bug15064 new file mode 100644 index 0000000..e6bd747 --- /dev/null +++ b/changes/bug15064 @@ -0,0 +1,4 @@ + o Major bugfixes (FreeBSD IPFW transparent proxy): + - Fix address detection with FreeBSD transparent proxies, + when "TransProxyType ipfw" is in use. + Fixes bug 15064; bugfix on 0.2.5.4-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 49f9ba4..1eeb22f 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1531,7 +1531,8 @@ connection_ap_get_original_destination(entry_connection_t *conn, if (options->TransProxyType_parsed == TPT_PF_DIVERT) return destination_from_socket(conn, req); - if (options->TransProxyType_parsed == TPT_DEFAULT) + if (options->TransProxyType_parsed == TPT_DEFAULT || + options->TransProxyType_parsed == TPT_IPFW) return destination_from_pf(conn, req); (void)conn;

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5
by nickm＠torproject.org 13 Mar '15

13 Mar '15

commit eecd410984e3f1741dda877fe482e082a41db700 Merge: a00d07a 24c031b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 12:27:25 2015 -0400 Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5 changes/bug15064 | 4 ++++ changes/bug15205 | 5 +++++ src/common/compat.h | 12 ++++++++++++ src/or/connection_edge.c | 3 ++- 4 files changed, 23 insertions(+), 1 deletion(-)

1 0