June 2012 - tor-commits - lists.torproject.org

[tor/release-0.2.3] Merge remote-tracking branch 'public/bug6225' into maint-0.2.3
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 2703e072a1056edd3b68a16e045175e5bd268301 Merge: a6688c5 ffd7189 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 25 11:51:19 2012 -0400 Merge remote-tracking branch 'public/bug6225' into maint-0.2.3 src/common/util.c | 34 ++++++++++++++++++++++++---------- src/common/util.h | 4 ++-- src/test/test_util.c | 16 +++++++++++----- 3 files changed, 37 insertions(+), 17 deletions(-)

1 0

[tor/release-0.2.3] Don't do DNS lookups when parsing corrupted managed proxy messages.
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 53e4452f985cad0947cd8ebfa0a1c198b6a7da7d Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jun 25 18:30:15 2012 +0300 Don't do DNS lookups when parsing corrupted managed proxy messages. The functions parse_{s,c}method_line() were using tor_addr_port_lookup() which is capable of doing DNS lookups. DNS lookups should not be necessary when parsing {C,S}METHOD lines. --- changes/bug6226 | 3 +++ src/or/transports.c | 30 ++++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/changes/bug6226 b/changes/bug6226 new file mode 100644 index 0000000..7cbee10 --- /dev/null +++ b/changes/bug6226 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Don't do DNS lookups when parsing corrupted managed proxy + protocol messages. Fixes bug 6226; bugfix on 0.2.3.6-alpha. diff --git a/src/or/transports.c b/src/or/transports.c index e43ec6c..4ba2395 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -790,7 +790,8 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) char *method_name=NULL; char *addrport=NULL; - tor_addr_t addr; + tor_addr_t tor_addr; + char *address=NULL; uint16_t port = 0; transport_t *transport=NULL; @@ -814,7 +815,7 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) } addrport = smartlist_get(items, 2); - if (tor_addr_port_lookup(addrport, &addr, &port)<0) { + if (tor_addr_port_split(LOG_PROTOCOL_WARN, addrport, &address, &port)<0) { log_warn(LD_CONFIG, "Error parsing transport " "address '%s'", addrport); goto err; @@ -826,7 +827,12 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) goto err; } - transport = transport_new(&addr, port, method_name, PROXY_NONE); + if (tor_addr_parse(&tor_addr, address) < 0) { + log_warn(LD_CONFIG, "Error parsing transport address '%s'", address); + goto err; + } + + transport = transport_new(&tor_addr, port, method_name, PROXY_NONE); if (!transport) goto err; @@ -835,7 +841,7 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) /* For now, notify the user so that he knows where the server transport is listening. */ log_info(LD_CONFIG, "Server transport %s at %s:%d.", - method_name, fmt_addr(&addr), (int)port); + method_name, address, (int)port); r=0; goto done; @@ -846,6 +852,7 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) done: SMARTLIST_FOREACH(items, char*, s, tor_free(s)); smartlist_free(items); + tor_free(address); return r; } @@ -863,7 +870,8 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) int socks_ver=PROXY_NONE; char *addrport=NULL; - tor_addr_t addr; + tor_addr_t tor_addr; + char *address=NULL; uint16_t port = 0; transport_t *transport=NULL; @@ -899,7 +907,7 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) } addrport = smartlist_get(items, 3); - if (tor_addr_port_lookup(addrport, &addr, &port)<0) { + if (tor_addr_port_split(LOG_PROTOCOL_WARN, addrport, &address, &port)<0) { log_warn(LD_CONFIG, "Error parsing transport " "address '%s'", addrport); goto err; @@ -911,7 +919,12 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) goto err; } - transport = transport_new(&addr, port, method_name, socks_ver); + if (tor_addr_parse(&tor_addr, address) < 0) { + log_warn(LD_CONFIG, "Error parsing transport address '%s'", address); + goto err; + } + + transport = transport_new(&tor_addr, port, method_name, socks_ver); if (!transport) goto err; @@ -919,7 +932,7 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) log_info(LD_CONFIG, "Transport %s at %s:%d with SOCKS %d. " "Attached to managed proxy.", - method_name, fmt_addr(&addr), (int)port, socks_ver); + method_name, address, (int)port, socks_ver); r=0; goto done; @@ -930,6 +943,7 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) done: SMARTLIST_FOREACH(items, char*, s, tor_free(s)); smartlist_free(items); + tor_free(address); return r; }

1 0

[tor/release-0.2.3] Fix a compilation warning with clang 3.0
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 201b852c277bdf4bf70a656871d502318bd5b25b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 10:48:31 2012 -0400 Fix a compilation warning with clang 3.0 In b1ad1a1d0266a20bb we introduced an implicit (but safe) long-to-int shortening that clang didn't like. Warning not in any released version of Tor. --- src/common/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index e5b51b9..d94dcf2 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3347,7 +3347,7 @@ format_helper_exit_status(unsigned char child_state, int saved_errno, *cur++ = '\n'; *cur++ = '\0'; - res = cur - hex_errno - 1; + res = (int)(cur - hex_errno - 1); goto done;

1 0

[tor/release-0.2.3] Bump the test util/threads timeout up to 150 sec
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 4645f28c3b125f9d281eb457d110c431a6a0b166 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 25 13:44:34 2012 -0400 Bump the test util/threads timeout up to 150 sec This should make some debian build systems happier. Also, increase the select() timeout to a more reasonable 100 msec. --- changes/bug6227 | 3 +++ src/test/test_util.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug6227 b/changes/bug6227 new file mode 100644 index 0000000..77b06ac --- /dev/null +++ b/changes/bug6227 @@ -0,0 +1,3 @@ + o Minor bugfixes (unit tests): + - Avoid a false positive in the util/threads unit test by increasing + the maximum timeout time. Fixes bug 6227; bugfix on 0.2.0.4-alpha. diff --git a/src/test/test_util.c b/src/test/test_util.c index fab9595..9b9fccf 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1186,7 +1186,7 @@ test_util_threads(void) #ifndef _WIN32 struct timeval tv; tv.tv_sec=0; - tv.tv_usec=10; + tv.tv_usec=100*1000; #endif #ifndef TOR_IS_MULTITHREADED /* Skip this test if we aren't threading. We should be threading most @@ -1213,7 +1213,7 @@ test_util_threads(void) if (strmap_get(_thread_test_strmap, "thread 1") && strmap_get(_thread_test_strmap, "thread 2")) { done = 1; - } else if (time(NULL) > started + 25) { + } else if (time(NULL) > started + 150) { timedout = done = 1; } tor_mutex_release(_thread_test_mutex);

1 0

[tor/release-0.2.3] Downgrade message about md cache cleaning from notice to info
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit c4586f4df7b7b403867baab03508ccc2f078a0ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 10:30:11 2012 -0400 Downgrade message about md cache cleaning from notice to info Fix for #6238 --- changes/bug6238 | 3 +++ src/or/microdesc.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug6238 b/changes/bug6238 new file mode 100644 index 0000000..67cfd1d --- /dev/null +++ b/changes/bug6238 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Downgrade a message about cleaning the microdescriptor cache to + "info" from "notice". Fixes bug 6238; bugfix on 0.2.3.1-alpha. diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 42e8605..9395a9a 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -373,8 +373,8 @@ microdesc_cache_clean(microdesc_cache_t *cache, time_t cutoff, int force) } if (dropped) { - log_notice(LD_DIR, "Removed %d/%d microdescriptors as old.", - dropped,dropped+kept); + log_info(LD_DIR, "Removed %d/%d microdescriptors as old.", + dropped,dropped+kept); cache->bytes_dropped += bytes_dropped; } }

1 0

[tor/release-0.2.3] merge changes files into upcoming changelog
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 0b3f5ca11f276841f498cf7164016682911a42bd Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Jun 27 21:32:17 2012 -0400 merge changes files into upcoming changelog --- ChangeLog | 59 +++++++++++++++++++++++++++++++++++++++ changes/bug3311 | 5 --- changes/bug4748 | 4 -- changes/bug5099 | 3 -- changes/bug5557 | 3 -- changes/bug5932 | 3 -- changes/bug6028 | 4 -- changes/bug6169 | 4 -- changes/bug6173 | 5 --- changes/bug6203 | 5 --- changes/bug6211 | 4 -- changes/bug6226 | 3 -- changes/bug6227 | 3 -- changes/bug6238 | 3 -- changes/check_correct_flav_sigs | 4 -- changes/clang_strcspn | 3 -- changes/descriptor_limit | 2 - changes/envvar_test | 2 - changes/log_bad_md_entry | 3 -- changes/move_cached_gtod | 3 -- 20 files changed, 59 insertions(+), 66 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2e9f45..7c88187 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,62 @@ +Changes in version 0.2.3.18-rc - 2012-06-28 + + o Major bugfixes: + - Make our linker option detection code more robust against linkers + such as on FreeBSD 8, where a bad combination of options completes + successfully but makes an unrunnable binary. Fixes bug 6173; + bugfix on 0.2.3.17-beta. + + o Minor bugfixes (on 0.2.2.x and earlier): + - Avoid a false positive in the util/threads unit test by increasing + the maximum timeout time. Fixes bug 6227; bugfix on 0.2.0.4-alpha. + - Replace "Sending publish request" log messages with "Launching + upload", so that they no longer confusingly imply that we're + sending somtheing to a directory we might not even be connected + to yet. Fixes bug 3311; bugfix on 0.2.0.10-alpha. + - When checking for requested signatures on the latest consensus + before serving it to a client, make sure to check the right + consensus flavor. Bugfix on 0.2.2.6-alpha. + - Downgrade "eventdns rejected address" message to LOG_PROTOCOL_WARN. + Fixes bug 5932; bugfix on 0.2.2.7-alpha. + + o Minor bugfixes (on 0.2.3.x): + - Downgrade a message about cleaning the microdescriptor cache to + "info" from "notice". Fixes bug 6238; bugfix on 0.2.3.1-alpha. + - Improve log message issued when a managed proxy fails to + launch. Fixes bug 5099; bugfix on 0.2.3.6-alpha. + - Don't do DNS lookups when parsing corrupted managed proxy protocol + messages. Fixes bug 6226; bugfix on 0.2.3.6-alpha. + - Avoid a warning caused by using strcspn() from glibc with clang 3.0. + Bugfix on 0.2.3.13-alpha. + - Make format_helper_exit_status() avoid unnecessary space padding and + stop confusing log_from_pipe(). Fixes ticket 5557. + - Make sure to set *socket_error in all error cases in + connection_connect(), so it can't produce a warning about errno + being zero from errno_to_orconn_end_reason(). Resolves ticket 6028. + - Remove non-bug log messages about running with circuit timeout + learning enabled from LD_BUG. Fixes bug 6169; bugfix on + 0.2.3.17-beta. + - Disable a spurious warning about reading on a marked and flushing + connection. We shouldn't be doing that, but apparently we + sometimes do. Fixes bug 6203; bugfix on 0.2.3.17-beta. + - Fix a bug that stopped AllowDotExit from working on addresses + that had an entry in the DNS cache. Fixes bug 6211; bugfix on + 0.2.3.17-beta. + - Log a BUG message at INFO if we have a networkstatus with a missing + entry for some microdescriptor. + + o Code simplification, refactoring, unit tests: + - Move tor_gettimeofday_cached() into compat_libevent.c, and use + Libevent's notion of cached time when possible. + - Remove duplicate code for invoking getrlimit() from control.c. + - Add a unit test for the environment_variable_names_equal function. + + o Documentation: + - Document the --defaults-torrc option, and the new (in 0.2.3) + semantics for overriding, extending, and clearing lists of + options. Closes bug 4748. + + Changes in version 0.2.3.17-beta - 2012-06-15 Tor 0.2.3.17-beta enables compiler and linker hardening by default, gets our TLS handshake back on track for being able to blend in with diff --git a/changes/bug3311 b/changes/bug3311 deleted file mode 100644 index 014d18d..0000000 --- a/changes/bug3311 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Replace "Sending publish request" log messages with "Launching - upload", so that they no longer confusingly imply that we're - sending somtheing to a directory we might not even be connected - to yet. Fixes bug 3311; bugfix on 0.2.0.10-alpha. diff --git a/changes/bug4748 b/changes/bug4748 deleted file mode 100644 index 9c0f9cf..0000000 --- a/changes/bug4748 +++ /dev/null @@ -1,4 +0,0 @@ - o Documentation: - - Document the --defaults-torrc option, and the new (in 0.2.3) - semantics for overriding, extending, and clearing lists of - options. Closes bug 4748. diff --git a/changes/bug5099 b/changes/bug5099 deleted file mode 100644 index 4c46a39..0000000 --- a/changes/bug5099 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Improve log message issued when a managed proxy fails to - launch. Fixes bug 5099; bugfix on 0.2.3.6-alpha. diff --git a/changes/bug5557 b/changes/bug5557 deleted file mode 100644 index c73fbe2..0000000 --- a/changes/bug5557 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes - - Make format_helper_exit_status() avoid unnecessary space padding and - stop confusing log_from_pipe(). Fixes ticket 5557. diff --git a/changes/bug5932 b/changes/bug5932 deleted file mode 100644 index f2ca98e..0000000 --- a/changes/bug5932 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Downgrade "eventdns rejected address" message to LOG_PROTOCOL_WARN. - Fixes bug 5932; bugfix on 0.2.2.7-alpha. diff --git a/changes/bug6028 b/changes/bug6028 deleted file mode 100644 index fedd02f..0000000 --- a/changes/bug6028 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Make sure to set *socket_error in all error cases in - connection_connect(), so it can't produce a warning about errno being - zero from errno_to_orconn_end_reason(). Resolves ticket 6028. diff --git a/changes/bug6169 b/changes/bug6169 deleted file mode 100644 index 9880fc9..0000000 --- a/changes/bug6169 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Remove a non-bug log messages about running with circuit timeout - learning enabled from LD_BUG. Fixes bug 6169; bugfix on - 0.2.3.17-beta. diff --git a/changes/bug6173 b/changes/bug6173 deleted file mode 100644 index 3b467a9..0000000 --- a/changes/bug6173 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - Make our linker option detection code more robust against linkers - where a bad combination of options completes successfully but - makes an unrunnable binary. Fixes bug 6173; bugfix on 0.2.3.17-beta. - diff --git a/changes/bug6203 b/changes/bug6203 deleted file mode 100644 index bf96753..0000000 --- a/changes/bug6203 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Disable a spurious warning about reading on a marked and flushing - connection. We shouldn't be doing that, but apparently we - sometimes do. Fix for bug 6203; bugfix on 0.2.3.17-beta. - diff --git a/changes/bug6211 b/changes/bug6211 deleted file mode 100644 index 2c8d9b8..0000000 --- a/changes/bug6211 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Fix a bug that stopped AllowDotExit from working on addresses - that had an entry in the DNS cache. Fixes bug 6211; bugfix on - 0.2.3.17-beta. diff --git a/changes/bug6226 b/changes/bug6226 deleted file mode 100644 index 7cbee10..0000000 --- a/changes/bug6226 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Don't do DNS lookups when parsing corrupted managed proxy - protocol messages. Fixes bug 6226; bugfix on 0.2.3.6-alpha. diff --git a/changes/bug6227 b/changes/bug6227 deleted file mode 100644 index 77b06ac..0000000 --- a/changes/bug6227 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (unit tests): - - Avoid a false positive in the util/threads unit test by increasing - the maximum timeout time. Fixes bug 6227; bugfix on 0.2.0.4-alpha. diff --git a/changes/bug6238 b/changes/bug6238 deleted file mode 100644 index 67cfd1d..0000000 --- a/changes/bug6238 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Downgrade a message about cleaning the microdescriptor cache to - "info" from "notice". Fixes bug 6238; bugfix on 0.2.3.1-alpha. diff --git a/changes/check_correct_flav_sigs b/changes/check_correct_flav_sigs deleted file mode 100644 index db21182..0000000 --- a/changes/check_correct_flav_sigs +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - When checking for requested signatures on the latest consensus before - serving it to a client, make sure to check the right consensus flavor. - Bugfix on 0.2.2.6-alpha. diff --git a/changes/clang_strcspn b/changes/clang_strcspn deleted file mode 100644 index 38670ac..0000000 --- a/changes/clang_strcspn +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Avoid a warning caused by using strcspn from glibc with clang 3.0. - Bugfix on 0.2.3.13-alpha. diff --git a/changes/descriptor_limit b/changes/descriptor_limit deleted file mode 100644 index 29be3d9..0000000 --- a/changes/descriptor_limit +++ /dev/null @@ -1,2 +0,0 @@ - o Code simplification and refactoring: - - Remove duplicate code for invoking getrlimit() from control.c. diff --git a/changes/envvar_test b/changes/envvar_test deleted file mode 100644 index d76a817..0000000 --- a/changes/envvar_test +++ /dev/null @@ -1,2 +0,0 @@ - o New unit tests: - - Add a unit test for the environment_variable_names_equal function. \ No newline at end of file diff --git a/changes/log_bad_md_entry b/changes/log_bad_md_entry deleted file mode 100644 index 3c65327..0000000 --- a/changes/log_bad_md_entry +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (debugging): - - Log a BUG message at INFO if we have a networkstatus with a missing - entry for some microdescriptor. diff --git a/changes/move_cached_gtod b/changes/move_cached_gtod deleted file mode 100644 index 53d8092..0000000 --- a/changes/move_cached_gtod +++ /dev/null @@ -1,3 +0,0 @@ - o Code simplification and refactoring: - - Move tor_gettimeofday_cached() into compat_libevent.c, and use - Libevent's notion of cached time when possible.

1 0

[tor/release-0.2.3] Merge remote-tracking branch 'public/bug6227' into maint-0.2.3
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 6330d2d9e6dc8cdeceea9486ad96e57487d6d232 Merge: 5fad3dc 4645f28 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 11:03:56 2012 -0400 Merge remote-tracking branch 'public/bug6227' into maint-0.2.3 changes/bug6227 | 3 +++ src/test/test_util.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.3] Fix a warning when using glibc's strcspn with clang.
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 5fad3dc36b3aad7f2ea13e56d838c3eb37fb029d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 10:55:23 2012 -0400 Fix a warning when using glibc's strcspn with clang. With glibc 2.15 and clang 3.0, I get warnings from where we use the strcpsn implementation in the header as strcspn(string, "="). This is apparently because clang sees that part of the strcspn macro expands to "="[2], and doesn't realize that that part of the macro is only evaluated when "="[1] != 0. --- changes/clang_strcspn | 3 +++ src/common/util.c | 19 ++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/changes/clang_strcspn b/changes/clang_strcspn new file mode 100644 index 0000000..38670ac --- /dev/null +++ b/changes/clang_strcspn @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Avoid a warning caused by using strcspn from glibc with clang 3.0. + Bugfix on 0.2.3.13-alpha. diff --git a/src/common/util.c b/src/common/util.c index d94dcf2..51d9321 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3887,13 +3887,26 @@ tor_get_exit_code(const process_handle_t *process_handle, return PROCESS_EXIT_EXITED; } +/** Helper: return the number of characters in s preceding the first + * occurence of ch. If ch does not occur in s, return + * the length of s. Should be equivalent to strspn(s, "ch"). */ +static INLINE size_t +str_num_before(const char *s, char ch) +{ + const char *cp = strchr(s, ch); + if (cp) + return cp - s; + else + return strlen(s); +} + /** Return non-zero iff getenv would consider s1 and s2 * to have the same name as strings in a process's environment. */ int environment_variable_names_equal(const char *s1, const char *s2) { - size_t s1_name_len = strcspn(s1, "="); - size_t s2_name_len = strcspn(s2, "="); + size_t s1_name_len = str_num_before(s1, '='); + size_t s2_name_len = str_num_before(s2, '='); return (s1_name_len == s2_name_len && tor_memeq(s1, s2, s1_name_len)); @@ -3968,7 +3981,7 @@ process_environment_make(struct smartlist_t *env_vars) for (i = 0; i < n_env_vars; ++i) { const char *s = smartlist_get(env_vars_sorted, i); size_t slen = strlen(s); - size_t s_name_len = strcspn(s, "="); + size_t s_name_len = str_num_before(s, '='); if (s_name_len == slen) { log_warn(LD_GENERAL,

1 0

[tor/release-0.2.3] Add a unit test for environment_variable_names_equal
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 9c8ec0aa20cda1787ee27a96e666af84f1081f5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 10:50:37 2012 -0400 Add a unit test for environment_variable_names_equal I need this because I'm about to frob that function to stop using strcspn() in order to get rid of a clang warning. --- changes/envvar_test | 2 ++ src/test/test_util.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/changes/envvar_test b/changes/envvar_test new file mode 100644 index 0000000..d76a817 --- /dev/null +++ b/changes/envvar_test @@ -0,0 +1,2 @@ + o New unit tests: + - Add a unit test for the environment_variable_names_equal function. \ No newline at end of file diff --git a/src/test/test_util.c b/src/test/test_util.c index fab9595..d2d0a55 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2869,6 +2869,39 @@ test_util_sl_new_from_text_lines(void *ptr) } } +static void +test_util_envnames(void *ptr) +{ + (void) ptr; + + tt_assert(environment_variable_names_equal("abc", "abc")); + tt_assert(environment_variable_names_equal("abc", "abc=")); + tt_assert(environment_variable_names_equal("abc", "abc=def")); + tt_assert(environment_variable_names_equal("abc=def", "abc")); + tt_assert(environment_variable_names_equal("abc=def", "abc=ghi")); + + tt_assert(environment_variable_names_equal("abc", "abc")); + tt_assert(environment_variable_names_equal("abc", "abc=")); + tt_assert(environment_variable_names_equal("abc", "abc=def")); + tt_assert(environment_variable_names_equal("abc=def", "abc")); + tt_assert(environment_variable_names_equal("abc=def", "abc=ghi")); + + tt_assert(!environment_variable_names_equal("abc", "abcd")); + tt_assert(!environment_variable_names_equal("abc=", "abcd")); + tt_assert(!environment_variable_names_equal("abc=", "abcd")); + tt_assert(!environment_variable_names_equal("abc=", "def")); + tt_assert(!environment_variable_names_equal("abc=", "def=")); + tt_assert(!environment_variable_names_equal("abc=x", "def=x")); + + tt_assert(!environment_variable_names_equal("", "a=def")); + /* A bit surprising. */ + tt_assert(environment_variable_names_equal("", "=def")); + tt_assert(environment_variable_names_equal("=y", "=x")); + + done: + ; +} + /** Test process_environment_make */ static void test_util_make_environment(void *ptr) @@ -3081,6 +3114,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(n_bits_set, 0), UTIL_TEST(eat_whitespace, 0), UTIL_TEST(sl_new_from_text_lines, 0), + UTIL_TEST(envnames, 0), UTIL_TEST(make_environment, 0), UTIL_TEST(set_env_var_in_sl, 0), END_OF_TESTCASES

1 0

[tor/release-0.2.3] Allow wildcarded mapaddress targets in controller MAPADDRESS command
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 23f2e37ff75ef539cc5634e3f48f9a86cb95a2d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 27 23:38:04 2012 -0400 Allow wildcarded mapaddress targets in controller MAPADDRESS command --- changes/bug6244 | 4 ++++ src/or/control.c | 18 ++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/changes/bug6244 b/changes/bug6244 new file mode 100644 index 0000000..c6d64ff --- /dev/null +++ b/changes/bug6244 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Allow wildcarded mapaddress targets to be specified on the controlport. + Partial fix for bug 6244; bugfix on 0.2.3.9-alpha. + diff --git a/src/or/control.c b/src/or/control.c index 9fc28bb..6675c01 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1313,6 +1313,17 @@ handle_control_takeownership(control_connection_t *conn, uint32_t len, return 0; } +/** Return true iff addr is unusable as a mapaddress target because of + * containing funny characters. */ +static int +address_is_invalid_mapaddress_target(const char *addr) +{ + if (!strcmpstart(addr, "*.")) + return address_is_invalid_destination(addr+2, 1); + else + return address_is_invalid_destination(addr, 1); +} + /** Called when we get a MAPADDRESS command; try to bind all listed addresses, * and report success or failure. */ static int @@ -1331,14 +1342,13 @@ handle_control_mapaddress(control_connection_t *conn, uint32_t len, reply = smartlist_new(); smartlist_split_string(lines, body, " ", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); - SMARTLIST_FOREACH(lines, char *, line, - { + SMARTLIST_FOREACH_BEGIN(lines, char *, line) { tor_strlower(line); smartlist_split_string(elts, line, "=", 0, 2); if (smartlist_len(elts) == 2) { const char *from = smartlist_get(elts,0); const char *to = smartlist_get(elts,1); - if (address_is_invalid_destination(to, 1)) { + if (address_is_invalid_mapaddress_target(to)) { smartlist_add_asprintf(reply, "512-syntax error: invalid address '%s'", to); log_warn(LD_CONTROL, @@ -1370,7 +1380,7 @@ handle_control_mapaddress(control_connection_t *conn, uint32_t len, } SMARTLIST_FOREACH(elts, char *, cp, tor_free(cp)); smartlist_clear(elts); - }); + } SMARTLIST_FOREACH_END(line); SMARTLIST_FOREACH(lines, char *, cp, tor_free(cp)); smartlist_free(lines); smartlist_free(elts);

1 0