romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-24 01:27:24 +03:00
Code Issues Projects Releases Packages Wiki Activity

hostip: resolve *.localhost to 127.0.0.1/::1

Browse source 
Following the footsteps of other clients like Firefox/Chrome.  RFC 6761
says clients SHOULD do this.

Add test 389 to verify.

Reported-by: TheKnarf on github
Fixes #9192
Closes #9296
This commit is contained in:
Daniel Stenberg 2022-08-11 11:32:22 +02:00
parent 586cfc3c2c
commit b5c0fe20e3
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
3 changed files with 82 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

36
lib/hostip.c
View file

@ -463,12 +463,12 @@ Curl_cache_addr(struct Curl_easy *data,
}
#ifdef ENABLE_IPV6
/* return a static IPv6 resolve for 'localhost' */
static struct Curl_addrinfo *get_localhost6(int port)
/* return a static IPv6 ::1 for the name */
static struct Curl_addrinfo *get_localhost6(int port, const char *name)
{
struct Curl_addrinfo *ca;
const size_t ss_size = sizeof(struct sockaddr_in6);
const size_t hostlen = strlen("localhost");
const size_t hostlen = strlen(name);
struct sockaddr_in6 sa6;
unsigned char ipv6[16];
unsigned short port16 = (unsigned short)(port & 0xffff);
@ -493,19 +493,19 @@ static struct Curl_addrinfo *get_localhost6(int port)
ca->ai_addr = (void *)((char *)ca + sizeof(struct Curl_addrinfo));
memcpy(ca->ai_addr, &sa6, ss_size);
ca->ai_canonname = (char *)ca->ai_addr + ss_size;
strcpy(ca->ai_canonname, "localhost");
strcpy(ca->ai_canonname, name);
return ca;
}
#else
#define get_localhost6(x) NULL
#define get_localhost6(x,y) NULL
#endif
/* return a static IPv4 resolve for 'localhost' */
static struct Curl_addrinfo *get_localhost(int port)
/* return a static IPv4 127.0.0.1 for the given name */
static struct Curl_addrinfo *get_localhost(int port, const char *name)
{
struct Curl_addrinfo *ca;
const size_t ss_size = sizeof(struct sockaddr_in);
const size_t hostlen = strlen("localhost");
const size_t hostlen = strlen(name);
struct sockaddr_in sa;
unsigned int ipv4;
unsigned short port16 = (unsigned short)(port & 0xffff);
@ -529,8 +529,8 @@ static struct Curl_addrinfo *get_localhost(int port)
ca->ai_addr = (void *)((char *)ca + sizeof(struct Curl_addrinfo));
memcpy(ca->ai_addr, &sa, ss_size);
ca->ai_canonname = (char *)ca->ai_addr + ss_size;
strcpy(ca->ai_canonname, "localhost");
ca->ai_next = get_localhost6(port);
strcpy(ca->ai_canonname, name);
ca->ai_next = get_localhost6(port, name);
return ca;
}
@ -583,6 +583,17 @@ bool Curl_host_is_ipnum(const char *hostname)
return FALSE;
}
/* return TRUE if 'part' is a case insentive tail of 'full' */
static bool tailmatch(const char *full, const char *part)
{
size_t plen = strlen(part);
size_t flen = strlen(full);
if(plen > flen)
return FALSE;
return strncasecompare(part, &full[flen - plen], plen);
}
/*
* Curl_resolv() is the main name resolve function within libcurl. It resolves
* a name and returns a pointer to the entry in the 'entry' argument (if one
@ -718,8 +729,9 @@ enum resolve_t Curl_resolv(struct Curl_easy *data,
if(conn->ip_version == CURL_IPRESOLVE_V6 && !Curl_ipv6works(data))
return CURLRESOLV_ERROR;
if(strcasecompare(hostname, "localhost"))
addr = get_localhost(port);
if(strcasecompare(hostname, "localhost") ||
tailmatch(hostname, ".localhost"))
addr = get_localhost(port, hostname);
#ifndef CURL_DISABLE_DOH
else if(allowDOH && data->set.doh && !ipnum)
addr = Curl_doh(data, hostname, port, &respwait);