tor-commits February 2012

tor-commits@lists.torproject.org

21 participants
991 discussions

[tor/master] set_managed_proxy_environment() can't fail anymore
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 93414707aec510c253cf150b654b04dab45cf9e9 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Feb 12 06:57:35 2012 +0100 set_managed_proxy_environment() can't fail anymore It already couldn't fail on Windows, now it can't fail on non-Windows, either. --- src/or/transports.c | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index 77d3a86..7bdb88a 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -95,7 +95,7 @@ static void set_managed_proxy_environment(LPVOID *envp, const managed_proxy_t *mp); #else -static int set_managed_proxy_environment(char ***envp, +static void set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp); #endif @@ -305,12 +305,8 @@ launch_managed_proxy(managed_proxy_t *mp) char **envp=NULL; /* prepare the environment variables for the managed proxy */ - if (set_managed_proxy_environment(&envp, mp) < 0) { - log_warn(LD_GENERAL, "Could not setup the environment of " - "the managed proxy at '%s'.", mp->argv[0]); - free_execve_args(envp); - return -1; - } + set_managed_proxy_environment(&envp, mp); + tor_assert(envp); retval = tor_spawn_background(mp->argv[0], (const char **)mp->argv, (const char **)envp, &mp->process_handle); @@ -1082,7 +1078,7 @@ extern char **environ; /** Prepare the environment envp of managed proxy mp. * envp is allocated on the heap and should be freed by the * caller after its use. */ -static int +static void set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp) { const or_options_t *options = get_options(); @@ -1093,7 +1089,6 @@ set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp) int environ_size=0; char **environ_tmp = environ; - int r = -1; int n_envs = mp->is_server ? ENVIRON_SIZE_SERVER : ENVIRON_SIZE_CLIENT; while (*environ_tmp) { @@ -1130,13 +1125,9 @@ set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp) } *tmp = NULL; - r = 0; - tor_free(state_loc); tor_free(transports_to_launch); tor_free(bindaddr); - - return r; } #endif /* _WIN32 */

1 0

[tor/master] Merge branch 'bug5082_squashed'
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 2aa1a6baa320d2d9a63d5ed3222ea95ef5ac00dc Merge: 15309cb 9341470 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 12 23:40:23 2012 -0500 Merge branch 'bug5082_squashed' changes/bug5082 | 6 ++++++ src/or/transports.c | 46 +++++++++++++++++++++------------------------- 2 files changed, 27 insertions(+), 25 deletions(-)

1 0

[tor/master] Don't smartlist_remove a managed proxy from a list we're iterating over.
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit fff511a5e76e82e0aa8af4a665e0d0abb69b7583 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 12 22:24:52 2012 -0500 Don't smartlist_remove a managed proxy from a list we're iterating over. In some cases, we solve this by doing a SMARTLIST_DEL_CURRENT before calling managed_proxy_destroy. But for a trickier one, we just make a copy of the list before iterating over it, so that changes to the manage proxy list don't hurt our iteration. This could be related to bug 5084. --- src/or/transports.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index 3d8e11d..daa62b5 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -316,9 +316,16 @@ launch_managed_proxy(managed_proxy_t *mp) void pt_configure_remaining_proxies(void) { + smartlist_t *tmp = smartlist_new(); + log_debug(LD_CONFIG, "Configuring remaining managed proxies (%d)!", unconfigured_proxies_n); - SMARTLIST_FOREACH_BEGIN(managed_proxy_list, managed_proxy_t *, mp) { + + /* Iterate over tmp, not managed_proxy_list, since configure_proxy can + * remove elements from managed_proxy_list. */ + smartlist_add_all(tmp, managed_proxy_list); + + SMARTLIST_FOREACH_BEGIN(tmp, managed_proxy_t *, mp) { tor_assert(mp->conf_state != PT_PROTO_BROKEN || mp->conf_state != PT_PROTO_FAILED_LAUNCH); @@ -347,6 +354,8 @@ pt_configure_remaining_proxies(void) configure_proxy(mp); } SMARTLIST_FOREACH_END(mp); + + smartlist_free(tmp); } #ifdef _WIN32 @@ -1196,6 +1205,7 @@ pt_prepare_proxy_list_for_config_read(void) SMARTLIST_FOREACH_BEGIN(managed_proxy_list, managed_proxy_t *, mp) { /* Destroy unconfigured proxies. */ if (mp->conf_state != PT_PROTO_COMPLETED) { + SMARTLIST_DEL_CURRENT(managed_proxy_list, mp); managed_proxy_destroy(mp, 1); unconfigured_proxies_n--; continue; @@ -1239,8 +1249,10 @@ pt_free_all(void) transports and it's the duty of the circuitbuild.c subsystem to free them. Otherwise, it hasn't registered its transports yet and we should free them here. */ - SMARTLIST_FOREACH(managed_proxy_list, managed_proxy_t *, mp, - managed_proxy_destroy(mp, 1)); + SMARTLIST_FOREACH(managed_proxy_list, managed_proxy_t *, mp, { + SMARTLIST_DEL_CURRENT(managed_proxy_list, mp); + managed_proxy_destroy(mp, 1); + }); smartlist_free(managed_proxy_list); managed_proxy_list=NULL;

1 0

[tor/master] Try to have (and maintain!) an invariant about unconfigured_proxies_n
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 60b42d68f35870f2d72dae5381120146813e9106 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 12 22:58:49 2012 -0500 Try to have (and maintain!) an invariant about unconfigured_proxies_n The invariant is: unconfigured_proxies_n is exactly the number of managed_proxy_t not in state PT_PROTO_COMPLETED. To maintain this, we need to stop overloading unconfigured_proxies_n to also count managed_proxy_t items that are in PT_PROTO_COMPLETED but which might need relaunching. To make it so we can detect those, we introduce another variable. This commit also adds a function to assert that we haven't broken the invariant. Fix for bug 5084; bugfix on 0.2.3.6-alpha, I think. --- src/or/transports.c | 49 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 40 insertions(+), 9 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index daa62b5..15d96ca 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -140,12 +140,35 @@ static INLINE void free_execve_args(char **arg); static smartlist_t *managed_proxy_list = NULL; /** Number of still unconfigured proxies. */ static int unconfigured_proxies_n = 0; +/** Boolean: True iff we might need to restart some proxies. */ +static int check_if_restarts_needed = 0; -/** Return true if there are still unconfigured managed proxies. */ +/** Return true if there are still unconfigured managed proxies, or proxies + * that need restarting. */ int pt_proxies_configuration_pending(void) { - return !! unconfigured_proxies_n; + return unconfigured_proxies_n || check_if_restarts_needed; +} + +/** Assert that the unconfigured_proxies_n value correctly matches the number + * of proxies in a state other than PT_PROTO_COMPLETE. */ +static void +assert_unconfigured_count_ok(void) +{ + int n_completed = 0; + if (!managed_proxy_list) { + tor_assert(unconfigured_proxies_n == 0); + return; + } + + SMARTLIST_FOREACH(managed_proxy_list, managed_proxy_t *, mp, { + if (mp->conf_state == PT_PROTO_COMPLETED) + ++n_completed; + }); + + tor_assert(n_completed + unconfigured_proxies_n == + smartlist_len(managed_proxy_list)); } /** Return true if mp has the same argv as proxy_argv */ @@ -255,6 +278,7 @@ proxy_prepare_for_restart(managed_proxy_t *mp) /* flag it as an infant proxy so that it gets launched on next tick */ mp->conf_state = PT_PROTO_INFANT; + unconfigured_proxies_n++; } /** Launch managed proxy mp. */ @@ -325,6 +349,8 @@ pt_configure_remaining_proxies(void) * remove elements from managed_proxy_list. */ smartlist_add_all(tmp, managed_proxy_list); + assert_unconfigured_count_ok(); + SMARTLIST_FOREACH_BEGIN(tmp, managed_proxy_t *, mp) { tor_assert(mp->conf_state != PT_PROTO_BROKEN || mp->conf_state != PT_PROTO_FAILED_LAUNCH); @@ -332,17 +358,14 @@ pt_configure_remaining_proxies(void) if (mp->got_hup) { mp->got_hup = 0; - /* This proxy is marked by a SIGHUP. Check whether we need to - restart it. */ + /* This proxy is marked by a SIGHUP. Check whether we need to + restart it. */ if (proxy_needs_restart(mp)) { log_info(LD_GENERAL, "Preparing managed proxy for restart."); proxy_prepare_for_restart(mp); - continue; } else { /* it doesn't need to be restarted. */ log_info(LD_GENERAL, "Nothing changed for managed proxy after HUP: " "not restarting."); - unconfigured_proxies_n--; - tor_assert(unconfigured_proxies_n >= 0); } continue; @@ -356,6 +379,8 @@ pt_configure_remaining_proxies(void) } SMARTLIST_FOREACH_END(mp); smartlist_free(tmp); + check_if_restarts_needed = 0; + assert_unconfigured_count_ok(); } #ifdef _WIN32 @@ -1134,6 +1159,8 @@ managed_proxy_create(const smartlist_t *transport_list, smartlist_add(managed_proxy_list, mp); unconfigured_proxies_n++; + assert_unconfigured_count_ok(); + return mp; } @@ -1163,7 +1190,7 @@ pt_kickstart_proxy(const smartlist_t *transport_list, it. */ if (mp->marked_for_removal) { mp->marked_for_removal = 0; - unconfigured_proxies_n++; + check_if_restarts_needed = 1; } SMARTLIST_FOREACH_BEGIN(transport_list, const char *, transport) { @@ -1202,6 +1229,7 @@ pt_prepare_proxy_list_for_config_read(void) if (!managed_proxy_list) return; + assert_unconfigured_count_ok(); SMARTLIST_FOREACH_BEGIN(managed_proxy_list, managed_proxy_t *, mp) { /* Destroy unconfigured proxies. */ if (mp->conf_state != PT_PROTO_COMPLETED) { @@ -1219,6 +1247,8 @@ pt_prepare_proxy_list_for_config_read(void) smartlist_clear(mp->transports_to_launch); } SMARTLIST_FOREACH_END(mp); + assert_unconfigured_count_ok(); + tor_assert(unconfigured_proxies_n == 0); } @@ -1231,13 +1261,14 @@ sweep_proxy_list(void) { if (!managed_proxy_list) return; - + assert_unconfigured_count_ok(); SMARTLIST_FOREACH_BEGIN(managed_proxy_list, managed_proxy_t *, mp) { if (mp->marked_for_removal) { SMARTLIST_DEL_CURRENT(managed_proxy_list, mp); managed_proxy_destroy(mp, 1); } } SMARTLIST_FOREACH_END(mp); + assert_unconfigured_count_ok(); } /** Release all storage held by the pluggable transports subsystem. */

1 0

[tor/master] Add a changes file for bug5084
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 01acce62b95e102e4381a38337f71ca2b30cc40e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 12 23:19:15 2012 -0500 Add a changes file for bug5084 --- changes/bug5084 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug5084 b/changes/bug5084 new file mode 100644 index 0000000..bf175c6 --- /dev/null +++ b/changes/bug5084 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Avoid a crash when managed proxies are configured and we receive + HUP signals or configuration values too rapidly. Fixes bug 5084; + bugfix on 0.2.3.6-alpha.

1 0

[tor/master] Merge branch 'bug5084_squashed'
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 15309cbc49135f01041f66453d29e8fb2fdfd5e8 Merge: d7d6da2 01acce6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 12 23:32:53 2012 -0500 Merge branch 'bug5084_squashed' changes/bug5084 | 4 +++ src/or/transports.c | 67 +++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 59 insertions(+), 12 deletions(-)

1 0

[tor/master] Fix a check-spaces complaint
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit d7d6da28d4264aa2d018cfe9437117ae6dbefce9 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Feb 9 16:22:01 2012 +0100 Fix a check-spaces complaint --- src/or/routerparse.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 28ec945..95cef93 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4427,7 +4427,8 @@ microdescs_parse_from_string(const char *s, const char *eos, /** Return true iff this Tor version can answer directory questions * about microdescriptors. */ -int tor_version_supports_microdescriptors(const char *platform) +int +tor_version_supports_microdescriptors(const char *platform) { return tor_version_as_new_as(platform, "0.2.3.1-alpha"); }

1 0

[tor/master] Properly protect paths to sed, sha1sum, openssl
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 8ce6722d7654e6b19fb3d3741b7329b95cb72bac Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 10 00:51:58 2012 +0100 Properly protect paths to sed, sha1sum, openssl in Makefile.am, we used it without quoting it, causing build failure if your openssl/sed/sha1sum happened to live in a directory with a space in it (very common on windows) --- changes/bug5065 | 5 +++++ src/common/Makefile.am | 4 ++-- src/or/Makefile.am | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changes/bug5065 b/changes/bug5065 new file mode 100644 index 0000000..d195313 --- /dev/null +++ b/changes/bug5065 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Fix build if path to sed, openssl or sha1sum contains spaces. + This is pretty common on Windows. Fixes bug 5065; bugfix on + 0.2.2.1-alpha. + diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 6952591..6da1782 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -20,9 +20,9 @@ noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h tort common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) if test "@SHA1SUM@" != none; then \ - @SHA1SUM@ $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) | @SED@ -n 's/^$.*$$$/"\1\\n"/p' > common_sha1.i; \ + "@SHA1SUM@" $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) | "@SED@" -n 's/^$.*$$$/"\1\\n"/p' > common_sha1.i; \ elif test "@OPENSSL@" != none; then \ - @OPENSSL@ sha1 $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) | @SED@ -n 's/SHA1($.*$)= $.*$/"\2 \1\\n"/p' > common_sha1.i; \ + "@OPENSSL@" sha1 $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) | "@SED@" -n 's/SHA1($.*$)= $.*$/"\2 \1\\n"/p' > common_sha1.i; \ else \ rm common_sha1.i; \ touch common_sha1.i; \ diff --git a/src/or/Makefile.am b/src/or/Makefile.am index a9ac3cd..4f4e9c9 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -74,9 +74,9 @@ micro-revision.i: FORCE or_sha1.i: $(tor_SOURCES) if test "@SHA1SUM@" != none; then \ - @SHA1SUM@ $(tor_SOURCES) | @SED@ -n 's/^$.*$$$/"\1\\n"/p' > or_sha1.i; \ + "@SHA1SUM@" $(tor_SOURCES) | "@SED@" -n 's/^$.*$$$/"\1\\n"/p' > or_sha1.i; \ elif test "@OPENSSL@" != none; then \ - @OPENSSL@ sha1 $(tor_SOURCES) | @SED@ -n 's/SHA1($.*$)= $.*$/"\2 \1\\n"/p' > or_sha1.i; \ + "@OPENSSL@" sha1 $(tor_SOURCES) | "@SED@" -n 's/SHA1($.*$)= $.*$/"\2 \1\\n"/p' > or_sha1.i; \ else \ rm or_sha1.i; \ touch or_sha1.i; \

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 4aa0aa0300ca9ff4e65ff32eae0db7db4fe24c3d Merge: 6145229 8ce6722 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 12 23:27:31 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/common/Makefile.am src/or/Makefile.am changes/bug5065 | 5 +++++ src/common/Makefile.am | 4 ++-- src/or/Makefile.am | 8 ++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --cc src/common/Makefile.am index 04c4115,6da1782..5e76842 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@@ -55,9 -20,9 +55,9 @@@ noinst_HEADERS = common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) if test "@SHA1SUM@" != none; then \ - (cd "$(srcdir)" && @SHA1SUM@ $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)) | @SED@ -n 's/^$.*$$$/"\1\\n"/p' > common_sha1.i; \ - "@SHA1SUM@" $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) | "@SED@" -n 's/^$.*$$$/"\1\\n"/p' > common_sha1.i; \ ++ (cd "$(srcdir)" && "@SHA1SUM@" $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/^$.*$$$/"\1\\n"/p' > common_sha1.i; \ elif test "@OPENSSL@" != none; then \ - (cd "$(srcdir)" && @OPENSSL@ sha1 $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)) | @SED@ -n 's/SHA1($.*$)= $.*$/"\2 \1\\n"/p' > common_sha1.i; \ - "@OPENSSL@" sha1 $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) | "@SED@" -n 's/SHA1($.*$)= $.*$/"\2 \1\\n"/p' > common_sha1.i; \ ++ (cd "$(srcdir)" && "@OPENSSL@" sha1 $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/SHA1($.*$)= $.*$/"\2 \1\\n"/p' > common_sha1.i; \ else \ rm common_sha1.i; \ touch common_sha1.i; \ diff --cc src/or/Makefile.am index 57f5dd6,4f4e9c9..3cc789a --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@@ -140,13 -72,11 +140,13 @@@ micro-revision.i: FORC mv micro-revision.tmp micro-revision.i; \ fi; true -or_sha1.i: $(tor_SOURCES) +or_sha1.i: $(tor_SOURCES) $(libtor_a_SOURCES) if test "@SHA1SUM@" != none; then \ - (cd "$(srcdir)" && @SHA1SUM@ $(tor_SOURCES) $(libtor_a_SOURCES)) | \ - @SED@ -n 's/^$.*$$$/"\1\\n"/p' > or_sha1.i; \ - "@SHA1SUM@" $(tor_SOURCES) | "@SED@" -n 's/^$.*$$$/"\1\\n"/p' > or_sha1.i; \ ++ (cd "$(srcdir)" && "@SHA1SUM@" $(tor_SOURCES) $(libtor_a_SOURCES)) | \ ++ "@SED@" -n 's/^$.*$$$/"\1\\n"/p' > or_sha1.i; \ elif test "@OPENSSL@" != none; then \ - (cd "$(srcdir)" && @OPENSSL@ sha1 $(tor_SOURCES) $(libtor_a_SOURCES)) | \ - @SED@ -n 's/SHA1($.*$)= $.*$/"\2 \1\\n"/p' > or_sha1.i; \ - "@OPENSSL@" sha1 $(tor_SOURCES) | "@SED@" -n 's/SHA1($.*$)= $.*$/"\2 \1\\n"/p' > or_sha1.i; \ ++ (cd "$(srcdir)" && "@OPENSSL@" sha1 $(tor_SOURCES) $(libtor_a_SOURCES)) | \ ++ "@SED@" -n 's/SHA1($.*$)= $.*$/"\2 \1\\n"/p' > or_sha1.i; \ else \ rm or_sha1.i; \ touch or_sha1.i; \

1 0

[tor/maint-0.2.2] Properly protect paths to sed, sha1sum, openssl
by nickm＠torproject.org 13 Feb '12

13 Feb '12

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2012