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

[tor/master] Minor changes to adhere to codebase conventions.
by nickm＠torproject.org 03 Sep '13

03 Sep '13

commit db318dc77f47157d685fdd9e2035c96574b283db Author: Kevin Butler <haqkrs(a)gmail.com> Date: Tue Sep 3 17:47:03 2013 +0100 Minor changes to adhere to codebase conventions. --- src/or/config.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 594e010..436fcc4 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3090,7 +3090,7 @@ options_validate(or_options_t *old_options, or_options_t *options, "You should also make sure you aren't listing this bridge's " "fingerprint in any other MyFamily."); } - if (check_nickname_list((char **)&options->MyFamily, "MyFamily", msg)) + if (check_nickname_list(&options->MyFamily, "MyFamily", msg)) return -1; for (cl = options->NodeFamilies; cl; cl = cl->next) { routerset_t *rs = routerset_new(); @@ -3639,15 +3639,14 @@ check_nickname_list(char **lst, const char *name, char **msg) smartlist_split_string(sl, *lst, ",", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK|SPLIT_STRIP_SPACE, 0); - SMARTLIST_FOREACH(sl, char *, s, + SMARTLIST_FOREACH_BEGIN(sl, char *, s) { if (!is_legal_nickname_or_hexdigest(s)) { // check if first char is dollar if (s[0] != '$') { // Try again but with a dollar symbol prepended - char *prepended = tor_malloc(strlen(s)+2); - strcpy(prepended, "$"); - strcat(prepended, s); + char *prepended; + tor_asprintf(&prepended, "$%s", s); if (is_legal_nickname_or_hexdigest(prepended)) { // The nickname is valid when it's prepended, swap the current @@ -3666,7 +3665,8 @@ check_nickname_list(char **lst, const char *name, char **msg) r = -1; break; } - }); + } + SMARTLIST_FOREACH_END(s); // Replace the caller's nickname list with a fixed one if (changes && r == 0) {

1 0

[tor/master] Changed signature for check_nickname_list to remove warnings on free.
by nickm＠torproject.org 03 Sep '13

03 Sep '13

commit bb69bf888288a3a3debc40d7630640314dc0ebcb Author: Kevin Butler <haqkrs(a)gmail.com> Date: Sat Aug 31 05:12:36 2013 +0100 Changed signature for check_nickname_list to remove warnings on free. --- src/or/config.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 2792f14..594e010 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -521,7 +521,7 @@ static int options_transition_affects_workers( const or_options_t *old_options, const or_options_t *new_options); static int options_transition_affects_descriptor( const or_options_t *old_options, const or_options_t *new_options); -static int check_nickname_list(const char **lst, const char *name, char **msg); +static int check_nickname_list(char **lst, const char *name, char **msg); static int parse_client_transport_line(const char *line, int validate_only); @@ -3090,7 +3090,7 @@ options_validate(or_options_t *old_options, or_options_t *options, "You should also make sure you aren't listing this bridge's " "fingerprint in any other MyFamily."); } - if (check_nickname_list((const char **)&options->MyFamily, "MyFamily", msg)) + if (check_nickname_list((char **)&options->MyFamily, "MyFamily", msg)) return -1; for (cl = options->NodeFamilies; cl; cl = cl->next) { routerset_t *rs = routerset_new(); @@ -3626,7 +3626,7 @@ get_default_conf_file(int defaults_file) * Warn and return -1 on failure. */ static int -check_nickname_list(const char **lst, const char *name, char **msg) +check_nickname_list(char **lst, const char *name, char **msg) { int r = 0; smartlist_t *sl; @@ -3639,7 +3639,7 @@ check_nickname_list(const char **lst, const char *name, char **msg) smartlist_split_string(sl, *lst, ",", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK|SPLIT_STRIP_SPACE, 0); - SMARTLIST_FOREACH(sl, const char *, s, + SMARTLIST_FOREACH(sl, char *, s, { if (!is_legal_nickname_or_hexdigest(s)) { // check if first char is dollar @@ -3670,7 +3670,7 @@ check_nickname_list(const char **lst, const char *name, char **msg) // Replace the caller's nickname list with a fixed one if (changes && r == 0) { - const char *newNicknames = smartlist_join_strings(sl, ", ", 0, NULL); + char *newNicknames = smartlist_join_strings(sl, ", ", 0, NULL); tor_free(*lst); *lst = newNicknames; }

1 0

[tor/master] Fix warnings in test_config_fix_my_family
by nickm＠torproject.org 03 Sep '13

03 Sep '13

commit 37534880113133716b220bf6d5ffaaf910072b30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 3 13:35:44 2013 -0400 Fix warnings in test_config_fix_my_family --- src/test/test_config.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index 911913a..6a285db 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4,6 +4,8 @@ /* See LICENSE for licensing information */ #include "orconfig.h" + +#define CONFIG_PRIVATE #include "or.h" #include "addressmap.h" #include "config.h" @@ -515,12 +517,14 @@ static void test_config_fix_my_family(void *arg) { char *err = NULL; - char *family = "$1111111111111111111111111111111111111111, " - "1111111111111111111111111111111111111112, " - "$1111111111111111111111111111111111111113"; + const char *family = "$1111111111111111111111111111111111111111, " + "1111111111111111111111111111111111111112, " + "$1111111111111111111111111111111111111113"; or_options_t* options = options_new(); or_options_t* defaults = options_new(); + (void) arg; + options_init(options); options_init(defaults); options->MyFamily = tor_strdup(family); @@ -528,7 +532,7 @@ test_config_fix_my_family(void *arg) options_validate(NULL, options, defaults, 0, &err) ; if (err != NULL) { - test_fail_msg(err); + TT_FAIL(("options_validate failed: %s", err)); } test_streq(options->MyFamily, "$1111111111111111111111111111111111111111, "

1 0

[tor/master] Merge remote-tracking branch 'Ryman/bug4341'
by nickm＠torproject.org 03 Sep '13

03 Sep '13

commit eb5f22eff22745ad85741106215ee0831325c0bf Merge: 824df4a db318dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 3 13:16:22 2013 -0400 Merge remote-tracking branch 'Ryman/bug4341' changes/bug4341 | 2 ++ src/or/config.c | 48 ++++++++++++++++++++++++++++++++++++++++-------- src/test/test_config.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 8 deletions(-)

1 0

[tor/master] Tougher validation for parsing urls from HTTP headers. Fixes #2767.
by nickm＠torproject.org 03 Sep '13

03 Sep '13

commit 5327605caa5863ec9593fd0899425cd971a9d525 Author: Kevin Butler <haqkrs(a)gmail.com> Date: Tue Sep 3 01:14:43 2013 +0100 Tougher validation for parsing urls from HTTP headers. Fixes #2767. --- changes/bug2767 | 2 ++ src/or/directory.c | 9 ++++++++- src/or/directory.h | 5 +++++ src/test/test_dir.c | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 1 deletion(-) diff --git a/changes/bug2767 b/changes/bug2767 new file mode 100644 index 0000000..974ce63 --- /dev/null +++ b/changes/bug2767 @@ -0,0 +1,2 @@ + o Minor bugfixes: + - No longer accepting malformed http headers when parsing urls from headers, replies with Bad Request(400). Fixes #2767. \ No newline at end of file diff --git a/src/or/directory.c b/src/or/directory.c index 97305ae..58ce0cf 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1387,7 +1387,7 @@ directory_send_command(dir_connection_t *conn, * so it does. Return 0. * Otherwise, return -1. */ -static int +STATIC int parse_http_url(const char *headers, char **url) { char *s, *start, *tmp; @@ -1416,6 +1416,13 @@ parse_http_url(const char *headers, char **url) } } + /* Check if the header is well formed (next sequence + * should be HTTP/1.X\r\n). Assumes we're supporting 1.0? */ + char *e = (char *)eat_whitespace_no_nl(s); + if (strcmpstart(e, "HTTP/1.") || !(*(e+8) == '\r')) { + return -1; + } + if (s-start < 5 || strcmpstart(start,"/tor/")) { /* need to rewrite it */ *url = tor_malloc(s - start + 5); strlcpy(*url,"/tor", s-start+5); diff --git a/src/or/directory.h b/src/or/directory.h index 41f18a1..0453160 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -118,5 +118,10 @@ download_status_mark_impossible(download_status_t *dl) int download_status_get_n_failures(const download_status_t *dls); +#ifdef TOR_UNIT_TESTS +/* Used only by directory.c and test_dir.c */ +STATIC int parse_http_url(const char *headers, char **url); +#endif + #endif diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 6c2915d..05e13b5 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2364,6 +2364,45 @@ test_dir_fmt_control_ns(void *arg) tor_free(s); } +static void +test_dir_http_handling(void *args) +{ + (void)args; + char *url = NULL; + + /* Parse http url tests: */ + /* Good headers */ + test_eq(parse_http_url("GET /tor/a/b/c.txt HTTP/1.1\r\n" + "Host: example.com\r\n" + "User-Agent: Mozilla/5.0 (Windows;" + " U; Windows NT 6.1; en-US; rv:1.9.1.5)\r\n", + &url), 0); + test_streq(url, "/tor/a/b/c.txt"); + tor_free(url); + + /* Should prepends '/tor/' to url if required */ + test_eq(parse_http_url("GET /a/b/c.txt HTTP/1.1\r\n" + "Host: example.com\r\n" + "User-Agent: Mozilla/5.0 (Windows;" + " U; Windows NT 6.1; en-US; rv:1.9.1.5)\r\n", + &url), 0); + test_streq(url, "/tor/a/b/c.txt"); + tor_free(url); + + /* Bad headers */ + test_eq(parse_http_url("GET /a/b/c.txt\r\n" + "Host: example.com\r\n" + "User-Agent: Mozilla/5.0 (Windows;" + " U; Windows NT 6.1; en-US; rv:1.9.1.5)\r\n", + &url), -1); + tt_assert(!url); + + /* TODO: more http handling tests */ + + done: + ; +} + #define DIR_LEGACY(name) \ { #name, legacy_test_helper, TT_FORK, &legacy_setup, test_dir_ ## name } @@ -2386,6 +2425,7 @@ struct testcase_t dir_tests[] = { DIR_LEGACY(clip_unmeasured_bw_kb_alt), DIR(v2_dir, TT_FORK), DIR(fmt_control_ns, 0), + DIR(http_handling, 0), END_OF_TESTCASES };

1 0

[tor/master] Handle HTTP minor versions greater than 9
by nickm＠torproject.org 03 Sep '13

03 Sep '13

commit 270b4f030a07a0ff3ad80e4ae5495ad89b4096ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 3 11:37:04 2013 -0400 Handle HTTP minor versions greater than 9 (In practice they don't exist, but so long as we're making changes for standards compliance...) Also add several more unit tests for good and bad URL types. --- src/or/directory.c | 12 +++++++++--- src/test/test_dir.c | 37 +++++++++++++++++++++++++++++++++---- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 58ce0cf..099df50 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1417,10 +1417,16 @@ parse_http_url(const char *headers, char **url) } /* Check if the header is well formed (next sequence - * should be HTTP/1.X\r\n). Assumes we're supporting 1.0? */ + * should be HTTP/1.X\r\n). Assumes we're supporting 1.0? */ char *e = (char *)eat_whitespace_no_nl(s); - if (strcmpstart(e, "HTTP/1.") || !(*(e+8) == '\r')) { - return -1; + { + unsigned minor_ver; + char ch; + if (2 != tor_sscanf(e, "HTTP/1.%u%c", &minor_ver, &ch)) { + return -1; + } + if (ch != '\r') + return -1; } if (s-start < 5 || strcmpstart(start,"/tor/")) { /* need to rewrite it */ diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 05e13b5..0292cbd 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2380,7 +2380,15 @@ test_dir_http_handling(void *args) test_streq(url, "/tor/a/b/c.txt"); tor_free(url); - /* Should prepends '/tor/' to url if required */ + test_eq(parse_http_url("GET /tor/a/b/c.txt HTTP/1.0\r\n", &url), 0); + test_streq(url, "/tor/a/b/c.txt"); + tor_free(url); + + test_eq(parse_http_url("GET /tor/a/b/c.txt HTTP/1.600\r\n", &url), 0); + test_streq(url, "/tor/a/b/c.txt"); + tor_free(url); + + /* Should prepend '/tor/' to url if required */ test_eq(parse_http_url("GET /a/b/c.txt HTTP/1.1\r\n" "Host: example.com\r\n" "User-Agent: Mozilla/5.0 (Windows;" @@ -2389,6 +2397,14 @@ test_dir_http_handling(void *args) test_streq(url, "/tor/a/b/c.txt"); tor_free(url); + /* Bad headers -- no HTTP/1.x*/ + test_eq(parse_http_url("GET /a/b/c.txt\r\n" + "Host: example.com\r\n" + "User-Agent: Mozilla/5.0 (Windows;" + " U; Windows NT 6.1; en-US; rv:1.9.1.5)\r\n", + &url), -1); + tt_assert(!url); + /* Bad headers */ test_eq(parse_http_url("GET /a/b/c.txt\r\n" "Host: example.com\r\n" @@ -2397,10 +2413,23 @@ test_dir_http_handling(void *args) &url), -1); tt_assert(!url); - /* TODO: more http handling tests */ + test_eq(parse_http_url("GET /tor/a/b/c.txt", &url), -1); + tt_assert(!url); + + test_eq(parse_http_url("GET /tor/a/b/c.txt HTTP/1.1", &url), -1); + tt_assert(!url); + + test_eq(parse_http_url("GET /tor/a/b/c.txt HTTP/1.1x\r\n", &url), -1); + tt_assert(!url); + + test_eq(parse_http_url("GET /tor/a/b/c.txt HTTP/1.", &url), -1); + tt_assert(!url); + + test_eq(parse_http_url("GET /tor/a/b/c.txt HTTP/1.\r", &url), -1); + tt_assert(!url); - done: - ; + done: + tor_free(url); } #define DIR_LEGACY(name) \

1 0

[tor/master] Merge remote-tracking branch 'public/bug2767'
by nickm＠torproject.org 03 Sep '13

03 Sep '13

commit 824df4a08ec9af8d8ac6b4ecacc1a6fdbc87ac8b Merge: 77e4a01 270b4f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 3 12:37:36 2013 -0400 Merge remote-tracking branch 'public/bug2767' changes/bug2767 | 2 ++ src/or/directory.c | 15 ++++++++++- src/or/directory.h | 5 ++++ src/test/test_dir.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 1 deletion(-)

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 03 Sep '13

03 Sep '13

commit 7f9e7723c609d54c29f940f81d614900045af4ad Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 15:46:29 2013 +0000 Update translations for torbirdy_completed --- zh_CN/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd index 4e4e796..e043641 100644 --- a/zh_CN/torbirdy.dtd +++ b/zh_CN/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "请勿将 Thunderbird 的时区设置为 UTC [默认：设置为 UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "将收件人 key ID 放入加密邮件 [默认：不放入]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "请勿讲收件人密钥 ID 放入加密邮件[默认：放入]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "在发送电子邮件之前，确认 Enigmail 是否已启用 [默认：不确认]"> <!ENTITY torbirdy.prefs.confirmemail.key "c">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 03 Sep '13

03 Sep '13

commit 0e2433d18e51cd1b79e8f4334149997248da0740 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 15:46:25 2013 +0000 Update translations for torbirdy --- zh_CN/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd index e5c0d10..e043641 100644 --- a/zh_CN/torbirdy.dtd +++ b/zh_CN/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "请勿将 Thunderbird 的时区设置为 UTC [默认：设置为 UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "请勿讲收件人密钥 ID 放入加密邮件[默认：放入]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "在发送电子邮件之前，确认 Enigmail 是否已启用 [默认：不确认]"> <!ENTITY torbirdy.prefs.confirmemail.key "c">

1 0

[tor/master] Updated openssl configuration advice for Debian
by nickm＠torproject.org 03 Sep '13

03 Sep '13

commit 77e4a01f12cc127022df16922fbe526bfc5824d9 Author: Kevin Butler <haqkrs(a)gmail.com> Date: Mon Sep 2 19:54:50 2013 +0100 Updated openssl configuration advice for Debian --- changes/bug9207 | 2 ++ configure.ac | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/bug9207 b/changes/bug9207 new file mode 100644 index 0000000..66f8e34 --- /dev/null +++ b/changes/bug9207 @@ -0,0 +1,2 @@ + o Minor Bugfixes: + - Updated configuration advice for installing openssl on Debian. Fixes #9207. diff --git a/configure.ac b/configure.ac index 4aeec92..2ea69c9 100644 --- a/configure.ac +++ b/configure.ac @@ -499,7 +499,7 @@ dnl ------------------------------------------------------ dnl Where do you live, openssl? And how do we call you? tor_openssl_pkg_redhat="openssl" -tor_openssl_pkg_debian="libssl" +tor_openssl_pkg_debian="libssl-dev" tor_openssl_devpkg_redhat="openssl-devel" tor_openssl_devpkg_debian="libssl-dev"

1 0