nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

dirauth: reorder the checks in dirserv_router_has_valid_address()

Browse Source 
To avoid a bug warning.

Fixes 31793. Bug not in any release, no changes file required.
This commit is contained in:
teor 2019-09-19 15:27:39 +10:00
parent 46fea1dfee
commit 03c2b1be8d
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/feature/dirauth/process_descs.c
View File

@ -432,20 +432,22 @@ STATIC int
dirserv_router_has_valid_address(routerinfo_t *ri) dirserv_router_has_valid_address(routerinfo_t *ri)
{ {
tor_addr_t addr; tor_addr_t addr;
if (get_options()->DirAllowPrivateAddresses) if (get_options()->DirAllowPrivateAddresses)
return 0; /* whatever it is, we're fine with it */ return 0; /* whatever it is, we're fine with it */
tor_addr_from_ipv4h(&addr, ri->addr);
if (tor_addr_is_internal(&addr, 0) || tor_addr_is_null(&addr)) { tor_addr_from_ipv4h(&addr, ri->addr);
if (tor_addr_is_null(&addr) || tor_addr_is_internal(&addr, 0)) {
log_info(LD_DIRSERV, log_info(LD_DIRSERV,
"Router %s published internal IPv4 address. Refusing.", "Router %s published internal IPv4 address. Refusing.",
router_describe(ri)); router_describe(ri));
return -1; /* it's a private IP, we should reject it */ return -1; /* it's a private IP, we should reject it */
} }
/* We only check internal v6 on non-null addresses because we do not require /* We only check internal v6 on non-null addresses because we do not require
* IPv6 and null IPv6 is normal. */ * IPv6 and null IPv6 is normal. */
if (tor_addr_is_internal(&ri->ipv6_addr, 0) && if (!tor_addr_is_null(&ri->ipv6_addr) &&
!tor_addr_is_null(&ri->ipv6_addr)) { tor_addr_is_internal(&ri->ipv6_addr, 0)) {
log_info(LD_DIRSERV, log_info(LD_DIRSERV,
"Router %s published internal IPv6 address. Refusing.", "Router %s published internal IPv6 address. Refusing.",
router_describe(ri)); router_describe(ri));