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

[tor/master] Merge remote-tracking branch 'public/bug7950' into maint-0.2.4
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit a7b46336eb5f1f7f734ac2d978c7ab17d1c870c0 Merge: 60d1442 1827be0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 15:32:17 2013 -0400 Merge remote-tracking branch 'public/bug7950' into maint-0.2.4 changes/bug7950 | 4 ++++ src/common/util.c | 19 ++++++++++++++----- src/common/util.h | 7 +++++-- src/or/confparse.c | 5 ++++- 4 files changed, 27 insertions(+), 8 deletions(-)

1 0

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

19 Mar '13

commit acbfc9c8cc2c24adb610d391cb2b83d7cbc11719 Merge: 60fd08f a7b4633 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 15:32:44 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug7950 | 4 ++++ src/common/util.c | 19 ++++++++++++++----- src/common/util.h | 7 +++++-- src/or/confparse.c | 5 ++++- 4 files changed, 27 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.2.4] Make a parse_config_line_from_str variant that gives error messages
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 1827be0bd6a400f4b5970f5b37b1d2c8e83b6a3f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 17:32:15 2013 -0500 Make a parse_config_line_from_str variant that gives error messages Without this patch, there's no way to know what went wrong when we fail to parse a torrc line entirely (that is, we can't turn it into a K,V pair.) This patch introduces a new function that yields an error message on failure, so we can at least tell the user what to look for in their nonfunctional torrc. (Actually, it's the same function as before with a new name: parse_config_line_from_str is now a wrapper macro that the unit tests use.) Fixes bug 7950; fix on 0.2.0.16-alpha (58de695f9062576f) which first introduced the possibility of a torrc value not parsing correctly. --- changes/bug7950 | 4 ++++ src/common/util.c | 19 ++++++++++++++----- src/common/util.h | 7 +++++-- src/or/confparse.c | 5 ++++- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/changes/bug7950 b/changes/bug7950 new file mode 100644 index 0000000..e62cca0 --- /dev/null +++ b/changes/bug7950 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When rejecting a configuration because we were unable to parse a + quoted string, log an actual error message. Fix for bug 7950; + bugfix on 0.2.0.16-alpha. diff --git a/src/common/util.c b/src/common/util.c index 6a69635..5f045d5 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2537,10 +2537,13 @@ unescape_string(const char *s, char **result, size_t *size_out) * key portion and *value_out to a new string holding the value portion * of the line, and return a pointer to the start of the next line. If we run * out of data, return a pointer to the end of the string. If we encounter an - * error, return NULL. + * error, return NULL and set *err_out (if provided) to an error + * message. */ const char * -parse_config_line_from_str(const char *line, char **key_out, char **value_out) +parse_config_line_from_str_verbose(const char *line, char **key_out, + char **value_out, + const char **err_out) { /* I believe the file format here is supposed to be: FILE = (EMPTYLINE | LINE)* (EMPTYLASTLINE | LASTLINE)? @@ -2614,12 +2617,18 @@ parse_config_line_from_str(const char *line, char **key_out, char **value_out) /* Find the end of the line. */ if (*line == '\"') { // XXX No continuation handling is done here - if (!(line = unescape_string(line, value_out, NULL))) - return NULL; + if (!(line = unescape_string(line, value_out, NULL))) { + if (err_out) + *err_out = "Invalid escape sequence in quoted string"; + return NULL; + } while (*line == ' ' || *line == '\t') ++line; - if (*line && *line != '#' && *line != '\n') + if (*line && *line != '#' && *line != '\n') { + if (err_out) + *err_out = "Excess data after quoted string"; return NULL; + } } else { /* Look for the end of the line. */ while (*line && *line != '\n' && (*line != '#' || continuation)) { diff --git a/src/common/util.h b/src/common/util.h index ac88f1c..0123a53 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -375,8 +375,11 @@ char *read_file_to_str(const char *filename, int flags, struct stat *stat_out) char *read_file_to_str_until_eof(int fd, size_t max_bytes_to_read, size_t *sz_out) ATTR_MALLOC; -const char *parse_config_line_from_str(const char *line, - char **key_out, char **value_out); +const char *parse_config_line_from_str_verbose(const char *line, + char **key_out, char **value_out, + const char **err_out); +#define parse_config_line_from_str(line,key_out,value_out) \ + parse_config_line_from_str_verbose((line),(key_out),(value_out),NULL) char *expand_filename(const char *filename); struct smartlist_t *tor_listdir(const char *dirname); int path_is_relative(const char *filename); diff --git a/src/or/confparse.c b/src/or/confparse.c index 717d4ac..98fde98 100644 --- a/src/or/confparse.c +++ b/src/or/confparse.c @@ -91,12 +91,15 @@ config_get_lines(const char *string, config_line_t **result, int extended) { config_line_t *list = NULL, **next; char *k, *v; + const char *parse_err; next = &list; do { k = v = NULL; - string = parse_config_line_from_str(string, &k, &v); + string = parse_config_line_from_str_verbose(string, &k, &v, &parse_err); if (!string) { + log_warn(LD_CONFIG, "Error while parsing configuration: %s", + parse_err?parse_err:"<unknown>"); config_free_lines(list); tor_free(k); tor_free(v);

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug7950' into maint-0.2.4
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit a7b46336eb5f1f7f734ac2d978c7ab17d1c870c0 Merge: 60d1442 1827be0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 15:32:17 2013 -0400 Merge remote-tracking branch 'public/bug7950' into maint-0.2.4 changes/bug7950 | 4 ++++ src/common/util.c | 19 ++++++++++++++----- src/common/util.h | 7 +++++-- src/or/confparse.c | 5 ++++- 4 files changed, 27 insertions(+), 8 deletions(-)

1 0

[tor/master] Fix option names in tor-fw-helper manpage
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 8c211c3cdae1c6cb0f2d004f8dfaf15569b7501a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 17:57:27 2013 -0400 Fix option names in tor-fw-helper manpage fix for bug 7768 --- changes/bug7768 | 3 +++ doc/tor-fw-helper.1.txt | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/changes/bug7768 b/changes/bug7768 new file mode 100644 index 0000000..f523b5b --- /dev/null +++ b/changes/bug7768 @@ -0,0 +1,3 @@ + o Documentation fixes: + - Update tor-fw-helper.1.txt to describe its options with their + correct names. Fixes bug 7768. diff --git a/doc/tor-fw-helper.1.txt b/doc/tor-fw-helper.1.txt index cf769d9..f51ffc4 100644 --- a/doc/tor-fw-helper.1.txt +++ b/doc/tor-fw-helper.1.txt @@ -15,8 +15,7 @@ tor-fw-helper - Manage upstream firewall/NAT devices SYNOPSIS -------- **tor-fw-helper** [-h|--help] [-T|--test] [-v|--verbose] [-g|--fetch-public-ip] - -i|--internal-or-port __TCP port__ [-e|--external-or-port _TCP port_] - [-d|--internal-dir-port _TCP port_] [-p|--external-dir-port _TCP port_] + [-p __external port__:__internal_port__] DESCRIPTION ----------- @@ -31,7 +30,7 @@ OPTIONS **-h** or **--help**:: Display help text and exit. -**-v**:: +**-v** or **--verbose**:: Display verbose output. **-T** or **--test**:: @@ -41,8 +40,9 @@ OPTIONS **-g** or **--fetch-public-ip**:: Fetch the the public ip address for each supported NAT helper method. -**-p** or **--forward-port** __external_port__:__internal_port__:: - Forward external_port to internal_port. +**-p** or **--port** __external_port__:__internal_port__:: + Forward external_port to internal_port. This option can appear + more than once. BUGS ----

1 0

[tor/master] Use option name --test-commandline in tor-fw-helper.
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 03efe54027e214be51f5cb4bafcbbd57422da7a1 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 13 00:43:21 2013 -0700 Use option name --test-commandline in tor-fw-helper. It was previously --Test in the help output and --test-commandline in the getopt call. The man page already had --test. (Originally by David, who resolved the tie in favor of "--test"; I chose --test-commandline" instead so that nothing that depended on it could break. -Nick) --- changes/bug7768 | 4 ++-- src/tools/tor-fw-helper/tor-fw-helper.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changes/bug7768 b/changes/bug7768 index f523b5b..e3f9600 100644 --- a/changes/bug7768 +++ b/changes/bug7768 @@ -1,3 +1,3 @@ o Documentation fixes: - - Update tor-fw-helper.1.txt to describe its options with their - correct names. Fixes bug 7768. + - Update tor-fw-helper.1.txt and tor-fw-helper.c to make option + names match. Fixes bug 7768. diff --git a/src/tools/tor-fw-helper/tor-fw-helper.c b/src/tools/tor-fw-helper/tor-fw-helper.c index d92445e..488fe67 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper.c +++ b/src/tools/tor-fw-helper/tor-fw-helper.c @@ -97,7 +97,7 @@ usage(void) { fprintf(stderr, "tor-fw-helper usage:\n" " [-h|--help]\n" - " [-T|--Test]\n" + " [-T|--test-commandline]\n" " [-v|--verbose]\n" " [-g|--fetch-public-ip]\n" " [-p|--forward-port ([<external port>]:<internal port>])\n");

1 0

[tor/master] Use --test-commandline name in tor-fw-helper manpage
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 6fe4e24645e820167322886f12d27e5e161e9228 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 15:11:34 2013 -0400 Use --test-commandline name in tor-fw-helper manpage --- doc/tor-fw-helper.1.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tor-fw-helper.1.txt b/doc/tor-fw-helper.1.txt index f51ffc4..1c103d9 100644 --- a/doc/tor-fw-helper.1.txt +++ b/doc/tor-fw-helper.1.txt @@ -14,7 +14,7 @@ tor-fw-helper - Manage upstream firewall/NAT devices SYNOPSIS -------- -**tor-fw-helper** [-h|--help] [-T|--test] [-v|--verbose] [-g|--fetch-public-ip] +**tor-fw-helper** [-h|--help] [-T|--test-commandline] [-v|--verbose] [-g|--fetch-public-ip] [-p __external port__:__internal_port__] DESCRIPTION @@ -33,7 +33,7 @@ OPTIONS **-v** or **--verbose**:: Display verbose output. -**-T** or **--test**:: +**-T** or **--test-commandline**:: Display test information and print the test information in tor-fw-helper.log

1 0

[tor/master] Merge remote-tracking branch 'public/bug7768' into maint-0.2.4
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 60d14421363bdbeee337ba69b21640058a26a6bd Merge: 8d29866 6fe4e24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 15:11:47 2013 -0400 Merge remote-tracking branch 'public/bug7768' into maint-0.2.4 changes/bug7768 | 3 +++ doc/tor-fw-helper.1.txt | 14 +++++++------- src/tools/tor-fw-helper/tor-fw-helper.c | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --cc src/tools/tor-fw-helper/tor-fw-helper.c index adeb63b,488fe67..bb6e70a --- a/src/tools/tor-fw-helper/tor-fw-helper.c +++ b/src/tools/tor-fw-helper/tor-fw-helper.c @@@ -97,10 -97,10 +97,10 @@@ usage(void { fprintf(stderr, "tor-fw-helper usage:\n" " [-h|--help]\n" - " [-T|--Test]\n" + " [-T|--test-commandline]\n" " [-v|--verbose]\n" " [-g|--fetch-public-ip]\n" - " [-p|--forward-port ([<external port>]:<internal port>])\n"); + " [-p|--forward-port ([<external port>]:<internal port>)]\n"); } /** Log commandline options to a hardcoded file tor-fw-helper.log in the

1 0

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

19 Mar '13

commit 60fd08f40be9bfe3e53de4e22b66f25451206f96 Merge: 01af92f 60d1442 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 15:13:07 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug7768 | 3 +++ doc/tor-fw-helper.1.txt | 14 +++++++------- src/tools/tor-fw-helper/tor-fw-helper.c | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.2.4] Use --test-commandline name in tor-fw-helper manpage
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 6fe4e24645e820167322886f12d27e5e161e9228 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 15:11:34 2013 -0400 Use --test-commandline name in tor-fw-helper manpage --- doc/tor-fw-helper.1.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tor-fw-helper.1.txt b/doc/tor-fw-helper.1.txt index f51ffc4..1c103d9 100644 --- a/doc/tor-fw-helper.1.txt +++ b/doc/tor-fw-helper.1.txt @@ -14,7 +14,7 @@ tor-fw-helper - Manage upstream firewall/NAT devices SYNOPSIS -------- -**tor-fw-helper** [-h|--help] [-T|--test] [-v|--verbose] [-g|--fetch-public-ip] +**tor-fw-helper** [-h|--help] [-T|--test-commandline] [-v|--verbose] [-g|--fetch-public-ip] [-p __external port__:__internal_port__] DESCRIPTION @@ -33,7 +33,7 @@ OPTIONS **-v** or **--verbose**:: Display verbose output. -**-T** or **--test**:: +**-T** or **--test-commandline**:: Display test information and print the test information in tor-fw-helper.log

1 0