April 2019 - tor-commits - lists.torproject.org

[tor/master] Add rudimentary qstring support to kvline.c
by dgoulet＠torproject.org 30 Apr '19

30 Apr '19

commit 8799b4e805ed5495409b6036b82d08e4624bacd3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 9 09:49:03 2019 -0400 Add rudimentary qstring support to kvline.c --- src/lib/encoding/kvline.c | 26 +++++++++++++++++++++----- src/lib/encoding/kvline.h | 1 + 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/lib/encoding/kvline.c b/src/lib/encoding/kvline.c index 806f9d3db..d4a8f510b 100644 --- a/src/lib/encoding/kvline.c +++ b/src/lib/encoding/kvline.c @@ -16,6 +16,7 @@ #include "lib/encoding/confline.h" #include "lib/encoding/cstring.h" #include "lib/encoding/kvline.h" +#include "lib/encoding/qstring.h" #include "lib/malloc/malloc.h" #include "lib/string/compat_ctype.h" #include "lib/string/printf.h" @@ -111,11 +112,15 @@ kvline_can_encode_lines(const config_line_t *line, unsigned flags) * If KV_OMIT_VALS is set in flags, then an empty value is * encoded as 'Key', not as 'Key=' or 'Key=""'. Mutually exclusive with * KV_OMIT_KEYS. + * + * KV_QUOTED_QSTRING is not supported. */ char * kvline_encode(const config_line_t *line, unsigned flags) { + tor_assert(! (flags & KV_QUOTED_QSTRING)); + if (!kvline_can_encode_lines(line, flags)) return NULL; @@ -170,7 +175,7 @@ kvline_encode(const config_line_t *line, * allocated list of pairs on success, or NULL on failure. * * If KV_QUOTED is set in flags, then (double-)quoted values are - * allowed. Otherwise, such values are not allowed. + * allowed and handled as C strings. Otherwise, such values are not allowed. * * If KV_OMIT_KEYS is set in flags, then values without keys are * allowed. Otherwise, such values are not allowed. @@ -178,6 +183,10 @@ kvline_encode(const config_line_t *line, * If KV_OMIT_VALS is set in flags, then keys without values are * allowed. Otherwise, such keys are not allowed. Mutually exclusive with * KV_OMIT_KEYS. + * + * If KV_QUOTED_QSTRING is set in flags, then double-quoted values + * are allowed and handled as QuotedStrings per qstring.c. Do not add + * new users of this flag. */ config_line_t * kvline_parse(const char *line, unsigned flags) @@ -188,7 +197,8 @@ kvline_parse(const char *line, unsigned flags) const char *cp = line, *cplast = NULL; const bool omit_keys = (flags & KV_OMIT_KEYS) != 0; const bool omit_vals = (flags & KV_OMIT_VALS) != 0; - const bool quoted = (flags & KV_QUOTED) != 0; + const bool quoted = (flags & (KV_QUOTED|KV_QUOTED_QSTRING)) != 0; + const bool c_quoted = (flags & (KV_QUOTED)) != 0; config_line_t *result = NULL; config_line_t **next_line = &result; @@ -236,7 +246,11 @@ kvline_parse(const char *line, unsigned flags) if (!quoted) goto err; size_t len=0; - cp = unescape_string(cp, &val, &len); + if (c_quoted) { + cp = unescape_string(cp, &val, &len); + } else { + cp = decode_qstring(cp, strlen(cp), &val, &len); + } if (cp == NULL || len != strlen(val)) { // The string contains a NUL or is badly coded. goto err; @@ -260,8 +274,10 @@ kvline_parse(const char *line, unsigned flags) key = val = NULL; } - if (!kvline_can_encode_lines(result, flags)) { - goto err; + if (! (flags & KV_QUOTED_QSTRING)) { + if (!kvline_can_encode_lines(result, flags)) { + goto err; + } } return result; diff --git a/src/lib/encoding/kvline.h b/src/lib/encoding/kvline.h index 6740f81d5..dea2ce180 100644 --- a/src/lib/encoding/kvline.h +++ b/src/lib/encoding/kvline.h @@ -18,6 +18,7 @@ struct config_line_t; #define KV_QUOTED (1u<<0) #define KV_OMIT_KEYS (1u<<1) #define KV_OMIT_VALS (1u<<2) +#define KV_QUOTED_QSTRING (1u<<3) struct config_line_t *kvline_parse(const char *line, unsigned flags); char *kvline_encode(const struct config_line_t *line, unsigned flags);

1 0

[tor/master] expand CMD_FL_WIPE to wipe the parsed arguments too
by dgoulet＠torproject.org 30 Apr '19

30 Apr '19

commit ff9ba7d6c4ba7072b9a96d527959350ef90406b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 9 11:10:26 2019 -0400 expand CMD_FL_WIPE to wipe the parsed arguments too --- src/feature/control/control_cmd.c | 22 ++++++++++++++++++++++ src/feature/control/control_cmd.h | 1 + 2 files changed, 23 insertions(+) diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c index c3863c646..7a9af19cd 100644 --- a/src/feature/control/control_cmd.c +++ b/src/feature/control/control_cmd.c @@ -81,6 +81,24 @@ control_cmd_args_free_(control_cmd_args_t *args) tor_free(args); } +/** Erase all memory held in args. */ +void +control_cmd_args_wipe(control_cmd_args_t *args) +{ + if (!args) + return; + + if (args->args) { + SMARTLIST_FOREACH(args->args, char *, c, memwipe(c, 0, strlen(c))); + } + for (config_line_t *line = args->kwargs; line; line = line->next) { + memwipe(line->key, 0, strlen(line->key)); + memwipe(line->value, 0, strlen(line->value)); + } + if (args->object) + memwipe(args->object, 0, args->object_len); +} + /** * Return true iff any element of the NULL-terminated array matches * kwd. Case-insensitive. @@ -2328,6 +2346,10 @@ handle_single_control_command(const control_cmd_def_t *def, tor_free(err); if (def->handler(conn, parsed_args)) rv = 0; + + if (def->flags & CMD_FL_WIPE) + control_cmd_args_wipe(parsed_args); + control_cmd_args_free(parsed_args); } diff --git a/src/feature/control/control_cmd.h b/src/feature/control/control_cmd.h index b825d6da5..986718887 100644 --- a/src/feature/control/control_cmd.h +++ b/src/feature/control/control_cmd.h @@ -21,6 +21,7 @@ void control_cmd_free_all(void); typedef struct control_cmd_args_t control_cmd_args_t; void control_cmd_args_free_(control_cmd_args_t *args); +void control_cmd_args_wipe(control_cmd_args_t *args); #define control_cmd_args_free(v) \ FREE_AND_NULL(control_cmd_args_t, control_cmd_args_free_, (v))

1 0

[tor/master] Simplify handler logic in control_cmd.c
by dgoulet＠torproject.org 30 Apr '19

30 Apr '19

commit 88d22b898efa5bfce82c614e454874d8807e2104 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 9 10:58:42 2019 -0400 Simplify handler logic in control_cmd.c Now that the legacy handlers are gone, we can simplify the structures and macros here. --- src/feature/control/control_cmd.c | 188 +++++++++++++------------------------- 1 file changed, 66 insertions(+), 122 deletions(-) diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c index a29ab72ff..c3863c646 100644 --- a/src/feature/control/control_cmd.c +++ b/src/feature/control/control_cmd.c @@ -2171,16 +2171,18 @@ handle_control_del_onion(control_connection_t *conn, return 0; } +static const control_cmd_syntax_t obsolete_syntax = { + .max_args = UINT_MAX +}; + /** * Called when we get an obsolete command: tell the controller that it is * obsolete. */ static int handle_control_obsolete(control_connection_t *conn, - uint32_t arg_len, - const char *args) + const control_cmd_args_t *args) { - (void)arg_len; (void)args; char *command = tor_strdup(conn->current_cmd); tor_strupper(command); @@ -2190,37 +2192,10 @@ handle_control_obsolete(control_connection_t *conn, } /** - * Selects an API to a controller command. See handler_fn_t for the - * possible types. - **/ -typedef enum handler_type_t { - hnd_legacy, - hnd_parsed, -} handler_type_t; - -/** - * Union: a function pointer to a handler function for a controller command. - * - * This needs to be a union (rather than just a single pointer) since not - * all controller commands have the same type. + * Function pointer to a handler function for a controller command. **/ -typedef union handler_fn_t { - /** - * A "legacy" handler takes a command's arguments as a nul-terminated - * string, and their length. It may not change the contents of the - * arguments. If the command is a multiline one, then the arguments may - * extend across multiple lines. - */ - int (*legacy)(control_connection_t *conn, - uint32_t arg_len, - const char *args); - /** - * A "parsed" handler expects its arguments in a pre-parsed format, in - * an immutable control_cmd_args_t *object. - **/ - int (*parsed)(control_connection_t *conn, - const control_cmd_args_t *args); -} handler_fn_t; +typedef int (*handler_fn_t) (control_connection_t *conn, + const control_cmd_args_t *args); /** * Definition for a controller command. @@ -2231,10 +2206,6 @@ typedef struct control_cmd_def_t { * begin with "+". This is not case-sensitive. */ const char *name; /** - * Which API to use when calling the handler function. - */ - handler_type_t handler_type; - /** * A function to execute the command. */ handler_fn_t handler; @@ -2254,54 +2225,37 @@ typedef struct control_cmd_def_t { */ #define CMD_FL_WIPE (1u<<0) -#define SYNTAX_IGNORE { 0, UINT_MAX, false } - /** Macro: declare a command with a one-line argument, a given set of flags, * and a syntax definition. **/ -#define ONE_LINE_(name, htype, flags, syntax) \ - { #name, \ - hnd_ ##htype, \ - { .htype = handle_control_ ##name }, \ +#define ONE_LINE(name, flags) \ + { \ + #name, \ + handle_control_ ##name, \ flags, \ - syntax, \ - } - -/** Macro: declare a parsed command with a one-line argument, a given set of - * flags, and a syntax definition. - **/ -#define ONE_LINE(name, htype, flags) \ - ONE_LINE_(name, htype, flags, NULL) -#define ONE_LINE_PARSED(name, flags) \ - ONE_LINE_(name, parsed, flags, &name ##_syntax) + &name##_syntax, \ + } /** * Macro: declare a command with a multi-line argument and a given set of * flags. **/ -#define MULTLINE_(name, htype, flags, syntax) \ +#define MULTLINE(name, flags) \ { "+"#name, \ - hnd_ ##htype, \ - { .htype = handle_control_ ##name }, \ + handle_control_ ##name, \ flags, \ - syntax \ + &name##_syntax \ } -#define MULTLINE(name, htype, flags) \ - MULTLINE_(name, htype, flags, NULL) -#define MULTLINE_PARSED(name, flags) \ - MULTLINE_(name, parsed, flags, &name##_syntax) - /** * Macro: declare an obsolete command. (Obsolete commands give a different * error than non-existent ones.) **/ #define OBSOLETE(name) \ { #name, \ - hnd_legacy, \ - { .legacy = handle_control_obsolete }, \ + handle_control_obsolete, \ 0, \ - NULL, \ + &obsolete_syntax, \ } /** @@ -2309,35 +2263,35 @@ typedef struct control_cmd_def_t { **/ static const control_cmd_def_t CONTROL_COMMANDS[] = { - ONE_LINE_PARSED(setconf, 0), - ONE_LINE_PARSED(resetconf, 0), - ONE_LINE_PARSED(getconf, 0), - MULTLINE_PARSED(loadconf, 0), - ONE_LINE_PARSED(setevents, 0), - ONE_LINE_PARSED(authenticate, CMD_FL_WIPE), - ONE_LINE_PARSED(saveconf, 0), - ONE_LINE_PARSED(signal, 0), - ONE_LINE_PARSED(takeownership, 0), - ONE_LINE_PARSED(dropownership, 0), - ONE_LINE_PARSED(mapaddress, 0), - ONE_LINE_PARSED(getinfo, 0), - ONE_LINE_PARSED(extendcircuit, 0), - ONE_LINE_PARSED(setcircuitpurpose, 0), + ONE_LINE(setconf, 0), + ONE_LINE(resetconf, 0), + ONE_LINE(getconf, 0), + MULTLINE(loadconf, 0), + ONE_LINE(setevents, 0), + ONE_LINE(authenticate, CMD_FL_WIPE), + ONE_LINE(saveconf, 0), + ONE_LINE(signal, 0), + ONE_LINE(takeownership, 0), + ONE_LINE(dropownership, 0), + ONE_LINE(mapaddress, 0), + ONE_LINE(getinfo, 0), + ONE_LINE(extendcircuit, 0), + ONE_LINE(setcircuitpurpose, 0), OBSOLETE(setrouterpurpose), - ONE_LINE_PARSED(attachstream, 0), - MULTLINE_PARSED(postdescriptor, 0), - ONE_LINE_PARSED(redirectstream, 0), - ONE_LINE_PARSED(closestream, 0), - ONE_LINE_PARSED(closecircuit, 0), - ONE_LINE_PARSED(usefeature, 0), - ONE_LINE_PARSED(resolve, 0), - ONE_LINE_PARSED(protocolinfo, 0), - ONE_LINE_PARSED(authchallenge, CMD_FL_WIPE), - ONE_LINE_PARSED(dropguards, 0), - ONE_LINE_PARSED(hsfetch, 0), - MULTLINE_PARSED(hspost, 0), - ONE_LINE_PARSED(add_onion, CMD_FL_WIPE), - ONE_LINE_PARSED(del_onion, CMD_FL_WIPE), + ONE_LINE(attachstream, 0), + MULTLINE(postdescriptor, 0), + ONE_LINE(redirectstream, 0), + ONE_LINE(closestream, 0), + ONE_LINE(closecircuit, 0), + ONE_LINE(usefeature, 0), + ONE_LINE(resolve, 0), + ONE_LINE(protocolinfo, 0), + ONE_LINE(authchallenge, CMD_FL_WIPE), + ONE_LINE(dropguards, 0), + ONE_LINE(hsfetch, 0), + MULTLINE(hspost, 0), + ONE_LINE(add_onion, CMD_FL_WIPE), + ONE_LINE(del_onion, CMD_FL_WIPE), }; /** @@ -2356,35 +2310,25 @@ handle_single_control_command(const control_cmd_def_t *def, char *args) { int rv = 0; - switch (def->handler_type) { - case hnd_legacy: - if (def->handler.legacy(conn, cmd_data_len, args)) - rv = -1; - break; - case hnd_parsed: { - control_cmd_args_t *parsed_args; - char *err=NULL; - tor_assert(def->syntax); - parsed_args = control_cmd_parse_args(conn->current_cmd, - def->syntax, - cmd_data_len, args, - &err); - if (!parsed_args) { - connection_printf_to_buf(conn, - "512 Bad arguments to %s: %s\r\n", - conn->current_cmd, err?err:""); - tor_free(err); - } else { - if (BUG(err)) - tor_free(err); - if (def->handler.parsed(conn, parsed_args)) - rv = 0; - control_cmd_args_free(parsed_args); - } - break; - } - default: - tor_assert_unreached(); + + control_cmd_args_t *parsed_args; + char *err=NULL; + tor_assert(def->syntax); + parsed_args = control_cmd_parse_args(conn->current_cmd, + def->syntax, + cmd_data_len, args, + &err); + if (!parsed_args) { + connection_printf_to_buf(conn, + "512 Bad arguments to %s: %s\r\n", + conn->current_cmd, err?err:""); + tor_free(err); + } else { + if (BUG(err)) + tor_free(err); + if (def->handler(conn, parsed_args)) + rv = 0; + control_cmd_args_free(parsed_args); } if (def->flags & CMD_FL_WIPE)

1 0

[tor/master] Merge branch 'tor-github/pr/980'
by dgoulet＠torproject.org 30 Apr '19

30 Apr '19

commit 43c119fedbdf599241cd2e3e4292ae5fd55d527c Merge: e543c4e20 a5cced2b7 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Apr 30 11:50:36 2019 -0400 Merge branch 'tor-github/pr/980' Signed-off-by: David Goulet <dgoulet(a)torproject.org> changes/ticket29984 | 5 + changes/ticket30091 | 4 + scripts/maint/practracker/exceptions.txt | 6 +- src/core/include.am | 1 + src/core/mainloop/connection.c | 1 + src/feature/control/control.c | 63 +- src/feature/control/control.h | 6 + src/feature/control/control_auth.c | 144 +-- src/feature/control/control_auth.h | 13 +- src/feature/control/control_cmd.c | 1431 ++++++++++++++------------- src/feature/control/control_cmd.h | 64 ++ src/feature/control/control_cmd_args_st.h | 52 + src/feature/control/control_connection_st.h | 3 +- src/feature/control/control_fmt.c | 88 -- src/feature/control/control_fmt.h | 4 - src/feature/control/control_getinfo.c | 16 +- src/feature/control/control_getinfo.h | 8 +- src/lib/encoding/confline.c | 13 + src/lib/encoding/confline.h | 2 + src/lib/encoding/include.am | 2 + src/lib/encoding/kvline.c | 72 +- src/lib/encoding/kvline.h | 2 + src/lib/encoding/qstring.c | 90 ++ src/lib/encoding/qstring.h | 18 + src/test/fuzz/fuzz_strops.c | 12 + src/test/test_config.c | 55 + src/test/test_controller.c | 185 ++++ 27 files changed, 1488 insertions(+), 872 deletions(-)

1 0

[tor/master] Port the authenticate and authchallenge commands to the new parser
by dgoulet＠torproject.org 30 Apr '19

30 Apr '19

commit ddd33d39c7e115045d296dd88fd4d310b932a4e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 9 10:09:38 2019 -0400 Port the authenticate and authchallenge commands to the new parser These two presented their own challenge, because of their use of QString, and their distinguished handling of quoted versus non-quoted values. --- src/feature/control/control_auth.c | 143 ++++++++++++++++-------------- src/feature/control/control_auth.h | 13 ++- src/feature/control/control_cmd.c | 9 +- src/feature/control/control_cmd.h | 7 ++ src/feature/control/control_cmd_args_st.h | 4 + 5 files changed, 102 insertions(+), 74 deletions(-) diff --git a/src/feature/control/control_auth.c b/src/feature/control/control_auth.c index 820429048..a86442c21 100644 --- a/src/feature/control/control_auth.c +++ b/src/feature/control/control_auth.c @@ -11,12 +11,15 @@ #include "app/config/config.h" #include "core/mainloop/connection.h" #include "feature/control/control.h" +#include "feature/control/control_cmd.h" #include "feature/control/control_auth.h" +#include "feature/control/control_cmd_args_st.h" #include "feature/control/control_connection_st.h" #include "feature/control/control_fmt.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" #include "lib/encoding/confline.h" +#include "lib/encoding/kvline.h" #include "lib/encoding/qstring.h" #include "lib/crypt_ops/crypto_s2k.h" @@ -117,12 +120,19 @@ decode_hashed_passwords(config_line_t *passwords) return NULL; } +const control_cmd_syntax_t authchallenge_syntax = { + .min_args = 1, + .max_args = 1, + .accept_keywords=true, + .kvline_flags=KV_OMIT_KEYS|KV_QUOTED_QSTRING, + .store_raw_body=true +}; + /** Called when we get an AUTHCHALLENGE command. */ int -handle_control_authchallenge(control_connection_t *conn, uint32_t len, - const char *body) +handle_control_authchallenge(control_connection_t *conn, + const control_cmd_args_t *args) { - const char *cp = body; char *client_nonce; size_t client_nonce_len; char server_hash[DIGEST256_LEN]; @@ -130,63 +140,50 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, char server_nonce[SAFECOOKIE_SERVER_NONCE_LEN]; char server_nonce_encoded[(2*SAFECOOKIE_SERVER_NONCE_LEN) + 1]; - cp += strspn(cp, " \t\n\r"); - if (!strcasecmpstart(cp, "SAFECOOKIE")) { - cp += strlen("SAFECOOKIE"); - } else { + if (strcasecmp(smartlist_get(args->args, 0), "SAFECOOKIE")) { connection_write_str_to_buf("513 AUTHCHALLENGE only supports SAFECOOKIE " "authentication\r\n", conn); - connection_mark_for_close(TO_CONN(conn)); - return -1; + goto fail; } - if (!authentication_cookie_is_set) { connection_write_str_to_buf("515 Cookie authentication is disabled\r\n", conn); - connection_mark_for_close(TO_CONN(conn)); - return -1; + goto fail; + } + if (args->kwargs == NULL || args->kwargs->next != NULL) { + /* connection_write_str_to_buf("512 AUTHCHALLENGE requires exactly " + "2 arguments.\r\n", conn); + */ + connection_printf_to_buf(conn, + "512 AUTHCHALLENGE dislikes argument list %s\r\n", + escaped(args->raw_body)); + goto fail; + } + if (strcmp(args->kwargs->key, "")) { + connection_write_str_to_buf("512 AUTHCHALLENGE does not accept keyword " + "arguments.\r\n", conn); + goto fail; } - cp += strspn(cp, " \t\n\r"); - if (*cp == '"') { - const char *newcp = - decode_qstring(cp, len - (cp - body), - &client_nonce, &client_nonce_len); - if (newcp == NULL) { - connection_write_str_to_buf("513 Invalid quoted client nonce\r\n", - conn); - connection_mark_for_close(TO_CONN(conn)); - return -1; - } - cp = newcp; + bool contains_quote = strchr(args->raw_body, '\"'); + if (contains_quote) { + /* The nonce was quoted */ + client_nonce = tor_strdup(args->kwargs->value); + client_nonce_len = strlen(client_nonce); } else { - size_t client_nonce_encoded_len = strspn(cp, "0123456789ABCDEFabcdef"); - - client_nonce_len = client_nonce_encoded_len / 2; - client_nonce = tor_malloc_zero(client_nonce_len); - - if (base16_decode(client_nonce, client_nonce_len, - cp, client_nonce_encoded_len) - != (int) client_nonce_len) { + /* The nonce was should be in hex. */ + const char *hex_nonce = args->kwargs->value; + client_nonce_len = strlen(hex_nonce) / 2; + client_nonce = tor_malloc(client_nonce_len); + if (base16_decode(client_nonce, client_nonce_len, hex_nonce, + strlen(hex_nonce)) != (int)client_nonce_len) { connection_write_str_to_buf("513 Invalid base16 client nonce\r\n", conn); - connection_mark_for_close(TO_CONN(conn)); tor_free(client_nonce); - return -1; + goto fail; } - - cp += client_nonce_encoded_len; } - cp += strspn(cp, " \t\n\r"); - if (*cp != '\0' || - cp != body + len) { - connection_write_str_to_buf("513 Junk at end of AUTHCHALLENGE command\r\n", - conn); - connection_mark_for_close(TO_CONN(conn)); - tor_free(client_nonce); - return -1; - } crypto_rand(server_nonce, SAFECOOKIE_SERVER_NONCE_LEN); /* Now compute and send the server-to-controller response, and the @@ -234,38 +231,56 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, tor_free(client_nonce); return 0; + fail: + connection_mark_for_close(TO_CONN(conn)); + return -1; } +const control_cmd_syntax_t authenticate_syntax = { + .max_args = 0, + .accept_keywords=true, + .kvline_flags=KV_OMIT_KEYS|KV_QUOTED_QSTRING, + .store_raw_body=true +}; + /** Called when we get an AUTHENTICATE message. Check whether the * authentication is valid, and if so, update the connection's state to * OPEN. Reply with DONE or ERROR. */ int -handle_control_authenticate(control_connection_t *conn, uint32_t len, - const char *body) +handle_control_authenticate(control_connection_t *conn, + const control_cmd_args_t *args) { - int used_quoted_string = 0; + bool used_quoted_string = false; const or_options_t *options = get_options(); const char *errstr = "Unknown error"; char *password; size_t password_len; - const char *cp; - int i; int bad_cookie=0, bad_password=0; smartlist_t *sl = NULL; - if (!len) { + if (args->kwargs == NULL) { password = tor_strdup(""); password_len = 0; - } else if (TOR_ISXDIGIT(body[0])) { - cp = body; - while (TOR_ISXDIGIT(*cp)) - ++cp; - i = (int)(cp - body); - tor_assert(i>0); - password_len = i/2; - password = tor_malloc(password_len + 1); - if (base16_decode(password, password_len+1, body, i) + } else if (args->kwargs->next) { + connection_write_str_to_buf( + "512 Too many arguments to AUTHENTICATE.\r\n", conn); + connection_mark_for_close(TO_CONN(conn)); + return 0; + } else if (strcmp(args->kwargs->key, "")) { + connection_write_str_to_buf( + "512 AUTHENTICATE does not accept keyword arguments.\r\n", conn); + connection_mark_for_close(TO_CONN(conn)); + return 0; + } else if (strchr(args->raw_body, '\"')) { + used_quoted_string = true; + password = tor_strdup(args->kwargs->value); + password_len = strlen(password); + } else { + const char *hex_passwd = args->kwargs->value; + password_len = strlen(hex_passwd) / 2; + password = tor_malloc(password_len+1); + if (base16_decode(password, password_len+1, hex_passwd, strlen(hex_passwd)) != (int) password_len) { connection_write_str_to_buf( "551 Invalid hexadecimal encoding. Maybe you tried a plain text " @@ -275,14 +290,6 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len, tor_free(password); return 0; } - } else { - if (!decode_qstring(body, len, &password, &password_len)) { - connection_write_str_to_buf("551 Invalid quoted string. You need " - "to put the password in double quotes.\r\n", conn); - connection_mark_for_close(TO_CONN(conn)); - return 0; - } - used_quoted_string = 1; } if (conn->safecookie_client_hash != NULL) { diff --git a/src/feature/control/control_auth.h b/src/feature/control/control_auth.h index f436482e4..246e18ccb 100644 --- a/src/feature/control/control_auth.h +++ b/src/feature/control/control_auth.h @@ -12,16 +12,21 @@ #ifndef TOR_CONTROL_AUTH_H #define TOR_CONTROL_AUTH_H +struct control_cmd_args_t; +struct control_cmd_syntax_t; + int init_control_cookie_authentication(int enabled); char *get_controller_cookie_file_name(void); struct config_line_t; smartlist_t *decode_hashed_passwords(struct config_line_t *passwords); -int handle_control_authchallenge(control_connection_t *conn, uint32_t len, - const char *body); +int handle_control_authchallenge(control_connection_t *conn, + const struct control_cmd_args_t *args); int handle_control_authenticate(control_connection_t *conn, - uint32_t cmd_data_len, - const char *args); + const struct control_cmd_args_t *args); void control_auth_free_all(void); +extern const struct control_cmd_syntax_t authchallenge_syntax; +extern const struct control_cmd_syntax_t authenticate_syntax; + #endif /* !defined(TOR_CONTROL_AUTH_H) */ diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c index 0b4f3555f..a29ab72ff 100644 --- a/src/feature/control/control_cmd.c +++ b/src/feature/control/control_cmd.c @@ -116,6 +116,11 @@ control_cmd_parse_args(const char *command, result->command = command; + if (syntax->store_raw_body) { + tor_assert(body[body_len] == 0); + result->raw_body = body; + } + const char *eol = memchr(body, '\n', body_len); if (syntax->want_object) { if (! eol || (eol+1) == body+body_len) { @@ -2309,7 +2314,7 @@ static const control_cmd_def_t CONTROL_COMMANDS[] = ONE_LINE_PARSED(getconf, 0), MULTLINE_PARSED(loadconf, 0), ONE_LINE_PARSED(setevents, 0), - ONE_LINE(authenticate, legacy, CMD_FL_WIPE), + ONE_LINE_PARSED(authenticate, CMD_FL_WIPE), ONE_LINE_PARSED(saveconf, 0), ONE_LINE_PARSED(signal, 0), ONE_LINE_PARSED(takeownership, 0), @@ -2327,7 +2332,7 @@ static const control_cmd_def_t CONTROL_COMMANDS[] = ONE_LINE_PARSED(usefeature, 0), ONE_LINE_PARSED(resolve, 0), ONE_LINE_PARSED(protocolinfo, 0), - ONE_LINE(authchallenge, legacy, CMD_FL_WIPE), + ONE_LINE_PARSED(authchallenge, CMD_FL_WIPE), ONE_LINE_PARSED(dropguards, 0), ONE_LINE_PARSED(hsfetch, 0), MULTLINE_PARSED(hspost, 0), diff --git a/src/feature/control/control_cmd.h b/src/feature/control/control_cmd.h index 6f35c74de..b825d6da5 100644 --- a/src/feature/control/control_cmd.h +++ b/src/feature/control/control_cmd.h @@ -64,6 +64,13 @@ typedef struct control_cmd_syntax_t { * True iff this command wants to be followed by a multiline object. **/ bool want_object; + /** + * True iff this command needs access to the raw body of the input. + * + * This should not be needed for pure commands; it is purely a legacy + * option. + **/ + bool store_raw_body; } control_cmd_syntax_t; #ifdef CONTROL_CMD_PRIVATE diff --git a/src/feature/control/control_cmd_args_st.h b/src/feature/control/control_cmd_args_st.h index 06e2a183b..fb4fe64a0 100644 --- a/src/feature/control/control_cmd_args_st.h +++ b/src/feature/control/control_cmd_args_st.h @@ -43,6 +43,10 @@ struct control_cmd_args_t { * A multiline object passed with this command. **/ char *object; + /** + * If set, a nul-terminated string containing the raw unparsed arguments. + **/ + const char *raw_body; }; #endif /* !defined(TOR_CONTROL_CMD_ST_H) */

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 30 Apr '19

30 Apr '19

commit 02af961829c1ad9316a9abab465532bbf43fc1aa Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 15:51:26 2019 +0000 Update translations for support-portal --- contents+fr.po | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index b69945d45..eec3c8fca 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -2324,10 +2324,10 @@ msgid "" "href=\"https://guardianproject.info/\">Guardian Project's " "website</a>." msgstr "" -"Le projet Guardian maintient Tor (et d’autres applications de " -"confidentialité) sur Android. De plus amples renseignements se trouvent sur " -"le <a href=\"https://guardianproject.info/\">site Web du Projet " -"Guardian</a>." +"Le projet Guardian maintient Tor (et d’autres applications de protection des" +" données personnelles) sur Android. De plus amples renseignements se " +"trouvent sur le <a href=\"https://guardianproject.info/\">site Web du " +"Projet Guardian</a>." #: https//support.torproject.org/tormobile/tormobile-3/ #: (content/tormobile/tormobile-3/contents+en.lrquestion.title) @@ -5054,6 +5054,8 @@ msgid "" "[Learn more about Onion Browser](https://blog.torproject.org/tor-heart-" "onion-browser-and-more-ios-tor)" msgstr "" +"[En apprendre davantage sur le Navigateur Onion](https://blog.torproject.org" +"/tor-heart-onion-browser-and-more-ios-tor)" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5591,7 +5593,7 @@ msgstr "Elle vise à préserver votre vie privée et votre anonymat." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "[Learn more about Tails](https://tails.boum.org/)." -msgstr "" +msgstr "[En apprendre davantage sur Tails](https://tails.boum.org/)." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6480,7 +6482,7 @@ msgid "" "services?" msgstr "" "Le Projet Tor offre-t-il des services de courriel ou d’autres services Web " -"de protection de la confidentialité ?" +"de protection de la vie privée et des données personnelles ?" #: https//support.torproject.org/misc/misc-7/ #: (content/misc/misc-7/contents+en.lrquestion.description) @@ -6545,10 +6547,10 @@ msgid "" "understanding." msgstr "" "faire progresser les droits de la personne et les libertés en créant et en " -"déployant des technologies d’anonymat, de protection des données " -"personnelles et de la vie privée gratuites et à code source ouvert. Nous " -"soutenons aussi leur disponibilité et leur utilisation sans restriction en " -"les faisant mieux connaître des scientifiques et du public." +"déployant des technologies gratuites d’anonymat et de protection de la vie " +"privée et des données personnelles, à code source ouvert. Nous soutenons " +"aussi leur disponibilité et leur utilisation sans restriction en les faisant" +" mieux connaître des scientifiques et du public." #: templates/footer.html:24 msgid "Subscribe to our Newsletter"

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 30 Apr '19

30 Apr '19

commit 56104135323b730d57c7e11d67d30ce257320790 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 15:51:04 2019 +0000 Update translations for tpo-web --- contents+fr.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index a88057d94..97f0d3616 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -833,10 +833,10 @@ msgid "" "understanding." msgstr "" "Faire progresser les droits de la personne et les libertés en créant et en " -"déployant des technologies d’anonymat, de protection des données " -"personnelles et de la vie privée gratuites et à code source ouvert. Nous " -"soutenons aussi leur disponibilité et leur utilisation sans restriction en " -"les faisant mieux connaître des scientifiques et du public." +"déployant des technologies gratuites d’anonymat et de protection de la vie " +"privée et des données personnelles, à code source ouvert. Nous soutenons " +"aussi leur disponibilité et leur utilisation sans restriction en les faisant" +" mieux connaître des scientifiques et du public." #: templates/footer.html:48 msgid "Subscribe to our Newsletter"

1 0

[translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed
by translation＠torproject.org 30 Apr '19

30 Apr '19

commit 5de7ee669f5fa8371bd8bfc07f3d3bbefd5c56aa Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 15:50:11 2019 +0000 Update translations for torbutton-browseronboardingproperties_completed --- fr/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/browserOnboarding.properties b/fr/browserOnboarding.properties index 08ce2c549..be06c4d5f 100644 --- a/fr/browserOnboarding.properties +++ b/fr/browserOnboarding.properties @@ -9,7 +9,7 @@ onboarding.tour-tor-welcome.next-button=Aller vers Confidentialité onboarding.tour-tor-privacy=Confidentialité onboarding.tour-tor-privacy.title=Repoussez les traqueurs et les fouineurs. -onboarding.tour-tor-privacy.description=Le Navigateur Tor isole les témoins et supprime l’historique de votre navigateur en fin de session. Ces modifications garantissent que confidentialité et sécurité sont protégées dans le navigateur. Cliquez sur « Réseau Tor » pour savoir comment nous vous protégeons au niveau du réseau. +onboarding.tour-tor-privacy.description=Le Navigateur Tor isole les témoins et supprime l’historique de votre navigateur en fin de session. Ces modifications garantissent que confidentialité et sécurité sont protégées dans le navigateur. Cliquez sur « Réseau Tor » pour découvrir comment nous vous protégeons au niveau du réseau. onboarding.tour-tor-privacy.button=Aller vers Réseau Tor onboarding.tour-tor-network=Réseau Tor

1 0

[translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
by translation＠torproject.org 30 Apr '19

30 Apr '19

commit 9eeba7164e836d06c48be9d30408cc7785dc8a2a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 15:50:04 2019 +0000 Update translations for torbutton-browseronboardingproperties --- fr/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/browserOnboarding.properties b/fr/browserOnboarding.properties index 08ce2c549..be06c4d5f 100644 --- a/fr/browserOnboarding.properties +++ b/fr/browserOnboarding.properties @@ -9,7 +9,7 @@ onboarding.tour-tor-welcome.next-button=Aller vers Confidentialité onboarding.tour-tor-privacy=Confidentialité onboarding.tour-tor-privacy.title=Repoussez les traqueurs et les fouineurs. -onboarding.tour-tor-privacy.description=Le Navigateur Tor isole les témoins et supprime l’historique de votre navigateur en fin de session. Ces modifications garantissent que confidentialité et sécurité sont protégées dans le navigateur. Cliquez sur « Réseau Tor » pour savoir comment nous vous protégeons au niveau du réseau. +onboarding.tour-tor-privacy.description=Le Navigateur Tor isole les témoins et supprime l’historique de votre navigateur en fin de session. Ces modifications garantissent que confidentialité et sécurité sont protégées dans le navigateur. Cliquez sur « Réseau Tor » pour découvrir comment nous vous protégeons au niveau du réseau. onboarding.tour-tor-privacy.button=Aller vers Réseau Tor onboarding.tour-tor-network=Réseau Tor

1 0

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 30 Apr '19

30 Apr '19

commit 8dcb42eb85419c16084d5f9d18a2dfe573339cdf Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 30 15:48:14 2019 +0000 Update translations for tbmanual-contentspot_completed --- contents+fr.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 0fa7fa0ff..99bd7c468 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -78,8 +78,8 @@ msgstr "À propos du Navigateur Tor" #: (content/about/contents+en-US.lrtopic.description) msgid "Learn what Tor Browser can do to protect your privacy and anonymity" msgstr "" -"Apprenez ce que le Navigateur Tor peut faire pour protéger vos données " -"personnelles et votre anonymat" +"Découvrez ce que le Navigateur Tor peut faire pour protéger votre vie " +"privée, vos données personnelles et votre anonymat" #: https//tb-manual.torproject.org/en-US/about/ #: (content/about/contents+en-US.lrtopic.body) @@ -87,9 +87,9 @@ msgid "" "Tor Browser uses the Tor network to protect your privacy and anonymity. " "Using the Tor network has two main properties:" msgstr "" -"Le Navigateur Tor utilise le réseau Tor pour protéger vos données " -"personnelles et votre anonymat. L’utilisation du réseau Tor présente deux " -"atouts principaux :" +"Le Navigateur Tor utilise le réseau Tor pour protéger votre vie privée, vos " +"données personnelles et votre anonymat. L’utilisation du réseau Tor présente" +" deux atouts principaux :" #: https//tb-manual.torproject.org/en-US/about/ #: (content/about/contents+en-US.lrtopic.body) @@ -333,7 +333,7 @@ msgstr "Premier lancement du Navigateur Tor" #: https//tb-manual.torproject.org/en-US/running-tor-browser/ #: (content/running-tor-browser/contents+en-US.lrtopic.description) msgid "Learn how to use Tor Browser for the first time" -msgstr "Apprenez à utiliser le Navigateur Tor pour la première fois" +msgstr "Découvrez comment utiliser le Navigateur Tor pour la première fois" #: https//tb-manual.torproject.org/en-US/running-tor-browser/ #: (content/running-tor-browser/contents+en-US.lrtopic.body) @@ -919,8 +919,8 @@ msgid "" "obtain them." msgstr "" "Si vous avez essayé toutes ces actions et qu’aucune ne vous permet de vous " -"connecter, vous devrez saisir des adresses de pont manuellement. Lisez la " -"section <a href=\"/bridges\">Les ponts </a> pour apprendre ce que sont les " +"connecter, vous devrez saisir manuellement des adresses de pont. Lisez la " +"section <a href=\"/bridges\">Les ponts</a> pour découvrir ce que sont les " "ponts et comment en obtenir." #: https//tb-manual.torproject.org/en-US/managing-identities/ @@ -932,8 +932,8 @@ msgstr "La gestion des identités" #: (content/managing-identities/contents+en-US.lrtopic.description) msgid "Learn how to control personally-identifying information in Tor Browser" msgstr "" -"Apprenez à contrôler dans le Navigateur Tor les renseignements permettant " -"d’identifier quelqu’un" +"Découvrez comment contrôler, dans le Navigateur Tor, les renseignements qui " +"permettent d’identifier quelqu’un" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) @@ -1326,7 +1326,7 @@ msgstr "Les connexions sécurisées" #: (content/secure-connections/contents+en-US.lrtopic.description) msgid "Learn how to protect your data using Tor Browser and HTTPS" msgstr "" -"Apprenez comment protéger vos données en utilisant le Navigateur Tor et " +"Découvrez comment protéger vos données en utilisant le Navigateur Tor et " "HTTPS" #: https//tb-manual.torproject.org/en-US/secure-connections/ @@ -2344,10 +2344,10 @@ msgid "" "understanding." msgstr "" "faire progresser les droits de la personne et les libertés en créant et en " -"déployant des technologies d’anonymat, de protection des données " -"personnelles et de la vie privée gratuites et à code source ouvert. Nous " -"soutenons aussi leur disponibilité et leur utilisation sans restriction en " -"les faisant mieux connaître des scientifiques et du public." +"déployant des technologies gratuites d’anonymat et de protection de la vie " +"privée et des données personnelles, à code source ouvert. Nous soutenons " +"aussi leur disponibilité et leur utilisation sans restriction en les faisant" +" mieux connaître des scientifiques et du public." #: templates/footer.html:24 msgid "Subscribe to our Newsletter"

1 0