- tor-commits - lists.torproject.org

[tor/master] Tweak policies_log_first_redundant_entry even more
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit 580d788b3f85ee04f8893325b902bf28727a451b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 9 11:04:56 2015 -0500 Tweak policies_log_first_redundant_entry even more * Use smartlist_foreach_begin/end instead of a plain for loop. * constify the pointers. --- src/or/policies.c | 13 ++++++------- src/or/policies.h | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/or/policies.c b/src/or/policies.c index ec29b23..07f8cd7 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1129,12 +1129,10 @@ policies_log_first_redundant_entry(const smartlist_t *policy) int found_final_effective_entry = 0; int first_redundant_entry = 0; tor_assert(policy); - for (int i = 0; i < smartlist_len(policy); ++i) { + SMARTLIST_FOREACH_BEGIN(policy, const addr_policy_t *, p) { sa_family_t family; - addr_policy_t *p; int found_ipv4_wildcard = 0, found_ipv6_wildcard = 0; - - p = smartlist_get(policy, i); + const int i = p_sl_idx; /* Look for accept/reject *[4|6|]:* entires */ if (p->prt_min <= 1 && p->prt_max == 65535 && p->maskbits == 0) { @@ -1162,10 +1160,11 @@ policies_log_first_redundant_entry(const smartlist_t *policy) } break; } - } + } SMARTLIST_FOREACH_END(p); + /* Work out if there are redundant trailing entries in the policy list */ if (found_final_effective_entry && first_redundant_entry > 0) { - addr_policy_t *p; + const addr_policy_t *p; /* Longest possible policy is * "accept6 ffff:ffff:..255/128:10000-65535", * which contains a max-length IPv6 address, plus 24 characters. */ @@ -1504,7 +1503,7 @@ policy_is_reject_star(const smartlist_t *policy, sa_family_t family) /** Write a single address policy to the buf_len byte buffer at buf. Return * the number of characters written, or -1 on failure. */ int -policy_write_item(char *buf, size_t buflen, addr_policy_t *policy, +policy_write_item(char *buf, size_t buflen, const addr_policy_t *policy, int format_for_desc) { size_t written = 0; diff --git a/src/or/policies.h b/src/or/policies.h index bb56bf4..007f494 100644 --- a/src/or/policies.h +++ b/src/or/policies.h @@ -75,7 +75,7 @@ char * policy_dump_to_string(const smartlist_t *policy_list, int getinfo_helper_policies(control_connection_t *conn, const char *question, char **answer, const char **errmsg); -int policy_write_item(char *buf, size_t buflen, addr_policy_t *item, +int policy_write_item(char *buf, size_t buflen, const addr_policy_t *item, int format_for_desc); void addr_policy_list_free(smartlist_t *p);

1 0

[tor/master] Make policies_log_first_redundant_entry take a const smartlist_t *
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit bca4095b93615d5f77554b440b7935daff6773de Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Sun Dec 6 21:30:52 2015 +1100 Make policies_log_first_redundant_entry take a const smartlist_t * Also fixup code style. --- src/or/policies.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/or/policies.c b/src/or/policies.c index 275bab2..692eaa1 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1119,25 +1119,22 @@ policies_parse_exit_policy_reject_private( } } -#define DEFAULT_EXIT_POLICY \ - "reject *:25,reject *:119,reject *:135-139,reject *:445," \ - "reject *:563,reject *:1214,reject *:4661-4666," \ - "reject *:6346-6429,reject *:6699,reject *:6881-6999,accept *:*" - /** - * Iterates through *dest and logs a warning with first + * Iterates through dest and logs a warning with first * redundant entry if found */ -static void -policies_log_first_redundant_entry(smartlist_t** dest) { +static void +policies_log_first_redundant_entry(const smartlist_t* dest) +{ int found_final_effective_entry = 0; int first_redundant_entry = 0; - for (int i = 0; i < smartlist_len(*dest); ++i) { + tor_assert(dest); + for (int i = 0; i < smartlist_len(dest); ++i) { sa_family_t family; addr_policy_t *p; int found_ipv4_wildcard = 0, found_ipv6_wildcard = 0; - p = smartlist_get(*dest, i); + p = smartlist_get(dest, i); /* Look for accept/reject *[4|6|]:* entires */ if (p->prt_min <= 1 && p->prt_max == 65535 && p->maskbits == 0) { @@ -1160,7 +1157,7 @@ policies_log_first_redundant_entry(smartlist_t** dest) { if (found_ipv4_wildcard && found_ipv6_wildcard) { found_final_effective_entry = 1; /* if we're not on the final entry in the list */ - if (i < smartlist_len(*dest) - 1) { + if (i < smartlist_len(dest) - 1) { first_redundant_entry = i + 1; } break; @@ -1174,8 +1171,8 @@ policies_log_first_redundant_entry(smartlist_t** dest) { * which contains a max-length IPv6 address, plus 24 characters. */ char line[TOR_ADDR_BUF_LEN + 32]; - tor_assert(first_redundant_entry < smartlist_len(*dest)); - p = smartlist_get(*dest, first_redundant_entry); + tor_assert(first_redundant_entry < smartlist_len(dest)); + p = smartlist_get(dest, first_redundant_entry); /* since we've already parsed the policy into an addr_policy_t struct, * we might not log exactly what the user typed in */ policy_write_item(line, TOR_ADDR_BUF_LEN + 32, p, 0); @@ -1187,6 +1184,11 @@ policies_log_first_redundant_entry(smartlist_t** dest) { } } +#define DEFAULT_EXIT_POLICY \ + "reject *:25,reject *:119,reject *:135-139,reject *:445," \ + "reject *:563,reject *:1214,reject *:4661-4666," \ + "reject *:6346-6429,reject *:6699,reject *:6881-6999,accept *:*" + /** Parse the exit policy cfg into the linked list *dest. * * If ipv6_exit is false, prepend "reject *6:*" to the policy. @@ -1235,7 +1237,7 @@ policies_parse_exit_policy_internal(config_line_t *cfg, /* Before we add the default policy and final rejects, check to see if * there are any lines after accept *:* or reject *:*. These lines have no * effect, and are most likely an error. */ - policies_log_first_redundant_entry(dest); + policies_log_first_redundant_entry(*dest); if (add_default_policy) { append_exit_policy_string(dest, DEFAULT_EXIT_POLICY);

1 0

[tor/master] Tweak policies_log_first_redundant_entry more.
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit db433b8dc3c8684e6a86365e12336a708f67edaa Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 9 11:02:10 2015 -0500 Tweak policies_log_first_redundant_entry more. * Since the variable is no longer modified, it should be called 'policy' instead of 'dest'. ("Dest" is short for "destination".) * Fixed the space issue that dgoulet found on the ticket. * Fixed the comment a little. (We use the imperative for function documentation.) --- src/or/policies.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/or/policies.c b/src/or/policies.c index 692eaa1..ec29b23 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1120,21 +1120,21 @@ policies_parse_exit_policy_reject_private( } /** - * Iterates through dest and logs a warning with first - * redundant entry if found + * Iterate through policy looking for redundant entries. Log a + * warning message with the first redundant entry, if any is found. */ static void -policies_log_first_redundant_entry(const smartlist_t* dest) +policies_log_first_redundant_entry(const smartlist_t *policy) { int found_final_effective_entry = 0; int first_redundant_entry = 0; - tor_assert(dest); - for (int i = 0; i < smartlist_len(dest); ++i) { + tor_assert(policy); + for (int i = 0; i < smartlist_len(policy); ++i) { sa_family_t family; addr_policy_t *p; int found_ipv4_wildcard = 0, found_ipv6_wildcard = 0; - p = smartlist_get(dest, i); + p = smartlist_get(policy, i); /* Look for accept/reject *[4|6|]:* entires */ if (p->prt_min <= 1 && p->prt_max == 65535 && p->maskbits == 0) { @@ -1157,7 +1157,7 @@ policies_log_first_redundant_entry(const smartlist_t* dest) if (found_ipv4_wildcard && found_ipv6_wildcard) { found_final_effective_entry = 1; /* if we're not on the final entry in the list */ - if (i < smartlist_len(dest) - 1) { + if (i < smartlist_len(policy) - 1) { first_redundant_entry = i + 1; } break; @@ -1171,8 +1171,8 @@ policies_log_first_redundant_entry(const smartlist_t* dest) * which contains a max-length IPv6 address, plus 24 characters. */ char line[TOR_ADDR_BUF_LEN + 32]; - tor_assert(first_redundant_entry < smartlist_len(dest)); - p = smartlist_get(dest, first_redundant_entry); + tor_assert(first_redundant_entry < smartlist_len(policy)); + p = smartlist_get(policy, first_redundant_entry); /* since we've already parsed the policy into an addr_policy_t struct, * we might not log exactly what the user typed in */ policy_write_item(line, TOR_ADDR_BUF_LEN + 32, p, 0); @@ -1237,7 +1237,7 @@ policies_parse_exit_policy_internal(config_line_t *cfg, /* Before we add the default policy and final rejects, check to see if * there are any lines after accept *:* or reject *:*. These lines have no * effect, and are most likely an error. */ - policies_log_first_redundant_entry(*dest); + policies_log_first_redundant_entry(*dest); if (add_default_policy) { append_exit_policy_string(dest, DEFAULT_EXIT_POLICY);

1 0

[tor/master] Refactor policies_parse_exit_policy_internal
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit ba5053b45dd14bd2fb982a29360fe0e1dc4525dc Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Sun Dec 6 21:28:21 2015 +1100 Refactor policies_parse_exit_policy_internal Move logging of redundant policy entries in policies_parse_exit_policy_internal into its own function. Closes ticket 17608; patch from "juce". --- changes/feature17608 | 4 ++ src/or/policies.c | 103 +++++++++++++++++++++++++++----------------------- 2 files changed, 60 insertions(+), 47 deletions(-) diff --git a/changes/feature17608 b/changes/feature17608 new file mode 100644 index 0000000..d56bb7d --- /dev/null +++ b/changes/feature17608 @@ -0,0 +1,4 @@ + o Minor feature (refactoring): + - Move logging of redundant policy entries in + policies_parse_exit_policy_internal into its own function. + Closes ticket 17608; patch from "juce". diff --git a/src/or/policies.c b/src/or/policies.c index 126ba46..275bab2 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1124,54 +1124,12 @@ policies_parse_exit_policy_reject_private( "reject *:563,reject *:1214,reject *:4661-4666," \ "reject *:6346-6429,reject *:6699,reject *:6881-6999,accept *:*" -/** Parse the exit policy cfg into the linked list *dest. - * - * If ipv6_exit is false, prepend "reject *6:*" to the policy. - * - * If rejectprivate is true: - * - prepend "reject private:*" to the policy. - * - prepend entries that reject publicly routable addresses on this exit - * relay by calling policies_parse_exit_policy_reject_private - * - * If cfg doesn't end in an absolute accept or reject and if - * add_default_policy is true, add the default exit - * policy afterwards. - * - * Return -1 if we can't parse cfg, else return 0. - * - * This function is used to parse the exit policy from our torrc. For - * the functions used to parse the exit policy from a router descriptor, - * see router_add_exit_policy. +/** + * Iterates through *dest and logs a warning with first + * redundant entry if found */ -static int -policies_parse_exit_policy_internal(config_line_t *cfg, - smartlist_t **dest, - int ipv6_exit, - int rejectprivate, - const smartlist_t *configured_addresses, - int reject_interface_addresses, - int reject_configured_port_addresses, - int add_default_policy) -{ - if (!ipv6_exit) { - append_exit_policy_string(dest, "reject *6:*"); - } - if (rejectprivate) { - /* Reject IPv4 and IPv6 reserved private netblocks */ - append_exit_policy_string(dest, "reject private:*"); - /* Reject IPv4 and IPv6 publicly routable addresses on this exit relay */ - policies_parse_exit_policy_reject_private( - dest, ipv6_exit, - configured_addresses, - reject_interface_addresses, - reject_configured_port_addresses); - } - if (parse_addr_policy(cfg, dest, -1)) - return -1; - - /* Before we add the default policy and final rejects, check to see if - * there are any lines after accept *:* or reject *:*. These lines have no - * effect, and are most likely an error. */ +static void +policies_log_first_redundant_entry(smartlist_t** dest) { int found_final_effective_entry = 0; int first_redundant_entry = 0; for (int i = 0; i < smartlist_len(*dest); ++i) { @@ -1227,6 +1185,57 @@ policies_parse_exit_policy_internal(config_line_t *cfg, "accept/reject *:* as the last entry in any exit policy.)", line); } +} + +/** Parse the exit policy cfg into the linked list *dest. + * + * If ipv6_exit is false, prepend "reject *6:*" to the policy. + * + * If rejectprivate is true: + * - prepend "reject private:*" to the policy. + * - prepend entries that reject publicly routable addresses on this exit + * relay by calling policies_parse_exit_policy_reject_private + * + * If cfg doesn't end in an absolute accept or reject and if + * add_default_policy is true, add the default exit + * policy afterwards. + * + * Return -1 if we can't parse cfg, else return 0. + * + * This function is used to parse the exit policy from our torrc. For + * the functions used to parse the exit policy from a router descriptor, + * see router_add_exit_policy. + */ +static int +policies_parse_exit_policy_internal(config_line_t *cfg, + smartlist_t **dest, + int ipv6_exit, + int rejectprivate, + const smartlist_t *configured_addresses, + int reject_interface_addresses, + int reject_configured_port_addresses, + int add_default_policy) +{ + if (!ipv6_exit) { + append_exit_policy_string(dest, "reject *6:*"); + } + if (rejectprivate) { + /* Reject IPv4 and IPv6 reserved private netblocks */ + append_exit_policy_string(dest, "reject private:*"); + /* Reject IPv4 and IPv6 publicly routable addresses on this exit relay */ + policies_parse_exit_policy_reject_private( + dest, ipv6_exit, + configured_addresses, + reject_interface_addresses, + reject_configured_port_addresses); + } + if (parse_addr_policy(cfg, dest, -1)) + return -1; + + /* Before we add the default policy and final rejects, check to see if + * there are any lines after accept *:* or reject *:*. These lines have no + * effect, and are most likely an error. */ + policies_log_first_redundant_entry(dest); if (add_default_policy) { append_exit_policy_string(dest, DEFAULT_EXIT_POLICY);

1 0

[tor/master] Merge remote-tracking branch 'teor/first-hop-no-private'
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit caff66530924f45ce8aacdef0f00002a0b001ccd Merge: d6a3b1f 45f2e7e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 9 10:47:59 2015 -0500 Merge remote-tracking branch 'teor/first-hop-no-private' changes/first-hop-no-private | 8 ++++++++ doc/tor.1.txt | 8 +++++--- src/or/circuitbuild.c | 8 ++++++++ 3 files changed, 21 insertions(+), 3 deletions(-)

1 0

[tor/master] fixup! Refuse to make direct connections to private OR addresses
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit 45f2e7ec040c20d2640de2df1ce5da94d338f76f Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Nov 25 07:54:18 2015 +1100 fixup! Refuse to make direct connections to private OR addresses Add changes file. --- changes/first-hop-no-private | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/changes/first-hop-no-private b/changes/first-hop-no-private new file mode 100644 index 0000000..e8d0684 --- /dev/null +++ b/changes/first-hop-no-private @@ -0,0 +1,8 @@ + o Minor bugfix (relays, hidden services): + - Refuse connection requests to private OR addresses unless + ExtendAllowPrivateAddresses is set. Previously, tor would + connect, then refuse to send any cells to a private address. + Fixes bugs 17674 and 8976; bugfix on b7c172c9ec76 (28 Aug 2012) + Original bug 6710, released in 0.2.3.21-rc and an 0.2.2 maint + release. + Patch by "teor".

1 0

[tor/master] Refuse to make direct connections to private OR addresses
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit 23b088907fd23da417f5caf2b7b5f664f317ef4a Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Nov 25 03:11:15 2015 +1100 Refuse to make direct connections to private OR addresses Refuse connection requests to private OR addresses unless ExtendAllowPrivateAddresses is set. Previously, tor would connect, then refuse to send any cells to a private address. Fixes bugs 17674 and 8976; bugfix on b7c172c9ec76 (28 Aug 2012) Original bug 6710, released in 0.2.3.21-rc and an 0.2.2 maint release. Patch by "teor". --- doc/tor.1.txt | 8 +++++--- src/or/circuitbuild.c | 8 ++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index aba0c1c..2ada568 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1898,9 +1898,11 @@ is non-zero): (Default: 1) [[ExtendAllowPrivateAddresses]] **ExtendAllowPrivateAddresses** **0**|**1**:: - When this option is enabled, Tor routers allow EXTEND request to - localhost, RFC1918 addresses, and so on. This can create security issues; - you should probably leave it off. (Default: 0) + When this option is enabled, Tor will connect to localhost, RFC1918 + addresses, and so on. In particular, Tor will make direct connections, and + Tor routers allow EXTEND requests, to these private addresses. This can + create security issues; you should probably leave it off. + (Default: 0) [[MaxMemInQueues]] **MaxMemInQueues** __N__ **bytes**|**KB**|**MB**|**GB**:: This option configures a threshold above which Tor will assume that it diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 0688398..933d70b 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -498,6 +498,14 @@ circuit_handle_first_hop(origin_circuit_t *circ) tor_assert(firsthop); tor_assert(firsthop->extend_info); + /* XX/teor - does tor ever need build a circuit directly to itself? */ + if (tor_addr_is_internal(&firsthop->extend_info->addr, 0) && + !get_options()->ExtendAllowPrivateAddresses) { + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Client asked me to connect directly to a private address"); + return -END_CIRC_REASON_TORPROTOCOL; + } + /* now see if we're already connected to the first OR in 'route' */ log_debug(LD_CIRC,"Looking for firsthop '%s'", fmt_addrport(&firsthop->extend_info->addr,

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 09 Dec '15

09 Dec '15

commit a6a4718a1e5a74dd0803fdc3a5ea22af1a034c4c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 9 15:45:51 2015 +0000 Update translations for abouttor-homepage_completed --- ru/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/aboutTor.dtd b/ru/aboutTor.dtd index bb5a49b..ac71c5b 100644 --- a/ru/aboutTor.dtd +++ b/ru/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "О проекте Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "ВНИМАНИЕ: этот обозреватель устарел."> +<!ENTITY aboutTor.outOfDateTorOn.label "ВНИМАНИЕ: этот браузер устарел."> <!ENTITY aboutTor.outOfDateTorOff.label "КРОМЕ ТОГО, данный браузер устарел."> <!ENTITY aboutTor.outOfDate2.label "Нажмите на "луковицу"и затем выберите "Проверить обновления браузера Tor"">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 09 Dec '15

09 Dec '15

commit f75efe8c2bdec7a49f7515bca434d7d7f6114fc7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 9 15:45:46 2015 +0000 Update translations for abouttor-homepage --- ru/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/aboutTor.dtd b/ru/aboutTor.dtd index bb5a49b..ac71c5b 100644 --- a/ru/aboutTor.dtd +++ b/ru/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "О проекте Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "ВНИМАНИЕ: этот обозреватель устарел."> +<!ENTITY aboutTor.outOfDateTorOn.label "ВНИМАНИЕ: этот браузер устарел."> <!ENTITY aboutTor.outOfDateTorOff.label "КРОМЕ ТОГО, данный браузер устарел."> <!ENTITY aboutTor.outOfDate2.label "Нажмите на "луковицу"и затем выберите "Проверить обновления браузера Tor"">

1 0

[tor/master] changes file for bug17791
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit d6a3b1f0199db5b6d792f84b5073e532e4c6d10b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 9 10:38:13 2015 -0500 changes file for bug17791 --- changes/bug17791 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug17791 b/changes/bug17791 new file mode 100644 index 0000000..f191012 --- /dev/null +++ b/changes/bug17791 @@ -0,0 +1,4 @@ + o Documentation: + - Fix a minor formatting typo in the manpage. Closes ticket + 17791. +

1 0