tor-commits November 2014

tor-commits@lists.torproject.org

24 participants
954 discussions

[tor/master] Add some mocks needed to unit test ClientTransportPlugin/ServerTransportPlugin config line parsing
by nickm＠torproject.org 04 Nov '14

04 Nov '14

commit b8b46e8ef847c0683fab00783fb64bef0c6f83c6 Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Jul 25 21:41:03 2014 -0700 Add some mocks needed to unit test ClientTransportPlugin/ServerTransportPlugin config line parsing --- src/or/entrynodes.c | 4 ++-- src/or/entrynodes.h | 2 +- src/or/transports.c | 12 ++++++------ src/or/transports.h | 10 ++++++---- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.… [View More]c index 4d09195..8f105c7 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1884,8 +1884,8 @@ bridge_resolve_conflicts(const tor_addr_t *addr, uint16_t port, /** Return True if we have a bridge that uses a transport with name * transport_name. */ -int -transport_is_needed(const char *transport_name) +MOCK_IMPL(int, +transport_is_needed, (const char *transport_name)) { if (!bridge_list) return 0; diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 5d91756..8b5ffba 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -151,7 +151,7 @@ struct transport_t; int get_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, const struct transport_t **transport); -int transport_is_needed(const char *transport_name); +MOCK_DECL(int, transport_is_needed, (const char *transport_name)); int validate_pluggable_transports_config(void); double pathbias_get_close_success_count(entry_guard_t *guard); diff --git a/src/or/transports.c b/src/or/transports.c index dc30754..0fb5926 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -324,9 +324,9 @@ transport_add(transport_t *t) /** Remember a new pluggable transport proxy at addr:port. * name is set to the name of the protocol this proxy uses. * socks_ver is set to the SOCKS version of the proxy. */ -int -transport_add_from_config(const tor_addr_t *addr, uint16_t port, - const char *name, int socks_ver) +MOCK_IMPL(int, +transport_add_from_config, (const tor_addr_t *addr, uint16_t port, + const char *name, int socks_ver)) { transport_t *t = transport_new(addr, port, name, socks_ver, NULL); @@ -1349,9 +1349,9 @@ managed_proxy_create(const smartlist_t *transport_list, * Requires that proxy_argv be a NULL-terminated array of command-line * elements, containing at least one element. **/ -void -pt_kickstart_proxy(const smartlist_t *transport_list, - char **proxy_argv, int is_server) +MOCK_IMPL(void, +pt_kickstart_proxy, (const smartlist_t *transport_list, + char **proxy_argv, int is_server)) { managed_proxy_t *mp=NULL; transport_t *old_transport = NULL; diff --git a/src/or/transports.h b/src/or/transports.h index 1365ead..deacdcd 100644 --- a/src/or/transports.h +++ b/src/or/transports.h @@ -32,14 +32,16 @@ typedef struct transport_t { void mark_transport_list(void); void sweep_transport_list(void); -int transport_add_from_config(const tor_addr_t *addr, uint16_t port, - const char *name, int socks_ver); +MOCK_DECL(int, transport_add_from_config, + (const tor_addr_t *addr, uint16_t port, + const char *name, int socks_ver)); void transport_free(transport_t *transport); transport_t *transport_get_by_name(const char *name); -void pt_kickstart_proxy(const smartlist_t *transport_list, char **proxy_argv, - int is_server); +MOCK_DECL(void, pt_kickstart_proxy, + (const smartlist_t *transport_list, char **proxy_argv, + int is_server)); #define pt_kickstart_client_proxy(tl, pa) \ pt_kickstart_proxy(tl, pa, 0) [View Less]

1 0

[tor/master] Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
by nickm＠torproject.org 04 Nov '14

04 Nov '14

commit 4a5164fd86465ab4546ce4aad0ed8ec1b9e26cd1 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Jul 28 19:32:23 2014 -0700 Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub --- src/or/config.c | 291 ++++++++++++++++++++++++++---------------------- src/or/config.h | 7 +- src/test/test_config.c | 104 ++++++++--------- 3 files changed, 214 insertions(+), 188 deletions(-) diff --… [View More]git a/src/or/config.c b/src/or/config.c index b50834b..7911b5c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -538,6 +538,10 @@ static int options_transition_affects_descriptor( static int check_nickname_list(char **lst, const char *name, char **msg); static char *get_bindaddr_from_transport_listen_line(const char *line, const char *transport); +static int parse_client_transport_line(const or_options_t *options, + const char *line, int validate_only); +static int parse_server_transport_line(const or_options_t *options, + const char *line, int validate_only); static int parse_dir_authority_line(const char *line, dirinfo_type_t required_type, int validate_only); @@ -1423,7 +1427,7 @@ options_act(const or_options_t *old_options) pt_prepare_proxy_list_for_config_read(); if (options->ClientTransportPlugin) { for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { - if (parse_client_transport_line(options, cl->value, 0)<0) { + if (parse_transport_line(options, cl->value, 0, 0) < 0) { log_warn(LD_BUG, "Previously validated ClientTransportPlugin line " "could not be added!"); @@ -1434,7 +1438,7 @@ options_act(const or_options_t *old_options) if (options->ServerTransportPlugin && server_mode(options)) { for (cl = options->ServerTransportPlugin; cl; cl = cl->next) { - if (parse_server_transport_line(options, cl->value, 0)<0) { + if (parse_transport_line(options, cl->value, 0, 1) < 0) { log_warn(LD_BUG, "Previously validated ServerTransportPlugin line " "could not be added!"); @@ -3287,12 +3291,12 @@ options_validate(or_options_t *old_options, or_options_t *options, } for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { - if (parse_client_transport_line(options, cl->value, 1)<0) + if (parse_transport_line(options, cl->value, 1, 0) < 0) REJECT("Invalid client transport line. See logs for details."); } for (cl = options->ServerTransportPlugin; cl; cl = cl->next) { - if (parse_server_transport_line(options, cl->value, 1)<0) + if (parse_transport_line(options, cl->value, 1, 1) < 0) REJECT("Invalid server transport line. See logs for details."); } @@ -4748,6 +4752,29 @@ parse_bridge_line(const char *line) return bridge_line; } +/** Read the contents of a ClientTransportPlugin or ServerTransportPlugin + * line from line, depending on the value of server. Return 0 + * if the line is well-formed, and -1 if it isn't. + * + * If validate_only is 0, the line is well-formed, and the transport is + * needed by some bridge: + * - If it's an external proxy line, add the transport described in the line to + * our internal transport list. + * - If it's a managed proxy line, launch the managed proxy. + */ + +STATIC int +parse_transport_line(const or_options_t *options, + const char *line, int validate_only, + int server) +{ + if (server) { + return parse_server_transport_line(options, line, validate_only); + } else { + return parse_client_transport_line(options, line, validate_only); + } +} + /** Read the contents of a ClientTransportPlugin line from * line. Return 0 if the line is well-formed, and -1 if it * isn't. @@ -4757,7 +4784,7 @@ parse_bridge_line(const char *line) * - If it's an external proxy line, add the transport described in the line to * our internal transport list. * - If it's a managed proxy line, launch the managed proxy. */ -STATIC int +static int parse_client_transport_line(const or_options_t *options, const char *line, int validate_only) { @@ -4901,6 +4928,133 @@ parse_client_transport_line(const or_options_t *options, return r; } +/** Read the contents of a ServerTransportPlugin line from + * line. Return 0 if the line is well-formed, and -1 if it + * isn't. + * If validate_only is 0, the line is well-formed, and it's a + * managed proxy line, launch the managed proxy. */ +static int +parse_server_transport_line(const or_options_t *options, + const char *line, int validate_only) +{ + smartlist_t *items = NULL; + int r; + const char *transports=NULL; + smartlist_t *transport_list=NULL; + char *type=NULL; + char *addrport=NULL; + tor_addr_t addr; + uint16_t port = 0; + + /* managed proxy options */ + int is_managed=0; + char **proxy_argv=NULL; + char **tmp=NULL; + int proxy_argc,i; + + int line_length; + + items = smartlist_new(); + smartlist_split_string(items, line, NULL, + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); + + line_length = smartlist_len(items); + if (line_length < 3) { + log_warn(LD_CONFIG, "Too few arguments on ServerTransportPlugin line."); + goto err; + } + + /* Get the first line element, split it to commas into + transport_list (in case it's multiple transports) and validate + the transport names. */ + transports = smartlist_get(items, 0); + transport_list = smartlist_new(); + smartlist_split_string(transport_list, transports, ",", + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); + SMARTLIST_FOREACH_BEGIN(transport_list, const char *, transport_name) { + if (!string_is_C_identifier(transport_name)) { + log_warn(LD_CONFIG, "Transport name is not a C identifier (%s).", + transport_name); + goto err; + } + } SMARTLIST_FOREACH_END(transport_name); + + type = smartlist_get(items, 1); + + if (!strcmp(type, "exec")) { + is_managed=1; + } else if (!strcmp(type, "proxy")) { + is_managed=0; + } else { + log_warn(LD_CONFIG, "Strange ServerTransportPlugin type '%s'", type); + goto err; + } + + if (is_managed && options->Sandbox) { + log_warn(LD_CONFIG, "Managed proxies are not compatible with Sandbox mode." + "(ServerTransportPlugin line was %s)", escaped(line)); + goto err; + } + + if (is_managed) { /* managed */ + if (!validate_only) { + proxy_argc = line_length-2; + tor_assert(proxy_argc > 0); + proxy_argv = tor_malloc_zero(sizeof(char*)*(proxy_argc+1)); + tmp = proxy_argv; + + for (i=0;i<proxy_argc;i++) { /* store arguments */ + *tmp++ = smartlist_get(items, 2); + smartlist_del_keeporder(items, 2); + } + *tmp = NULL; /*terminated with NULL, just like execve() likes it*/ + + /* kickstart the thing */ + pt_kickstart_server_proxy(transport_list, proxy_argv); + } + } else { /* external */ + if (smartlist_len(transport_list) != 1) { + log_warn(LD_CONFIG, "You can't have an external proxy with " + "more than one transports."); + goto err; + } + + addrport = smartlist_get(items, 2); + + if (tor_addr_port_lookup(addrport, &addr, &port)<0) { + log_warn(LD_CONFIG, "Error parsing transport " + "address '%s'", addrport); + goto err; + } + if (!port) { + log_warn(LD_CONFIG, + "Transport address '%s' has no port.", addrport); + goto err; + } + + if (!validate_only) { + log_info(LD_DIR, "Server transport '%s' at %s.", + transports, fmt_addrport(&addr, port)); + } + } + + r = 0; + goto done; + + err: + r = -1; + + done: + SMARTLIST_FOREACH(items, char*, s, tor_free(s)); + smartlist_free(items); + if (transport_list) { + SMARTLIST_FOREACH(transport_list, char*, s, tor_free(s)); + smartlist_free(transport_list); + } + + return r; +} + /** Given a ServerTransportListenAddr line, return its * <address:port> string. Return NULL if the line was not * well-formed. @@ -5052,133 +5206,6 @@ get_options_for_server_transport(const char *transport) return NULL; } -/** Read the contents of a ServerTransportPlugin line from - * line. Return 0 if the line is well-formed, and -1 if it - * isn't. - * If validate_only is 0, the line is well-formed, and it's a - * managed proxy line, launch the managed proxy. */ -STATIC int -parse_server_transport_line(const or_options_t *options, - const char *line, int validate_only) -{ - smartlist_t *items = NULL; - int r; - const char *transports=NULL; - smartlist_t *transport_list=NULL; - char *type=NULL; - char *addrport=NULL; - tor_addr_t addr; - uint16_t port = 0; - - /* managed proxy options */ - int is_managed=0; - char **proxy_argv=NULL; - char **tmp=NULL; - int proxy_argc,i; - - int line_length; - - items = smartlist_new(); - smartlist_split_string(items, line, NULL, - SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); - - line_length = smartlist_len(items); - if (line_length < 3) { - log_warn(LD_CONFIG, "Too few arguments on ServerTransportPlugin line."); - goto err; - } - - /* Get the first line element, split it to commas into - transport_list (in case it's multiple transports) and validate - the transport names. */ - transports = smartlist_get(items, 0); - transport_list = smartlist_new(); - smartlist_split_string(transport_list, transports, ",", - SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); - SMARTLIST_FOREACH_BEGIN(transport_list, const char *, transport_name) { - if (!string_is_C_identifier(transport_name)) { - log_warn(LD_CONFIG, "Transport name is not a C identifier (%s).", - transport_name); - goto err; - } - } SMARTLIST_FOREACH_END(transport_name); - - type = smartlist_get(items, 1); - - if (!strcmp(type, "exec")) { - is_managed=1; - } else if (!strcmp(type, "proxy")) { - is_managed=0; - } else { - log_warn(LD_CONFIG, "Strange ServerTransportPlugin type '%s'", type); - goto err; - } - - if (is_managed && options->Sandbox) { - log_warn(LD_CONFIG, "Managed proxies are not compatible with Sandbox mode." - "(ServerTransportPlugin line was %s)", escaped(line)); - goto err; - } - - if (is_managed) { /* managed */ - if (!validate_only) { - proxy_argc = line_length-2; - tor_assert(proxy_argc > 0); - proxy_argv = tor_malloc_zero(sizeof(char*)*(proxy_argc+1)); - tmp = proxy_argv; - - for (i=0;i<proxy_argc;i++) { /* store arguments */ - *tmp++ = smartlist_get(items, 2); - smartlist_del_keeporder(items, 2); - } - *tmp = NULL; /*terminated with NULL, just like execve() likes it*/ - - /* kickstart the thing */ - pt_kickstart_server_proxy(transport_list, proxy_argv); - } - } else { /* external */ - if (smartlist_len(transport_list) != 1) { - log_warn(LD_CONFIG, "You can't have an external proxy with " - "more than one transports."); - goto err; - } - - addrport = smartlist_get(items, 2); - - if (tor_addr_port_lookup(addrport, &addr, &port)<0) { - log_warn(LD_CONFIG, "Error parsing transport " - "address '%s'", addrport); - goto err; - } - if (!port) { - log_warn(LD_CONFIG, - "Transport address '%s' has no port.", addrport); - goto err; - } - - if (!validate_only) { - log_info(LD_DIR, "Server transport '%s' at %s.", - transports, fmt_addrport(&addr, port)); - } - } - - r = 0; - goto done; - - err: - r = -1; - - done: - SMARTLIST_FOREACH(items, char*, s, tor_free(s)); - smartlist_free(items); - if (transport_list) { - SMARTLIST_FOREACH(transport_list, char*, s, tor_free(s)); - smartlist_free(transport_list); - } - - return r; -} - /** Read the contents of a DirAuthority line from line. If * validate_only is 0, and the line is well-formed, and it * shares any bits with required_type or required_type diff --git a/src/or/config.h b/src/or/config.h index 31496c2..4097d37 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -140,10 +140,9 @@ STATIC int options_validate(or_options_t *old_options, or_options_t *options, or_options_t *default_options, int from_setconf, char **msg); -STATIC int parse_client_transport_line(const or_options_t *options, - const char *line, int validate_only); -STATIC int parse_server_transport_line(const or_options_t *options, - const char *line, int validate_only); +STATIC int parse_transport_line(const or_options_t *options, + const char *line, int validate_only, + int server); #endif #endif diff --git a/src/test/test_config.c b/src/test/test_config.c index 5975e1e..ae01fac 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -608,84 +608,84 @@ test_config_parse_transport_plugin_line(void *arg) int old_transport_is_needed_mock_call_count; /* Bad transport lines - too short */ - r = parse_client_transport_line(options, "bad", 1); + r = parse_transport_line(options, "bad", 1, 0); test_assert(r < 0); - r = parse_server_transport_line(options, "bad", 1); + r = parse_transport_line(options, "bad", 1, 1); test_assert(r < 0); - r = parse_client_transport_line(options, "bad bad", 1); + r = parse_transport_line(options, "bad bad", 1, 0); test_assert(r < 0); - r = parse_server_transport_line(options, "bad bad", 1); + r = parse_transport_line(options, "bad bad", 1, 1); test_assert(r < 0); /* Test transport list parsing */ - r = parse_client_transport_line(options, - "transport_1 exec /usr/bin/fake-transport", 1); + r = parse_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 1, 0); test_assert(r == 0); - r = parse_server_transport_line(options, - "transport_1 exec /usr/bin/fake-transport", 1); + r = parse_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 1, 1); test_assert(r == 0); - r = parse_client_transport_line(options, - "transport_1,transport_2 exec /usr/bin/fake-transport", 1); + r = parse_transport_line(options, + "transport_1,transport_2 exec /usr/bin/fake-transport", 1, 0); test_assert(r == 0); - r = parse_server_transport_line(options, - "transport_1,transport_2 exec /usr/bin/fake-transport", 1); + r = parse_transport_line(options, + "transport_1,transport_2 exec /usr/bin/fake-transport", 1, 1); test_assert(r == 0); /* Bad transport identifiers */ - r = parse_client_transport_line(options, - "transport_* exec /usr/bin/fake-transport", 1); + r = parse_transport_line(options, + "transport_* exec /usr/bin/fake-transport", 1, 0); test_assert(r < 0); - r = parse_server_transport_line(options, - "transport_* exec /usr/bin/fake-transport", 1); + r = parse_transport_line(options, + "transport_* exec /usr/bin/fake-transport", 1, 1); test_assert(r < 0); /* Check SOCKS cases for client transport */ - r = parse_client_transport_line(options, - "transport_1 socks4 1.2.3.4:567", 1); + r = parse_transport_line(options, + "transport_1 socks4 1.2.3.4:567", 1, 0); test_assert(r == 0); - r = parse_client_transport_line(options, - "transport_1 socks5 1.2.3.4:567", 1); + r = parse_transport_line(options, + "transport_1 socks5 1.2.3.4:567", 1, 0); test_assert(r == 0); /* Proxy case for server transport */ - r = parse_server_transport_line(options, - "transport_1 proxy 1.2.3.4:567", 1); + r = parse_transport_line(options, + "transport_1 proxy 1.2.3.4:567", 1, 1); test_assert(r == 0); /* Multiple-transport error exit */ - r = parse_client_transport_line(options, - "transport_1,transport_2 socks5 1.2.3.4:567", 1); + r = parse_transport_line(options, + "transport_1,transport_2 socks5 1.2.3.4:567", 1, 0); test_assert(r < 0); - r = parse_server_transport_line(options, - "transport_1,transport_2 proxy 1.2.3.4:567", 1); + r = parse_transport_line(options, + "transport_1,transport_2 proxy 1.2.3.4:567", 1, 1); /* No port error exit */ - r = parse_client_transport_line(options, - "transport_1 socks5 1.2.3.4", 1); + r = parse_transport_line(options, + "transport_1 socks5 1.2.3.4", 1, 0); test_assert(r < 0); - r = parse_server_transport_line(options, - "transport_1 proxy 1.2.3.4", 1); + r = parse_transport_line(options, + "transport_1 proxy 1.2.3.4", 1, 1); test_assert(r < 0); /* Unparsable address error exit */ - r = parse_client_transport_line(options, - "transport_1 socks5 1.2.3:6x7", 1); + r = parse_transport_line(options, + "transport_1 socks5 1.2.3:6x7", 1, 0); test_assert(r < 0); - r = parse_server_transport_line(options, - "transport_1 proxy 1.2.3:6x7", 1); + r = parse_transport_line(options, + "transport_1 proxy 1.2.3:6x7", 1, 1); test_assert(r < 0); /* "Strange {Client|Server}TransportPlugin field" error exit */ - r = parse_client_transport_line(options, - "transport_1 foo bar", 1); + r = parse_transport_line(options, + "transport_1 foo bar", 1, 0); test_assert(r < 0); - r = parse_server_transport_line(options, - "transport_1 foo bar", 1); + r = parse_transport_line(options, + "transport_1 foo bar", 1, 1); test_assert(r < 0); /* No sandbox mode error exit */ tmp = options->Sandbox; options->Sandbox = 1; - r = parse_client_transport_line(options, - "transport_1 exec /usr/bin/fake-transport", 1); + r = parse_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 1, 0); test_assert(r < 0); - r = parse_server_transport_line(options, - "transport_1 exec /usr/bin/fake-transport", 1); + r = parse_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 1, 1); test_assert(r < 0); options->Sandbox = tmp; @@ -696,16 +696,16 @@ test_config_parse_transport_plugin_line(void *arg) MOCK(pt_kickstart_proxy, pt_kickstart_proxy_mock); old_pt_kickstart_proxy_mock_call_count = pt_kickstart_proxy_mock_call_count; - r = parse_server_transport_line(options, - "transport_1 exec /usr/bin/fake-transport", 0); + r = parse_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 0, 1); test_assert(r == 0); test_assert(pt_kickstart_proxy_mock_call_count == old_pt_kickstart_proxy_mock_call_count + 1); UNMOCK(pt_kickstart_proxy); /* This one hits a log line in the !validate_only case only */ - r = parse_server_transport_line(options, - "transport_1 proxy 1.2.3.4:567", 0); + r = parse_transport_line(options, + "transport_1 proxy 1.2.3.4:567", 0, 1); test_assert(r == 0); /* Check mocked client transport cases */ @@ -721,8 +721,8 @@ test_config_parse_transport_plugin_line(void *arg) transport_add_from_config_mock_call_count; old_transport_is_needed_mock_call_count = transport_is_needed_mock_call_count; - r = parse_client_transport_line(options, - "transport_1 exec /usr/bin/fake-transport", 0); + r = parse_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 0, 0); /* Should have succeeded */ test_assert(r == 0); /* transport_is_needed() should have been called */ @@ -745,8 +745,8 @@ test_config_parse_transport_plugin_line(void *arg) transport_add_from_config_mock_call_count; old_transport_is_needed_mock_call_count = transport_is_needed_mock_call_count; - r = parse_client_transport_line(options, - "transport_1 exec /usr/bin/fake-transport", 0); + r = parse_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 0, 0); /* Should have succeeded */ test_assert(r == 0); /* @@ -769,8 +769,8 @@ test_config_parse_transport_plugin_line(void *arg) transport_add_from_config_mock_call_count; old_transport_is_needed_mock_call_count = transport_is_needed_mock_call_count; - r = parse_client_transport_line(options, - "transport_1 socks5 1.2.3.4:567", 0); + r = parse_transport_line(options, + "transport_1 socks5 1.2.3.4:567", 0, 0); /* Should have succeeded */ test_assert(r == 0); /* [View Less]

1 0

[tor/master] Merge remote-tracking branch 'andrea/ticket6456'
by nickm＠torproject.org 04 Nov '14

04 Nov '14

commit 9619c395ac7e2a8c2e57f55cd1885fe5f8e5f8b5 Merge: b1ca05d 2d4241d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 4 09:49:35 2014 -0500 Merge remote-tracking branch 'andrea/ticket6456' Somewhat tricky conflicts: src/or/config.c Also, s/test_assert/tt_assert in test_config.c src/or/config.c | 287 ++++++++++++++++-------------------------------- src/or/config.h | 3 + src/or/entrynodes.c | 4 +- src/or/entrynodes.h … [View More] | 2 +- src/or/transports.c | 12 +- src/or/transports.h | 10 +- src/test/test_config.c | 248 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 361 insertions(+), 205 deletions(-) diff --cc src/or/config.c index 681955e,10b118c..cb27dac --- a/src/or/config.c +++ b/src/or/config.c @@@ -1410,26 -1421,24 +1404,26 @@@ options_act(const or_options_t *old_opt mark_transport_list(); pt_prepare_proxy_list_for_config_read(); - if (options->ClientTransportPlugin) { - for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { - if (parse_transport_line(options, cl->value, 0, 0) < 0) { - log_warn(LD_BUG, - "Previously validated ClientTransportPlugin line " - "could not be added!"); - return -1; + if (!options->DisableNetwork) { + if (options->ClientTransportPlugin) { + for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { - if (parse_client_transport_line(options, cl->value, 0)<0) { ++ if (parse_transport_line(options, cl->value, 0, 0) < 0) { + log_warn(LD_BUG, + "Previously validated ClientTransportPlugin line " + "could not be added!"); + return -1; + } } } - } - if (options->ServerTransportPlugin && server_mode(options)) { - for (cl = options->ServerTransportPlugin; cl; cl = cl->next) { - if (parse_transport_line(options, cl->value, 0, 1) < 0) { - log_warn(LD_BUG, - "Previously validated ServerTransportPlugin line " - "could not be added!"); - return -1; + if (options->ServerTransportPlugin && server_mode(options)) { + for (cl = options->ServerTransportPlugin; cl; cl = cl->next) { - if (parse_server_transport_line(options, cl->value, 0)<0) { ++ if (parse_transport_line(options, cl->value, 0, 1) < 0) { + log_warn(LD_BUG, + "Previously validated ServerTransportPlugin line " + "could not be added!"); + return -1; + } } } } @@@ -4844,40 -4846,49 +4852,57 @@@ parse_transport_line(const or_options_ goto err; } - if (is_managed) { /* managed */ - if (!validate_only && is_useless_proxy) { - log_info(LD_GENERAL, "Pluggable transport proxy (%s) does not provide " - "any needed transports and will not be launched.", line); + if (is_managed) { + /* managed */ + + if (!server && !validate_only && is_useless_proxy) { - log_notice(LD_GENERAL, - "Pluggable transport proxy (%s) does not provide " - "any needed transports and will not be launched.", - line); ++ log_info(LD_GENERAL, ++ "Pluggable transport proxy (%s) does not provide " ++ "any needed transports and will not be launched.", ++ line); } - /* If we are not just validating, use the rest of the line as the - argv of the proxy to be launched. Also, make sure that we are - only launching proxies that contribute useful transports. */ - if (!validate_only && !is_useless_proxy) { - proxy_argc = line_length-2; + /* + * If we are not just validating, use the rest of the line as the + * argv of the proxy to be launched. Also, make sure that we are + * only launching proxies that contribute useful transports. + */ + + if (!validate_only && (server || !is_useless_proxy)) { + proxy_argc = line_length - 2; tor_assert(proxy_argc > 0); - proxy_argv = tor_malloc_zero(sizeof(char *) * (proxy_argc + 1)); + proxy_argv = tor_calloc((proxy_argc + 1), sizeof(char *)); tmp = proxy_argv; - for (i=0;i<proxy_argc;i++) { /* store arguments */ + + for (i = 0; i < proxy_argc; i++) { + /* store arguments */ *tmp++ = smartlist_get(items, 2); smartlist_del_keeporder(items, 2); } - *tmp = NULL; /*terminated with NULL, just like execve() likes it*/ + *tmp = NULL; /* terminated with NULL, just like execve() likes it */ /* kickstart the thing */ - pt_kickstart_client_proxy(transport_list, proxy_argv); + if (server) { + pt_kickstart_server_proxy(transport_list, proxy_argv); + } else { + pt_kickstart_client_proxy(transport_list, proxy_argv); + } } - } else { /* external */ + } else { + /* external */ + + /* ClientTransportPlugins connecting through a proxy is managed only. */ - if (options->Socks4Proxy || options->Socks5Proxy || options->HTTPSProxy) { ++ if (!server && ++ (options->Socks4Proxy || options->Socks5Proxy || options->HTTPSProxy)) { + log_warn(LD_CONFIG, "You have configured an external proxy with another " + "proxy type. (Socks4Proxy|Socks5Proxy|HTTPSProxy)"); + goto err; + } + if (smartlist_len(transport_list) != 1) { - log_warn(LD_CONFIG, "You can't have an external proxy with " - "more than one transports."); + log_warn(LD_CONFIG, + "You can't have an external proxy with more than " + "one transport."); goto err; } diff --cc src/test/test_config.c index 823d067,ae01fac..1ecb816 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@@ -552,6 -554,251 +554,251 @@@ test_config_parse_transport_options_lin } } + /* Mocks needed for the transport plugin line test */ + + static void pt_kickstart_proxy_mock(const smartlist_t *transport_list, + char **proxy_argv, int is_server); + static int transport_add_from_config_mock(const tor_addr_t *addr, + uint16_t port, const char *name, + int socks_ver); + static int transport_is_needed_mock(const char *transport_name); + + static int pt_kickstart_proxy_mock_call_count = 0; + static int transport_add_from_config_mock_call_count = 0; + static int transport_is_needed_mock_call_count = 0; + static int transport_is_needed_mock_return = 0; + + static void + pt_kickstart_proxy_mock(const smartlist_t *transport_list, + char **proxy_argv, int is_server) + { + ++pt_kickstart_proxy_mock_call_count; + } + + static int + transport_add_from_config_mock(const tor_addr_t *addr, + uint16_t port, const char *name, + int socks_ver) + { + ++transport_add_from_config_mock_call_count; + + return 0; + } + + static int + transport_is_needed_mock(const char *transport_name) + { + ++transport_is_needed_mock_call_count; + + return transport_is_needed_mock_return; + } + + /** + * Test parsing for the ClientTransportPlugin and ServerTransportPlugin config + * options. + */ + + static void + test_config_parse_transport_plugin_line(void *arg) + { + or_options_t *options = get_options_mutable(); + int r, tmp; + int old_pt_kickstart_proxy_mock_call_count; + int old_transport_add_from_config_mock_call_count; + int old_transport_is_needed_mock_call_count; + + /* Bad transport lines - too short */ + r = parse_transport_line(options, "bad", 1, 0); - test_assert(r < 0); ++ tt_assert(r < 0); + r = parse_transport_line(options, "bad", 1, 1); - test_assert(r < 0); ++ tt_assert(r < 0); + r = parse_transport_line(options, "bad bad", 1, 0); - test_assert(r < 0); ++ tt_assert(r < 0); + r = parse_transport_line(options, "bad bad", 1, 1); - test_assert(r < 0); ++ tt_assert(r < 0); + + /* Test transport list parsing */ + r = parse_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 1, 0); - test_assert(r == 0); ++ tt_assert(r == 0); + r = parse_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 1, 1); - test_assert(r == 0); ++ tt_assert(r == 0); + r = parse_transport_line(options, + "transport_1,transport_2 exec /usr/bin/fake-transport", 1, 0); - test_assert(r == 0); ++ tt_assert(r == 0); + r = parse_transport_line(options, + "transport_1,transport_2 exec /usr/bin/fake-transport", 1, 1); - test_assert(r == 0); ++ tt_assert(r == 0); + /* Bad transport identifiers */ + r = parse_transport_line(options, + "transport_* exec /usr/bin/fake-transport", 1, 0); - test_assert(r < 0); ++ tt_assert(r < 0); + r = parse_transport_line(options, + "transport_* exec /usr/bin/fake-transport", 1, 1); - test_assert(r < 0); ++ tt_assert(r < 0); + + /* Check SOCKS cases for client transport */ + r = parse_transport_line(options, + "transport_1 socks4 1.2.3.4:567", 1, 0); - test_assert(r == 0); ++ tt_assert(r == 0); + r = parse_transport_line(options, + "transport_1 socks5 1.2.3.4:567", 1, 0); - test_assert(r == 0); ++ tt_assert(r == 0); + /* Proxy case for server transport */ + r = parse_transport_line(options, + "transport_1 proxy 1.2.3.4:567", 1, 1); - test_assert(r == 0); ++ tt_assert(r == 0); + /* Multiple-transport error exit */ + r = parse_transport_line(options, + "transport_1,transport_2 socks5 1.2.3.4:567", 1, 0); - test_assert(r < 0); ++ tt_assert(r < 0); + r = parse_transport_line(options, + "transport_1,transport_2 proxy 1.2.3.4:567", 1, 1); + /* No port error exit */ + r = parse_transport_line(options, + "transport_1 socks5 1.2.3.4", 1, 0); - test_assert(r < 0); ++ tt_assert(r < 0); + r = parse_transport_line(options, + "transport_1 proxy 1.2.3.4", 1, 1); - test_assert(r < 0); ++ tt_assert(r < 0); + /* Unparsable address error exit */ + r = parse_transport_line(options, + "transport_1 socks5 1.2.3:6x7", 1, 0); - test_assert(r < 0); ++ tt_assert(r < 0); + r = parse_transport_line(options, + "transport_1 proxy 1.2.3:6x7", 1, 1); - test_assert(r < 0); ++ tt_assert(r < 0); + + /* "Strange {Client|Server}TransportPlugin field" error exit */ + r = parse_transport_line(options, + "transport_1 foo bar", 1, 0); - test_assert(r < 0); ++ tt_assert(r < 0); + r = parse_transport_line(options, + "transport_1 foo bar", 1, 1); - test_assert(r < 0); ++ tt_assert(r < 0); + + /* No sandbox mode error exit */ + tmp = options->Sandbox; + options->Sandbox = 1; + r = parse_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 1, 0); - test_assert(r < 0); ++ tt_assert(r < 0); + r = parse_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 1, 1); - test_assert(r < 0); ++ tt_assert(r < 0); + options->Sandbox = tmp; + + /* + * These final test cases cover code paths that only activate without + * validate_only, so they need mocks in place. + */ + MOCK(pt_kickstart_proxy, pt_kickstart_proxy_mock); + old_pt_kickstart_proxy_mock_call_count = + pt_kickstart_proxy_mock_call_count; + r = parse_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 0, 1); - test_assert(r == 0); - test_assert(pt_kickstart_proxy_mock_call_count == ++ tt_assert(r == 0); ++ tt_assert(pt_kickstart_proxy_mock_call_count == + old_pt_kickstart_proxy_mock_call_count + 1); + UNMOCK(pt_kickstart_proxy); + + /* This one hits a log line in the !validate_only case only */ + r = parse_transport_line(options, + "transport_1 proxy 1.2.3.4:567", 0, 1); - test_assert(r == 0); ++ tt_assert(r == 0); + + /* Check mocked client transport cases */ + MOCK(pt_kickstart_proxy, pt_kickstart_proxy_mock); + MOCK(transport_add_from_config, transport_add_from_config_mock); + MOCK(transport_is_needed, transport_is_needed_mock); + + /* Unnecessary transport case */ + transport_is_needed_mock_return = 0; + old_pt_kickstart_proxy_mock_call_count = + pt_kickstart_proxy_mock_call_count; + old_transport_add_from_config_mock_call_count = + transport_add_from_config_mock_call_count; + old_transport_is_needed_mock_call_count = + transport_is_needed_mock_call_count; + r = parse_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 0, 0); + /* Should have succeeded */ - test_assert(r == 0); ++ tt_assert(r == 0); + /* transport_is_needed() should have been called */ - test_assert(transport_is_needed_mock_call_count == ++ tt_assert(transport_is_needed_mock_call_count == + old_transport_is_needed_mock_call_count + 1); + /* + * pt_kickstart_proxy() and transport_add_from_config() should + * not have been called. + */ - test_assert(pt_kickstart_proxy_mock_call_count == ++ tt_assert(pt_kickstart_proxy_mock_call_count == + old_pt_kickstart_proxy_mock_call_count); - test_assert(transport_add_from_config_mock_call_count == ++ tt_assert(transport_add_from_config_mock_call_count == + old_transport_add_from_config_mock_call_count); + + /* Necessary transport case */ + transport_is_needed_mock_return = 1; + old_pt_kickstart_proxy_mock_call_count = + pt_kickstart_proxy_mock_call_count; + old_transport_add_from_config_mock_call_count = + transport_add_from_config_mock_call_count; + old_transport_is_needed_mock_call_count = + transport_is_needed_mock_call_count; + r = parse_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 0, 0); + /* Should have succeeded */ - test_assert(r == 0); ++ tt_assert(r == 0); + /* + * transport_is_needed() and pt_kickstart_proxy() should have been + * called. + */ - test_assert(pt_kickstart_proxy_mock_call_count == ++ tt_assert(pt_kickstart_proxy_mock_call_count == + old_pt_kickstart_proxy_mock_call_count + 1); - test_assert(transport_is_needed_mock_call_count == ++ tt_assert(transport_is_needed_mock_call_count == + old_transport_is_needed_mock_call_count + 1); + /* transport_add_from_config() should not have been called. */ - test_assert(transport_add_from_config_mock_call_count == ++ tt_assert(transport_add_from_config_mock_call_count == + old_transport_add_from_config_mock_call_count); + + /* proxy case */ + transport_is_needed_mock_return = 1; + old_pt_kickstart_proxy_mock_call_count = + pt_kickstart_proxy_mock_call_count; + old_transport_add_from_config_mock_call_count = + transport_add_from_config_mock_call_count; + old_transport_is_needed_mock_call_count = + transport_is_needed_mock_call_count; + r = parse_transport_line(options, + "transport_1 socks5 1.2.3.4:567", 0, 0); + /* Should have succeeded */ - test_assert(r == 0); ++ tt_assert(r == 0); + /* + * transport_is_needed() and transport_add_from_config() should have + * been called. + */ - test_assert(transport_add_from_config_mock_call_count == ++ tt_assert(transport_add_from_config_mock_call_count == + old_transport_add_from_config_mock_call_count + 1); - test_assert(transport_is_needed_mock_call_count == ++ tt_assert(transport_is_needed_mock_call_count == + old_transport_is_needed_mock_call_count + 1); + /* pt_kickstart_proxy() should not have been called. */ - test_assert(pt_kickstart_proxy_mock_call_count == ++ tt_assert(pt_kickstart_proxy_mock_call_count == + old_pt_kickstart_proxy_mock_call_count); + + /* Done with mocked client transport cases */ + UNMOCK(transport_is_needed); + UNMOCK(transport_add_from_config); + UNMOCK(pt_kickstart_proxy); + + done: + /* Make sure we undo all mocks */ + UNMOCK(pt_kickstart_proxy); + UNMOCK(transport_add_from_config); + UNMOCK(transport_is_needed); + + return; + } + // Tests if an options with MyFamily fingerprints missing '$' normalises // them correctly and also ensure it also works with multiple fingerprints static void [View Less]

1 0

[tor/master] Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
by nickm＠torproject.org 04 Nov '14

04 Nov '14

commit 5d81fd25a0558794902b93d0d73c0f0134ccfce6 Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Jul 25 21:42:12 2014 -0700 Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing --- src/test/test_config.c | 248 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 248 insertions(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index b35984f..5975e1e 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@… [View More] -14,6 +14,8 @@ #include "test.h" #include "util.h" #include "address.h" +#include "entrynodes.h" +#include "transports.h" static void test_config_addressmap(void *arg) @@ -552,6 +554,251 @@ test_config_parse_transport_options_line(void *arg) } } +/* Mocks needed for the transport plugin line test */ + +static void pt_kickstart_proxy_mock(const smartlist_t *transport_list, + char **proxy_argv, int is_server); +static int transport_add_from_config_mock(const tor_addr_t *addr, + uint16_t port, const char *name, + int socks_ver); +static int transport_is_needed_mock(const char *transport_name); + +static int pt_kickstart_proxy_mock_call_count = 0; +static int transport_add_from_config_mock_call_count = 0; +static int transport_is_needed_mock_call_count = 0; +static int transport_is_needed_mock_return = 0; + +static void +pt_kickstart_proxy_mock(const smartlist_t *transport_list, + char **proxy_argv, int is_server) +{ + ++pt_kickstart_proxy_mock_call_count; +} + +static int +transport_add_from_config_mock(const tor_addr_t *addr, + uint16_t port, const char *name, + int socks_ver) +{ + ++transport_add_from_config_mock_call_count; + + return 0; +} + +static int +transport_is_needed_mock(const char *transport_name) +{ + ++transport_is_needed_mock_call_count; + + return transport_is_needed_mock_return; +} + +/** + * Test parsing for the ClientTransportPlugin and ServerTransportPlugin config + * options. + */ + +static void +test_config_parse_transport_plugin_line(void *arg) +{ + or_options_t *options = get_options_mutable(); + int r, tmp; + int old_pt_kickstart_proxy_mock_call_count; + int old_transport_add_from_config_mock_call_count; + int old_transport_is_needed_mock_call_count; + + /* Bad transport lines - too short */ + r = parse_client_transport_line(options, "bad", 1); + test_assert(r < 0); + r = parse_server_transport_line(options, "bad", 1); + test_assert(r < 0); + r = parse_client_transport_line(options, "bad bad", 1); + test_assert(r < 0); + r = parse_server_transport_line(options, "bad bad", 1); + test_assert(r < 0); + + /* Test transport list parsing */ + r = parse_client_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 1); + test_assert(r == 0); + r = parse_server_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 1); + test_assert(r == 0); + r = parse_client_transport_line(options, + "transport_1,transport_2 exec /usr/bin/fake-transport", 1); + test_assert(r == 0); + r = parse_server_transport_line(options, + "transport_1,transport_2 exec /usr/bin/fake-transport", 1); + test_assert(r == 0); + /* Bad transport identifiers */ + r = parse_client_transport_line(options, + "transport_* exec /usr/bin/fake-transport", 1); + test_assert(r < 0); + r = parse_server_transport_line(options, + "transport_* exec /usr/bin/fake-transport", 1); + test_assert(r < 0); + + /* Check SOCKS cases for client transport */ + r = parse_client_transport_line(options, + "transport_1 socks4 1.2.3.4:567", 1); + test_assert(r == 0); + r = parse_client_transport_line(options, + "transport_1 socks5 1.2.3.4:567", 1); + test_assert(r == 0); + /* Proxy case for server transport */ + r = parse_server_transport_line(options, + "transport_1 proxy 1.2.3.4:567", 1); + test_assert(r == 0); + /* Multiple-transport error exit */ + r = parse_client_transport_line(options, + "transport_1,transport_2 socks5 1.2.3.4:567", 1); + test_assert(r < 0); + r = parse_server_transport_line(options, + "transport_1,transport_2 proxy 1.2.3.4:567", 1); + /* No port error exit */ + r = parse_client_transport_line(options, + "transport_1 socks5 1.2.3.4", 1); + test_assert(r < 0); + r = parse_server_transport_line(options, + "transport_1 proxy 1.2.3.4", 1); + test_assert(r < 0); + /* Unparsable address error exit */ + r = parse_client_transport_line(options, + "transport_1 socks5 1.2.3:6x7", 1); + test_assert(r < 0); + r = parse_server_transport_line(options, + "transport_1 proxy 1.2.3:6x7", 1); + test_assert(r < 0); + + /* "Strange {Client|Server}TransportPlugin field" error exit */ + r = parse_client_transport_line(options, + "transport_1 foo bar", 1); + test_assert(r < 0); + r = parse_server_transport_line(options, + "transport_1 foo bar", 1); + test_assert(r < 0); + + /* No sandbox mode error exit */ + tmp = options->Sandbox; + options->Sandbox = 1; + r = parse_client_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 1); + test_assert(r < 0); + r = parse_server_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 1); + test_assert(r < 0); + options->Sandbox = tmp; + + /* + * These final test cases cover code paths that only activate without + * validate_only, so they need mocks in place. + */ + MOCK(pt_kickstart_proxy, pt_kickstart_proxy_mock); + old_pt_kickstart_proxy_mock_call_count = + pt_kickstart_proxy_mock_call_count; + r = parse_server_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 0); + test_assert(r == 0); + test_assert(pt_kickstart_proxy_mock_call_count == + old_pt_kickstart_proxy_mock_call_count + 1); + UNMOCK(pt_kickstart_proxy); + + /* This one hits a log line in the !validate_only case only */ + r = parse_server_transport_line(options, + "transport_1 proxy 1.2.3.4:567", 0); + test_assert(r == 0); + + /* Check mocked client transport cases */ + MOCK(pt_kickstart_proxy, pt_kickstart_proxy_mock); + MOCK(transport_add_from_config, transport_add_from_config_mock); + MOCK(transport_is_needed, transport_is_needed_mock); + + /* Unnecessary transport case */ + transport_is_needed_mock_return = 0; + old_pt_kickstart_proxy_mock_call_count = + pt_kickstart_proxy_mock_call_count; + old_transport_add_from_config_mock_call_count = + transport_add_from_config_mock_call_count; + old_transport_is_needed_mock_call_count = + transport_is_needed_mock_call_count; + r = parse_client_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 0); + /* Should have succeeded */ + test_assert(r == 0); + /* transport_is_needed() should have been called */ + test_assert(transport_is_needed_mock_call_count == + old_transport_is_needed_mock_call_count + 1); + /* + * pt_kickstart_proxy() and transport_add_from_config() should + * not have been called. + */ + test_assert(pt_kickstart_proxy_mock_call_count == + old_pt_kickstart_proxy_mock_call_count); + test_assert(transport_add_from_config_mock_call_count == + old_transport_add_from_config_mock_call_count); + + /* Necessary transport case */ + transport_is_needed_mock_return = 1; + old_pt_kickstart_proxy_mock_call_count = + pt_kickstart_proxy_mock_call_count; + old_transport_add_from_config_mock_call_count = + transport_add_from_config_mock_call_count; + old_transport_is_needed_mock_call_count = + transport_is_needed_mock_call_count; + r = parse_client_transport_line(options, + "transport_1 exec /usr/bin/fake-transport", 0); + /* Should have succeeded */ + test_assert(r == 0); + /* + * transport_is_needed() and pt_kickstart_proxy() should have been + * called. + */ + test_assert(pt_kickstart_proxy_mock_call_count == + old_pt_kickstart_proxy_mock_call_count + 1); + test_assert(transport_is_needed_mock_call_count == + old_transport_is_needed_mock_call_count + 1); + /* transport_add_from_config() should not have been called. */ + test_assert(transport_add_from_config_mock_call_count == + old_transport_add_from_config_mock_call_count); + + /* proxy case */ + transport_is_needed_mock_return = 1; + old_pt_kickstart_proxy_mock_call_count = + pt_kickstart_proxy_mock_call_count; + old_transport_add_from_config_mock_call_count = + transport_add_from_config_mock_call_count; + old_transport_is_needed_mock_call_count = + transport_is_needed_mock_call_count; + r = parse_client_transport_line(options, + "transport_1 socks5 1.2.3.4:567", 0); + /* Should have succeeded */ + test_assert(r == 0); + /* + * transport_is_needed() and transport_add_from_config() should have + * been called. + */ + test_assert(transport_add_from_config_mock_call_count == + old_transport_add_from_config_mock_call_count + 1); + test_assert(transport_is_needed_mock_call_count == + old_transport_is_needed_mock_call_count + 1); + /* pt_kickstart_proxy() should not have been called. */ + test_assert(pt_kickstart_proxy_mock_call_count == + old_pt_kickstart_proxy_mock_call_count); + + /* Done with mocked client transport cases */ + UNMOCK(transport_is_needed); + UNMOCK(transport_add_from_config); + UNMOCK(pt_kickstart_proxy); + + done: + /* Make sure we undo all mocks */ + UNMOCK(pt_kickstart_proxy); + UNMOCK(transport_add_from_config); + UNMOCK(transport_is_needed); + + return; +} + // Tests if an options with MyFamily fingerprints missing '$' normalises // them correctly and also ensure it also works with multiple fingerprints static void @@ -596,6 +843,7 @@ struct testcase_t config_tests[] = { CONFIG_TEST(addressmap, 0), CONFIG_TEST(parse_bridge_line, 0), CONFIG_TEST(parse_transport_options_line, 0), + CONFIG_TEST(parse_transport_plugin_line, TT_FORK), CONFIG_TEST(check_or_create_data_subdir, TT_FORK), CONFIG_TEST(write_to_data_subdir, TT_FORK), CONFIG_TEST(fix_my_family, 0), [View Less]

1 0

[tor/master] Fix unused-argument warnings
by nickm＠torproject.org 04 Nov '14

04 Nov '14

commit 07e06b335d8e044062818d2c5ae3e36a4834640f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 4 09:54:51 2014 -0500 Fix unused-argument warnings --- src/test/test_config.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index 1ecb816..71c338e 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -572,6 +572,11 @@ static void pt_kickstart_proxy_mock(const smartlist_t *… [View More]

1 0

[tor/master] Fix a wide line I introduced
by nickm＠torproject.org 04 Nov '14

04 Nov '14

commit ce147d33f5c029fc74756dda8f9986cb4b8f2673 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 4 09:56:46 2014 -0500 Fix a wide line I introduced --- src/or/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index cb27dac..d7c1c5c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4892,8 +4892,8 @@ parse_transport_line(const or_options_t *options, /* external */ /* … [View More]

1 0

[tor/master] Update verbiage in README to mention autogen.sh
by nickm＠torproject.org 04 Nov '14

04 Nov '14

commit b1ca05d273eaef7477528c059ab0d1deb0dc9dab Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 4 09:01:46 2014 -0500 Update verbiage in README to mention autogen.sh Closes ticket 13190 --- README | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README b/README index e878476..342376f 100644 --- a/README +++ b/README @@ -6,6 +6,9 @@ configure it properly. To build Tor from source: ./configure && make && make install +To … [View More]

1 0

[torflow/master] Fixes #13645, removal of bwauthority.cfg causes bwauth to fail
by aagbsn＠torproject.org 04 Nov '14

04 Nov '14

commit 6e9fed9285738a2f8de1d326529e0b016ad6cd8c Author: aagbsn <aagbsn(a)extc.org> Date: Tue Nov 4 13:12:23 2014 +0000 Fixes #13645, removal of bwauthority.cfg causes bwauth to fail Thanks to micah for catching and patching this bug :-) --- NetworkScanners/BwAuthority/run_scan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NetworkScanners/BwAuthority/run_scan.sh b/NetworkScanners/BwAuthority/run_scan.sh index cb32da9..c6b552f 100755 --- a/… [View More]

1 0

[flashproxy/master] have automake output test failures to stdout
by infinity0＠torproject.org 04 Nov '14

04 Nov '14

commit de8d428ab5f2dfcc830ac8a4b34985a87643749f Author: Ximin Luo <infinity0(a)torproject.org> Date: Tue Nov 4 01:28:55 2014 +0000 have automake output test failures to stdout --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 922f140..56e76ab 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,7 @@ test-full: test cd facilitator && \ { test -x ./config.status && ./config.status || \ { test -x ./… [View More]

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 04 Nov '14

04 Nov '14

commit c65f2522321c495729c61d8f5c02899d3bd5bf4d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 4 11:15:41 2014 +0000 Update translations for tails-misc --- lt.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt.po b/lt.po index 6cda902..d3ebab6 100644 --- a/lt.po +++ b/lt.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 17:57+0200\n" -"PO-Revision-… [View More]

1 0

← Newer
1
...
83
84
85
86
87
88
89
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2014