moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-15 14:05:03 -05:00
Code Issues Releases Wiki Activity

hostip: on macOS avoid DoH when given a numerical IP address

Browse Source 
When USE_RESOLVE_ON_IPS is set (defined on macOS), it means that
numerical IP addresses still need to get "resolved" - but not with DoH.

Reported-by: Viktor Szakats
Fixes #5454
Closes #5459
This commit is contained in:
Daniel Stenberg 2020-05-26 11:07:06 +02:00
parent 96a822f6e2
commit 67d2802dea
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/doh.c
View File

@ -389,6 +389,7 @@ struct Curl_addrinfo *Curl_doh(struct connectdata *conn,
/* start clean, consider allocating this struct on demand */ /* start clean, consider allocating this struct on demand */
memset(&data->req.doh, 0, sizeof(struct dohdata)); memset(&data->req.doh, 0, sizeof(struct dohdata));
conn->bits.doh = TRUE;
data->req.doh.host = hostname; data->req.doh.host = hostname;
data->req.doh.port = port; data->req.doh.port = port;
data->req.doh.headers = data->req.doh.headers =

22
lib/hostip.c
View File

@ -492,6 +492,7 @@ enum resolve_t Curl_resolv(struct connectdata *conn,
enum resolve_t rc = CURLRESOLV_ERROR; /* default to failure */ enum resolve_t rc = CURLRESOLV_ERROR; /* default to failure */
*entry = NULL; *entry = NULL;
conn->bits.doh = FALSE; /* default is not */
if(data->share) if(data->share)
Curl_share_lock(data, CURL_LOCK_DATA_DNS, CURL_LOCK_ACCESS_SINGLE); Curl_share_lock(data, CURL_LOCK_DATA_DNS, CURL_LOCK_ACCESS_SINGLE);
@ -512,9 +513,11 @@ enum resolve_t Curl_resolv(struct connectdata *conn,
struct Curl_addrinfo *addr = NULL; struct Curl_addrinfo *addr = NULL;
int respwait = 0; int respwait = 0;
#ifndef USE_RESOLVE_ON_IPS
struct in_addr in; struct in_addr in;
#ifndef USE_RESOLVE_ON_IPS
const
#endif #endif
bool ipnum = FALSE;
/* notify the resolver start callback */ /* notify the resolver start callback */
if(data->set.resolver_start) { if(data->set.resolver_start) {
@ -527,7 +530,6 @@ enum resolve_t Curl_resolv(struct connectdata *conn,
return CURLRESOLV_ERROR; return CURLRESOLV_ERROR;
} }
#ifndef USE_RESOLVE_ON_IPS
/* First check if this is an IPv4 address string */ /* First check if this is an IPv4 address string */
if(Curl_inet_pton(AF_INET, hostname, &in) > 0) if(Curl_inet_pton(AF_INET, hostname, &in) > 0)
/* This is a dotted IP address 123.123.123.123-style */ /* This is a dotted IP address 123.123.123.123-style */
@ -541,7 +543,15 @@ enum resolve_t Curl_resolv(struct connectdata *conn,
addr = Curl_ip2addr(AF_INET6, &in6, hostname, port); addr = Curl_ip2addr(AF_INET6, &in6, hostname, port);
} }
#endif /* ENABLE_IPV6 */ #endif /* ENABLE_IPV6 */
#endif /* !USE_RESOLVE_ON_IPS */
#ifdef USE_RESOLVE_ON_IPS
/* If given a numerical IP, USE_RESOLVE_ON_IPS means this still needs to
get "resolved" but not with DoH */
if(addr) {
addr = NULL;
ipnum = TRUE;
}
#endif /* USE_RESOLVE_ON_IPS */
if(!addr) { if(!addr) {
/* Check what IP specifics the app has requested and if we can provide /* Check what IP specifics the app has requested and if we can provide
@ -549,7 +559,7 @@ enum resolve_t Curl_resolv(struct connectdata *conn,
if(!Curl_ipvalid(conn)) if(!Curl_ipvalid(conn))
return CURLRESOLV_ERROR; return CURLRESOLV_ERROR;
if(allowDOH && data->set.doh) { if(allowDOH && data->set.doh && !ipnum) {
addr = Curl_doh(conn, hostname, port, &respwait); addr = Curl_doh(conn, hostname, port, &respwait);
} }
else { else {
@ -1044,7 +1054,7 @@ CURLcode Curl_resolv_check(struct connectdata *conn,
(void)dns; (void)dns;
#endif #endif
if(conn->data->set.doh) if(conn->bits.doh)
return Curl_doh_is_resolved(conn, dns); return Curl_doh_is_resolved(conn, dns);
return Curl_resolver_is_resolved(conn, dns); return Curl_resolver_is_resolved(conn, dns);
} }
@ -1053,7 +1063,7 @@ int Curl_resolv_getsock(struct connectdata *conn,
curl_socket_t *socks) curl_socket_t *socks)
{ {
#ifdef CURLRES_ASYNCH #ifdef CURLRES_ASYNCH
if(conn->data->set.doh) if(conn->bits.doh)
/* nothing to wait for during DOH resolve, those handles have their own /* nothing to wait for during DOH resolve, those handles have their own
sockets */ sockets */
return GETSOCK_BLANK; return GETSOCK_BLANK;

1
lib/urldata.h
View File

@ -480,6 +480,7 @@ struct ConnectBits {
BIT(tls_enable_npn); /* TLS NPN extension? */ BIT(tls_enable_npn); /* TLS NPN extension? */
BIT(tls_enable_alpn); /* TLS ALPN extension? */ BIT(tls_enable_alpn); /* TLS ALPN extension? */
BIT(connect_only); BIT(connect_only);
BIT(doh);
}; };
struct hostname { struct hostname {