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

[translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
by translation＠torproject.org 06 Oct '20

06 Oct '20

commit 428b53e651f16be63b17835cd76474130347c73e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 6 14:15:21 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstr… --- sw/torbrowser_strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/sw/torbrowser_strings.xml b/sw/torbrowser_strings.xml index 0a1697173b..af4fd46e19 100644 --- a/sw/torbrowser_strings.xml +++ b/sw/torbrowser_strings.xml @@ -22,6 +22,7 @@ <string name="tor_explore_privately">Chunguza. Faragha</string> + <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_obfs4">obfs4</string> <string name="preferences_tor_network_settings_yes">Ndio</string> <string name="preferences_tor_network_settings_no">Hapana</string> <string name="preferences_tor_network_settings_disconnected">Tenganisha</string>

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 06 Oct '20

06 Oct '20

commit 67679f47dda3404bab637404a2259014db53130e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 6 13:48:46 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+sw.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+sw.po b/contents+sw.po index 4e86485e22..f727d13758 100644 --- a/contents+sw.po +++ b/contents+sw.po @@ -605,7 +605,7 @@ msgstr "" #: lego/templates/banner.html:3 lego/templates/banner.html:5 #: templates/banner.html:3 templates/banner.html:5 msgid "Close banner" -msgstr "" +msgstr "Funga banner" #: lego/templates/banner.html:11 templates/banner.html:11 msgid "Tracking, surveillance, and censorship are widespread online." @@ -735,15 +735,15 @@ msgstr "" #: lego/templates/secure-connections.html:44 msgid "user / pw" -msgstr "" +msgstr "mtumiaji/ pw" #: lego/templates/secure-connections.html:47 msgid "Username and password used for authentication." -msgstr "" +msgstr "Jina la mtumiaji na nywila iliyotumika kwa uhalisishaji." #: lego/templates/secure-connections.html:51 msgid "data" -msgstr "" +msgstr "data" #: lego/templates/secure-connections.html:54 msgid "Data being transmitted." @@ -1356,7 +1356,7 @@ msgstr "" #: templates/macros/question.html:14 msgid "Edit this page" -msgstr "" +msgstr "Hariri ukurasa huu" #: templates/macros/question.html:15 msgid "Suggest Feedback"

1 0

[translation/tor-and-https] https://gitweb.torproject.org/translation.git/commit/?h=tor-and-https
by translation＠torproject.org 06 Oct '20

06 Oct '20

commit a3ddd15d7cf2eca075f8f9aed30def5a3d9974cd Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 6 13:47:54 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-and-https --- sw.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sw.po b/sw.po index 90885acee5..530daca9de 100644 --- a/sw.po +++ b/sw.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" -"PO-Revision-Date: 2020-09-24 19:09+0000\n" +"PO-Revision-Date: 2020-10-06 13:44+0000\n" "Last-Translator: Zaituni Njovu <zaituni(a)zainafoundationtz.org>\n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" @@ -39,14 +39,14 @@ msgstr "" #: C/tor-and-https.svg:363 #, no-wrap msgid "user / pw" -msgstr "" +msgstr "mtumiaji/ pw" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". #: C/tor-and-https.svg:363 #, no-wrap msgid "data" -msgstr "" +msgstr "data" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M".

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 06 Oct '20

06 Oct '20

commit 3b3e17ba4340d85940702aa1fa36fb4db3ae8f9e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 6 13:47:41 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+sw.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/contents+sw.po b/contents+sw.po index 47ae355271..13fa72f613 100644 --- a/contents+sw.po +++ b/contents+sw.po @@ -2725,12 +2725,12 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "### Tor Browser for iOS" -msgstr "" +msgstr "### Tor Kivinjari kwa iOS" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "There is no Tor Browser for iOS." -msgstr "" +msgstr "Hakuna Tor Kivinjari kwa iOS." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2877,7 +2877,7 @@ msgstr "" #: lego/templates/banner.html:3 lego/templates/banner.html:5 #: templates/banner.html:3 templates/banner.html:5 msgid "Close banner" -msgstr "" +msgstr "Funga banner" #: lego/templates/banner.html:11 templates/banner.html:11 msgid "Tracking, surveillance, and censorship are widespread online." @@ -3025,17 +3025,17 @@ msgstr "" #: lego/templates/secure-connections.html:44 #: templates/secure-connections.html:44 msgid "user / pw" -msgstr "" +msgstr "mtumiaji/ pw" #: lego/templates/secure-connections.html:47 #: templates/secure-connections.html:47 msgid "Username and password used for authentication." -msgstr "" +msgstr "Jina la mtumiaji na nywila iliyotumika kwa uhalisishaji." #: lego/templates/secure-connections.html:51 #: templates/secure-connections.html:51 msgid "data" -msgstr "" +msgstr "data" #: lego/templates/secure-connections.html:54 #: templates/secure-connections.html:54 @@ -3078,7 +3078,7 @@ msgstr "" #: templates/macros/topic.html:24 msgid "Edit this page" -msgstr "" +msgstr "Hariri ukurasa huu" #: templates/macros/topic.html:25 msgid "Suggest Feedback"

1 0

[tor/master] Add `OutboundBindAddressPT` to torrc.
by dgoulet＠torproject.org 06 Oct '20

06 Oct '20

commit db0aaf428ebb00b37b451db1d5eecb2fd5689b79 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jul 2 19:03:39 2019 +0200 Add `OutboundBindAddressPT` to torrc. This patch adds a new option to torrc: `OutboundBindAddressPT`. This option works in the same way as `OutboundBindAddressOR` and `OutboundBindAddressExit` in that it allows the user to specify which outbound IP address the user wants the PT to make its connections from. There is one difference though in that OutboundBindAddressPT will only be a suggestion for the PT to use since Tor cannot enforce whether or not the PT actually uses this option for anything. See: https://bugs.torproject.org/5304 --- doc/man/tor.1.txt | 11 +++++++++++ src/app/config/config.c | 10 +++++++++- src/app/config/or_options_st.h | 6 ++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index 4b37548b07..cd53d5ea26 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -797,6 +797,17 @@ forward slash (/) in the configuration file and on the command line. field, Tor will use it for separate rate limiting for each connection from a non-relay. (Default: 0) +[[OutboundBindAddressPT]] **OutboundBindAddressPT** __IP__:: + Request that pluggable transports makes all outbound connections + originate from the IP address specified. Because outgoing connections + are handled by the pluggable transport itself, it is not possible for + Tor to enforce whether the pluggable transport honors this option. This + option overrides **OutboundBindAddress** for the same IP version. This + option may be used twice, once with an IPv4 address and once with an + IPv6 address. IPv6 addresses should be wrapped in square brackets. This + setting will be ignored for connections to the loopback addresses + (127.0.0.0/8 and ::1). + [[PidFile]] **PidFile** __FILE__:: On startup, write our PID to FILE. On clean shutdown, remove FILE. Can not be changed while tor is running. diff --git a/src/app/config/config.c b/src/app/config/config.c index 5c8a3792ee..9fee83aebb 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -580,6 +580,7 @@ static const config_var_t option_vars_[] = { V(OutboundBindAddress, LINELIST, NULL), V(OutboundBindAddressOR, LINELIST, NULL), V(OutboundBindAddressExit, LINELIST, NULL), + V(OutboundBindAddressPT, LINELIST, NULL), OBSOLETE("PathBiasDisableRate"), V(PathBiasCircThreshold, INT, "-1"), @@ -7180,7 +7181,8 @@ parse_outbound_address_lines(const config_line_t *lines, outbound_addr_t type, "configured: %s", family==AF_INET?" IPv4":(family==AF_INET6?" IPv6":""), type==OUTBOUND_ADDR_OR?" OR": - (type==OUTBOUND_ADDR_EXIT?" exit":""), lines->value); + (type==OUTBOUND_ADDR_EXIT?" exit": + (type==OUTBOUND_ADDR_PT?" PT":"")), lines->value); return -1; } lines = lines->next; @@ -7220,6 +7222,12 @@ parse_outbound_addresses(or_options_t *options, int validate_only, char **msg) goto err; } + if (parse_outbound_address_lines(options->OutboundBindAddressPT, + OUTBOUND_ADDR_PT, options, validate_only, + msg) < 0) { + goto err; + } + return 0; err: return -1; diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 9520a1b736..ce3006cc37 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -34,6 +34,10 @@ typedef enum { * `OutboundBindAddressOR` configuration entry in torrc. */ OUTBOUND_ADDR_OR, + /** Outbound IP address for PT connections. Controlled by the + * `OutboundBindAddressPT` configuration entry in torrc. */ + OUTBOUND_ADDR_PT, + /** Outbound IP address for both Exit and OR connections. Controlled by the * OutboundBindAddress configuration entry in torrc. This value is used as * fallback if the more specific OUTBOUND_ADDR_EXIT and OUTBOUND_ADDR_OR is @@ -146,6 +150,8 @@ struct or_options_t { struct config_line_t *OutboundBindAddressOR; /** Local address to bind outbound exit sockets */ struct config_line_t *OutboundBindAddressExit; + /** Local address to bind outbound PT sockets */ + struct config_line_t *OutboundBindAddressPT; /** Addresses derived from the various OutboundBindAddress lines. * [][0] is IPv4, [][1] is IPv6 */

1 0

[tor/master] Document enumeration values for `outbound_addr_t`.
by dgoulet＠torproject.org 06 Oct '20

06 Oct '20

commit 25bffccd718220bd5b378d1517d09669d6685db1 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jul 2 18:49:44 2019 +0200 Document enumeration values for `outbound_addr_t`. This patch adds doxygen documentation strings for each of the values in `outbound_addr_t`. See: https://bugs.torproject.org/5304 --- src/app/config/or_options_st.h | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 3b84e5e1f2..9520a1b736 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -25,9 +25,24 @@ struct routerset_t; /** Enumeration of outbound address configuration types: * Exit-only, OR-only, or both */ -typedef enum {OUTBOUND_ADDR_EXIT, OUTBOUND_ADDR_OR, - OUTBOUND_ADDR_EXIT_AND_OR, - OUTBOUND_ADDR_MAX} outbound_addr_t; +typedef enum { + /** Outbound IP address for Exit connections. Controlled by the + * `OutboundBindAddressExit` configuration entry in torrc. */ + OUTBOUND_ADDR_EXIT, + + /** Outbound IP address for OR connections. Controlled by the + * `OutboundBindAddressOR` configuration entry in torrc. */ + OUTBOUND_ADDR_OR, + + /** Outbound IP address for both Exit and OR connections. Controlled by the + * OutboundBindAddress configuration entry in torrc. This value is used as + * fallback if the more specific OUTBOUND_ADDR_EXIT and OUTBOUND_ADDR_OR is + * unset. */ + OUTBOUND_ADDR_EXIT_AND_OR, + + /** Max value for this enum. Must be the last element in this enum. */ + OUTBOUND_ADDR_MAX +} outbound_addr_t; /** Which protocol to use for TCPProxy. */ typedef enum {

1 0

[tor/master] Rename `OUTBOUND_ADDR_EXIT_AND_OR` to `OUTBOUND_ADDR_ANY`.
by dgoulet＠torproject.org 06 Oct '20

06 Oct '20

commit ad087432995e1a55b9b9e63f28e295cbec528890 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jul 2 19:09:22 2019 +0200 Rename `OUTBOUND_ADDR_EXIT_AND_OR` to `OUTBOUND_ADDR_ANY`. This patch renames the enumeration value in `outbound_addr_t` from `OUTBOUND_ADDR_EXIT_AND_OR` to `OUTBOUND_ADDR_ANY` since with the arrival of `OUTBOUND_ADDR_PT` it no longer makes sense to call the fallback value for "Exit and OR". Instead we rename it to "any". See: https://bugs.torproject.org/5304 --- src/app/config/config.c | 2 +- src/app/config/or_options_st.h | 10 +++++----- src/core/mainloop/connection.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 9fee83aebb..46d98b2ab2 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -7205,7 +7205,7 @@ parse_outbound_addresses(or_options_t *options, int validate_only, char **msg) } if (parse_outbound_address_lines(options->OutboundBindAddress, - OUTBOUND_ADDR_EXIT_AND_OR, options, + OUTBOUND_ADDR_ANY, options, validate_only, msg) < 0) { goto err; } diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index ce3006cc37..7f201b8dd7 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -24,7 +24,7 @@ struct config_suite_t; struct routerset_t; /** Enumeration of outbound address configuration types: - * Exit-only, OR-only, or both */ + * Exit-only, OR-only, PT-only, or any of them */ typedef enum { /** Outbound IP address for Exit connections. Controlled by the * `OutboundBindAddressExit` configuration entry in torrc. */ @@ -38,11 +38,11 @@ typedef enum { * `OutboundBindAddressPT` configuration entry in torrc. */ OUTBOUND_ADDR_PT, - /** Outbound IP address for both Exit and OR connections. Controlled by the + /** Outbound IP address for any outgoing connections. Controlled by the * OutboundBindAddress configuration entry in torrc. This value is used as - * fallback if the more specific OUTBOUND_ADDR_EXIT and OUTBOUND_ADDR_OR is - * unset. */ - OUTBOUND_ADDR_EXIT_AND_OR, + * fallback if the more specific OUTBOUND_ADDR_EXIT, OUTBOUND_ADDR_OR, and + * OUTBOUND_ADDR_PT are unset. */ + OUTBOUND_ADDR_ANY, /** Max value for this enum. Must be the last element in this enum. */ OUTBOUND_ADDR_MAX diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 29ffdaaf4e..c043b1ccec 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -2331,9 +2331,9 @@ conn_get_outbound_address(sa_family_t family, ext_addr = &options->OutboundBindAddresses[OUTBOUND_ADDR_EXIT] [fam_index]; } else if (!tor_addr_is_null( - &options->OutboundBindAddresses[OUTBOUND_ADDR_EXIT_AND_OR] + &options->OutboundBindAddresses[OUTBOUND_ADDR_ANY] [fam_index])) { - ext_addr = &options->OutboundBindAddresses[OUTBOUND_ADDR_EXIT_AND_OR] + ext_addr = &options->OutboundBindAddresses[OUTBOUND_ADDR_ANY] [fam_index]; } } else { // All non-exit connections @@ -2342,9 +2342,9 @@ conn_get_outbound_address(sa_family_t family, ext_addr = &options->OutboundBindAddresses[OUTBOUND_ADDR_OR] [fam_index]; } else if (!tor_addr_is_null( - &options->OutboundBindAddresses[OUTBOUND_ADDR_EXIT_AND_OR] + &options->OutboundBindAddresses[OUTBOUND_ADDR_ANY] [fam_index])) { - ext_addr = &options->OutboundBindAddresses[OUTBOUND_ADDR_EXIT_AND_OR] + ext_addr = &options->OutboundBindAddresses[OUTBOUND_ADDR_ANY] [fam_index]; } }

1 0

[tor/master] Move parse logic for outbound addresses to before we handle PT's.
by dgoulet＠torproject.org 06 Oct '20

06 Oct '20

commit 69c1a4ebc369d79b2a58c25926187407a34b511e Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jul 2 20:18:19 2019 +0200 Move parse logic for outbound addresses to before we handle PT's. This patch moves the logic for handling outbound addresses in torrc to before we handle pluggable transports. Since we need access to the values in OutboundBindAddress and friends for #5304 we have to parse these values before we spawn any PT's. This commit is code movement only. See: https://bugs.torproject.org/5304 --- src/app/config/config.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 46d98b2ab2..0706a0dbdc 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -2105,6 +2105,16 @@ options_act,(const or_options_t *old_options)) "in a non-anonymous mode. It will provide NO ANONYMITY."); } + /* 31851: OutboundBindAddressExit is relay-only */ + if (parse_outbound_addresses(options, 0, &msg) < 0) { + // LCOV_EXCL_START + log_warn(LD_BUG, "Failed parsing previously validated outbound " + "bind addresses: %s", msg); + tor_free(msg); + return -1; + // LCOV_EXCL_STOP + } + if (options->Bridges) { mark_bridge_list(); for (cl = options->Bridges; cl; cl = cl->next) { @@ -2266,16 +2276,6 @@ options_act,(const or_options_t *old_options)) tor_free(http_authenticator); } - /* 31851: OutboundBindAddressExit is relay-only */ - if (parse_outbound_addresses(options, 0, &msg) < 0) { - // LCOV_EXCL_START - log_warn(LD_BUG, "Failed parsing previously validated outbound " - "bind addresses: %s", msg); - tor_free(msg); - return -1; - // LCOV_EXCL_STOP - } - config_maybe_load_geoip_files_(options, old_options); if (geoip_is_loaded(AF_INET) && options->GeoIPExcludeUnknown) {

1 0

[tor/master] Expose TOR_PT_OUTBOUND_BIND_ADDRESS_{V4, V6} to Pluggable Transports.
by dgoulet＠torproject.org 06 Oct '20

06 Oct '20

commit 5f61e19d8a4e96be9e8692777d835dde8d1ea7f8 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jul 2 20:21:13 2019 +0200 Expose TOR_PT_OUTBOUND_BIND_ADDRESS_{V4,V6} to Pluggable Transports. This patch adds support for exposing the environment variables `TOR_PT_OUTBOUND_BIND_ADDRESS_V4` and `TOR_PT_OUTBOUND_BIND_ADDRESS_V6` to Pluggable Transport proccesses. These two values will contain the IPv4 and IPv6 address that the user have specified in torrc that they wish the PT to use for all outgoing IP packets. It is important to note here that it is up to the indvidual Pluggable Transport if they are willing to honor these values or ignore them completely. One can test this feature using the following dummy PT written in POSIX shell script: #!/bin/sh echo "LOG SEVERITY=warning MESSAGE=\"Value for IPv4: ${TOR_PT_OUTBOUND_BIND_ADDRESS_V4}\"" echo "LOG SEVERITY=warning MESSAGE=\"Value for IPv6: ${TOR_PT_OUTBOUND_BIND_ADDRESS_V6}\"" while true ; do sleep 1 done with the following entries in your torrc: OutboundBindAddressPT 203.0.113.4 OutboundBindAddress 203.0.113.5 OutboundBindAddressPT 2001:db8::4 OutboundBindAddress 2001:db8::5 See: https://bugs.torproject.org/5304 --- changes/bug5304 | 6 +++ scripts/maint/practracker/exceptions.txt | 2 +- src/feature/client/transports.c | 74 ++++++++++++++++++++++++++++++++ src/feature/client/transports.h | 2 + 4 files changed, 83 insertions(+), 1 deletion(-) diff --git a/changes/bug5304 b/changes/bug5304 new file mode 100644 index 0000000000..9afa838129 --- /dev/null +++ b/changes/bug5304 @@ -0,0 +1,6 @@ + o Minor features (pluggable transports): + - Added option OutboundBindAddressPT to torrc. This option allows users to + specify which IPv4 and IPv6 address they want pluggable transports to use + for outgoing IP packets. Tor does not have a way to enforce that the pluggable + transport honors this option so each pluggable transport will have to + implement support for this feature. Closes ticket 5304. diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index eeef0bd668..0373641b60 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -189,7 +189,7 @@ problem function-size /src/feature/client/entrynodes.c:entry_guard_parse_from_st problem file-size /src/feature/client/entrynodes.h 700 problem function-size /src/feature/client/transports.c:handle_proxy_line() 108 problem function-size /src/feature/client/transports.c:parse_method_line_helper() 110 -problem function-size /src/feature/client/transports.c:create_managed_proxy_environment() 111 +problem function-size /src/feature/client/transports.c:create_managed_proxy_environment() 140 problem function-size /src/feature/control/control.c:connection_control_process_inbuf() 113 problem function-size /src/feature/control/control_auth.c:handle_control_authenticate() 186 problem function-size /src/feature/control/control_cmd.c:handle_control_extendcircuit() 150 diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index 2eb05d6a67..0e4361a210 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -1447,6 +1447,37 @@ create_managed_proxy_environment(const managed_proxy_t *mp) */ smartlist_add_asprintf(envs, "TOR_PT_EXIT_ON_STDIN_CLOSE=1"); + /* Specify which IPv4 and IPv6 addresses the PT should make its outgoing + * connections from. See: https://bugs.torproject.org/5304 for more + * information about this. */ + { + /* Set TOR_PT_OUTBOUND_BIND_ADDRESS_V4. */ + const tor_addr_t *ipv4_addr = managed_proxy_outbound_address(options, + AF_INET); + + /* managed_proxy_outbound_address() only returns a non-NULL value if + * tor_addr_is_null() was false, which means we don't have to check that + * here. */ + if (ipv4_addr) { + char *ipv4_addr_str = tor_addr_to_str_dup(ipv4_addr); + smartlist_add_asprintf(envs, + "TOR_PT_OUTBOUND_BIND_ADDRESS_V4=%s", + ipv4_addr_str); + tor_free(ipv4_addr_str); + } + + /* Set TOR_PT_OUTBOUND_BIND_ADDRESS_V6. */ + const tor_addr_t *ipv6_addr = managed_proxy_outbound_address(options, + AF_INET6); + if (ipv6_addr) { + char *ipv6_addr_str = tor_addr_to_str_dup(ipv6_addr); + smartlist_add_asprintf(envs, + "TOR_PT_OUTBOUND_BIND_ADDRESS_V6=[%s]", + ipv6_addr_str); + tor_free(ipv6_addr_str); + } + } + SMARTLIST_FOREACH_BEGIN(envs, const char *, env_var) { set_environment_variable_in_smartlist(merged_env_vars, env_var, tor_free_, 1); @@ -1919,3 +1950,46 @@ managed_proxy_severity_parse(const char *severity) return -1; } + +/** Return the outbound address from the given <b>family</b>. Returns NULL if + * the user haven't specified a specific outbound address in either + * OutboundBindAddress or OutboundBindAddressPT. */ +STATIC const tor_addr_t * +managed_proxy_outbound_address(const or_options_t *options, sa_family_t family) +{ + tor_assert(options); + + const tor_addr_t *address = NULL; + int family_index; + + switch (family) { + case AF_INET: + family_index = 0; + break; + case AF_INET6: + family_index = 1; + break; + default: + /* LCOV_EXCL_START */ + tor_assert_unreached(); + return NULL; + /* LCOV_EXCL_STOP */ + } + + /* We start by checking if the user specified an address in + * OutboundBindAddressPT. */ + address = &options->OutboundBindAddresses[OUTBOUND_ADDR_PT][family_index]; + + if (! tor_addr_is_null(address)) + return address; + + /* We fallback to check if the user specified an address in + * OutboundBindAddress. */ + address = &options->OutboundBindAddresses[OUTBOUND_ADDR_ANY][family_index]; + + if (! tor_addr_is_null(address)) + return address; + + /* The user have not specified a preference for outgoing connections. */ + return NULL; +} diff --git a/src/feature/client/transports.h b/src/feature/client/transports.h index 1ed942c175..3aff1cb248 100644 --- a/src/feature/client/transports.h +++ b/src/feature/client/transports.h @@ -149,6 +149,8 @@ STATIC void managed_proxy_stderr_callback(process_t *, const char *, size_t); STATIC bool managed_proxy_exit_callback(process_t *, process_exit_code_t); STATIC int managed_proxy_severity_parse(const char *); +STATIC const tor_addr_t *managed_proxy_outbound_address(const or_options_t *, + sa_family_t); #endif /* defined(PT_PRIVATE) */

1 0

[torspec/master] Split the TOR_PT_OUTBOUND_BIND_ADDRESS into a V4/V6 variant.
by dgoulet＠torproject.org 06 Oct '20

06 Oct '20

commit 406e41642938f7f17abd186d85fd97a0877bd617 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue May 21 12:30:15 2019 +0200 Split the TOR_PT_OUTBOUND_BIND_ADDRESS into a V4/V6 variant. --- pt-spec.txt | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/pt-spec.txt b/pt-spec.txt index 0a8548f..5fefff1 100644 --- a/pt-spec.txt +++ b/pt-spec.txt @@ -217,27 +217,41 @@ Table of Contents TOR_PT_EXIT_ON_STDIN_CLOSE=1 - "TOR_PT_OUTBOUND_BIND_ADDRESS" + "TOR_PT_OUTBOUND_BIND_ADDRESS_V4" - Specifies an IP address that the PT proxy SHOULD use as source address for - outgoing IP packets. This feature allows people with multiple network - interfaces to specify explicitly which interface they prefer the PT proxy to use. + Specifies an IPv4 IP address that the PT proxy SHOULD use as source address for + outgoing IPv4 IP packets. This feature allows people with multiple network + interfaces to specify explicitly which interface they prefer the PT proxy to + use. If this value is unset or empty, the PT proxy MUST use the default source address for outgoing connections. This setting MUST be ignored for connections to - loopback addresses (127.0.0.0/8 and [::1]). + loopback addresses (127.0.0.0/8). - IPv6 addresses MUST always be wrapped in square brackets. + Example: + + TOR_PT_OUTBOUND_BIND_ADDRESS_V4=203.0.113.4 + + "TOR_PT_OUTBOUND_BIND_ADDRESS_V6" + + Specifies an IPv6 IP address that the PT proxy SHOULD use as source address for + outgoing IPv6 IP packets. This feature allows people with multiple network + interfaces to specify explicitly which interface they prefer the PT proxy to + use. - Example with IPv4: + If this value is unset or empty, the PT proxy MUST use the default source + address for outgoing connections. - TOR_PT_OUTBOUND_BIND_ADDRESS=203.0.113.4 + This setting MUST be ignored for connections to + loopback addresses ([::1]). + + IPv6 addresses MUST always be wrapped in square brackets. - Example with IPv6: + Example:: - TOR_PT_OUTBOUND_BIND_ADDRESS=[2001:db8::4] + TOR_PT_OUTBOUND_BIND_ADDRESS_V6=[2001:db8::4] 3.2.2. Pluggable Transport Client Environment Variables

1 0