curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-11 14:42:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

urlapi: normalize the IPv6 address

Browse Source 
As the parsing and address "regeneration" are done anyway, we might as
well use the updated version in the result and thereby A) get a
normalized (and lower cased) version of the address and B) avoid a
strcpy().

Updated test 1560 to verify.

Closes #15143
This commit is contained in:
Daniel Stenberg 2024-10-03 14:37:00 +02:00
parent 87e19ea68f
commit 566a6d7b09
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/urlapi.c
View File

@ -610,19 +610,14 @@ static CURLUcode ipv6_parse(struct Curl_URL *u, char *hostname,
/* hostname is fine */ /* hostname is fine */
} }
/* Check the IPv6 address. */ /* Normalize the IPv6 address */
{ {
char dest[16]; /* fits a binary IPv6 address */ char dest[16]; /* fits a binary IPv6 address */
char norm[MAX_IPADR_LEN];
hostname[hlen] = 0; /* end the address there */ hostname[hlen] = 0; /* end the address there */
if(1 != Curl_inet_pton(AF_INET6, hostname, dest)) if(1 != Curl_inet_pton(AF_INET6, hostname, dest))
return CURLUE_BAD_IPV6; return CURLUE_BAD_IPV6;
if(Curl_inet_ntop(AF_INET6, dest, hostname, hlen)) {
/* check if it can be done shorter */ hlen = strlen(hostname); /* might be shorter now */
if(Curl_inet_ntop(AF_INET6, dest, norm, sizeof(norm)) &&
(strlen(norm) < hlen)) {
strcpy(hostname, norm);
hlen = strlen(norm);
hostname[hlen + 1] = 0; hostname[hlen + 1] = 0;
} }
hostname[hlen] = ']'; /* restore ending bracket */ hostname[hlen] = ']'; /* restore ending bracket */

4
tests/libtest/lib1560.c
View File

@ -565,6 +565,10 @@ static const struct urltestcase get_url_list[] = {
{"https://[fe80:0:0:0:409b::]:80/moo", {"https://[fe80:0:0:0:409b::]:80/moo",
"https://[fe80::409b:0:0:0]:80/moo", "https://[fe80::409b:0:0:0]:80/moo",
0, 0, CURLUE_OK}, 0, 0, CURLUE_OK},
/* normalize to lower case */
{"https://[FE80:0:A:0:409B:0:0:0]:80/moo",
"https://[fe80:0:a:0:409b::]:80/moo",
0, 0, CURLUE_OK},
{"https://[::%25fakeit];80/moo", {"https://[::%25fakeit];80/moo",
"", "",
0, 0, CURLUE_BAD_PORT_NUMBER}, 0, 0, CURLUE_BAD_PORT_NUMBER},