romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-15 08:03:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

altsvc: use Curl_peer in processing

Browse source 
Use `data->state.origin` when processing alt-avc information.

Decomplexify parsing function.

Closes #22184
This commit is contained in:
Stefan Eissing 2026-06-26 10:50:14 +02:00 • committed by Daniel Stenberg
parent 2f1e94eaed
commit cfc7922377
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
7 changed files with 247 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

59
tests/unit/unit1654.c
View file

@ -31,9 +31,12 @@ static CURLcode test_unit1654(const char *arg)
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_ALTSVC)
char outname[256];
CURL *curl;
CURL *curl = NULL;
CURLcode result;
struct altsvcinfo *asi = Curl_altsvc_init();
struct Curl_peer *origin = NULL;
const struct Curl_scheme *scheme = &Curl_scheme_https;
abort_if(!asi, "Curl_altsvc_i");
result = Curl_altsvc_load(asi, arg);
fail_if(result, "Curl_altsvc_load");
@ -44,101 +47,125 @@ static CURLcode test_unit1654(const char *arg)
fail_if(!curl, "curl_easy_init");
if(!curl)
goto fail;
fail_unless(Curl_llist_count(&asi->list) == 4, "wrong number of entries");
curl_msnprintf(outname, sizeof(outname), "%s-out", arg);
if(Curl_peer_create(curl, scheme, "example.org", 8080, &origin))
goto fail;
result = Curl_altsvc_parse(curl, asi, "h2=\"example.com:8080\"\r\n",
ALPN_h1, "example.org", 8080);
origin, ALPN_h1);
fail_if(result, "Curl_altsvc_parse() failed!");
fail_unless(Curl_llist_count(&asi->list) == 5, "wrong number of entries");
if(Curl_peer_create(curl, scheme, "2.example.org", 8080, &origin))
goto fail;
result = Curl_altsvc_parse(curl, asi, "h3=\":8080\"\r\n",
ALPN_h1, "2.example.org", 8080);
origin, ALPN_h1);
fail_if(result, "Curl_altsvc_parse(2) failed!");
fail_unless(Curl_llist_count(&asi->list) == 6, "wrong number of entries");
if(Curl_peer_create(curl, scheme, "3.example.org", 8080, &origin))
goto fail;
result = Curl_altsvc_parse(curl, asi,
"h2=\"example.com:8080\", "
"h3=\"yesyes.com:8080\"\r\n",
ALPN_h1, "3.example.org", 8080);
origin, ALPN_h1);
fail_if(result, "Curl_altsvc_parse(3) failed!");
/* that one should make two entries */
fail_unless(Curl_llist_count(&asi->list) == 8, "wrong number of entries");
if(Curl_peer_create(curl, scheme, "example.org", 80, &origin))
goto fail;
result = Curl_altsvc_parse(curl, asi,
"h2=\"example.com:443\"; ma = 120;\r\n",
ALPN_h2, "example.org", 80);
origin, ALPN_h2);
fail_if(result, "Curl_altsvc_parse(4) failed!");
fail_unless(Curl_llist_count(&asi->list) == 9, "wrong number of entries");
/* quoted 'ma' value */
if(Curl_peer_create(curl, scheme, "example.net", 80, &origin))
goto fail;
result = Curl_altsvc_parse(curl, asi,
"h2=\"example.net:443\"; ma=\"180\";\r\n",
ALPN_h2, "example.net", 80);
origin, ALPN_h2);
fail_if(result, "Curl_altsvc_parse(5) failed!");
fail_unless(Curl_llist_count(&asi->list) == 10, "wrong number of entries");
if(Curl_peer_create(curl, scheme, "curl.se", 80, &origin))
goto fail;
result = Curl_altsvc_parse(curl, asi,
"h2=\":443\"; ma=180, h3=\":443\"; "
"persist = \"1\"; ma = 120;\r\n",
ALPN_h1, "curl.se", 80);
origin, ALPN_h1);
fail_if(result, "Curl_altsvc_parse(6) failed!");
fail_unless(Curl_llist_count(&asi->list) == 12, "wrong number of entries");
/* clear that one again and decrease the counter */
result = Curl_altsvc_parse(curl, asi, "clear;\r\n",
ALPN_h1, "curl.se", 80);
origin, ALPN_h1);
fail_if(result, "Curl_altsvc_parse(7) failed!");
fail_unless(Curl_llist_count(&asi->list) == 10, "wrong number of entries");
result = Curl_altsvc_parse(curl, asi,
"h2=\":443\", h3=\":443\"; "
"persist = \"1\"; ma = 120;\r\n",
ALPN_h1, "curl.se", 80);
origin, ALPN_h1);
fail_if(result, "Curl_altsvc_parse(6) failed!");
fail_unless(Curl_llist_count(&asi->list) == 12, "wrong number of entries");
/* clear - without semicolon */
result = Curl_altsvc_parse(curl, asi, "clear\r\n",
ALPN_h1, "curl.se", 80);
origin, ALPN_h1);
fail_if(result, "Curl_altsvc_parse(7) failed!");
fail_unless(Curl_llist_count(&asi->list) == 10, "wrong number of entries");
/* only a non-existing alpn */
if(Curl_peer_create(curl, scheme, "5.example.net", 80, &origin))
goto fail;
result = Curl_altsvc_parse(curl, asi,
"h6=\"example.net:443\"; ma=\"180\";\r\n",
ALPN_h2, "5.example.net", 80);
origin, ALPN_h2);
fail_if(result, "Curl_altsvc_parse(8) failed!");
/* missing quote in alpn host */
if(Curl_peer_create(curl, scheme, "6.example.net", 80, &origin))
goto fail;
result = Curl_altsvc_parse(curl, asi,
"h2=\"example.net:443,; ma=\"180\";\r\n",
ALPN_h2, "6.example.net", 80);
origin, ALPN_h2);
fail_if(result, "Curl_altsvc_parse(9) failed!");
/* missing port in hostname */
if(Curl_peer_create(curl, scheme, "7.example.net", 80, &origin))
goto fail;
result = Curl_altsvc_parse(curl, asi,
"h2=\"example.net\"; ma=\"180\";\r\n",
ALPN_h2, "7.example.net", 80);
origin, ALPN_h2);
fail_if(result, "Curl_altsvc_parse(10) failed!");
/* illegal port in hostname */
if(Curl_peer_create(curl, scheme, "8.example.net", 80, &origin))
goto fail;
result = Curl_altsvc_parse(curl, asi,
"h2=\"example.net:70000\"; ma=\"180\";\r\n",
ALPN_h2, "8.example.net", 80);
origin, ALPN_h2);
fail_if(result, "Curl_altsvc_parse(11) failed!");
if(Curl_peer_create(curl, scheme, "test.se", 443, &origin))
goto fail;
result = Curl_altsvc_parse(curl, asi,
"h2=\"test2.se:443\"; ma=\"180 \" ; unknown=2, "
"h2=\"test3.se:443\"; ma = 120;\r\n",
ALPN_h2, "test.se", 443);
origin, ALPN_h2);
fail_if(result, "Curl_altsvc_parse(12) failed!");
Curl_altsvc_save(curl, asi, outname);
curl_easy_cleanup(curl);
fail:
curl_easy_cleanup(curl);
Curl_altsvc_cleanup(&asi);
Curl_peer_unlink(&origin);
#endif
UNITTEST_END(curl_global_cleanup())