- tor-commits - lists.torproject.org

[tor/master] Fix some bugs that did not allow compilation on Windows.
by nickm＠torproject.org 06 Sep '12

06 Sep '12

commit b9551fd0741434e9d0917355d67164775eb25fbe Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 21 20:56:30 2012 +0300 Fix some bugs that did not allow compilation on Windows. --- src/common/util.c | 14 +++++++------- src/tools/tor-fw-helper/tor-fw-helper.c | 20 +++++--------------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 25ddcc1..fa8fb53 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4381,17 +4381,17 @@ tor_get_lines_from_handle(HANDLE *handle, char stdout_buf[600] = {0}; smartlist_t *lines = NULL; - tor_assert(stream_status); + tor_assert(stream_status_out); - *stream_status = IO_STREAM_TERM; + *stream_status_out = IO_STREAM_TERM; pos = tor_read_all_handle(handle, stdout_buf, sizeof(stdout_buf) - 1, NULL); if (pos < 0) { - *stream_status = IO_STREAM_TERM; + *stream_status_out = IO_STREAM_TERM; return NULL; } if (pos == 0) { - *stream_status = IO_STREAM_EAGAIN; + *stream_status_out = IO_STREAM_EAGAIN; return NULL; } @@ -4408,7 +4408,7 @@ tor_get_lines_from_handle(HANDLE *handle, SMARTLIST_FOREACH(lines, char *, line, SMARTLIST_REPLACE_CURRENT(lines, line, tor_strdup(line))); - *stream_status = IO_STREAM_OKAY; + *stream_status_out = IO_STREAM_OKAY; return lines; } @@ -4461,8 +4461,8 @@ log_from_handle(HANDLE *pipe, int severity) #else /** Return a smartlist containing lines outputted from - * handle. Return NULL on error, and set stream_status - * appropriately. */ + * handle. Return NULL on error, and set + * stream_status_out appropriately. */ smartlist_t * tor_get_lines_from_handle(FILE *handle, enum stream_status *stream_status_out) { diff --git a/src/tools/tor-fw-helper/tor-fw-helper.c b/src/tools/tor-fw-helper/tor-fw-helper.c index d02b757..4efe515 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper.c +++ b/src/tools/tor-fw-helper/tor-fw-helper.c @@ -353,28 +353,18 @@ parse_port(const char *arg) /** Report a failure of epic proportions: We didn't manage to * initialize any port forwarding backends. */ static void -report_full_fail(const smartlist_t *ports_to_forward, backends_t *backends) +report_full_fail(const smartlist_t *ports_to_forward) { - char *list_of_backends_str = NULL; - char *fail_msg = NULL; - if (!ports_to_forward) return; - list_of_backends_str = get_list_of_backends_string(backends); - tor_asprintf(&fail_msg, - "Port forwarding backends (%s) could not be initialized.", - list_of_backends_str); - SMARTLIST_FOREACH_BEGIN(ports_to_forward, const port_to_forward_t *, port_to_forward) { tor_fw_helper_report_port_fw_fail(port_to_forward->internal_port, port_to_forward->external_port, - fail_msg); + "All backends (NAT-PMP, UPnP) failed " + "to initialize!"); /* XXX hardcoded */ } SMARTLIST_FOREACH_END(port_to_forward); - - tor_free(list_of_backends_str); - tor_free(fail_msg); } int @@ -481,8 +471,8 @@ main(int argc, char **argv) r = init_backends(&tor_fw_options, &backend_state); if (!r) { // all backends failed: // report our failure - report_full_fail(tor_fw_options.ports_to_forward, &backend_state); - fprintf(stderr, "V: tor-fw-helper: All backends failed.\n"); + report_full_fail(tor_fw_options.ports_to_forward); + fprintf(stderr, "tor-fw-helper: All backends failed.\n"); exit(1); } else { // some backends succeeded: fprintf(stderr, "tor-fw-helper: %i NAT traversal helper(s) loaded\n", r);

1 0

[tor/master] Merge remote-tracking branch 'asn/bug4567_rebased'
by nickm＠torproject.org 06 Sep '12

06 Sep '12

commit e9684405acf5d3bbfa3c2d4f70332cef3c66d553 Merge: d2d7cab 4edc57c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 6 10:12:28 2012 -0400 Merge remote-tracking branch 'asn/bug4567_rebased' changes/bug4567 | 3 + changes/bug4567_2 | 4 + doc/tor-fw-helper.1.txt | 14 +- src/common/util.c | 272 ++++++++++++++++-- src/common/util.h | 13 +- src/or/circuitbuild.h | 4 + src/or/config.c | 37 +++ src/or/config.h | 2 + src/or/main.c | 14 +- src/or/transports.c | 113 +++----- src/or/transports.h | 2 + src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 58 ++-- src/tools/tor-fw-helper/tor-fw-helper-natpmp.h | 4 +- src/tools/tor-fw-helper/tor-fw-helper-upnp.c | 44 ++-- src/tools/tor-fw-helper/tor-fw-helper-upnp.h | 3 +- src/tools/tor-fw-helper/tor-fw-helper.c | 367 +++++++++++++++--------- src/tools/tor-fw-helper/tor-fw-helper.h | 20 +- 17 files changed, 656 insertions(+), 318 deletions(-)

1 0

[tor/master] Figure out ORPort and DirPort even when 'auto' is used.
by nickm＠torproject.org 06 Sep '12

06 Sep '12

commit 4edc57caa5c4a7d4d46d30bf0150a7f70e8dcccb Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Sep 5 20:17:25 2012 +0300 Figure out ORPort and DirPort even when 'auto' is used. Use router_get_advertised_{dir,or}_port() functions instead of get_primary_{dir,or}_port(). --- src/or/config.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index a4af22a..02afa1e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -7266,11 +7266,11 @@ get_list_of_ports_to_forward(void) /** XXX TODO tor-fw-helper does not support forwarding ports to other hosts than the local one. If the user is binding to a different IP address, tor-fw-helper won't work. */ - port = get_primary_or_port(); /* Get ORPort */ + port = router_get_advertised_or_port(get_options()); /* Get ORPort */ if (port) smartlist_add_asprintf(ports_to_forward, "%d:%d", port, port); - port = get_primary_dir_port(); /* Get DirPort */ + port = router_get_advertised_dir_port(get_options(), 0); /* Get DirPort */ if (port) smartlist_add_asprintf(ports_to_forward, "%d:%d", port, port);

1 0

[tor/master] General tweaks and fixes for Nick's comments.
by nickm＠torproject.org 06 Sep '12

06 Sep '12

commit 44fe717524408d247ab10e3794438232d81d66dc Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jun 29 19:32:34 2012 +0300 General tweaks and fixes for Nick's comments. * Add changes/ files. * Edit the tor-fw-helper manpage. * Fix check-spaces. * Add prototype for get_list_of_ports_to_forward(). * Fix tor_parse_long() TCP port range. * Improve doc. of tor_check_port_forwarding(). * Check for overflows in tor_check_port_forwarding(). * Demote successful port forwarding to LOG_INFO. Conflicts: src/common/address.c src/or/circuitbuild.c --- changes/bug4567 | 3 ++ changes/bug4567_2 | 4 +++ doc/tor-fw-helper.1.txt | 14 +--------- src/common/address.c | 1 - src/common/util.c | 42 ++++++++++++++++++++++-------- src/or/config.c | 10 ++++--- src/or/config.h | 2 + src/tools/tor-fw-helper/tor-fw-helper.c | 14 ++++++---- 8 files changed, 56 insertions(+), 34 deletions(-) diff --git a/changes/bug4567 b/changes/bug4567 new file mode 100644 index 0000000..d57a33d --- /dev/null +++ b/changes/bug4567 @@ -0,0 +1,3 @@ + o Major features: + - Automatically forward the TCP ports of pluggable transport + proxies using tor-fw-helper if PortForwarding is enabled. diff --git a/changes/bug4567_2 b/changes/bug4567_2 new file mode 100644 index 0000000..5387593 --- /dev/null +++ b/changes/bug4567_2 @@ -0,0 +1,4 @@ + o Code refactoring: + - Tweak tor-fw-helper to accept an arbitrary amount of arbitrary + TCP ports to forward. In the past it only accepted two ports: + the ORPort and the DirPort. diff --git a/doc/tor-fw-helper.1.txt b/doc/tor-fw-helper.1.txt index 4caf16c..cf769d9 100644 --- a/doc/tor-fw-helper.1.txt +++ b/doc/tor-fw-helper.1.txt @@ -41,18 +41,8 @@ OPTIONS **-g** or **--fetch-public-ip**:: Fetch the the public ip address for each supported NAT helper method. -**-i** or **--internal-or-port** __port__:: - Inform **tor-fw-helper** of your internal OR port. This is the only - required argument. - -**-e** or **--external-or-port** __port__:: - Inform **tor-fw-helper** of your external OR port. - -**-d** or **--internal-dir-port** __port__:: - Inform **tor-fw-helper** of your internal Dir port. - -**-p** or **--external-dir-port** __port__:: - Inform **tor-fw-helper** of your external Dir port. +**-p** or **--forward-port** __external_port__:__internal_port__:: + Forward external_port to internal_port. BUGS ---- diff --git a/src/common/address.c b/src/common/address.c index e5862be..ac45cba 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1697,7 +1697,6 @@ tor_addr_hostname_is_local(const char *name) !strcasecmpend(name, ".local"); } - /** Return a newly allocated tor_addr_port_t with addr and port filled in. */ tor_addr_port_t * diff --git a/src/common/util.c b/src/common/util.c index b1a05b5..25ddcc1 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4676,10 +4676,10 @@ handle_fw_helper_line(const char *line) message_for_log ? message_for_log : "", internal_port); } else { - log_notice(LD_GENERAL, - "Tor successfully forwarded TCP port '%s' to '%s'%s.", - external_port, internal_port, - message_for_log ? message_for_log : ""); + log_info(LD_GENERAL, + "Tor successfully forwarded TCP port '%s' to '%s'%s.", + external_port, internal_port, + message_for_log ? message_for_log : ""); } goto done; @@ -4723,7 +4723,9 @@ handle_fw_helper_output(process_handle_t *process_handle) } /** Spawn tor-fw-helper and ask it to forward the ports in - * ports_to_forward. */ + * ports_to_forward. ports_to_forward contains strings + * of the form "<external port>:<internal port>", which is the format + * that tor-fw-helper expects. */ void tor_check_port_forwarding(const char *filename, smartlist_t *ports_to_forward, @@ -4748,17 +4750,35 @@ tor_check_port_forwarding(const char *filename, /* Start the child, if it is not already running */ if ((!child_handle || child_handle->status != PROCESS_STATUS_RUNNING) && time_to_run_helper < now) { - /* tor-fw-helper cli looks like this: tor_fw_helper -p :5555 -p 4555:1111 */ + /*tor-fw-helper cli looks like this: tor_fw_helper -p :5555 -p 4555:1111 */ const char **argv; /* cli arguments */ - /* Number of cli arguments: one for the filename, two for each - smartlist element (one for "-p" and one for the ports), and one - for the final NULL. */ - int args_n = 1 + 2*smartlist_len(ports_to_forward) + 1; + int args_n, status; int argv_index = 0; /* index inside 'argv' */ - int status; tor_assert(smartlist_len(ports_to_forward) > 0); + /* check for overflow during 'argv' allocation: + (len(ports_to_forward)*2 + 2)*sizeof(char*) > SIZE_MAX == + len(ports_to_forward) > (((SIZE_MAX/sizeof(char*)) - 2)/2) */ + if ((size_t) smartlist_len(ports_to_forward) > + (((SIZE_MAX/sizeof(char*)) - 2)/2)) { + log_warn(LD_GENERAL, + "Overflow during argv allocation. This shouldn't happen."); + return; + } + /* check for overflow during 'argv_index' increase: + ((len(ports_to_forward)*2 + 2) > INT_MAX) == + len(ports_to_forward) > (INT_MAX - 2)/2 */ + if (smartlist_len(ports_to_forward) > (INT_MAX - 2)/2) { + log_warn(LD_GENERAL, + "Overflow during argv_index increase. This shouldn't happen."); + return; + } + + /* Calculate number of cli arguments: one for the filename, two + for each smartlist element (one for "-p" and one for the + ports), and one for the final NULL. */ + args_n = 1 + 2*smartlist_len(ports_to_forward) + 1; argv = tor_malloc_zero(sizeof(char*)*args_n); argv[argv_index++] = filename; diff --git a/src/or/config.c b/src/or/config.c index ad422ef..a4af22a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -7275,10 +7275,12 @@ get_list_of_ports_to_forward(void) smartlist_add_asprintf(ports_to_forward, "%d:%d", port, port); /* Get ports of transport proxies */ - smartlist_t *transport_ports = get_transport_proxy_ports(); - if (transport_ports) { - smartlist_add_all(ports_to_forward, transport_ports); - smartlist_free(transport_ports); + { + smartlist_t *transport_ports = get_transport_proxy_ports(); + if (transport_ports) { + smartlist_add_all(ports_to_forward, transport_ports); + smartlist_free(transport_ports); + } } if (!smartlist_len(ports_to_forward)) { diff --git a/src/or/config.h b/src/or/config.h index dd76edc..d207965 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -82,6 +82,8 @@ void save_transport_to_state(const char *transport_name, const tor_addr_t *addr, uint16_t port); char *get_stored_bindaddr_for_server_transport(const char *transport); +smartlist_t *get_list_of_ports_to_forward(void); + int getinfo_helper_config(control_connection_t *conn, const char *question, char **answer, const char **errmsg); diff --git a/src/tools/tor-fw-helper/tor-fw-helper.c b/src/tools/tor-fw-helper/tor-fw-helper.c index 3263354..d02b757 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper.c +++ b/src/tools/tor-fw-helper/tor-fw-helper.c @@ -249,10 +249,11 @@ tor_fw_add_ports(tor_fw_options_t *tor_fw_options, (const char *) backends->backend_ops[i].name); } - r = backends->backend_ops[i].add_tcp_mapping(port_to_forward->internal_port, - port_to_forward->external_port, - tor_fw_options->verbose, - backends->backend_state[i]); + r = + backends->backend_ops[i].add_tcp_mapping(port_to_forward->internal_port, + port_to_forward->external_port, + tor_fw_options->verbose, + backends->backend_state[i]); if (r == 0) { /* backend success */ tor_fw_helper_report_port_fw_success(port_to_forward->internal_port, port_to_forward->external_port, @@ -326,13 +327,13 @@ parse_port(const char *arg) goto err; port_str = smartlist_get(sl, 0); /* macroify ? */ - port = (int)tor_parse_long(port_str, 10, 1, 65536, &ok, NULL); + port = (int)tor_parse_long(port_str, 10, 1, 65535, &ok, NULL); if (!ok && strlen(port_str)) /* ":1555" is valid */ goto err; port_to_forward->external_port = port; port_str = smartlist_get(sl, 1); - port = (int)tor_parse_long(port_str, 10, 1, 65536, &ok, NULL); + port = (int)tor_parse_long(port_str, 10, 1, 65535, &ok, NULL); if (!ok) goto err; port_to_forward->internal_port = port; @@ -507,3 +508,4 @@ main(int argc, char **argv) exit(r); } +

1 0

[torspec/master] Make tor-fw-helper port-purpose-agnostic.
by nickm＠torproject.org 06 Sep '12

06 Sep '12

commit 43c37b1113cd42b9818236a75660b896e16e6324 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jun 11 19:51:54 2012 +0300 Make tor-fw-helper port-purpose-agnostic. --- tor-fw-helper-spec.txt | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) diff --git a/tor-fw-helper-spec.txt b/tor-fw-helper-spec.txt index 0068b26..fdc34b1 100644 --- a/tor-fw-helper-spec.txt +++ b/tor-fw-helper-spec.txt @@ -22,25 +22,37 @@ 2.1 Output format - When tor-fw-helper has completed the requested action successfully, it will - report the following message to standard output: +2.1.1. Motivation - tor-fw-helper: SUCCESS + tor-fw-helper should be able to signal to tor whether its actions + succeeded so that tor can act accordingly. For this reason it's + important to standarize the output format of tor-fw-helper. - If tor-fw-helper was unable to complete the requested action successfully, it - will report the following message to standard error: + tor-fw-helper outputs signalling commands to stdout, and debugging + messages to stderr. This means that a program that launches + tor-fw-helper only needs to monitor stdout to learn its status. - tor-fw-helper: FAILURE +2.1.2. TCP forwarding output - All informational messages are printed to standard output; all error messages - are printed to standard error. Messages other than SUCCESS and FAILURE - may be printed by any compliant tor-fw-helper. + When tor-fw-helper completes a TCP forwarding action, it prints the + following message to standard output: -2.2 Output format stability + tor-fw-helper tcp-forwarding <external port> <internal port> <status> [<message>] - The above SUCCESS and FAILURE messages are the only stable output formats - provided by this specification. tor-fw-helper-spec compliant implementations - must return SUCCESS or FAILURE as defined above. + where, + + <external port>, is the TCP port in the external side of the NAT + device that was forwarded. + <internal port>, is the TCP port in the internal side of the NAT + device that accepts forwarded traffic. + <status>, is either "SUCCESS" or "FAIL". + <message>, is an optional supplementary message that can include + multiple words. + + For example, upon successfully using NAT-PMP to forward connections from + port '4200' to port '4333', tor-fw-helper would output in stdout: + + tor-fw-helper tcp-forwarding 4200 4333 SUCCESS NAT-PMP succeded 3. Security Concerns

1 0

[torspec/master] Merge remote-tracking branch 'asn-gitorious/bug6059'
by nickm＠torproject.org 06 Sep '12

06 Sep '12

commit e5e36e4acabc2914799f96de70bd649f8b80667d Merge: 5ddddcb 43c37b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 6 10:14:09 2012 -0400 Merge remote-tracking branch 'asn-gitorious/bug6059' tor-fw-helper-spec.txt | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-)

1 0

[tor/master] Use tor_malloc_zero() in var_cell_new().
by nickm＠torproject.org 06 Sep '12

06 Sep '12

commit 8284c2bcba4d8daecf5416fa88324212c5fc17ea Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Sep 6 01:22:32 2012 +0300 Use tor_malloc_zero() in var_cell_new(). This is just a precaution; we seem to be using var_cell_t.payload and var_cell_t.payload_len correctly at the moment. --- src/or/connection_or.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index da27cba..5a3b620 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -327,7 +327,7 @@ var_cell_t * var_cell_new(uint16_t payload_len) { size_t size = STRUCT_OFFSET(var_cell_t, payload) + payload_len; - var_cell_t *cell = tor_malloc(size); + var_cell_t *cell = tor_malloc_zero(size); cell->payload_len = payload_len; cell->command = 0; cell->circ_id = 0;

1 0

[tor/master] Log more information when we fail to terminate a process.
by nickm＠torproject.org 06 Sep '12

06 Sep '12

commit 93c38b679f01bba7d85ddf5eeac51c462e782a62 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Sep 6 17:03:11 2012 +0300 Log more information when we fail to terminate a process. --- src/common/util.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index ce67252..4b1bce8 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3897,10 +3897,15 @@ tor_process_handle_destroy(process_handle_t *process_handle, if (also_terminate_process) { if (tor_terminate_process(process_handle) < 0) { - log_notice(LD_GENERAL, "Failed to terminate process with PID '%d'", - tor_process_get_pid(process_handle)); + log_notice(LD_GENERAL, "Failed to terminate process with " + "PID '%d' ('%s').", tor_process_get_pid(process_handle), +#ifdef _WIN32 + format_win32_error(GetLastError())); +#else + strerror(errno)); +#endif } else { - log_info(LD_GENERAL, "Terminated process with PID '%d'", + log_info(LD_GENERAL, "Terminated process with PID '%d'.", tor_process_get_pid(process_handle)); } }

1 0

[tor/master] Merge remote-tracking branch 'asn/bug6765'
by nickm＠torproject.org 06 Sep '12

06 Sep '12

commit deee0b67c3171cf4a6c7cf9c64c642d882b39880 Merge: 0012054 8284c2b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 6 10:12:11 2012 -0400 Merge remote-tracking branch 'asn/bug6765' src/or/connection_or.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'asn/bug6779'
by nickm＠torproject.org 06 Sep '12

06 Sep '12

commit d2d7cab5b83e49aba4ae8ecf0aabb9dfcda8d31e Merge: deee0b6 93c38b6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 6 10:12:15 2012 -0400 Merge remote-tracking branch 'asn/bug6779' src/common/util.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)

1 0