mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-30 23:53:32 +01:00
Merge remote-tracking branch 'public/bug4645'
Conflicts: src/or/dirserv.c
This commit is contained in:
commit
fc9e84062b
3
changes/ticket4645
Normal file
3
changes/ticket4645
Normal file
@ -0,0 +1,3 @@
|
||||
o Code simplifications and refactoring:
|
||||
- Removing is_internal_IP() function. Resolves ticket 4645.
|
||||
|
@ -1445,19 +1445,6 @@ get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr)
|
||||
* XXXX024 IPv6 deprecate some of these.
|
||||
*/
|
||||
|
||||
/** Return true iff <b>ip</b> (in host order) is an IP reserved to localhost,
|
||||
* or reserved for local networks by RFC 1918.
|
||||
*/
|
||||
int
|
||||
is_internal_IP(uint32_t ip, int for_listening)
|
||||
{
|
||||
tor_addr_t myaddr;
|
||||
myaddr.family = AF_INET;
|
||||
myaddr.addr.in_addr.s_addr = htonl(ip);
|
||||
|
||||
return tor_addr_is_internal(&myaddr, for_listening);
|
||||
}
|
||||
|
||||
/** Given an address of the form "ip:port", try to divide it into its
|
||||
* ip and port portions, setting *<b>address_out</b> to a newly
|
||||
* allocated string holding the address portion and *<b>port_out</b>
|
||||
|
@ -215,7 +215,6 @@ int tor_addr_port_parse(int severity, const char *addrport,
|
||||
int tor_addr_hostname_is_local(const char *name);
|
||||
|
||||
/* IPv4 helpers */
|
||||
int is_internal_IP(uint32_t ip, int for_listening);
|
||||
int addr_port_lookup(int severity, const char *addrport, char **address,
|
||||
uint32_t *addr, uint16_t *port_out);
|
||||
int parse_port_range(const char *port, uint16_t *port_min_out,
|
||||
|
@ -2072,6 +2072,7 @@ resolve_my_address(int warn_severity, const or_options_t *options,
|
||||
int notice_severity = warn_severity <= LOG_NOTICE ?
|
||||
LOG_NOTICE : warn_severity;
|
||||
|
||||
tor_addr_t myaddr;
|
||||
tor_assert(addr_out);
|
||||
|
||||
/*
|
||||
@ -2122,24 +2123,26 @@ resolve_my_address(int warn_severity, const or_options_t *options,
|
||||
"local interface. Using that.", fmt_addr32(addr));
|
||||
strlcpy(hostname, "<guessed from interfaces>", sizeof(hostname));
|
||||
} else { /* resolved hostname into addr */
|
||||
tor_addr_from_ipv4h(&myaddr, addr);
|
||||
|
||||
if (!explicit_hostname &&
|
||||
is_internal_IP(addr, 0)) {
|
||||
uint32_t interface_ip;
|
||||
tor_addr_is_internal(&myaddr, 0)) {
|
||||
tor_addr_t interface_ip;
|
||||
|
||||
log_fn(notice_severity, LD_CONFIG, "Guessed local hostname '%s' "
|
||||
"resolves to a private IP address (%s). Trying something "
|
||||
"else.", hostname, fmt_addr32(addr));
|
||||
|
||||
if (get_interface_address(warn_severity, &interface_ip)) {
|
||||
if (get_interface_address6(warn_severity, AF_INET, &interface_ip)<0) {
|
||||
log_fn(warn_severity, LD_CONFIG,
|
||||
"Could not get local interface IP address. Too bad.");
|
||||
} else if (is_internal_IP(interface_ip, 0)) {
|
||||
} else if (tor_addr_is_internal(&interface_ip, 0)) {
|
||||
log_fn(notice_severity, LD_CONFIG,
|
||||
"Interface IP address '%s' is a private address too. "
|
||||
"Ignoring.", fmt_addr32(interface_ip));
|
||||
"Ignoring.", fmt_addr(&interface_ip));
|
||||
} else {
|
||||
from_interface = 1;
|
||||
addr = interface_ip;
|
||||
addr = tor_addr_to_ipv4h(&interface_ip);
|
||||
log_fn(notice_severity, LD_CONFIG,
|
||||
"Learned IP address '%s' for local interface."
|
||||
" Using that.", fmt_addr32(addr));
|
||||
@ -2157,8 +2160,10 @@ resolve_my_address(int warn_severity, const or_options_t *options,
|
||||
* out if it is and we don't want that.
|
||||
*/
|
||||
|
||||
tor_addr_from_ipv4h(&myaddr,addr);
|
||||
|
||||
addr_string = tor_dup_ip(addr);
|
||||
if (is_internal_IP(addr, 0)) {
|
||||
if (tor_addr_is_internal(&myaddr, 0)) {
|
||||
/* make sure we're ok with publishing an internal IP */
|
||||
if (!options->DirAuthorities && !options->AlternateDirAuthority) {
|
||||
/* if they are using the default authorities, disallow internal IPs
|
||||
@ -2264,7 +2269,7 @@ is_local_addr(const tor_addr_t *addr)
|
||||
* resolve_my_address will never be called at all). In those cases,
|
||||
* last_resolved_addr will be 0, and so checking to see whether ip is on
|
||||
* the same /24 as last_resolved_addr will be the same as checking whether
|
||||
* it was on net 0, which is already done by is_internal_IP.
|
||||
* it was on net 0, which is already done by tor_addr_is_internal.
|
||||
*/
|
||||
if ((last_resolved_addr & (uint32_t)0xffffff00ul)
|
||||
== (ip & (uint32_t)0xffffff00ul))
|
||||
|
@ -1383,13 +1383,14 @@ http_set_address_origin(const char *headers, connection_t *conn)
|
||||
if (!fwd)
|
||||
fwd = http_get_header(headers, "X-Forwarded-For: ");
|
||||
if (fwd) {
|
||||
struct in_addr in;
|
||||
if (!tor_inet_aton(fwd, &in) || is_internal_IP(ntohl(in.s_addr), 0)) {
|
||||
log_debug(LD_DIR, "Ignoring unrecognized or internal IP %s",
|
||||
escaped(fwd));
|
||||
tor_addr_t toraddr;
|
||||
if (tor_addr_parse(&toraddr,fwd) == -1 ||
|
||||
tor_addr_is_internal(&toraddr,0)) {
|
||||
log_debug(LD_DIR, "Ignoring local/internal IP %s", escaped(fwd));
|
||||
tor_free(fwd);
|
||||
return;
|
||||
}
|
||||
|
||||
tor_free(conn->address);
|
||||
conn->address = tor_strdup(fwd);
|
||||
tor_free(fwd);
|
||||
|
@ -504,9 +504,12 @@ dirserv_free_fingerprint_list(void)
|
||||
static int
|
||||
dirserv_router_has_valid_address(routerinfo_t *ri)
|
||||
{
|
||||
tor_addr_t addr;
|
||||
if (get_options()->DirAllowPrivateAddresses)
|
||||
return 0; /* whatever it is, we're fine with it */
|
||||
if (is_internal_IP(ri->addr, 0)) {
|
||||
tor_addr_from_ipv4h(&addr, ri->addr);
|
||||
|
||||
if (tor_addr_is_internal(&addr, 0)) {
|
||||
log_info(LD_DIRSERV,
|
||||
"Router %s published internal IP address. Refusing.",
|
||||
router_describe(ri));
|
||||
|
@ -402,7 +402,6 @@ test_addr_ip6_helpers(void)
|
||||
test_internal_ip("::ffff:169.254.0.0", 0);
|
||||
test_internal_ip("::ffff:169.254.255.255", 0);
|
||||
test_external_ip("::ffff:169.255.0.0", 0);
|
||||
test_assert(is_internal_IP(0x7f000001, 0));
|
||||
|
||||
/* tor_addr_compare(tor_addr_t x2) */
|
||||
test_addr_compare("ffff::", ==, "ffff::0");
|
||||
|
Loading…
Reference in New Issue
Block a user