July 2013 - tor-commits - lists.torproject.org

[translation/orbot] Update translations for orbot
by translation＠torproject.org 18 Jul '13

18 Jul '13

commit 20fe3027c7f79ca86563d4c8b34120d205ee8efe Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 18 13:15:10 2013 +0000 Update translations for orbot --- values-ja/strings.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/values-ja/strings.xml b/values-ja/strings.xml index ee17219..25c0600 100644 --- a/values-ja/strings.xml +++ b/values-ja/strings.xml @@ -129,13 +129,22 @@ <string name="pref_entrance_node">入り口ノード</string> <string name="pref_entrance_node_summary">最初のホップのためのデジタル指紋、ニックネーム、国とIPアドレス</string> <string name="pref_entrance_node_dialog">入り口ノードを入力</string> + <string name="pref_proxy_title">外方向ネットワークプロキシ (オプション)</string> <string name="pref_proxy_type_title">外方向プロキシの種類</string> <string name="pref_proxy_type_summary">HTTP,HTTPS,Socks4,Socks5で使用するプロトコル</string> <string name="pref_proxy_type_dialog">プロキシの種類を入力してください</string> <string name="pref_proxy_host_title">外方向プロキシのホスト</string> + <string name="pref_proxy_host_summary">プロキシサーバのホスト名</string> <string name="pref_proxy_host_dialog">プロクシ　ホストを入力</string> <string name="pref_proxy_port_title">外方向プロキシのポート</string> + <string name="pref_proxy_port_summary">プロキシサーバのポート</string> <string name="pref_proxy_port_dialog">プロキシのポートを入力してください</string> + <string name="pref_proxy_username_title">外方向プロキシのポート</string> + <string name="pref_proxy_username_summary">プロキシユーザー名 (オプション)</string> + <string name="pref_proxy_username_dialog">プロキシのユーザー名を入力してください</string> + <string name="pref_proxy_password_title">外方向プロキシのパスワード</string> + <string name="pref_proxy_password_summary">プロキシのパスワード (オプション)</string> + <string name="pref_proxy_password_dialog">プロキシのパスワードを入力してください</string> <string name="status">状態</string> <string name="setting_up_full_transparent_proxying_">完全な透過プロキシをセットアップ中...</string> <string name="setting_up_app_based_transparent_proxying_">アプリベースの透過プロキシをセットアップ中...</string> @@ -216,4 +225,5 @@ <string name="wizard_locale_msg">今の言語を変更するか、そのままにする</string> <string name="powered_by">powered by the Tor Project</string> <string name="btn_save_settings">設定を保存</string> + <string name="no_internet_connection_tor">インターネット接続なし。Torは待機中です...</string> </resources>

1 0

[tor/master] Remove a redundant declaration
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit 27ec1fafe4a739429ac82d47015465bb5a2d9674 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 18 08:56:02 2013 -0400 Remove a redundant declaration --- src/or/transports.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/or/transports.h b/src/or/transports.h index 126b704..1c6fc41 100644 --- a/src/or/transports.h +++ b/src/or/transports.h @@ -117,8 +117,6 @@ STATIC char *get_transport_options_for_server_proxy(const managed_proxy_t *mp); STATIC void managed_proxy_destroy(managed_proxy_t *mp, int also_terminate_process); -STATIC managed_proxy_t *managed_proxy_create(const smartlist_t *transport_list, - char **proxy_argv, int is_server); STATIC managed_proxy_t *managed_proxy_create(const smartlist_t *transport_list, char **proxy_argv, int is_server);

1 0

[tor/master] Remove a stray debugging echo from configure.ac
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit 95597ab176286650aacf6042bf2224f7e54cd2ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 18 08:54:28 2013 -0400 Remove a stray debugging echo from configure.ac --- configure.ac | 2 -- 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac index 7329969..4aeec92 100644 --- a/configure.ac +++ b/configure.ac @@ -47,8 +47,6 @@ AC_ARG_ENABLE(coverage, AM_CONDITIONAL(UNITTESTS_ENABLED, test x$enable_unittests != xno) AM_CONDITIONAL(COVERAGE_ENABLED, test x$enable_coverage = xyes) -echo "COVERAGE: $enable_coverage" - if test "$enable_static_tor" = "yes"; then enable_static_libevent="yes"; enable_static_openssl="yes";

1 0

[tor/master] Fix a wide line in test_pt.c
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit e6c0fb2b6db185448cdcbf479047cdbe525ef8a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 18 08:49:52 2013 -0400 Fix a wide line in test_pt.c --- src/test/test_pt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/test_pt.c b/src/test/test_pt.c index 84b7a59..ac97cf9 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -94,7 +94,8 @@ test_pt_parsing(void) reset_mp(mp); /* Include some arguments. Good ones. */ - strlcpy(line,"SMETHOD trebuchet 127.0.0.1:9999 ARGS:counterweight=3,sling=snappy", + strlcpy(line,"SMETHOD trebuchet 127.0.0.1:9999 " + "ARGS:counterweight=3,sling=snappy", sizeof(line)); test_assert(parse_smethod_line(line, mp) == 0); tt_int_op(1, ==, smartlist_len(mp->transports));

1 0

[tor/master] Write function that parses ServerTransportOptions torrc lines.
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit 08d98071252995d586f0ac3cef82f6ec46fc9347 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 12 15:28:31 2013 +0300 Write function that parses ServerTransportOptions torrc lines. And use it to validate them. --- src/or/config.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/config.h | 3 +++ src/or/or.h | 3 +++ 3 files changed, 77 insertions(+) diff --git a/src/or/config.c b/src/or/config.c index 6d3b133..1f6d1db 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -280,6 +280,7 @@ static config_var_t option_vars_[] = { V(IPv6Exit, BOOL, "0"), VAR("ServerTransportPlugin", LINELIST, ServerTransportPlugin, NULL), V(ServerTransportListenAddr, LINELIST, NULL), + V(ServerTransportOptions, LINELIST, NULL), V(Socks4Proxy, STRING, NULL), V(Socks5Proxy, STRING, NULL), V(Socks5ProxyUsername, STRING, NULL), @@ -3147,6 +3148,19 @@ options_validate(or_options_t *old_options, or_options_t *options, "ServerTransportListenAddr line will be ignored."); } + for (cl = options->ServerTransportOptions; cl; cl = cl->next) { + /** If get_options_from_transport_options_line() fails with + 'transport' being NULL, it means that something went wrong + while parsing the ServerTransportOptions line. */ + smartlist_t *options_sl = + get_options_from_transport_options_line(cl->value, NULL); + if (!options_sl) + REJECT("ServerTransportOptions did not parse. See logs for details."); + + SMARTLIST_FOREACH(options_sl, char *, cp, tor_free(cp)); + smartlist_free(options_sl); + } + if (options->ConstrainedSockets) { /* If the user wants to constrain socket buffer use, make sure the desired * limit is between MIN|MAX_TCPSOCK_BUFFER in k increments. */ @@ -4580,6 +4594,63 @@ get_bindaddr_from_transport_listen_line(const char *line,const char *transport) return addrport; } +/** Given a ServerTransportOptions line, return a smartlist + * with the options. Return NULL if the line was not well-formed. + * + * If transport is set, return NULL if the line is not + * referring to transport. + * + * The returned smartlist and its strings are allocated on the heap + * and it's the responsibility of the caller to free it. */ +smartlist_t * +get_options_from_transport_options_line(const char *line,const char *transport) +{ + smartlist_t *items = smartlist_new(); + smartlist_t *options = smartlist_new(); + const char *parsed_transport = NULL; + + smartlist_split_string(items, line, NULL, + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); + + if (smartlist_len(items) < 2) { + log_warn(LD_CONFIG,"Too few arguments on ServerTransportOptions line."); + goto err; + } + + parsed_transport = smartlist_get(items, 0); + /* If 'transport' is given, check if it matches the one on the line */ + if (transport && strcmp(transport, parsed_transport)) + goto err; + + SMARTLIST_FOREACH_BEGIN(items, const char *, option) { + if (option_sl_idx == 0) /* skip the transport field (first field)*/ + continue; + + /* validate that it's a k=v value */ + if (!string_is_key_value(LOG_WARN, option)) { + log_warn(LD_CONFIG, "%s is not a k=v value.", escaped(option)); + goto err; + } + + /* add it to the options smartlist */ + smartlist_add(options, tor_strdup(option)); + log_debug(LD_CONFIG, "Added %s to the list of options", escaped(option)); + } SMARTLIST_FOREACH_END(option); + + goto done; + + err: + SMARTLIST_FOREACH(options, char*, s, tor_free(s)); + smartlist_free(options); + options = NULL; + + done: + SMARTLIST_FOREACH(items, char*, s, tor_free(s)); + smartlist_free(items); + + return options; +} + /** Given the name of a pluggable transport in transport, check * the configuration file to see if the user has explicitly asked for * it to listen on a specific port. Return a <address:port> string if diff --git a/src/or/config.h b/src/or/config.h index c35214c..11e8109 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -112,6 +112,9 @@ typedef struct bridge_line_t { void bridge_line_free(bridge_line_t *bridge_line); bridge_line_t *parse_bridge_line(const char *line); +smartlist_t *get_options_from_transport_options_line(const char *line, + const char *transport); + #endif diff --git a/src/or/or.h b/src/or/or.h index 568958d..b8c4279 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3500,6 +3500,9 @@ typedef struct { /** List of TCP/IP addresses that transports should listen at. */ config_line_t *ServerTransportListenAddr; + /** List of options that must be passed to pluggable transports. */ + config_line_t *ServerTransportOptions; + int BridgeRelay; /**< Boolean: are we acting as a bridge relay? We make * this explicit so we can change how we behave in the * future. */

1 0

[tor/master] Add a basic unit test for pt_get_extra_info_descriptor_string.
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit e02b6b99f243566e1e652068af0d0b712b37914e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 16 11:53:36 2013 -0400 Add a basic unit test for pt_get_extra_info_descriptor_string. --- src/or/transports.c | 2 +- src/or/transports.h | 3 +++ src/test/test_pt.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/src/or/transports.c b/src/or/transports.c index 9123421..a600a10 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -1230,7 +1230,7 @@ create_managed_proxy_environment(const managed_proxy_t *mp) * proxy_argv. * * Requires that proxy_argv have at least one element. */ -static managed_proxy_t * +STATIC managed_proxy_t * managed_proxy_create(const smartlist_t *transport_list, char **proxy_argv, int is_server) { diff --git a/src/or/transports.h b/src/or/transports.h index 525d48a..54049e9 100644 --- a/src/or/transports.h +++ b/src/or/transports.h @@ -114,6 +114,9 @@ STATIC int parse_version(const char *line, managed_proxy_t *mp); STATIC void parse_env_error(const char *line); STATIC void handle_proxy_line(const char *line, managed_proxy_t *mp); +STATIC managed_proxy_t *managed_proxy_create(const smartlist_t *transport_list, + char **proxy_argv, int is_server); + #endif #endif diff --git a/src/test/test_pt.c b/src/test/test_pt.c index 6a09807..cc2b0a9 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -169,12 +169,59 @@ test_pt_protocol(void) tor_free(mp); } +static void +test_pt_get_extrainfo_string(void *arg) +{ + managed_proxy_t *mp1 = NULL, *mp2 = NULL; + char **argv1, **argv2; + smartlist_t *t1 = smartlist_new(), *t2 = smartlist_new(); + int r; + char *s = NULL; + (void) arg; + + argv1 = tor_malloc_zero(sizeof(char*)*3); + argv1[0] = tor_strdup("ewige"); + argv1[1] = tor_strdup("Blumenkraft"); + argv1[2] = NULL; + argv2 = tor_malloc_zero(sizeof(char*)*4); + argv2[0] = tor_strdup("und"); + argv2[1] = tor_strdup("ewige"); + argv2[2] = tor_strdup("Schlangenkraft"); + argv2[3] = NULL; + + mp1 = managed_proxy_create(t1, argv1, 1); + mp2 = managed_proxy_create(t2, argv2, 1); + + r = parse_smethod_line("SMETHOD hagbard 127.0.0.1:5555", mp1); + tt_int_op(r, ==, 0); + r = parse_smethod_line("SMETHOD celine 127.0.0.1:1723 ARGS:card=no-enemy", + mp2); + tt_int_op(r, ==, 0); + + /* Force these proxies to look "completed" or they won't generate output. */ + mp1->conf_state = mp2->conf_state = PT_PROTO_COMPLETED; + + s = pt_get_extra_info_descriptor_string(); + tt_assert(s); + tt_str_op(s, ==, + "transport hagbard 127.0.0.1:5555\n" + "transport celine 127.0.0.1:1723 card=no-enemy\n"); + + done: + /* XXXX clean up better */ + smartlist_free(t1); + smartlist_free(t2); + tor_free(s); +} + #define PT_LEGACY(name) \ { #name, legacy_test_helper, 0, &legacy_setup, test_pt_ ## name } struct testcase_t pt_tests[] = { PT_LEGACY(parsing), PT_LEGACY(protocol), + { "get_extrainfo_string", test_pt_get_extrainfo_string, TT_FORK, + NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] Write unit tests for the ServerTransportOptions parsing function.
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit 6cfc2b5d73f6ec1b2ab4af1f209b6126a7d8cba9 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 12 15:28:48 2013 +0300 Write unit tests for the ServerTransportOptions parsing function. --- src/test/test_config.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index 4e9e13e..7c43b5f 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -438,12 +438,74 @@ test_config_parse_bridge_line(void *arg) "aa=b"); } +static void +test_config_parse_transport_options_line(void *arg) +{ + smartlist_t *options_sl = NULL; + + (void) arg; + + { /* too small line */ + options_sl = get_options_from_transport_options_line("valley", NULL); + test_assert(!options_sl); + } + + { /* no k=v values */ + options_sl = get_options_from_transport_options_line("hit it!", NULL); + test_assert(!options_sl); + } + + { /* correct line, but wrong transport specified */ + options_sl = + get_options_from_transport_options_line("trebuchet k=v", "rook"); + test_assert(!options_sl); + } + + { /* correct -- no transport specified */ + smartlist_t *sl_tmp = smartlist_new(); + smartlist_add_asprintf(sl_tmp, "ladi=dadi"); + smartlist_add_asprintf(sl_tmp, "weliketo=party"); + + options_sl = + get_options_from_transport_options_line("rook ladi=dadi weliketo=party", + NULL); + test_assert(options_sl); + test_assert(smartlist_strings_eq(options_sl, sl_tmp)); + + SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s)); + smartlist_free(sl_tmp); + SMARTLIST_FOREACH(options_sl, char *, s, tor_free(s)); + smartlist_free(options_sl); + } + + { /* correct -- correct transport specified */ + smartlist_t *sl_tmp = smartlist_new(); + smartlist_add_asprintf(sl_tmp, "ladi=dadi"); + smartlist_add_asprintf(sl_tmp, "weliketo=party"); + + options_sl = + get_options_from_transport_options_line("rook ladi=dadi weliketo=party", + "rook"); + test_assert(options_sl); + test_assert(smartlist_strings_eq(options_sl, sl_tmp)); + + SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s)); + smartlist_free(sl_tmp); + SMARTLIST_FOREACH(options_sl, char *, s, tor_free(s)); + smartlist_free(options_sl); + } + + done: + ; +} + #define CONFIG_TEST(name, flags) \ { #name, test_config_ ## name, flags, NULL, NULL } struct testcase_t config_tests[] = { CONFIG_TEST(addressmap, 0), CONFIG_TEST(parse_bridge_line, 0), + CONFIG_TEST(parse_transport_options_line, 0), CONFIG_TEST(check_or_create_data_subdir, TT_FORK), CONFIG_TEST(write_to_data_subdir, TT_FORK), END_OF_TESTCASES

1 0

[tor/master] Pass characters to be escaped to tor_escape_str_for_socks_arg().
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit ea72958f25f6326d6947c8cd4ef185912582d436 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 12 16:23:16 2013 +0300 Pass characters to be escaped to tor_escape_str_for_socks_arg(). This is in preparation for using tor_escape_str_for_socks_arg() to escape server-side pluggable transport parameters. --- src/common/util.c | 10 ++++------ src/common/util.h | 3 ++- src/or/transports.c | 2 +- src/test/test_util.c | 10 +++++----- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index d9913dd..bd38a62 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1223,17 +1223,15 @@ escaped(const char *s) return escaped_val_; } -/** Escape every ";" or "\" character of string. Use - * escape_char as the character to use for escaping. - * The returned string is allocated on the heap and it's the - * responsibility of the caller to free it. */ +/** Escape every character of string that is in + * chars_to_escape. The returned string is allocated on the + * heap and it's the responsibility of the caller to free it. */ char * -tor_escape_str_for_socks_arg(const char *string) +tor_escape_str_for_socks_arg(const char *string, const char *chars_to_escape) { char *new_string = NULL; char *new_cp = NULL; size_t length, new_length; - static const char *chars_to_escape = ";\\"; tor_assert(string); diff --git a/src/common/util.h b/src/common/util.h index ad75266..ba0ec98 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -231,7 +231,8 @@ int tor_digest256_is_zero(const char *digest); char *esc_for_log(const char *string) ATTR_MALLOC; const char *escaped(const char *string); -char *tor_escape_str_for_socks_arg(const char *string); +char *tor_escape_str_for_socks_arg(const char *string, + const char *chars_to_escape); struct smartlist_t; int tor_vsscanf(const char *buf, const char *pattern, va_list ap) \ diff --git a/src/or/transports.c b/src/or/transports.c index cfec703..6f17702 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -1440,7 +1440,7 @@ pt_stringify_socks_args(const smartlist_t *socks_args) SMARTLIST_FOREACH_BEGIN(socks_args, const char *, s) { /* Escape ';' and '\'. */ - escaped_string = tor_escape_str_for_socks_arg(s); + escaped_string = tor_escape_str_for_socks_arg(s, ";\\"); if (!escaped_string) goto done; diff --git a/src/test/test_util.c b/src/test/test_util.c index 2cc25e9..54a089b 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -803,30 +803,30 @@ test_util_escape_string_socks(void) char *escaped_string = NULL; /** Simple backslash escape. */ - escaped_string = tor_escape_str_for_socks_arg("This is a backslash: \\"); + escaped_string = tor_escape_str_for_socks_arg("This is a backslash: \\", ";\\"); test_assert(escaped_string); test_streq(escaped_string, "This is a backslash: \\\\"); tor_free(escaped_string); /** Simple semicolon escape. */ - escaped_string = tor_escape_str_for_socks_arg("First rule: Do not use ;"); + escaped_string = tor_escape_str_for_socks_arg("First rule: Do not use ;", ";\\"); test_assert(escaped_string); test_streq(escaped_string, "First rule: Do not use \\;"); tor_free(escaped_string); /** Empty string. */ - escaped_string = tor_escape_str_for_socks_arg(""); + escaped_string = tor_escape_str_for_socks_arg("", ";\\"); test_assert(escaped_string); test_streq(escaped_string, ""); tor_free(escaped_string); /** Escape all characters. */ - escaped_string = tor_escape_str_for_socks_arg(";\\;\\"); + escaped_string = tor_escape_str_for_socks_arg(";\\;\\", ";\\"); test_assert(escaped_string); test_streq(escaped_string, "\\;\\\\\\;\\\\"); tor_free(escaped_string); - escaped_string = tor_escape_str_for_socks_arg(";"); + escaped_string = tor_escape_str_for_socks_arg(";", ";\\"); test_assert(escaped_string); test_streq(escaped_string, "\\;"); tor_free(escaped_string);

1 0

[tor/master] Place the options in the environment after processing them properly.
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit 1ee3a0cf4440f34c024ff61a320e0b16553a3558 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 12 17:12:39 2013 +0300 Place the options in the environment after processing them properly. --- src/or/config.c | 20 ++++++++++++++++++++ src/or/config.h | 2 +- src/or/transports.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index 1f6d1db..4ddced8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4671,6 +4671,26 @@ get_transport_bindaddr_from_config(const char *transport) return NULL; } +/** Given the name of a pluggable transport in transport, check + * the configuration file to see if the user has asked us to pass any + * parameters to the pluggable transport. Return a smartlist + * containing the parameters, otherwise NULL. */ +smartlist_t * +get_options_for_server_transport(const char *transport) +{ + config_line_t *cl; + const or_options_t *options = get_options(); + + for (cl = options->ServerTransportOptions; cl; cl = cl->next) { + smartlist_t *options_sl = + get_options_from_transport_options_line(cl->value, transport); + if (options_sl) + return options_sl; + } + + return NULL; +} + /** Read the contents of a ServerTransportPlugin line from * line. Return 0 if the line is well-formed, and -1 if it * isn't. diff --git a/src/or/config.h b/src/or/config.h index 11e8109..9910f18 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -114,7 +114,7 @@ void bridge_line_free(bridge_line_t *bridge_line); bridge_line_t *parse_bridge_line(const char *line); smartlist_t *get_options_from_transport_options_line(const char *line, const char *transport); - +smartlist_t *get_options_for_server_transport(const char *transport); #endif diff --git a/src/or/transports.c b/src/or/transports.c index 6b6882a..2b129cb 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -1100,6 +1100,48 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) return r; } +/** Return a newly allocated string that tor should place in + * TOR_PT_SERVER_TRANSPORT_OPTIONS while configuring the server + * manged proxy in mp. Return NULL if no such options are found. */ +static char * +get_transport_options_for_server_proxy(const managed_proxy_t *mp) +{ + char *options_string = NULL; + smartlist_t *string_sl = smartlist_new(); + + tor_assert(mp->is_server); + + /** Loop over the transports of the proxy. If we have options for + any of them, format them appropriately and place them in our + smartlist. Finally, join our smartlist to get the final + string. */ + SMARTLIST_FOREACH_BEGIN(mp->transports_to_launch, const char *, transport) { + smartlist_t *options_tmp_sl = NULL; + options_tmp_sl = get_options_for_server_transport(transport); + if (!options_tmp_sl) + continue; + + /** Loop over the options of this transport, escape them, and + place them in the smartlist. */ + SMARTLIST_FOREACH_BEGIN(options_tmp_sl, const char *, options) { + char *escaped_opts = tor_escape_str_for_pt_args(options, ":;\\"); + smartlist_add_asprintf(string_sl, "%s:%s", + transport, escaped_opts); + tor_free(escaped_opts); + } SMARTLIST_FOREACH_END(options); + + SMARTLIST_FOREACH(options_tmp_sl, char *, c, tor_free(c)); + smartlist_free(options_tmp_sl); + } SMARTLIST_FOREACH_END(transport); + + options_string = smartlist_join_strings(string_sl, ";", 0, NULL); + + SMARTLIST_FOREACH(string_sl, char *, t, tor_free(t)); + smartlist_free(string_sl); + + return options_string; +} + /** Return the string that tor should place in TOR_PT_SERVER_BINDADDR * while configuring the server managed proxy in mp. The * string is stored in the heap, and it's the the responsibility of @@ -1181,6 +1223,14 @@ create_managed_proxy_environment(const managed_proxy_t *mp) tor_free(bindaddr_tmp); } + { + char *server_transport_options = + get_transport_options_for_server_proxy(mp); + smartlist_add_asprintf(envs, "TOR_PT_SERVER_TRANSPORT_OPTIONS=%s", + server_transport_options); + tor_free(server_transport_options); + } + /* XXX024 Remove the '=' here once versions of obfsproxy which * assert that this env var exists are sufficiently dead. *

1 0

[tor/master] Insert the environment variable only if we have options to pass.
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit c71809d403f1fe84105748583ef0f66b6c778db2 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Jun 13 12:18:07 2013 +0300 Insert the environment variable only if we have options to pass. --- src/or/transports.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index 2b129cb..39cb872 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -1134,7 +1134,9 @@ get_transport_options_for_server_proxy(const managed_proxy_t *mp) smartlist_free(options_tmp_sl); } SMARTLIST_FOREACH_END(transport); - options_string = smartlist_join_strings(string_sl, ";", 0, NULL); + if (smartlist_len(string_sl)) { + options_string = smartlist_join_strings(string_sl, ";", 0, NULL); + } SMARTLIST_FOREACH(string_sl, char *, t, tor_free(t)); smartlist_free(string_sl); @@ -1226,9 +1228,11 @@ create_managed_proxy_environment(const managed_proxy_t *mp) { char *server_transport_options = get_transport_options_for_server_proxy(mp); - smartlist_add_asprintf(envs, "TOR_PT_SERVER_TRANSPORT_OPTIONS=%s", - server_transport_options); - tor_free(server_transport_options); + if (server_transport_options) { + smartlist_add_asprintf(envs, "TOR_PT_SERVER_TRANSPORT_OPTIONS=%s", + server_transport_options); + tor_free(server_transport_options); + } } /* XXX024 Remove the '=' here once versions of obfsproxy which

1 0