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

Check for private IPv6 addresses in dirserv_router_has_valid_address()

Browse Source
This commit is contained in:
Neel Chauhan 2019-07-19 12:56:02 -04:00 committed by Nick Mathewson
parent 5303dbe624
commit d9a7d47798
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -428,7 +428,7 @@ dirserv_free_fingerprint_list(void)
/** Return -1 if <b>ri</b> has a private or otherwise bad address, /** Return -1 if <b>ri</b> has a private or otherwise bad address,
* unless we're configured to not care. Return 0 if all ok. */ * unless we're configured to not care. Return 0 if all ok. */
static int 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;
@ -436,12 +436,22 @@ dirserv_router_has_valid_address(routerinfo_t *ri)
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); tor_addr_from_ipv4h(&addr, ri->addr);
if (tor_addr_is_internal(&addr, 0)) { if (tor_addr_is_internal(&addr, 0) || tor_addr_is_null(&addr)) {
log_info(LD_DIRSERV, log_info(LD_DIRSERV,
"Router %s published internal IP 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
* IPv6 and null IPv6 is normal. */
if (tor_addr_is_internal(&ri->ipv6_addr, 0) &&
!tor_addr_is_null(&ri->ipv6_addr)) {
log_info(LD_DIRSERV,
"Router %s published internal IPv6 address. Refusing.",
router_describe(ri));
return -1; /* it's a private IP, we should reject it */
}
return 0; return 0;
} }

4
src/feature/dirauth/process_descs.h
View File

@ -36,4 +36,8 @@ void dirserv_set_node_flags_from_authoritative_status(node_t *node,
int dirserv_would_reject_router(const routerstatus_t *rs); int dirserv_would_reject_router(const routerstatus_t *rs);
#ifdef TOR_UNIT_TESTS
STATIC int dirserv_router_has_valid_address(routerinfo_t *ri);
#endif /* defined(TOR_UNIT_TESTS) */
#endif /* !defined(TOR_RECV_UPLOADS_H) */ #endif /* !defined(TOR_RECV_UPLOADS_H) */