nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Vote Exit correctly with DirAllowPrivateAddresses set

Browse Source 
When allowing private addresses, mark Exits that only exit to private
locations as such. Fixes bug 20064; bugfix on 0.2.2.9-alpha.
This commit is contained in:
Sebastian Hahn 2016-09-05 23:32:16 +02:00
parent 341a159ab4
commit 0d485fcfef
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug20064 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (Directory Authority):
- When allowing private addresses, mark Exits that only exit to
private locations as such. Fixes bug 20064; bugfix on
0.2.2.9-alpha.

4
src/or/policies.c
View File

@ -2119,8 +2119,10 @@ exit_policy_is_general_exit_helper(smartlist_t *policy, int port)
if (subnet_status[i] != 0) if (subnet_status[i] != 0)
continue; /* We already reject some part of this /8 */ continue; /* We already reject some part of this /8 */
tor_addr_from_ipv4h(&addr, i<<24); tor_addr_from_ipv4h(&addr, i<<24);
if (tor_addr_is_internal(&addr, 0)) if (tor_addr_is_internal(&addr, 0) &&
!get_options()->DirAllowPrivateAddresses) {
continue; /* Local or non-routable addresses */ continue; /* Local or non-routable addresses */
}
if (p->policy_type == ADDR_POLICY_ACCEPT) { if (p->policy_type == ADDR_POLICY_ACCEPT) {
if (p->maskbits > 8) if (p->maskbits > 8)
continue; /* Narrower than a /8. */ continue; /* Narrower than a /8. */