- tor-commits - lists.torproject.org

[tor/master] Improve how we access or_state_t.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 2703e41d8b6ffcad653af68a8261c22b5a1ed26f Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun Sep 11 20:57:01 2011 +0200 Improve how we access or_state_t. * Use get_or_state()->VirtualOption instead of relying on config_find_option(), STRUCT_VAR_P and voodoo. --- src/or/config.c | 30 ++++++++++-------------------- 1 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 829d5ff..bacdae3 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5513,16 +5513,11 @@ static int validate_transports_in_state(or_state_t *state) { int broken = 0; + config_line_t *line; - config_var_t *var = config_find_option(&state_format,"TransportProxies"); - if (!var) - return 0; - - config_line_t **value = STRUCT_VAR_P(state, var->var_offset); - config_line_t *search = NULL; - - for (search = *value ; search ; search = search->next) { - if (!state_transport_line_is_valid(search->value)<0) + for (line = state->TransportProxies ; line ; line = line->next) { + tor_assert(!strcmp(line->key, "TransportProxy")); + if (!state_transport_line_is_valid(line->value)<0) broken = 1; } @@ -5790,18 +5785,13 @@ or_state_save(time_t now) static config_line_t * get_transport_in_state_by_name(const char *transport) { - config_var_t *var = config_find_option(&state_format,"TransportProxies"); - if (!var) - return NULL; - - config_line_t **value = STRUCT_VAR_P(get_or_state(), var->var_offset); - config_line_t *search = *value; - - while (search) { - if (!strcmpstart(search->value, transport)) - return search; + or_state_t *or_state = get_or_state(); + config_line_t *line; - search = search->next; + for (line = or_state->TransportProxies ; line ; line = line->next) { + tor_assert(!strcmp(line->key, "TransportProxy")); + if (!strcmpstart(line->value, transport)) + return line; } return NULL; }

1 0

[tor/master] Be more defensive in get_transport_bindaddr().
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 9a42ec685751b5c5fd21f33cd788810d997f0d6e Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun Sep 11 21:33:02 2011 +0200 Be more defensive in get_transport_bindaddr(). Make sure that lines in get_transport_bindaddr() begin with the name of the transport and a space. --- src/or/config.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 792124c..79c1b1e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5823,10 +5823,24 @@ get_transport_in_state_by_name(const char *transport) const char * get_transport_bindaddr(const char *line, const char *transport) { - if (strlen(line) < strlen(transport) + 2) - return NULL; - else + char *line_tmp = NULL; + + if (strlen(line) < strlen(transport) + 2) { + goto broken_state; + } else { + /* line should start with the name of the transport and a space. + (for example, "obfs2 127.0.0.1:47245") */ + tor_asprintf(&line_tmp, "%s ", transport); + if (strcmpstart(line, line_tmp)) + goto broken_state; + + tor_free(line_tmp); return (line+strlen(transport)+1); + } + + broken_state: + tor_free(line_tmp); + return NULL; } /** Return a static string containing the address:port a proxy

1 0

[tor/master] Remove connection_uses_transport() since it was unused.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 0dcf327248d9e971b2bad9fcd498c3b18f2f70c0 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun Sep 11 20:33:27 2011 +0200 Remove connection_uses_transport() since it was unused. --- src/or/connection.c | 11 ----------- src/or/connection.h | 1 - 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 04dba2b..05688e5 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4150,17 +4150,6 @@ get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type, return 0; } -/** Returns true if connection conn is using a pluggable - * transports proxy server. */ -int -connection_uses_transport(connection_t *conn) -{ - const transport_t *transport=NULL; - find_transport_by_bridge_addrport(&conn->addr, - conn->port,&transport); - return transport ? 1 : 0; -} - /** Returns the global proxy type used by tor. */ static int get_proxy_type(void) diff --git a/src/or/connection.h b/src/or/connection.h index 51cf2a8..be3de88 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -60,7 +60,6 @@ int connection_read_proxy_handshake(connection_t *conn); void log_failed_proxy_connection(connection_t *conn); int get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type, const connection_t *conn); -int connection_uses_transport(connection_t *conn); int retry_all_listeners(smartlist_t *replaced_conns, smartlist_t *new_conns);

1 0

[tor/master] Update the transports.c documentation based on the new data.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit a002f0e7c09dc664148a018fc69ac416789330dd Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun Sep 11 20:29:52 2011 +0200 Update the transports.c documentation based on the new data. --- src/or/transports.c | 82 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 70 insertions(+), 12 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index c4391c5..7d483a3 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -56,23 +56,81 @@ static smartlist_t *managed_proxy_list = NULL; /** Number of still unconfigured proxies. */ static int unconfigured_proxies_n = 0; -/* The main idea here is: +/** "The main idea is:" - A managed proxy is represented by a managed_proxy_t struct and can - spawn multiple transports. + Each managed proxy is represented by a 'managed_proxy_t'. + Each managed proxy can support multiple transports. + Each managed proxy gets configured through a multistep process. + + 'managed_proxy_list' contains all the managed proxies this tor + instance is supporting. + In the 'managed_proxy_list' there are 'unconfigured_proxies_n' + managed proxies that are still unconfigured. - managed_proxy_list is a list of all the unconfigured managed - proxies; everytime we find a managed proxy in torrc we add it in - that list. In every run_scheduled_event() tick, we attempt to launch and then - configure each managed proxy, using the configuration protocol - defined in the 180_pluggable_transport.txt proposal. A managed - proxy might need several ticks to get fully configured. + configure the unconfiged managed proxies, using the configuration + protocol defined in the 180_pluggable_transport.txt proposal. A + managed proxy might need several ticks to get fully configured. When a managed proxy is fully configured, we register all its - transports to the circuitbuild.c subsystem - like we do with - external proxies - and then free the managed proxy struct - since it's no longer needed. */ + transports to the circuitbuild.c subsystem. At that point the + transports are owned by the circuitbuild.c subsystem. + + When a managed proxy fails to follow the 180 configuration + protocol, it gets marked as broken and gets destroyed. + + "In a little more technical detail:" + + While we are serially parsing torrc, we store all the transports + that a proxy should spawn in its 'transports_to_launch' element. + + When we finish reading the torrc, we spawn the managed proxy and + expect {S,C}METHOD lines from its output. We add transports + described by METHOD lines to its 'transports' element, as + 'transport_t' structs. + + When the managed proxy stops spitting METHOD lines (signified by a + '{S,C}METHODS DONE' message) we register all the transports + collected to the circuitbuild.c subsystem. At this point, the + 'transport_t's can be transformed into dangling pointers at any + point by the circuitbuild.c subsystem, and so we replace all + 'transport_t's with strings describing the transport names. We + can still go from a transport name to a 'transport_t' using the + fact that transport names uniquely identify 'transport_t's. + + "In even more technical detail I shall describe what happens when + the SIGHUP bell tolls:" + + We immediately destroy all unconfigured proxies (We shouldn't have + unconfigured proxies in the first place, except when SIGHUP rings + 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. + + 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 + 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. +*/ /** Return true if there are still unconfigured managed proxies. */ int

1 0

[tor/master] Trivial fixes around the code.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 31361074216534b0a4c6377730c09b261ca4ef4e Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun Sep 11 23:33:31 2011 +0200 Trivial fixes around the code. * C90-fy. * Remove ASN comments. * Don't smartlist_clear() before smartlist_free(). * Plug a mem. leak. --- src/or/circuitbuild.c | 4 ++-- src/or/config.c | 12 ++++++------ src/or/transports.c | 17 ++++++++++++----- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index bd06d31..7338e24 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4722,9 +4722,10 @@ transport_resolve_conflicts(transport_t *t) int transport_add(transport_t *t) { + int r; tor_assert(t); - int r = transport_resolve_conflicts(t); + r = transport_resolve_conflicts(t); switch (r) { case 0: /* should register transport */ @@ -5016,7 +5017,6 @@ fetch_bridge_descriptors(or_options_t *options, time_t now) if (!bridge_list) return; - /* ASN Should we move this to launch_direct_bridge_descriptor_fetch() ? */ /* If we still have unconfigured managed proxies, don't go and connect to a bridge. */ if (pt_proxies_configuration_pending()) diff --git a/src/or/config.c b/src/or/config.c index 79c1b1e..d36418b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1226,11 +1226,6 @@ options_act(or_options_t *old_options) sweep_bridge_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(); - if (running_tor && rend_config_services(options, 0)<0) { log_warn(LD_BUG, "Previously validated hidden services line could not be added!"); @@ -1277,6 +1272,11 @@ 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) @@ -5820,7 +5820,7 @@ get_transport_in_state_by_name(const char *transport) /** Return string containing the address:port part of the * TransportProxy line for transport transport. * If the line is corrupted, return NULL. */ -const char * +static const char * get_transport_bindaddr(const char *line, const char *transport) { char *line_tmp = NULL; diff --git a/src/or/transports.c b/src/or/transports.c index 91ff518..1b7249f 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -13,7 +13,6 @@ #include "transports.h" #include "util.h" -/* ASN TIDY THESE UP*/ static void set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp); static INLINE int proxy_configuration_finished(const managed_proxy_t *mp); @@ -372,11 +371,16 @@ register_server_proxy(managed_proxy_t *mp) tor_assert(mp->conf_state != PT_PROTO_COMPLETED); SMARTLIST_FOREACH_BEGIN(mp->transports, transport_t *, t) { - save_transport_to_state(t->name,&t->addr,t->port); /* pass tor_addr_t? */ + save_transport_to_state(t->name, &t->addr, t->port); smartlist_add(sm_tmp, tor_strdup(t->name)); } SMARTLIST_FOREACH_END(t); + /* Since server proxies don't register their transports in the + circuitbuild.c subsystem, it's our duty to free them when we + switch mp->transports to strings. */ + SMARTLIST_FOREACH(mp->transports, transport_t *, t, transport_free(t)); smartlist_free(mp->transports); + mp->transports = sm_tmp; } @@ -438,7 +442,6 @@ managed_proxy_destroy(managed_proxy_t *mp) SMARTLIST_FOREACH(mp->transports_to_launch, char *, t, tor_free(t)); /* free the transports smartlist */ - smartlist_clear(mp->transports_to_launch); smartlist_free(mp->transports_to_launch); /* remove it from the list of managed proxies */ @@ -469,8 +472,12 @@ handle_finished_proxy(managed_proxy_t *mp) register_proxy(mp); /* register transports */ mp->conf_state = PT_PROTO_COMPLETED; /* mark it as completed. */ break; + case PT_PROTO_INFANT: + case PT_PROTO_LAUNCHED: + case PT_PROTO_ACCEPTING_METHODS: + case PT_PROTO_COMPLETED: default: - log_warn(LD_CONFIG, "Unfinished managed proxy in " + log_warn(LD_CONFIG, "Unexpected managed proxy state in " "handle_finished_proxy()."); tor_assert(0); } @@ -891,6 +898,7 @@ void pt_kickstart_proxy(const char *transport, char **proxy_argv, int is_server) { managed_proxy_t *mp=NULL; + transport_t *old_transport = NULL; mp = get_managed_proxy_by_argv_and_type(proxy_argv, is_server); @@ -911,7 +919,6 @@ pt_kickstart_proxy(const char *transport, char **proxy_argv, int is_server) unconfigured_proxies_n++; } - transport_t *old_transport = NULL; old_transport = transport_get_by_name(transport); if (old_transport) old_transport->marked_for_removal = 0;

1 0

[tor/master] Allow interwined {Client, Server}TransportPlugin lines.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 9bf34eb65b9533bf9a53952acf2994b9ee973ff2 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun Sep 11 20:30:08 2011 +0200 Allow interwined {Client,Server}TransportPlugin lines. --- src/or/transports.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index 7d483a3..91ff518 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -163,13 +163,14 @@ managed_proxy_has_argv(managed_proxy_t *mp, char **proxy_argv) /** Return a managed proxy with the same argv as proxy_argv. * If no such managed proxy exists, return NULL. */ static managed_proxy_t * -get_managed_proxy_by_argv(char **proxy_argv) +get_managed_proxy_by_argv_and_type(char **proxy_argv, int is_server) { if (!managed_proxy_list) return NULL; SMARTLIST_FOREACH_BEGIN(managed_proxy_list, managed_proxy_t *, mp) { - if (managed_proxy_has_argv(mp, proxy_argv)) + if (managed_proxy_has_argv(mp, proxy_argv) && + mp->is_server == is_server) return mp; } SMARTLIST_FOREACH_END(mp); @@ -891,7 +892,7 @@ pt_kickstart_proxy(const char *transport, char **proxy_argv, int is_server) { managed_proxy_t *mp=NULL; - mp = get_managed_proxy_by_argv(proxy_argv); + mp = get_managed_proxy_by_argv_and_type(proxy_argv, is_server); if (!mp) { /* we haven't seen this proxy before */ managed_proxy_create(transport, proxy_argv, is_server);

1 0

[tor/master] Fix bug in get_transport_in_state_by_name() when using strcmpstart().
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit ebc232bb79c8816d17eea75d3a29c1ecb25da0b0 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun Sep 11 21:22:37 2011 +0200 Fix bug in get_transport_in_state_by_name() when using strcmpstart(). We now split the state lines into smartlists and compare the token properly. Not that efficient but it's surely correct. --- src/or/config.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index bacdae3..792124c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5787,13 +5787,34 @@ get_transport_in_state_by_name(const char *transport) { or_state_t *or_state = get_or_state(); config_line_t *line; + config_line_t *ret = NULL; + smartlist_t *items = NULL; for (line = or_state->TransportProxies ; line ; line = line->next) { tor_assert(!strcmp(line->key, "TransportProxy")); - if (!strcmpstart(line->value, transport)) - return line; + + items = smartlist_create(); + smartlist_split_string(items, line->value, NULL, + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); + if (smartlist_len(items) != 2) /* broken state */ + goto done; + + if (!strcmp(smartlist_get(items, 0), transport)) { + ret = line; + goto done; + } + + SMARTLIST_FOREACH(items, char*, s, tor_free(s)); + smartlist_free(items); + items = NULL; } - return NULL; + + done: + if (items) { + SMARTLIST_FOREACH(items, char*, s, tor_free(s)); + smartlist_free(items); + } + return ret; } /** Return string containing the address:port part of the

1 0

[tor/master] Reverting the accounting thing introduced in 5492de76 till I think how it should be done properly.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 86b20e0d8ac0cc87cf85e34666d6cd25a9657521 Author: George Kadianakis <desnacked(a)gmail.com> Date: Thu Jul 14 04:24:10 2011 +0200 Reverting the accounting thing introduced in 5492de76 till I think how it should be done properly. --- src/or/connection.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 5e8f95f..04dba2b 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2080,8 +2080,6 @@ connection_is_rate_limited(connection_t *conn) or_options_t *options = get_options(); if (conn->linked) return 0; /* Internal connection */ - else if (connection_uses_transport(conn)) /* pluggable transport proxy */ - return 1; else if (! options->CountPrivateBandwidth && (tor_addr_family(&conn->addr) == AF_UNSPEC || /* no address */ tor_addr_is_internal(&conn->addr, 0))) @@ -4158,11 +4156,9 @@ int connection_uses_transport(connection_t *conn) { const transport_t *transport=NULL; - if (find_transport_by_bridge_addrport(&conn->addr, - conn->port,&transport) == 0) - return 1; - else - return 0; + find_transport_by_bridge_addrport(&conn->addr, + conn->port,&transport); + return transport ? 1 : 0; } /** Returns the global proxy type used by tor. */

1 0

[tor/master] Updated #includes etc. to use transports.[ch].
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit a8f21f91cfa916b662d07dd486857fdf848c6f1d Author: George Kadianakis <desnacked(a)gmail.com> Date: Mon Jul 18 02:33:31 2011 +0200 Updated #includes etc. to use transports.[ch]. --- src/or/Makefile.am | 4 ++-- src/or/circuitbuild.c | 2 +- src/or/config.c | 2 +- src/or/main.c | 2 +- src/or/transports.c | 4 ++-- src/or/transports.h | 8 ++++---- src/test/test_pt.c | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 4dc5ee5..41e89d7 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -39,7 +39,7 @@ libtor_a_SOURCES = \ networkstatus.c \ nodelist.c \ onion.c \ - pluggable_transports.c \ + transports.c \ policies.c \ reasons.c \ relay.c \ @@ -105,7 +105,7 @@ noinst_HEADERS = \ ntmain.h \ onion.h \ or.h \ - pluggable_transports.h \ + transports.h \ policies.h \ reasons.h \ relay.h \ diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 003f579..3dba83b 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -26,7 +26,7 @@ #include "nodelist.h" #include "onion.h" #include "policies.h" -#include "pluggable_transports.h" +#include "transports.h" #include "relay.h" #include "rephist.h" #include "router.h" diff --git a/src/or/config.c b/src/or/config.c index 5f2f11d..da35270 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -35,7 +35,7 @@ #include "router.h" #include "util.h" #include "routerlist.h" -#include "pluggable_transports.h" +#include "transports.h" #ifdef MS_WINDOWS #include <shlobj.h> #endif diff --git a/src/or/main.c b/src/or/main.c index d79d9eb..5294e4a 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -37,7 +37,7 @@ #include "ntmain.h" #include "onion.h" #include "policies.h" -#include "pluggable_transports.h" +#include "transports.h" #include "relay.h" #include "rendclient.h" #include "rendcommon.h" diff --git a/src/or/transports.c b/src/or/transports.c index 49b0e13..aae39cd 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -2,7 +2,7 @@ /* See LICENSE for licensing information */ /** - * \file pluggable_transports.c + * \file transports.c * \brief Pluggable Transports related code. **/ @@ -10,7 +10,7 @@ #include "or.h" #include "config.h" #include "circuitbuild.h" -#include "pluggable_transports.h" +#include "transports.h" /* ASN TIDY THESE UP*/ static void set_environ(char ***envp, const char *method, diff --git a/src/or/transports.h b/src/or/transports.h index 80d5429..17a6803 100644 --- a/src/or/transports.h +++ b/src/or/transports.h @@ -4,12 +4,12 @@ /* See LICENSE for licensing information */ /** - * \file pluggable_transpots.h - * \brief Headers for pluggable_transpots.c + * \file transports.h + * \brief Headers for transports.c **/ -#ifndef TOR_PLUGGABLE_TRANSPORTS_H -#define TOR_PLUGGABLE_TRANSPORTS_H +#ifndef TOR_TRANSPORTS_H +#define TOR_TRANSPORTS_H int pt_managed_launch_proxy(const char *method, char **proxy_argv, int is_server); diff --git a/src/test/test_pt.c b/src/test/test_pt.c index 02950b8..99fc514 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -6,7 +6,7 @@ #include "orconfig.h" #define PT_PRIVATE #include "or.h" -#include "pluggable_transports.h" +#include "transports.h" #include "circuitbuild.h" #include "test.h"

1 0

[tor/master] Renamed pluggable_transports.[ch] to transports.[ch].
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit d8c04c7ea52bc1ffbeec60d614970eccab3c9b4f Author: George Kadianakis <desnacked(a)gmail.com> Date: Mon Jul 18 02:19:38 2011 +0200 Renamed pluggable_transports.[ch] to transports.[ch]. --- src/or/pluggable_transports.c | 613 ----------------------------------------- src/or/pluggable_transports.h | 59 ---- src/or/transports.c | 613 +++++++++++++++++++++++++++++++++++++++++ src/or/transports.h | 59 ++++ 4 files changed, 672 insertions(+), 672 deletions(-) diff --git a/src/or/pluggable_transports.c b/src/or/pluggable_transports.c deleted file mode 100644 index 49b0e13..0000000 --- a/src/or/pluggable_transports.c +++ /dev/null @@ -1,613 +0,0 @@ -/* Copyright (c) 2011, The Tor Project, Inc. */ -/* See LICENSE for licensing information */ - -/** - * \file pluggable_transports.c - * \brief Pluggable Transports related code. - **/ - -#define PT_PRIVATE -#include "or.h" -#include "config.h" -#include "circuitbuild.h" -#include "pluggable_transports.h" - -/* ASN TIDY THESE UP*/ -static void set_environ(char ***envp, const char *method, - int is_server); -static INLINE int proxy_configuration_finished(managed_proxy_t *mp); - -static void managed_proxy_destroy(managed_proxy_t *mp, - int also_free_transports); -static void register_proxy_transports(managed_proxy_t *mp); -static void handle_finished_proxy(managed_proxy_t *mp); -static void configure_proxy(managed_proxy_t *mp); - -static void parse_method_error(char *line, int is_server_method); -#define parse_server_method_error(l) parse_method_error(l, 1) -#define parse_client_method_error(l) parse_method_error(l, 0) - -static INLINE void free_execve_args(char **arg); - -/** Managed proxy protocol strings */ -#define PROTO_ENV_ERROR "ENV-ERROR" -#define PROTO_NEG_SUCCESS "VERSION" -#define PROTO_NEG_FAIL "VERSION-ERROR no-version" -#define PROTO_CMETHOD "CMETHOD" -#define PROTO_SMETHOD "SMETHOD" -#define PROTO_CMETHOD_ERROR "CMETHOD-ERROR" -#define PROTO_SMETHOD_ERROR "SMETHOD-ERROR" -#define PROTO_CMETHODS_DONE "CMETHODS DONE" -#define PROTO_SMETHODS_DONE "SMETHODS DONE" - -/* The smallest valid managed proxy protocol line that can - appear. It's the size of "VERSION 1" */ -#define SMALLEST_MANAGED_LINE_SIZE 9 - -/** Number of environment variables for managed proxy clients/servers. */ -#define ENVIRON_SIZE_CLIENT 5 -#define ENVIRON_SIZE_SERVER 8 - -/** The first and only supported - at the moment - configuration - protocol version. */ -#define PROTO_VERSION_ONE 1 - -/** List of unconfigured managed proxies. */ -static smartlist_t *unconfigured_proxy_list = NULL; -/** Number of unconfigured managed proxies. */ -static int n_unconfigured_proxies = 0; - -/* The main idea is: - - A managed proxy is represented by a managed_proxy_t struct and can - spawn multiple transports. - - unconfigured_proxy_list is a list of all the unconfigured managed - proxies; everytime we spawn a managed proxy we add it in that - list. - In every run_scheduled_event() tick, we attempt to configure each - managed proxy further, using the configuration protocol defined in - the 180_pluggable_transport.txt proposal. - - When a managed proxy is fully configured, we register all its - transports to the circuitbuild.c subsystem - like we do with - external proxies - and then free the managed proxy struct - since it's no longer needed. */ - -/** Return true if there are still unconfigured managed proxies. */ -int -pt_proxies_configuration_pending(void) -{ - return !!n_unconfigured_proxies; -} - -/** Launch a proxy for method using proxy_argv as its - * arguments. If is_server, launch a server proxy. */ -int -pt_managed_launch_proxy(const char *method, - char **proxy_argv, int is_server) -{ - char **envp=NULL; - int retval; - FILE *stdout_read = NULL; - int stdout_pipe=-1, stderr_pipe=-1; - - /* prepare the environment variables for the managed proxy */ - set_environ(&envp, method, is_server); - - /* ASN we should probably check if proxy_argv[0] is executable by our user */ - retval = tor_spawn_background(proxy_argv[0], &stdout_pipe, - &stderr_pipe, (const char **)proxy_argv, - (const char **)envp); - if (retval < 0) { - log_warn(LD_GENERAL, "Spawn failed"); - return -1; - } - - /* free the memory allocated for the execve() */ - free_execve_args(envp); - free_execve_args(proxy_argv); - - /* Set stdout/stderr pipes to be non-blocking */ - fcntl(stdout_pipe, F_SETFL, O_NONBLOCK); - /* Open the buffered IO streams */ - stdout_read = fdopen(stdout_pipe, "r"); - - log_warn(LD_CONFIG, "The spawn is alive (%d)!", retval); - - /* create a managed proxy */ - managed_proxy_t *mp = tor_malloc(sizeof(managed_proxy_t)); - mp->conf_state = PT_PROTO_INFANT; - mp->stdout = stdout_read; - mp->transports = smartlist_create(); - - /* register the managed proxy */ - if (!unconfigured_proxy_list) - unconfigured_proxy_list = smartlist_create(); - smartlist_add(unconfigured_proxy_list, mp); - - n_unconfigured_proxies++; /* ASN should we care about overflows here? - I say no. */ - - return 0; -} - -/** Check if any of the managed proxies we are currently trying to - * configure have anything new to say. This is called from - * run_scheduled_events(). */ -void -pt_configure_remaining_proxies(void) -{ - log_warn(LD_CONFIG, "We start configuring remaining managed proxies!"); - SMARTLIST_FOREACH_BEGIN(unconfigured_proxy_list, managed_proxy_t *, mp) { - if (proxy_configuration_finished(mp)) /* finished managed proxies - shouldn't be here */ - assert(0); - - configure_proxy(mp); - - } SMARTLIST_FOREACH_END(mp); -} - -/** Receive input from the managed proxy mp to get closer to - * finally configuring it. */ -static void -configure_proxy(managed_proxy_t *mp) -{ - enum stream_status r; - char stdout_buf[200]; - - while (1) { - memset(stdout_buf, 0, sizeof(stdout_buf)); - - r = get_string_from_pipe(mp->stdout, stdout_buf, - sizeof(stdout_buf) - 1); - - if (r == ST_CLOSED || r == ST_TERM) { - log_warn(LD_GENERAL, "Managed proxy stream closed. " - "Most probably application stopped running"); - mp->conf_state = PT_PROTO_BROKEN; - } else if (r == ST_EAGAIN) { - return; - } else { - tor_assert(r == ST_OKAY); - handle_proxy_line(stdout_buf, mp); - } - - /* if the proxy finished configuring, exit the loop. */ - if (proxy_configuration_finished(mp)) { - handle_finished_proxy(mp); - return; - } - } -} - -/** Handle a configured or broken managed proxy mp. */ -static void -handle_finished_proxy(managed_proxy_t *mp) -{ - switch (mp->conf_state) { - case PT_PROTO_BROKEN: /* if broken: */ - managed_proxy_destroy(mp, 1); /* destroy it and all its transports */ - break; - case PT_PROTO_CONFIGURED: /* if configured correctly: */ - register_proxy_transports(mp); /* register all its transports, */ - mp->conf_state = PT_PROTO_COMPLETED; /* mark it as completed, */ - managed_proxy_destroy(mp, 0); /* destroy the managed proxy struct, - keeping the transports intact */ - break; - default: - log_warn(LD_CONFIG, "Unfinished managed proxy in " - "handle_finished_proxy()."); - assert(0); - } - - n_unconfigured_proxies--; - tor_assert(n_unconfigured_proxies >= 0); -} - -/** Register all the transports supported by managed proxy mp. */ -static void -register_proxy_transports(managed_proxy_t *mp) -{ - SMARTLIST_FOREACH_BEGIN(mp->transports, transport_t *, t) { - if (transport_add(t)<0) { - log_warn(LD_GENERAL, "Could not add transport %s. Skipping.", t->name); - transport_free(t); - } else { - log_warn(LD_GENERAL, "Succesfully registered transport %s", t->name); - } - } SMARTLIST_FOREACH_END(t); -} - -/** Free memory allocated by managed proxy mp. - * If also_free_transports is set, also free the transports - * associated with this managed proxy. */ -static void -managed_proxy_destroy(managed_proxy_t *mp, int also_free_transports) -{ - /* transport_free() all its transports */ - if (also_free_transports) - SMARTLIST_FOREACH(mp->transports, transport_t *, t, transport_free(t)); - - /* free the transports smartlist */ - smartlist_clear(mp->transports); - smartlist_free(mp->transports); - - /* remove it from the list of managed proxies */ - smartlist_remove(unconfigured_proxy_list, mp); - - /* close its stdout stream */ - fclose(mp->stdout); - - tor_free(mp); -} - -/** Return true if the configuration of the managed proxy mp is - finished. */ -static INLINE int -proxy_configuration_finished(managed_proxy_t *mp) -{ - return (mp->conf_state == PT_PROTO_CONFIGURED || - mp->conf_state == PT_PROTO_BROKEN); -} - -/** Handle a configuration protocol line received from a - * managed proxy mp. */ -void -handle_proxy_line(char *line, managed_proxy_t *mp) -{ - printf("Judging line: %s\n", line); - - if (strlen(line) < SMALLEST_MANAGED_LINE_SIZE) { - log_warn(LD_GENERAL, "Managed proxy configuration line is too small. " - "Discarding"); - goto err; - } - - if (!strncmp(line, PROTO_ENV_ERROR, strlen(PROTO_ENV_ERROR))) { - if (mp->conf_state != PT_PROTO_INFANT) - goto err; - - parse_env_error(line); - goto err; - } else if (!strncmp(line, PROTO_NEG_FAIL, strlen(PROTO_NEG_FAIL))) { - if (mp->conf_state != PT_PROTO_INFANT) - goto err; - - log_warn(LD_CONFIG, "Managed proxy could not pick a " - "configuration protocol version."); - goto err; - } else if (!strncmp(line, PROTO_NEG_SUCCESS, - strlen(PROTO_NEG_SUCCESS))) { - if (mp->conf_state != PT_PROTO_INFANT) - goto err; - - if (parse_version(line,mp) < 0) - goto err; - - tor_assert(mp->conf_protocol != 0); - mp->conf_state = PT_PROTO_ACCEPTING_METHODS; - return; - } else if (!strncmp(line, PROTO_CMETHODS_DONE, - strlen(PROTO_CMETHODS_DONE))) { - if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) - goto err; - - log_warn(LD_CONFIG, "Client managed proxy configuration completed!"); - mp->conf_state = PT_PROTO_CONFIGURED; - return; - } else if (!strncmp(line, PROTO_SMETHODS_DONE, - strlen(PROTO_SMETHODS_DONE))) { - if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) - goto err; - - log_warn(LD_CONFIG, "Server managed proxy configuration completed!"); - mp->conf_state = PT_PROTO_CONFIGURED; - return; - } else if (!strncmp(line, PROTO_CMETHOD_ERROR, - strlen(PROTO_CMETHOD_ERROR))) { - if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) - goto err; - - parse_client_method_error(line); - goto err; - } else if (!strncmp(line, PROTO_SMETHOD_ERROR, - strlen(PROTO_SMETHOD_ERROR))) { - if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) - goto err; - - parse_server_method_error(line); - goto err; - } else if (!strncmp(line, PROTO_CMETHOD, strlen(PROTO_CMETHOD))) { - if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) - goto err; - - if (parse_cmethod_line(line, mp) < 0) - goto err; - - return; - } else if (!strncmp(line, PROTO_SMETHOD, strlen(PROTO_SMETHOD))) { - if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) - goto err; - - if (parse_smethod_line(line, mp) < 0) - goto err; - - return; - } - - log_warn(LD_CONFIG, "Unknown line received by managed proxy. (%s)", line); - - err: - mp->conf_state = PT_PROTO_BROKEN; - return; -} - -/** Parses an ENV-ERROR line and warns the user accordingly. */ -void -parse_env_error(char *line) -{ - tor_assert(!strncmp(line, PROTO_ENV_ERROR, strlen(PROTO_ENV_ERROR))); - - /* (Length of the protocol string) plus (a space) and (the first char of - the error message) */ - if (strlen(line) < (strlen(PROTO_ENV_ERROR) + 2)) - log_warn(LD_CONFIG, "Managed proxy sent us an %s without an error " - "message.", PROTO_ENV_ERROR); - - log_warn(LD_CONFIG, "Managed proxy couldn't understand the " - "pluggable transport environment variables. (%s)", - line+strlen(PROTO_ENV_ERROR)+1); -} - -/** Handles a VERSION line. Updates the configuration protocol - * version in mp. */ -int -parse_version(char *line, managed_proxy_t *mp) -{ - tor_assert(!strncmp(line, PROTO_NEG_SUCCESS, strlen(PROTO_NEG_SUCCESS))); - - if (strlen(line) < (strlen(PROTO_NEG_SUCCESS) + 2)) { - log_warn(LD_CONFIG, "Managed proxy sent us malformed %s line.", - PROTO_NEG_SUCCESS); - return -1; - } - - if (strcmp("1", line+strlen(PROTO_NEG_SUCCESS)+1)) { - log_warn(LD_CONFIG, "We don't support version '%s'. " - "We only support version '1'", line+strlen(PROTO_NEG_SUCCESS)+1); - return -1; - } - - mp->conf_protocol = PROTO_VERSION_ONE; /* temp. till more versions appear */ - return 0; -} - -/** Parses {C,S}METHOD-ERROR line and warns the user - * accordingly. If is_server it is an SMETHOD-ERROR, - * otherwise it is a CMETHOD-ERROR. */ -static void -parse_method_error(char *line, int is_server) -{ - const char* error = is_server ? - PROTO_SMETHOD_ERROR : PROTO_CMETHOD_ERROR; - - /* (Length of the protocol string) plus (a space) and (the first char of - the error message) */ - if (strlen(line) < (strlen(error) + 2)) - log_warn(LD_CONFIG, "Managed proxy sent us an %s without an error " - "message.", error); - - log_warn(LD_CONFIG, "%s managed proxy encountered a method error. (%s)", - is_server ? "Server" : "Client", - line+strlen(error)+1); -} - -/** Parses an SMETHOD line. */ -int -parse_smethod_line(char *line, managed_proxy_t *mp) -{ - int r; - smartlist_t *items = NULL; - - char *method_name=NULL; - - char *addrport=NULL; - tor_addr_t addr; - uint16_t port = 0; - - items = smartlist_create(); - smartlist_split_string(items, line, NULL, - SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); - if (smartlist_len(items) < 3) { - log_warn(LD_CONFIG, "Server managed proxy sent us a SMETHOD line " - "with too few arguments."); - goto err; - } - - tor_assert(!strcmp(smartlist_get(items,0),PROTO_SMETHOD)); - - method_name = smartlist_get(items,1); - - addrport = smartlist_get(items, 2); - if (tor_addr_port_parse(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; - } - - /* For now, notify the user so that he knows where the server - transport is listening. */ - log_warn(LD_CONFIG, "Server transport %s at %s:%d.", - method_name, fmt_addr(&addr), (int)port); - - r=0; - goto done; - - err: - r = -1; - - done: - SMARTLIST_FOREACH(items, char*, s, tor_free(s)); - smartlist_free(items); - return r; -} - -/** Parses a CMETHOD line, and if well-formed it registers - * the new transport in mp. */ -int -parse_cmethod_line(char *line, managed_proxy_t *mp) -{ - int r; - smartlist_t *items = NULL; - - char *method_name=NULL; - - char *socks_ver_str=NULL; - int socks_ver=PROXY_NONE; - - char *addrport=NULL; - tor_addr_t addr; - uint16_t port = 0; - - transport_t *transport=NULL; - - items = smartlist_create(); - smartlist_split_string(items, line, NULL, - SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); - if (smartlist_len(items) < 4) { - log_warn(LD_CONFIG, "Client managed proxy sent us a CMETHOD line " - "with too few arguments."); - goto err; - } - - tor_assert(!strcmp(smartlist_get(items,0),PROTO_CMETHOD)); - - method_name = smartlist_get(items,1); - - socks_ver_str = smartlist_get(items,2); - - if (!strcmp(socks_ver_str,"socks4")) { - socks_ver = PROXY_SOCKS4; - } else if (!strcmp(socks_ver_str,"socks5")) { - socks_ver = PROXY_SOCKS5; - } else { - log_warn(LD_CONFIG, "Client managed proxy sent us a proxy protocol " - "we don't recognize. (%s)", socks_ver_str); - goto err; - } - - addrport = smartlist_get(items, 3); - if (tor_addr_port_parse(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; - } - - transport = transport_create(&addr, port, method_name, socks_ver); - if (!transport) - goto err; - - smartlist_add(mp->transports, transport); - - log_warn(LD_CONFIG, "Transport %s at %s:%d with SOCKS %d. " - "Attached to managed proxy.", - method_name, fmt_addr(&addr), (int)port, socks_ver); - - r=0; - goto done; - - err: - r = -1; - - done: - SMARTLIST_FOREACH(items, char*, s, tor_free(s)); - smartlist_free(items); - return r; -} - -/** Prepares the envp of a pluggable transport managed proxy - * - * method is a line with transport methods to be launched. - * If is_server is set, prepare a server proxy envp. */ -static void -set_environ(char ***envp, const char *method, int is_server) -{ - or_options_t *options = get_options(); - char **tmp=NULL; - char *state_loc=NULL; - - int n_envs = is_server ? ENVIRON_SIZE_SERVER : ENVIRON_SIZE_CLIENT; - - /* allocate enough space for our env. vars and a NULL pointer */ - *envp = tor_malloc(sizeof(char*)*(n_envs+1)); - tmp = *envp; - - /* these should all be customizable */ - tor_asprintf(tmp++, "HOME=%s", getenv("HOME")); - tor_asprintf(tmp++, "PATH=%s", getenv("PATH")); - state_loc = get_datadir_fname("pt_state/"); - tor_asprintf(tmp++, "TOR_PT_STATE_LOCATION=%s", state_loc); - tor_free(state_loc); - tor_asprintf(tmp++, "TOR_PT_MANAGED_TRANSPORT_VER=1"); /* temp */ - if (is_server) { - /* ASN check for ORPort values, should we be here if it's 0? */ - tor_asprintf(tmp++, "TOR_PT_ORPORT=127.0.0.1:%d", options->ORPort); /* temp */ - tor_asprintf(tmp++, "TOR_PT_SERVER_BINDADDR=127.0.0.1:0"); - tor_asprintf(tmp++, "TOR_PT_SERVER_TRANSPORTS=%s", method); - tor_asprintf(tmp++, "TOR_PT_EXTENDED_SERVER_PORT=127.0.0.1:4200"); /* temp*/ - } else { - tor_asprintf(tmp++, "TOR_PT_CLIENT_TRANSPORTS=%s", method); - } - *tmp = NULL; -} - -/* ASN is this too ugly/stupid? */ -/** Frees the array of pointers in arg used as arguments to - execve. */ -static INLINE void -free_execve_args(char **arg) -{ - char **tmp = arg; - while (*tmp) /* use the fact that the last element of the array is a - NULL pointer to know when to stop freeing */ - _tor_free(*tmp++); - - tor_free(arg); -} - -/** Release all storage held by the pluggable transports subsystem. */ -void -pt_free_all(void) -{ - if (unconfigured_proxy_list) { - /* If the proxy is in PT_PROTO_COMPLETED, it has registered its - transports and it's the duty of the circuitbuild.c subsystem to - free them. Otherwise, it hasn't registered its transports yet - and we should free them here. */ - SMARTLIST_FOREACH_BEGIN(unconfigured_proxy_list, managed_proxy_t *, mp) { - if (mp->conf_state == PT_PROTO_COMPLETED) - managed_proxy_destroy(mp,0); - else - managed_proxy_destroy(mp,1); - } SMARTLIST_FOREACH_END(mp); - - smartlist_clear(unconfigured_proxy_list); - smartlist_free(unconfigured_proxy_list); - unconfigured_proxy_list=NULL; - } -} - diff --git a/src/or/pluggable_transports.h b/src/or/pluggable_transports.h deleted file mode 100644 index 80d5429..0000000 --- a/src/or/pluggable_transports.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright (c) 2003-2004, Roger Dingledine - * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. - * Copyright (c) 2007-2011, The Tor Project, Inc. */ -/* See LICENSE for licensing information */ - -/** - * \file pluggable_transpots.h - * \brief Headers for pluggable_transpots.c - **/ - -#ifndef TOR_PLUGGABLE_TRANSPORTS_H -#define TOR_PLUGGABLE_TRANSPORTS_H - -int pt_managed_launch_proxy(const char *method, - char **proxy_argv, int is_server); - -#define pt_managed_launch_client_proxy(m, pa) \ - pt_managed_launch_proxy(m, pa, 0) -#define pt_managed_launch_server_proxy(m, pa) \ - pt_managed_launch_proxy(m, pa, 1) - -void pt_configure_remaining_proxies(void); - -int pt_proxies_configuration_pending(void); - -void pt_free_all(void); - -#ifdef PT_PRIVATE -/** State of the managed proxy configuration protocol. */ -enum pt_proto_state { - PT_PROTO_INFANT, /* was just born */ - PT_PROTO_ACCEPTING_METHODS, /* accepting methods */ - PT_PROTO_CONFIGURED, /* configured successfully */ - PT_PROTO_COMPLETED, /* configure and registered its transports */ - PT_PROTO_BROKEN -}; - -/** Structure containing information of a managed proxy. */ -typedef struct { - enum pt_proto_state conf_state; /* the current configuration state */ - int conf_protocol; /* the configuration protocol version used */ - - FILE *stdout; /* a stream to its stdout - (closed in managed_proxy_destroy()) */ - - smartlist_t *transports; /* list of transports this proxy spawns */ -} managed_proxy_t; - -int parse_cmethod_line(char *line, managed_proxy_t *mp); -int parse_smethod_line(char *line, managed_proxy_t *mp); - -int parse_version(char *line, managed_proxy_t *mp); -void parse_env_error(char *line); -void handle_proxy_line(char *line, managed_proxy_t *mp); - -#endif - -#endif - diff --git a/src/or/transports.c b/src/or/transports.c new file mode 100644 index 0000000..49b0e13 --- /dev/null +++ b/src/or/transports.c @@ -0,0 +1,613 @@ +/* Copyright (c) 2011, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file pluggable_transports.c + * \brief Pluggable Transports related code. + **/ + +#define PT_PRIVATE +#include "or.h" +#include "config.h" +#include "circuitbuild.h" +#include "pluggable_transports.h" + +/* ASN TIDY THESE UP*/ +static void set_environ(char ***envp, const char *method, + int is_server); +static INLINE int proxy_configuration_finished(managed_proxy_t *mp); + +static void managed_proxy_destroy(managed_proxy_t *mp, + int also_free_transports); +static void register_proxy_transports(managed_proxy_t *mp); +static void handle_finished_proxy(managed_proxy_t *mp); +static void configure_proxy(managed_proxy_t *mp); + +static void parse_method_error(char *line, int is_server_method); +#define parse_server_method_error(l) parse_method_error(l, 1) +#define parse_client_method_error(l) parse_method_error(l, 0) + +static INLINE void free_execve_args(char **arg); + +/** Managed proxy protocol strings */ +#define PROTO_ENV_ERROR "ENV-ERROR" +#define PROTO_NEG_SUCCESS "VERSION" +#define PROTO_NEG_FAIL "VERSION-ERROR no-version" +#define PROTO_CMETHOD "CMETHOD" +#define PROTO_SMETHOD "SMETHOD" +#define PROTO_CMETHOD_ERROR "CMETHOD-ERROR" +#define PROTO_SMETHOD_ERROR "SMETHOD-ERROR" +#define PROTO_CMETHODS_DONE "CMETHODS DONE" +#define PROTO_SMETHODS_DONE "SMETHODS DONE" + +/* The smallest valid managed proxy protocol line that can + appear. It's the size of "VERSION 1" */ +#define SMALLEST_MANAGED_LINE_SIZE 9 + +/** Number of environment variables for managed proxy clients/servers. */ +#define ENVIRON_SIZE_CLIENT 5 +#define ENVIRON_SIZE_SERVER 8 + +/** The first and only supported - at the moment - configuration + protocol version. */ +#define PROTO_VERSION_ONE 1 + +/** List of unconfigured managed proxies. */ +static smartlist_t *unconfigured_proxy_list = NULL; +/** Number of unconfigured managed proxies. */ +static int n_unconfigured_proxies = 0; + +/* The main idea is: + + A managed proxy is represented by a managed_proxy_t struct and can + spawn multiple transports. + + unconfigured_proxy_list is a list of all the unconfigured managed + proxies; everytime we spawn a managed proxy we add it in that + list. + In every run_scheduled_event() tick, we attempt to configure each + managed proxy further, using the configuration protocol defined in + the 180_pluggable_transport.txt proposal. + + When a managed proxy is fully configured, we register all its + transports to the circuitbuild.c subsystem - like we do with + external proxies - and then free the managed proxy struct + since it's no longer needed. */ + +/** Return true if there are still unconfigured managed proxies. */ +int +pt_proxies_configuration_pending(void) +{ + return !!n_unconfigured_proxies; +} + +/** Launch a proxy for method using proxy_argv as its + * arguments. If is_server, launch a server proxy. */ +int +pt_managed_launch_proxy(const char *method, + char **proxy_argv, int is_server) +{ + char **envp=NULL; + int retval; + FILE *stdout_read = NULL; + int stdout_pipe=-1, stderr_pipe=-1; + + /* prepare the environment variables for the managed proxy */ + set_environ(&envp, method, is_server); + + /* ASN we should probably check if proxy_argv[0] is executable by our user */ + retval = tor_spawn_background(proxy_argv[0], &stdout_pipe, + &stderr_pipe, (const char **)proxy_argv, + (const char **)envp); + if (retval < 0) { + log_warn(LD_GENERAL, "Spawn failed"); + return -1; + } + + /* free the memory allocated for the execve() */ + free_execve_args(envp); + free_execve_args(proxy_argv); + + /* Set stdout/stderr pipes to be non-blocking */ + fcntl(stdout_pipe, F_SETFL, O_NONBLOCK); + /* Open the buffered IO streams */ + stdout_read = fdopen(stdout_pipe, "r"); + + log_warn(LD_CONFIG, "The spawn is alive (%d)!", retval); + + /* create a managed proxy */ + managed_proxy_t *mp = tor_malloc(sizeof(managed_proxy_t)); + mp->conf_state = PT_PROTO_INFANT; + mp->stdout = stdout_read; + mp->transports = smartlist_create(); + + /* register the managed proxy */ + if (!unconfigured_proxy_list) + unconfigured_proxy_list = smartlist_create(); + smartlist_add(unconfigured_proxy_list, mp); + + n_unconfigured_proxies++; /* ASN should we care about overflows here? + I say no. */ + + return 0; +} + +/** Check if any of the managed proxies we are currently trying to + * configure have anything new to say. This is called from + * run_scheduled_events(). */ +void +pt_configure_remaining_proxies(void) +{ + log_warn(LD_CONFIG, "We start configuring remaining managed proxies!"); + SMARTLIST_FOREACH_BEGIN(unconfigured_proxy_list, managed_proxy_t *, mp) { + if (proxy_configuration_finished(mp)) /* finished managed proxies + shouldn't be here */ + assert(0); + + configure_proxy(mp); + + } SMARTLIST_FOREACH_END(mp); +} + +/** Receive input from the managed proxy mp to get closer to + * finally configuring it. */ +static void +configure_proxy(managed_proxy_t *mp) +{ + enum stream_status r; + char stdout_buf[200]; + + while (1) { + memset(stdout_buf, 0, sizeof(stdout_buf)); + + r = get_string_from_pipe(mp->stdout, stdout_buf, + sizeof(stdout_buf) - 1); + + if (r == ST_CLOSED || r == ST_TERM) { + log_warn(LD_GENERAL, "Managed proxy stream closed. " + "Most probably application stopped running"); + mp->conf_state = PT_PROTO_BROKEN; + } else if (r == ST_EAGAIN) { + return; + } else { + tor_assert(r == ST_OKAY); + handle_proxy_line(stdout_buf, mp); + } + + /* if the proxy finished configuring, exit the loop. */ + if (proxy_configuration_finished(mp)) { + handle_finished_proxy(mp); + return; + } + } +} + +/** Handle a configured or broken managed proxy mp. */ +static void +handle_finished_proxy(managed_proxy_t *mp) +{ + switch (mp->conf_state) { + case PT_PROTO_BROKEN: /* if broken: */ + managed_proxy_destroy(mp, 1); /* destroy it and all its transports */ + break; + case PT_PROTO_CONFIGURED: /* if configured correctly: */ + register_proxy_transports(mp); /* register all its transports, */ + mp->conf_state = PT_PROTO_COMPLETED; /* mark it as completed, */ + managed_proxy_destroy(mp, 0); /* destroy the managed proxy struct, + keeping the transports intact */ + break; + default: + log_warn(LD_CONFIG, "Unfinished managed proxy in " + "handle_finished_proxy()."); + assert(0); + } + + n_unconfigured_proxies--; + tor_assert(n_unconfigured_proxies >= 0); +} + +/** Register all the transports supported by managed proxy mp. */ +static void +register_proxy_transports(managed_proxy_t *mp) +{ + SMARTLIST_FOREACH_BEGIN(mp->transports, transport_t *, t) { + if (transport_add(t)<0) { + log_warn(LD_GENERAL, "Could not add transport %s. Skipping.", t->name); + transport_free(t); + } else { + log_warn(LD_GENERAL, "Succesfully registered transport %s", t->name); + } + } SMARTLIST_FOREACH_END(t); +} + +/** Free memory allocated by managed proxy mp. + * If also_free_transports is set, also free the transports + * associated with this managed proxy. */ +static void +managed_proxy_destroy(managed_proxy_t *mp, int also_free_transports) +{ + /* transport_free() all its transports */ + if (also_free_transports) + SMARTLIST_FOREACH(mp->transports, transport_t *, t, transport_free(t)); + + /* free the transports smartlist */ + smartlist_clear(mp->transports); + smartlist_free(mp->transports); + + /* remove it from the list of managed proxies */ + smartlist_remove(unconfigured_proxy_list, mp); + + /* close its stdout stream */ + fclose(mp->stdout); + + tor_free(mp); +} + +/** Return true if the configuration of the managed proxy mp is + finished. */ +static INLINE int +proxy_configuration_finished(managed_proxy_t *mp) +{ + return (mp->conf_state == PT_PROTO_CONFIGURED || + mp->conf_state == PT_PROTO_BROKEN); +} + +/** Handle a configuration protocol line received from a + * managed proxy mp. */ +void +handle_proxy_line(char *line, managed_proxy_t *mp) +{ + printf("Judging line: %s\n", line); + + if (strlen(line) < SMALLEST_MANAGED_LINE_SIZE) { + log_warn(LD_GENERAL, "Managed proxy configuration line is too small. " + "Discarding"); + goto err; + } + + if (!strncmp(line, PROTO_ENV_ERROR, strlen(PROTO_ENV_ERROR))) { + if (mp->conf_state != PT_PROTO_INFANT) + goto err; + + parse_env_error(line); + goto err; + } else if (!strncmp(line, PROTO_NEG_FAIL, strlen(PROTO_NEG_FAIL))) { + if (mp->conf_state != PT_PROTO_INFANT) + goto err; + + log_warn(LD_CONFIG, "Managed proxy could not pick a " + "configuration protocol version."); + goto err; + } else if (!strncmp(line, PROTO_NEG_SUCCESS, + strlen(PROTO_NEG_SUCCESS))) { + if (mp->conf_state != PT_PROTO_INFANT) + goto err; + + if (parse_version(line,mp) < 0) + goto err; + + tor_assert(mp->conf_protocol != 0); + mp->conf_state = PT_PROTO_ACCEPTING_METHODS; + return; + } else if (!strncmp(line, PROTO_CMETHODS_DONE, + strlen(PROTO_CMETHODS_DONE))) { + if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) + goto err; + + log_warn(LD_CONFIG, "Client managed proxy configuration completed!"); + mp->conf_state = PT_PROTO_CONFIGURED; + return; + } else if (!strncmp(line, PROTO_SMETHODS_DONE, + strlen(PROTO_SMETHODS_DONE))) { + if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) + goto err; + + log_warn(LD_CONFIG, "Server managed proxy configuration completed!"); + mp->conf_state = PT_PROTO_CONFIGURED; + return; + } else if (!strncmp(line, PROTO_CMETHOD_ERROR, + strlen(PROTO_CMETHOD_ERROR))) { + if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) + goto err; + + parse_client_method_error(line); + goto err; + } else if (!strncmp(line, PROTO_SMETHOD_ERROR, + strlen(PROTO_SMETHOD_ERROR))) { + if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) + goto err; + + parse_server_method_error(line); + goto err; + } else if (!strncmp(line, PROTO_CMETHOD, strlen(PROTO_CMETHOD))) { + if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) + goto err; + + if (parse_cmethod_line(line, mp) < 0) + goto err; + + return; + } else if (!strncmp(line, PROTO_SMETHOD, strlen(PROTO_SMETHOD))) { + if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) + goto err; + + if (parse_smethod_line(line, mp) < 0) + goto err; + + return; + } + + log_warn(LD_CONFIG, "Unknown line received by managed proxy. (%s)", line); + + err: + mp->conf_state = PT_PROTO_BROKEN; + return; +} + +/** Parses an ENV-ERROR line and warns the user accordingly. */ +void +parse_env_error(char *line) +{ + tor_assert(!strncmp(line, PROTO_ENV_ERROR, strlen(PROTO_ENV_ERROR))); + + /* (Length of the protocol string) plus (a space) and (the first char of + the error message) */ + if (strlen(line) < (strlen(PROTO_ENV_ERROR) + 2)) + log_warn(LD_CONFIG, "Managed proxy sent us an %s without an error " + "message.", PROTO_ENV_ERROR); + + log_warn(LD_CONFIG, "Managed proxy couldn't understand the " + "pluggable transport environment variables. (%s)", + line+strlen(PROTO_ENV_ERROR)+1); +} + +/** Handles a VERSION line. Updates the configuration protocol + * version in mp. */ +int +parse_version(char *line, managed_proxy_t *mp) +{ + tor_assert(!strncmp(line, PROTO_NEG_SUCCESS, strlen(PROTO_NEG_SUCCESS))); + + if (strlen(line) < (strlen(PROTO_NEG_SUCCESS) + 2)) { + log_warn(LD_CONFIG, "Managed proxy sent us malformed %s line.", + PROTO_NEG_SUCCESS); + return -1; + } + + if (strcmp("1", line+strlen(PROTO_NEG_SUCCESS)+1)) { + log_warn(LD_CONFIG, "We don't support version '%s'. " + "We only support version '1'", line+strlen(PROTO_NEG_SUCCESS)+1); + return -1; + } + + mp->conf_protocol = PROTO_VERSION_ONE; /* temp. till more versions appear */ + return 0; +} + +/** Parses {C,S}METHOD-ERROR line and warns the user + * accordingly. If is_server it is an SMETHOD-ERROR, + * otherwise it is a CMETHOD-ERROR. */ +static void +parse_method_error(char *line, int is_server) +{ + const char* error = is_server ? + PROTO_SMETHOD_ERROR : PROTO_CMETHOD_ERROR; + + /* (Length of the protocol string) plus (a space) and (the first char of + the error message) */ + if (strlen(line) < (strlen(error) + 2)) + log_warn(LD_CONFIG, "Managed proxy sent us an %s without an error " + "message.", error); + + log_warn(LD_CONFIG, "%s managed proxy encountered a method error. (%s)", + is_server ? "Server" : "Client", + line+strlen(error)+1); +} + +/** Parses an SMETHOD line. */ +int +parse_smethod_line(char *line, managed_proxy_t *mp) +{ + int r; + smartlist_t *items = NULL; + + char *method_name=NULL; + + char *addrport=NULL; + tor_addr_t addr; + uint16_t port = 0; + + items = smartlist_create(); + smartlist_split_string(items, line, NULL, + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); + if (smartlist_len(items) < 3) { + log_warn(LD_CONFIG, "Server managed proxy sent us a SMETHOD line " + "with too few arguments."); + goto err; + } + + tor_assert(!strcmp(smartlist_get(items,0),PROTO_SMETHOD)); + + method_name = smartlist_get(items,1); + + addrport = smartlist_get(items, 2); + if (tor_addr_port_parse(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; + } + + /* For now, notify the user so that he knows where the server + transport is listening. */ + log_warn(LD_CONFIG, "Server transport %s at %s:%d.", + method_name, fmt_addr(&addr), (int)port); + + r=0; + goto done; + + err: + r = -1; + + done: + SMARTLIST_FOREACH(items, char*, s, tor_free(s)); + smartlist_free(items); + return r; +} + +/** Parses a CMETHOD line, and if well-formed it registers + * the new transport in mp. */ +int +parse_cmethod_line(char *line, managed_proxy_t *mp) +{ + int r; + smartlist_t *items = NULL; + + char *method_name=NULL; + + char *socks_ver_str=NULL; + int socks_ver=PROXY_NONE; + + char *addrport=NULL; + tor_addr_t addr; + uint16_t port = 0; + + transport_t *transport=NULL; + + items = smartlist_create(); + smartlist_split_string(items, line, NULL, + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); + if (smartlist_len(items) < 4) { + log_warn(LD_CONFIG, "Client managed proxy sent us a CMETHOD line " + "with too few arguments."); + goto err; + } + + tor_assert(!strcmp(smartlist_get(items,0),PROTO_CMETHOD)); + + method_name = smartlist_get(items,1); + + socks_ver_str = smartlist_get(items,2); + + if (!strcmp(socks_ver_str,"socks4")) { + socks_ver = PROXY_SOCKS4; + } else if (!strcmp(socks_ver_str,"socks5")) { + socks_ver = PROXY_SOCKS5; + } else { + log_warn(LD_CONFIG, "Client managed proxy sent us a proxy protocol " + "we don't recognize. (%s)", socks_ver_str); + goto err; + } + + addrport = smartlist_get(items, 3); + if (tor_addr_port_parse(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; + } + + transport = transport_create(&addr, port, method_name, socks_ver); + if (!transport) + goto err; + + smartlist_add(mp->transports, transport); + + log_warn(LD_CONFIG, "Transport %s at %s:%d with SOCKS %d. " + "Attached to managed proxy.", + method_name, fmt_addr(&addr), (int)port, socks_ver); + + r=0; + goto done; + + err: + r = -1; + + done: + SMARTLIST_FOREACH(items, char*, s, tor_free(s)); + smartlist_free(items); + return r; +} + +/** Prepares the envp of a pluggable transport managed proxy + * + * method is a line with transport methods to be launched. + * If is_server is set, prepare a server proxy envp. */ +static void +set_environ(char ***envp, const char *method, int is_server) +{ + or_options_t *options = get_options(); + char **tmp=NULL; + char *state_loc=NULL; + + int n_envs = is_server ? ENVIRON_SIZE_SERVER : ENVIRON_SIZE_CLIENT; + + /* allocate enough space for our env. vars and a NULL pointer */ + *envp = tor_malloc(sizeof(char*)*(n_envs+1)); + tmp = *envp; + + /* these should all be customizable */ + tor_asprintf(tmp++, "HOME=%s", getenv("HOME")); + tor_asprintf(tmp++, "PATH=%s", getenv("PATH")); + state_loc = get_datadir_fname("pt_state/"); + tor_asprintf(tmp++, "TOR_PT_STATE_LOCATION=%s", state_loc); + tor_free(state_loc); + tor_asprintf(tmp++, "TOR_PT_MANAGED_TRANSPORT_VER=1"); /* temp */ + if (is_server) { + /* ASN check for ORPort values, should we be here if it's 0? */ + tor_asprintf(tmp++, "TOR_PT_ORPORT=127.0.0.1:%d", options->ORPort); /* temp */ + tor_asprintf(tmp++, "TOR_PT_SERVER_BINDADDR=127.0.0.1:0"); + tor_asprintf(tmp++, "TOR_PT_SERVER_TRANSPORTS=%s", method); + tor_asprintf(tmp++, "TOR_PT_EXTENDED_SERVER_PORT=127.0.0.1:4200"); /* temp*/ + } else { + tor_asprintf(tmp++, "TOR_PT_CLIENT_TRANSPORTS=%s", method); + } + *tmp = NULL; +} + +/* ASN is this too ugly/stupid? */ +/** Frees the array of pointers in arg used as arguments to + execve. */ +static INLINE void +free_execve_args(char **arg) +{ + char **tmp = arg; + while (*tmp) /* use the fact that the last element of the array is a + NULL pointer to know when to stop freeing */ + _tor_free(*tmp++); + + tor_free(arg); +} + +/** Release all storage held by the pluggable transports subsystem. */ +void +pt_free_all(void) +{ + if (unconfigured_proxy_list) { + /* If the proxy is in PT_PROTO_COMPLETED, it has registered its + transports and it's the duty of the circuitbuild.c subsystem to + free them. Otherwise, it hasn't registered its transports yet + and we should free them here. */ + SMARTLIST_FOREACH_BEGIN(unconfigured_proxy_list, managed_proxy_t *, mp) { + if (mp->conf_state == PT_PROTO_COMPLETED) + managed_proxy_destroy(mp,0); + else + managed_proxy_destroy(mp,1); + } SMARTLIST_FOREACH_END(mp); + + smartlist_clear(unconfigured_proxy_list); + smartlist_free(unconfigured_proxy_list); + unconfigured_proxy_list=NULL; + } +} + diff --git a/src/or/transports.h b/src/or/transports.h new file mode 100644 index 0000000..80d5429 --- /dev/null +++ b/src/or/transports.h @@ -0,0 +1,59 @@ +/* Copyright (c) 2003-2004, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2011, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file pluggable_transpots.h + * \brief Headers for pluggable_transpots.c + **/ + +#ifndef TOR_PLUGGABLE_TRANSPORTS_H +#define TOR_PLUGGABLE_TRANSPORTS_H + +int pt_managed_launch_proxy(const char *method, + char **proxy_argv, int is_server); + +#define pt_managed_launch_client_proxy(m, pa) \ + pt_managed_launch_proxy(m, pa, 0) +#define pt_managed_launch_server_proxy(m, pa) \ + pt_managed_launch_proxy(m, pa, 1) + +void pt_configure_remaining_proxies(void); + +int pt_proxies_configuration_pending(void); + +void pt_free_all(void); + +#ifdef PT_PRIVATE +/** State of the managed proxy configuration protocol. */ +enum pt_proto_state { + PT_PROTO_INFANT, /* was just born */ + PT_PROTO_ACCEPTING_METHODS, /* accepting methods */ + PT_PROTO_CONFIGURED, /* configured successfully */ + PT_PROTO_COMPLETED, /* configure and registered its transports */ + PT_PROTO_BROKEN +}; + +/** Structure containing information of a managed proxy. */ +typedef struct { + enum pt_proto_state conf_state; /* the current configuration state */ + int conf_protocol; /* the configuration protocol version used */ + + FILE *stdout; /* a stream to its stdout + (closed in managed_proxy_destroy()) */ + + smartlist_t *transports; /* list of transports this proxy spawns */ +} managed_proxy_t; + +int parse_cmethod_line(char *line, managed_proxy_t *mp); +int parse_smethod_line(char *line, managed_proxy_t *mp); + +int parse_version(char *line, managed_proxy_t *mp); +void parse_env_error(char *line); +void handle_proxy_line(char *line, managed_proxy_t *mp); + +#endif + +#endif +

1 0