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

[tor/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit f5092e711fb08dfdf7a356f8c58f10effe6fb831 Merge: a9d4df9a0 3cace828a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 8 08:24:47 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22644 | 5 +++++ src/or/control.c | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.3.1] Fix crashes on empty +HSPOST and +POSTDESCRIPTOR commands
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit 12dad5ebf798232111919d5498f522d5b3f146a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 7 09:20:00 2017 -0400 Fix crashes on empty +HSPOST and +POSTDESCRIPTOR commands Fixes bug 22644; bugfix on 0.2.7.1-alpha and 0.2.0.1-alpha respectively. --- changes/bug22644 | 5 +++++ src/or/control.c | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/changes/bug22644 b/changes/bug22644 new file mode 100644 index 000000000..9b8742eda --- /dev/null +++ b/changes/bug22644 @@ -0,0 +1,5 @@ + o Minor bugfixes (controller): + - Do not crash when receiving a POSTDESCRIPTOR command with an + empty body. Fixes part of bug 22644; bugfix on 0.2.0.1-alpha. + - Do not crash when receiving a HSPOST command with an empty body. + Fixes part of bug 22644; bugfix on 0.2.7.1-alpha. diff --git a/src/or/control.c b/src/or/control.c index 1bf1e33bb..03d9fcee2 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3568,12 +3568,15 @@ handle_control_postdescriptor(control_connection_t *conn, uint32_t len, int cache = 0; /* eventually, we may switch this to 1 */ const char *cp = memchr(body, '\n', len); - smartlist_t *args = smartlist_new(); - tor_assert(cp); + + if (cp == NULL) { + connection_printf_to_buf(conn, "251 Empty body\r\n"); + return 0; + } ++cp; char *cmdline = tor_memdup_nulterm(body, cp-body); - + smartlist_t *args = smartlist_new(); smartlist_split_string(args, cmdline, " ", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); SMARTLIST_FOREACH_BEGIN(args, char *, option) { @@ -4158,14 +4161,19 @@ handle_control_hspost(control_connection_t *conn, const char *body) { static const char *opt_server = "SERVER="; - smartlist_t *args = smartlist_new(); smartlist_t *hs_dirs = NULL; const char *encoded_desc = body; size_t encoded_desc_len = len; char *cp = memchr(body, '\n', len); + if (cp == NULL) { + connection_printf_to_buf(conn, "251 Empty body\r\n"); + return 0; + } char *argline = tor_strndup(body, cp-body); + smartlist_t *args = smartlist_new(); + /* If any SERVER= options were specified, try parse the options line */ if (!strcasecmpstart(argline, opt_server)) { /* encoded_desc begins after a newline character */

1 0

[tor/maint-0.3.0] Merge branch 'bug22644_029' into maint-0.2.9
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit 3cace828a9b42c62a73d1e3b79161a7f68aca40e Merge: 08592c95f 12dad5ebf Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 8 08:24:36 2017 -0400 Merge branch 'bug22644_029' into maint-0.2.9 changes/bug22644 | 5 +++++ src/or/control.c | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.3.0] Fix crashes on empty +HSPOST and +POSTDESCRIPTOR commands
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit 12dad5ebf798232111919d5498f522d5b3f146a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 7 09:20:00 2017 -0400 Fix crashes on empty +HSPOST and +POSTDESCRIPTOR commands Fixes bug 22644; bugfix on 0.2.7.1-alpha and 0.2.0.1-alpha respectively. --- changes/bug22644 | 5 +++++ src/or/control.c | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/changes/bug22644 b/changes/bug22644 new file mode 100644 index 000000000..9b8742eda --- /dev/null +++ b/changes/bug22644 @@ -0,0 +1,5 @@ + o Minor bugfixes (controller): + - Do not crash when receiving a POSTDESCRIPTOR command with an + empty body. Fixes part of bug 22644; bugfix on 0.2.0.1-alpha. + - Do not crash when receiving a HSPOST command with an empty body. + Fixes part of bug 22644; bugfix on 0.2.7.1-alpha. diff --git a/src/or/control.c b/src/or/control.c index 1bf1e33bb..03d9fcee2 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3568,12 +3568,15 @@ handle_control_postdescriptor(control_connection_t *conn, uint32_t len, int cache = 0; /* eventually, we may switch this to 1 */ const char *cp = memchr(body, '\n', len); - smartlist_t *args = smartlist_new(); - tor_assert(cp); + + if (cp == NULL) { + connection_printf_to_buf(conn, "251 Empty body\r\n"); + return 0; + } ++cp; char *cmdline = tor_memdup_nulterm(body, cp-body); - + smartlist_t *args = smartlist_new(); smartlist_split_string(args, cmdline, " ", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); SMARTLIST_FOREACH_BEGIN(args, char *, option) { @@ -4158,14 +4161,19 @@ handle_control_hspost(control_connection_t *conn, const char *body) { static const char *opt_server = "SERVER="; - smartlist_t *args = smartlist_new(); smartlist_t *hs_dirs = NULL; const char *encoded_desc = body; size_t encoded_desc_len = len; char *cp = memchr(body, '\n', len); + if (cp == NULL) { + connection_printf_to_buf(conn, "251 Empty body\r\n"); + return 0; + } char *argline = tor_strndup(body, cp-body); + smartlist_t *args = smartlist_new(); + /* If any SERVER= options were specified, try parse the options line */ if (!strcasecmpstart(argline, opt_server)) { /* encoded_desc begins after a newline character */

1 0

[tor/maint-0.2.9] Fix crashes on empty +HSPOST and +POSTDESCRIPTOR commands
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit 12dad5ebf798232111919d5498f522d5b3f146a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 7 09:20:00 2017 -0400 Fix crashes on empty +HSPOST and +POSTDESCRIPTOR commands Fixes bug 22644; bugfix on 0.2.7.1-alpha and 0.2.0.1-alpha respectively. --- changes/bug22644 | 5 +++++ src/or/control.c | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/changes/bug22644 b/changes/bug22644 new file mode 100644 index 000000000..9b8742eda --- /dev/null +++ b/changes/bug22644 @@ -0,0 +1,5 @@ + o Minor bugfixes (controller): + - Do not crash when receiving a POSTDESCRIPTOR command with an + empty body. Fixes part of bug 22644; bugfix on 0.2.0.1-alpha. + - Do not crash when receiving a HSPOST command with an empty body. + Fixes part of bug 22644; bugfix on 0.2.7.1-alpha. diff --git a/src/or/control.c b/src/or/control.c index 1bf1e33bb..03d9fcee2 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3568,12 +3568,15 @@ handle_control_postdescriptor(control_connection_t *conn, uint32_t len, int cache = 0; /* eventually, we may switch this to 1 */ const char *cp = memchr(body, '\n', len); - smartlist_t *args = smartlist_new(); - tor_assert(cp); + + if (cp == NULL) { + connection_printf_to_buf(conn, "251 Empty body\r\n"); + return 0; + } ++cp; char *cmdline = tor_memdup_nulterm(body, cp-body); - + smartlist_t *args = smartlist_new(); smartlist_split_string(args, cmdline, " ", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); SMARTLIST_FOREACH_BEGIN(args, char *, option) { @@ -4158,14 +4161,19 @@ handle_control_hspost(control_connection_t *conn, const char *body) { static const char *opt_server = "SERVER="; - smartlist_t *args = smartlist_new(); smartlist_t *hs_dirs = NULL; const char *encoded_desc = body; size_t encoded_desc_len = len; char *cp = memchr(body, '\n', len); + if (cp == NULL) { + connection_printf_to_buf(conn, "251 Empty body\r\n"); + return 0; + } char *argline = tor_strndup(body, cp-body); + smartlist_t *args = smartlist_new(); + /* If any SERVER= options were specified, try parse the options line */ if (!strcasecmpstart(argline, opt_server)) { /* encoded_desc begins after a newline character */

1 0

[tor/maint-0.2.9] Merge branch 'bug22644_029' into maint-0.2.9
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit 3cace828a9b42c62a73d1e3b79161a7f68aca40e Merge: 08592c95f 12dad5ebf Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 8 08:24:36 2017 -0400 Merge branch 'bug22644_029' into maint-0.2.9 changes/bug22644 | 5 +++++ src/or/control.c | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-)

1 0

[tor/master] Reject torrc if RunAsDaemon is given with relative paths.
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit 6fea44c673b8227d7adc452263fef3cc61da7fcf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 6 11:39:11 2017 -0400 Reject torrc if RunAsDaemon is given with relative paths. The chdir() call in RunAsDaemon makes the behavior here surprising, and either way of trying to resolve the surprise seems sure to startle a significant fraction of users. Instead, let's refuse to guess, and refuse these configurations. Closes ticket 22731. --- changes/bug22731 | 5 +++++ src/or/config.c | 52 ++++++++++++++++++++++++++++++++-------------------- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/changes/bug22731 b/changes/bug22731 new file mode 100644 index 000000000..acb65d56e --- /dev/null +++ b/changes/bug22731 @@ -0,0 +1,5 @@ + o Minor features (relay, configuration): + - Reject attempts to use relative file paths when RunAsDaemon is set. + Previously, Tor would accept these, but the directory-changing step + of RunAsDaemon would give strange and/or confusing results. + Closes ticket 22731. diff --git a/src/or/config.c b/src/or/config.c index eb89d6f5e..318789567 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2843,8 +2843,10 @@ options_validate_cb(void *old_options, void *options, void *default_options, * an absolute path that filepath will resolve to. * * In case filepath is absolute, do nothing. + * + * Return 1 if there were relative paths; 0 otherwise. */ -static void +static int warn_if_option_path_is_relative(const char *option, char *filepath) { @@ -2853,39 +2855,45 @@ warn_if_option_path_is_relative(const char *option, COMPLAIN("Path for %s (%s) is relative and will resolve to %s." " Is this what you wanted?", option, filepath, abs_path); tor_free(abs_path); + return 1; } + return 0; } /** Scan options for occurances of relative file/directory * path and log a warning whenever it is found. + * + * Return 1 if there were relative paths; 0 otherwise. */ -static void +static int warn_about_relative_paths(or_options_t *options) { tor_assert(options); + int n = 0; - warn_if_option_path_is_relative("CookieAuthFile", - options->CookieAuthFile); - warn_if_option_path_is_relative("ExtORPortCookieAuthFile", - options->ExtORPortCookieAuthFile); - warn_if_option_path_is_relative("DirPortFrontPage", - options->DirPortFrontPage); - warn_if_option_path_is_relative("V3BandwidthsFile", - options->V3BandwidthsFile); - warn_if_option_path_is_relative("ControlPortWriteToFile", - options->ControlPortWriteToFile); - warn_if_option_path_is_relative("GeoIPFile",options->GeoIPFile); - warn_if_option_path_is_relative("GeoIPv6File",options->GeoIPv6File); - warn_if_option_path_is_relative("Log",options->DebugLogFile); - warn_if_option_path_is_relative("AccelDir",options->AccelDir); - warn_if_option_path_is_relative("DataDirectory",options->DataDirectory); - warn_if_option_path_is_relative("PidFile",options->PidFile); + n += warn_if_option_path_is_relative("CookieAuthFile", + options->CookieAuthFile); + n += warn_if_option_path_is_relative("ExtORPortCookieAuthFile", + options->ExtORPortCookieAuthFile); + n += warn_if_option_path_is_relative("DirPortFrontPage", + options->DirPortFrontPage); + n += warn_if_option_path_is_relative("V3BandwidthsFile", + options->V3BandwidthsFile); + n += warn_if_option_path_is_relative("ControlPortWriteToFile", + options->ControlPortWriteToFile); + n += warn_if_option_path_is_relative("GeoIPFile",options->GeoIPFile); + n += warn_if_option_path_is_relative("GeoIPv6File",options->GeoIPv6File); + n += warn_if_option_path_is_relative("Log",options->DebugLogFile); + n += warn_if_option_path_is_relative("AccelDir",options->AccelDir); + n += warn_if_option_path_is_relative("DataDirectory",options->DataDirectory); + n += warn_if_option_path_is_relative("PidFile",options->PidFile); for (config_line_t *hs_line = options->RendConfigLines; hs_line; hs_line = hs_line->next) { if (!strcasecmp(hs_line->key, "HiddenServiceDir")) - warn_if_option_path_is_relative("HiddenServiceDir",hs_line->value); + n += warn_if_option_path_is_relative("HiddenServiceDir",hs_line->value); } + return n != 0; } /* Validate options related to single onion services. @@ -2989,7 +2997,11 @@ options_validate(or_options_t *old_options, or_options_t *options, * Always use the value of UseEntryGuards, not UseEntryGuards_option. */ options->UseEntryGuards = options->UseEntryGuards_option; - warn_about_relative_paths(options); + if (warn_about_relative_paths(options) && options->RunAsDaemon) { + REJECT("You have specified at least one relative path (see above) " + "with the RunAsDaemon option. RunAsDaemon is not compatible " + "with relative paths."); + } if (server_mode(options) && (!strcmpstart(uname, "Windows 95") ||

1 0

[tor/master] Merge branch 'ticket22731'
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit eebfe4f5398c94292986c3eab7fc995635c66a21 Merge: 1b1eeb0fb 6fea44c67 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 8 08:11:11 2017 -0400 Merge branch 'ticket22731' changes/bug22731 | 5 +++++ src/or/config.c | 52 ++++++++++++++++++++++++++++++++-------------------- 2 files changed, 37 insertions(+), 20 deletions(-)

1 0

[torspec/master] Merge branch 'feature23237_spec'
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit 66cafba616c108b5d17feb373a36a2259c445bd4 Merge: 6e887ba dc973f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 8 08:10:39 2017 -0400 Merge branch 'feature23237_spec' control-spec.txt | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[torspec/master] Document new GETINFO ip-to-country/ipv[46]-available options
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit dc973f84d742af55eceae1951260988f88599374 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 25 12:26:42 2017 -0400 Document new GETINFO ip-to-country/ipv[46]-available options Documents ticket 23237. --- control-spec.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index 69a77c1..e89a25d 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -744,6 +744,11 @@ A space-separated list of all the values supported by the SIGNAL command. + "ip-to-country/ipv4-available" + "ip-to-country/ipv6-available" + "1" if the relevant geoip or geoip6 database is present; "0" otherwise. + This field was added in Tor 0.3.2.1-alpha. + "ip-to-country/*" Maps IP addresses to 2-letter country codes. For example, "GETINFO ip-to-country/18.0.0.1" should give "US".

1 0