October 2011 - tor-commits - lists.torproject.org

[tor/master] Fix a bogus warning
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit c1ac0695d5bc64b555c345e4be87b18bab3ae56b Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Sep 14 00:05:03 2011 -0700 Fix a bogus warning --- changes/dont-warn-about-rfc1918-socksport-addrs | 7 +++++++ src/or/config.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/dont-warn-about-rfc1918-socksport-addrs b/changes/dont-warn-about-rfc1918-socksport-addrs new file mode 100644 index 0000000..9482599 --- /dev/null +++ b/changes/dont-warn-about-rfc1918-socksport-addrs @@ -0,0 +1,7 @@ + o Minor bugfixes: + + - Don't warn users that they are exposing a client port to the + Internet if they have specified an RFC1918 address. Previously, + we would warn if the user had specified any non-loopback + address. Bugfix on 0.2.3.3-alpha. Fixes bug 4018; reported by Tas. + diff --git a/src/or/config.c b/src/or/config.c index bc77b3a..51cab81 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4912,12 +4912,13 @@ port_cfg_free(port_cfg_t *port) tor_free(port); } -/** Warn for every port in ports that is not on a loopback address. */ +/** Warn for every port in ports that is on a publicly routable + * address. */ static void warn_nonlocal_client_ports(const smartlist_t *ports, const char *portname) { SMARTLIST_FOREACH_BEGIN(ports, const port_cfg_t *, port) { - if (!tor_addr_is_loopback(&port->addr)) { + if (!tor_addr_is_internal(&port->addr, 1)) { log_warn(LD_CONFIG, "You specified a public address for %sPort. " "Other people on the Internet might find your computer and " "use it as an open proxy. Please don't allow this unless you "

1 0

[tor/master] reinstate a notice for the non-loopback socksport case
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 8b0ee60fe7752f4894fff8334eff786e80941302 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 7 16:34:21 2011 -0400 reinstate a notice for the non-loopback socksport case Thanks to prop171, it's no longer a crazy thing to do, but you should make sure that you really meant it! --- src/or/config.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 3ac6e94..2705ba5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5130,6 +5130,11 @@ warn_nonlocal_client_ports(const smartlist_t *ports, const char *portname) "Other people on the Internet might find your computer and " "use it as an open proxy. Please don't allow this unless you " "have a good reason.", portname); + } else if (!tor_addr_is_loopback(&port->addr)) { + log_notice(LD_CONFIG, "You configured a non-loopback address for %sPort. " + "This allows everybody on your local network to use your " + "machine as a proxy. Make sure this is what you wanted.", + portname); } } SMARTLIST_FOREACH_END(port); }

1 0

[tor/master] Provide missing description for our FLEXIBLE_ARRAY_MEMBER defines
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 296649fd2b0aa1d0c328ca8b494d746a75cbb28b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 13 19:51:37 2011 -0400 Provide missing description for our FLEXIBLE_ARRAY_MEMBER defines Apparently autoheader throws a tantrum if you say 'AC_DEFINE([a], [b])'. Instead you must say 'AC_DEFINE([a], [b], [description of a])'. We were running into this in our replacement definitions for FLEXIBLE_ARRAY_MEMBER, which were only getting built on autoconf versions before 2.61 -- and this made us stop working with those autoconf versinos. Fixes bug 2430; bugfix on 0.2.3.1-alpha. --- changes/bug2430 | 4 ++++ configure.in | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug2430 b/changes/bug2430 new file mode 100644 index 0000000..3908856 --- /dev/null +++ b/changes/bug2430 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a bug in configure.in that kept it from building a configure + script with autoconf versions earlier than 2.61. Fixes bug 2430; + bugfix on 0.2.3.1-alpha. diff --git a/configure.in b/configure.in index a449136..c6ee589 100644 --- a/configure.in +++ b/configure.in @@ -189,9 +189,9 @@ AC_C_FLEXIBLE_ARRAY_MEMBER [tor_cv_c_flexarray=yes], [tor_cv_c_flexarray=no])]) if test $tor_cv_flexarray = yes ; then - AC_DEFINE([FLEXIBLE_ARRAY_MEMBER], []) + AC_DEFINE([FLEXIBLE_ARRAY_MEMBER], [], [Define to nothing if C supports flexible array members, and to 1 if it does not.]) else - AC_DEFINE([FLEXIBLE_ARRAY_MEMBER], [1]) + AC_DEFINE([FLEXIBLE_ARRAY_MEMBER], [1], [Define to nothing if C supports flexible array members, and to 1 if it does not.]) fi ])

1 0

[tor/master] Merge remote-tracking branch 'public/bug2430'
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit e8ed4657764effb4f16fd5721c13f3384fdd8db1 Merge: ed39621 296649f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 7 16:28:32 2011 -0400 Merge remote-tracking branch 'public/bug2430' changes/bug2430 | 4 ++++ configure.in | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[obfsproxy/master] Fix little copy/paste error.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit b4cb4281fc725fc53bebae5190f99df816c67876 Author: George Kadianakis <desnacked(a)gmail.com> Date: Fri Oct 7 19:29:42 2011 +0200 Fix little copy/paste error. --- src/sha256.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/sha256.c b/src/sha256.c index a49bf3b..8d835d4 100644 --- a/src/sha256.c +++ b/src/sha256.c @@ -9,7 +9,7 @@ #include "sha256.h" #ifndef _WIN32 -#include <arpa/inet.h> /* for inet_ntoa() */ +#include <arpa/inet.h> /* for htonl/ntohl */ #endif #define STMT_BEGIN do {

1 0

[obfsproxy/master] Merge remote-tracking branch 'asn/bug3437_v2'
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 169fb1c7d3f40b90538307be920b01c42540ae9d Merge: 70cb7af b4cb428 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 7 16:17:19 2011 -0400 Merge remote-tracking branch 'asn/bug3437_v2' src/sha256.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torspec/master] Support multiple transports in a single transport line.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit ef5a3c93402000dcaa5eff4878010cbb36a01205 Author: George Kadianakis <desnacked(a)gmail.com> Date: Wed Oct 5 16:41:09 2011 +0200 Support multiple transports in a single transport line. Support multiple comma-separated transpotrs in a single {Client,Server}TransportPlugin line. --- proposals/180-pluggable-transport.txt | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index eee2e0e..b4e8dad 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -188,7 +188,7 @@ Specifications: Client behavior 'trubuchet' connections, and Tor doesn't need to worry about it. A managed proxy is configured with - ClientTransportPlugin <method> exec <path> [options] + ClientTransportPlugin <methods> exec <path> [options] as in "ClientTransportPlugin trebuchet exec /usr/libexec/trebuchet --managed". This example tells Tor to launch an external program to provide a @@ -197,6 +197,10 @@ Specifications: Client behavior options, even if the same executable and options are listed for more than one method. + In managed proxies, <methods> can be a comma-separated list of + pluggable transport method names, as in: + "ClientTransportPlugin pawn,bishop,rook exec /bin/ptproxy --managed". + If instead of a transport method, the torrc lists "*" for a managed proxy, Tor uses that proxy for all transport methods that the plugin supports. So "ClientTransportPlugin * exec /usr/libexec/tor/foobar" @@ -235,7 +239,7 @@ Server behavior configuration information that we'll tell users. A managed proxy is configured as - ServerTransportPlugin <method> exec </path/to/binary> [options] + ServerTransportPlugin <methods> exec </path/to/binary> [options] or ServerTransportPlugin * exec </path/to/binary> [options]

1 0

[tor/master] Constification.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit e8715b30411062d09832e912d87d526dc203e4f0 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun Sep 11 23:35:00 2011 +0200 Constification. --- src/or/config.c | 2 +- src/or/transports.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index df06739..f2cb6cd 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5474,7 +5474,7 @@ options_get_datadir_fname2_suffix(or_options_t *options, /** Return true if line is a valid state TransportProxy line. * Return false otherwise. */ static int -state_transport_line_is_valid(char *line) +state_transport_line_is_valid(const char *line) { smartlist_t *items = NULL; char *addrport=NULL; diff --git a/src/or/transports.c b/src/or/transports.c index 01cbfca..a3abfed 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -141,7 +141,7 @@ pt_proxies_configuration_pending(void) /** Return true if mp has the same argv as proxy_argv */ static int -managed_proxy_has_argv(managed_proxy_t *mp, char **proxy_argv) +managed_proxy_has_argv(const managed_proxy_t *mp, char **proxy_argv) { char **tmp1=proxy_argv; char **tmp2=mp->argv; @@ -190,7 +190,7 @@ add_transport_to_proxy(const char *transport, managed_proxy_t *mp) * Returns true if managed proxy mp needs to be restarted * after the SIGHUP based on the new torrc. */ static int -proxy_needs_restart(managed_proxy_t *mp) +proxy_needs_restart(const managed_proxy_t *mp) { /* mp->transport_to_launch is populated with the names of the transports that must be launched *after* the SIGHUP.

1 0

[tor/master] Improve wording in some comments and log messages.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit e2703e36545babce19cd248299a5a12cdd11dff2 Author: George Kadianakis <desnacked(a)gmail.com> Date: Fri Sep 23 17:50:56 2011 +0200 Improve wording in some comments and log messages. --- src/or/circuitbuild.c | 10 +++--- src/or/config.c | 6 ++-- src/or/transports.c | 81 ++++++++++++++++++++++++++---------------------- 3 files changed, 52 insertions(+), 45 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 86154ba..ddd7931 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4675,7 +4675,8 @@ transport_resolve_conflicts(transport_t *t) we either have duplicate torrc lines OR we are here post-HUP and this transport was here pre-HUP as well. In any case, mark the old transport so that it doesn't get removed and ignore the new - one. + one. Our caller has to free the new transport so we return '1' to + signify this. If there is already a transport with the same name but different addrport: @@ -4703,8 +4704,8 @@ transport_resolve_conflicts(transport_t *t) transport_free(t_tmp); } else { /* *not* marked for removal */ log_notice(LD_GENERAL, "You tried to add transport '%s' at '%s:%u' " - "which already exists at '%s:%u'. Skipping.", t->name, - fmt_addr(&t->addr), t->port, + "but the same transport already exists at '%s:%u'. " + "Skipping.", t->name, fmt_addr(&t->addr), t->port, fmt_addr(&t_tmp->addr), t_tmp->port); return -1; } @@ -4731,10 +4732,9 @@ transport_add(transport_t *t) case 0: /* should register transport */ if (!transport_list) transport_list = smartlist_create(); - smartlist_add(transport_list, t); return 0; - default: /* should let the caller know the return code */ + default: /* let our caller know the return code */ return r; } } diff --git a/src/or/config.c b/src/or/config.c index 3d83b99..95017b3 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5879,8 +5879,8 @@ save_transport_to_state(const char *transport, config_line_t *transport_line = get_transport_in_state_by_name(transport); - if (transport_line) { /* if transport_exists_in_state() */ - const char *prev_bindaddr = /* get addrport stored in state */ + if (transport_line) { /* if transport already exists in state... */ + const char *prev_bindaddr = /* get its addrport... */ get_transport_bindaddr(transport_line->value, transport); tor_asprintf(&transport_addrport, "%s:%d", fmt_addr(addr), (int)port); @@ -5889,7 +5889,7 @@ save_transport_to_state(const char *transport, log_info(LD_CONFIG, "Transport seems to have spawned on its usual " "address:port."); goto done; - } else { /* addrport in state is different than the one we got */ + } else { /* if addrport in state is different than the one we got */ log_info(LD_CONFIG, "Transport seems to have spawned on different " "address:port. Let's update the state file with the new " "address:port"); diff --git a/src/or/transports.c b/src/or/transports.c index 8fafcf4..c67fc68 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -106,30 +106,32 @@ static int unconfigured_proxies_n = 0; immediately after tor is launched.). We mark all managed proxies and transports to signify that they - must be removed if they don't contribute by the new torrc. We also - mark all managed proxies to signify that they might need to be - restarted so that they end up supporting all the transports the - new torrc wants them to support. - We also clear the 'transports_to_launch' list so that we can put - there the transports we need to launch on each proxy according to - the new torrc. - - We then start parsing torrc again, everytime we encounter a - transport line using a known pre-SIGHUP managed proxy, we cleanse - that proxy from the removal mark. + must be removed if they don't contribute by the new torrc + (marked_for_removal). + We also mark all managed proxies to signify that they might need + to be restarted so that they end up supporting all the transports + the new torrc wants them to support (got_hup). + We also clear their 'transports_to_launch' list so that we can put + there the transports we need to launch according to the new torrc. + + We then start parsing torrc again. + + Everytime we encounter a transport line using a known pre-SIGHUP + managed proxy, we cleanse that proxy from the removal mark. We also mark it as unconfigured so that on the next scheduled events tick, we investigate whether we need to restart the proxy - so that it spawns the new 'transport_to_launch' list. Of course, - if the post-SIGHUP 'transports_to_launch' list is identical to the + so that it also spawns the new transports. + If the post-SIGHUP 'transports_to_launch' list is identical to the pre-SIGHUP one, it means that no changes were introduced to this proxy during the SIGHUP and no restart has to take place. - During the post-SIGHUP torrc parsing, we unmark all transports we - encounter. This happens in the case that no restart is needed, we - can continue using the old transports normally. If we end up - restarting the proxy, we destroy and unregister all old transports - from the circuitbuild.c subsystem since they become useless. + During the post-SIGHUP torrc parsing, we unmark all transports + spawned by managed proxies that we find in our torrc. + We do that so that if we don't need to restart a managed proxy, we + can continue using its old transports normally. + If we end up restarting the proxy, we destroy and unregister all + old transports from the circuitbuild.c subsystem. */ /** Return true if there are still unconfigured managed proxies. */ @@ -186,18 +188,16 @@ add_transport_to_proxy(const char *transport, managed_proxy_t *mp) smartlist_add(mp->transports_to_launch, tor_strdup(transport)); } -/** Called when a SIGHUP occurs. - * Returns true if managed proxy mp needs to be restarted - * after the SIGHUP based on the new torrc. */ +/** Called when a SIGHUP occurs. Returns true if managed proxy + * mp needs to be restarted after the SIGHUP, based on the new + * torrc. */ static int proxy_needs_restart(const managed_proxy_t *mp) { /* mp->transport_to_launch is populated with the names of the transports that must be launched *after* the SIGHUP. - - Since only PT_PROTO_COMPLETED proxies reach this function, - mp->transports is populated with strings of the *names of the - transports* that were launched *before* the SIGHUP. + mp->transports is populated with the names of the transports that + were launched *before* the SIGHUP. If the two lists contain the same strings, we don't need to restart the proxy, since it already does what we want. */ @@ -221,7 +221,7 @@ proxy_needs_restart(const managed_proxy_t *mp) } /** Managed proxy mp must be restarted. Do all the necessary - * preparations and then flag its state so that it will be launched + * preparations and then flag its state so that it will be relaunched * in the next tick. */ static void proxy_prepare_for_restart(managed_proxy_t *mp) @@ -371,6 +371,9 @@ configure_proxy(managed_proxy_t *mp) static void register_server_proxy(managed_proxy_t *mp) { + /* After we register this proxy's transports, we switch its + mp->transports to a list containing strings of its transport + names. (See transports.h) */ smartlist_t *sm_tmp = smartlist_create(); tor_assert(mp->conf_state != PT_PROTO_COMPLETED); @@ -394,6 +397,9 @@ static void register_client_proxy(managed_proxy_t *mp) { int r; + /* After we register this proxy's transports, we switch its + mp->transports to a list containing strings of its transport + names. (See transports.h) */ smartlist_t *sm_tmp = smartlist_create(); tor_assert(mp->conf_state != PT_PROTO_COMPLETED); @@ -442,9 +448,8 @@ managed_proxy_destroy(managed_proxy_t *mp) /* free the transports smartlist */ smartlist_free(mp->transports); + /* free the transports_to_launch smartlist */ SMARTLIST_FOREACH(mp->transports_to_launch, char *, t, tor_free(t)); - - /* free the transports smartlist */ smartlist_free(mp->transports_to_launch); /* remove it from the list of managed proxies */ @@ -472,8 +477,8 @@ handle_finished_proxy(managed_proxy_t *mp) managed_proxy_destroy(mp); /* annihilate it. */ break; case PT_PROTO_CONFIGURED: /* if configured correctly: */ - register_proxy(mp); /* register transports */ - mp->conf_state = PT_PROTO_COMPLETED; /* mark it as completed. */ + register_proxy(mp); /* register its transports */ + mp->conf_state = PT_PROTO_COMPLETED; /* and mark it as completed. */ break; case PT_PROTO_INFANT: case PT_PROTO_LAUNCHED: @@ -944,7 +949,7 @@ pt_kickstart_proxy(const char *transport, char **proxy_argv, int is_server) } /** Frees the array of pointers in arg used as arguments to - execve. */ + execve(2). */ static INLINE void free_execve_args(char **arg) { @@ -956,9 +961,10 @@ free_execve_args(char **arg) tor_free(arg); } -/** Tor will read its config, prepare the managed proxy list so that - * proxies that are not used in the new config will shutdown, and - * proxies that need to spawn more transports will do so. */ +/** Tor will read its config. + * Prepare the managed proxy list so that proxies not used in the new + * config will shutdown, and proxies that need to spawn different + * transports will do so. */ void pt_prepare_proxy_list_for_config_read(void) { @@ -984,9 +990,10 @@ pt_prepare_proxy_list_for_config_read(void) tor_assert(unconfigured_proxies_n == 0); } -/** The tor config was read, destroy all managed proxies that were - * marked by a previous call to prepare_proxy_list_for_config_read() - * and are not used by the new config. */ +/** The tor config was read. + * Destroy all managed proxies that were marked by a previous call to + * prepare_proxy_list_for_config_read() and are not used by the new + * config. */ void sweep_proxy_list(void) {

1 0

[tor/master] Don't warn of stray Bridges if managed proxies are still unconfigured.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit d0416ce3ec67ca87448153c8b2416dd7901013c6 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun Sep 11 23:51:29 2011 +0200 Don't warn of stray Bridges if managed proxies are still unconfigured. With managed proxies you would always get the error message: "You have a Bridge line using the X pluggable transport, but there doesn't seem to be a corresponding ClientTransportPlugin line." because the check happened directly after parse_client_transport_line() when managed proxies were not fully configured and their transports were not registered. The fix is to move the validation to run_scheduled_events() and make sure that all managed proxies are configured first. --- src/or/circuitbuild.c | 13 ++++++++++--- src/or/circuitbuild.h | 2 +- src/or/config.c | 5 ----- src/or/main.c | 9 +++++++++ 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index b4c2343..ed81304 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4769,11 +4769,14 @@ transport_add_from_config(const tor_addr_t *addr, uint16_t port, } } -/** Warns the user of possible pluggable transport misconfiguration. */ -void +/** Warn the user of possible pluggable transport misconfiguration. + * Return 0 if the validation happened, -1 if we should postpone the + * validation. */ +int validate_pluggable_transports_config(void) { - if (bridge_list) { + /* Don't validate if managed proxies are not yet fully configured. */ + if (bridge_list && !pt_proxies_configuration_pending()) { SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, b) { /* Skip bridges without transports. */ if (!b->transport_name) @@ -4787,6 +4790,10 @@ validate_pluggable_transports_config(void) "corresponding ClientTransportPlugin line.", b->transport_name); } SMARTLIST_FOREACH_END(b); + + return 0; + } else { + return -1; } } diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index 10e7287..dca541d 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -157,7 +157,7 @@ int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, const transport_t **transport); transport_t *transport_get_by_name(const char *name); -void validate_pluggable_transports_config(void); +int validate_pluggable_transports_config(void); #endif diff --git a/src/or/config.c b/src/or/config.c index f2cb6cd..8bd47b5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1271,11 +1271,6 @@ options_act(or_options_t *old_options) sweep_transport_list(); sweep_proxy_list(); - /* If we have pluggable transport related options enabled, see if we - should warn the user about potential configuration problems. */ - if (options->Bridges || options->ClientTransportPlugin) - validate_pluggable_transports_config(); - /* Bail out at this point if we're not going to be a client or server: * we want to not fork, and to log stuff to stderr. */ if (!running_tor) diff --git a/src/or/main.c b/src/or/main.c index 5294e4a..6297f0f 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1068,6 +1068,7 @@ run_scheduled_events(time_t now) static int should_init_bridge_stats = 1; static time_t time_to_retry_dns_init = 0; static time_t time_to_next_heartbeat = 0; + static int has_validated_pt = 0; or_options_t *options = get_options(); int is_server = server_mode(options); int i; @@ -1472,6 +1473,14 @@ run_scheduled_events(time_t now) if (pt_proxies_configuration_pending()) pt_configure_remaining_proxies(); + /** 11c. validate pluggable transports configuration if we need to */ + if (!has_validated_pt && + (options->Bridges || options->ClientTransportPlugin)) { + if (validate_pluggable_transports_config() == 0) { + has_validated_pt = 1; + } + } + /** 12. write the heartbeat message */ if (options->HeartbeatPeriod && time_to_next_heartbeat < now) {

1 0