mirror of
https://github.com/curl/curl.git
synced 2024-12-21 06:50:10 +08:00
d844f2b9ff
Fixed the alt-svc parser to treat a newline as end of line. The unit tests in test 1654 were done without CRLF and thus didn't quite match the real world. Now they use CRLF as well. Reported-by: Peter Wu Assisted-by: Peter Wu Assisted-by: Jay Satiro Fixes #5445 Closes #5446
139 lines
4.1 KiB
C
139 lines
4.1 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 2019 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
#include "curlcheck.h"
|
|
|
|
#include "urldata.h"
|
|
#include "altsvc.h"
|
|
|
|
static CURLcode
|
|
unit_setup(void)
|
|
{
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static void
|
|
unit_stop(void)
|
|
{
|
|
curl_global_cleanup();
|
|
}
|
|
|
|
#if defined(CURL_DISABLE_HTTP) || !defined(USE_ALTSVC)
|
|
UNITTEST_START
|
|
{
|
|
return 0; /* nothing to do when HTTP is disabled or alt-svc support is
|
|
missing */
|
|
}
|
|
UNITTEST_STOP
|
|
#else
|
|
UNITTEST_START
|
|
{
|
|
char outname[256];
|
|
CURL *curl;
|
|
CURLcode result;
|
|
struct altsvcinfo *asi = Curl_altsvc_init();
|
|
if(!asi)
|
|
return 1;
|
|
result = Curl_altsvc_load(asi, arg);
|
|
if(result) {
|
|
Curl_altsvc_cleanup(asi);
|
|
return result;
|
|
}
|
|
curl = curl_easy_init();
|
|
if(!curl)
|
|
goto fail;
|
|
fail_unless(asi->num == 4, "wrong number of entries");
|
|
msnprintf(outname, sizeof(outname), "%s-out", arg);
|
|
|
|
result = Curl_altsvc_parse(curl, asi, "h2=\"example.com:8080\"\r\n",
|
|
ALPN_h1, "example.org", 8080);
|
|
if(result) {
|
|
fprintf(stderr, "Curl_altsvc_parse() failed!\n");
|
|
unitfail++;
|
|
}
|
|
fail_unless(asi->num == 5, "wrong number of entries");
|
|
|
|
result = Curl_altsvc_parse(curl, asi, "h3=\":8080\"\r\n",
|
|
ALPN_h1, "2.example.org", 8080);
|
|
if(result) {
|
|
fprintf(stderr, "Curl_altsvc_parse(2) failed!\n");
|
|
unitfail++;
|
|
}
|
|
fail_unless(asi->num == 6, "wrong number of entries");
|
|
|
|
result = Curl_altsvc_parse(curl, asi,
|
|
"h2=\"example.com:8080\", h3=\"yesyes.com\"\r\n",
|
|
ALPN_h1, "3.example.org", 8080);
|
|
if(result) {
|
|
fprintf(stderr, "Curl_altsvc_parse(3) failed!\n");
|
|
unitfail++;
|
|
}
|
|
/* that one should make two entries */
|
|
fail_unless(asi->num == 8, "wrong number of entries");
|
|
|
|
result = Curl_altsvc_parse(curl, asi,
|
|
"h2=\"example.com:443\"; ma = 120;\r\n",
|
|
ALPN_h2, "example.org", 80);
|
|
if(result) {
|
|
fprintf(stderr, "Curl_altsvc_parse(4) failed!\n");
|
|
unitfail++;
|
|
}
|
|
fail_unless(asi->num == 9, "wrong number of entries");
|
|
|
|
/* quoted 'ma' value */
|
|
result = Curl_altsvc_parse(curl, asi,
|
|
"h2=\"example.net:443\"; ma=\"180\";\r\n",
|
|
ALPN_h2, "example.net", 80);
|
|
if(result) {
|
|
fprintf(stderr, "Curl_altsvc_parse(4) failed!\n");
|
|
unitfail++;
|
|
}
|
|
fail_unless(asi->num == 10, "wrong number of entries");
|
|
|
|
result =
|
|
Curl_altsvc_parse(curl, asi,
|
|
"h2=\":443\", h3=\":443\"; ma = 120; persist = 1\r\n",
|
|
ALPN_h1, "curl.haxx.se", 80);
|
|
if(result) {
|
|
fprintf(stderr, "Curl_altsvc_parse(5) failed!\n");
|
|
unitfail++;
|
|
}
|
|
fail_unless(asi->num == 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.haxx.se", 80);
|
|
if(result) {
|
|
fprintf(stderr, "Curl_altsvc_parse(6) failed!\n");
|
|
unitfail++;
|
|
}
|
|
fail_unless(asi->num == 10, "wrong number of entries");
|
|
|
|
Curl_altsvc_save(curl, asi, outname);
|
|
|
|
curl_easy_cleanup(curl);
|
|
fail:
|
|
Curl_altsvc_cleanup(asi);
|
|
return unitfail;
|
|
}
|
|
UNITTEST_STOP
|
|
#endif
|