mirror of
https://github.com/moparisthebest/curl
synced 2024-11-11 03:55:03 -05:00
55b51b8c49
This fixes potential out-of-buffer access on "file:./" URL $ valgrind curl "file:./" ==24516== Memcheck, a memory error detector ==24516== Copyright (C) 2002-2015, and GNU GPL'd, by Julian Seward et al. ==24516== Using Valgrind-3.11.0 and LibVEX; rerun with -h for copyright info ==24516== Command: /home/even/install-curl-git/bin/curl file:./ ==24516== ==24516== Conditional jump or move depends on uninitialised value(s) ==24516== at 0x4C31F9C: strcmp (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==24516== by 0x4EBB315: seturl (urlapi.c:801) ==24516== by 0x4EBB568: parseurl (urlapi.c:861) ==24516== by 0x4EBC509: curl_url_set (urlapi.c:1199) ==24516== by 0x4E644C6: parseurlandfillconn (url.c:2044) ==24516== by 0x4E67AEF: create_conn (url.c:3613) ==24516== by 0x4E68A4F: Curl_connect (url.c:4119) ==24516== by 0x4E7F0A4: multi_runsingle (multi.c:1440) ==24516== by 0x4E808E5: curl_multi_perform (multi.c:2173) ==24516== by 0x4E7558C: easy_transfer (easy.c:686) ==24516== by 0x4E75801: easy_perform (easy.c:779) ==24516== by 0x4E75868: curl_easy_perform (easy.c:798) Was originally spotted by https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10637 Credit to OSS-Fuzz Closes #3039
791 lines
23 KiB
C
791 lines
23 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2018, 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.
|
|
*
|
|
***************************************************************************/
|
|
|
|
/*
|
|
* Note:
|
|
*
|
|
* Since the URL parser by default only accepts schemes that *this instance*
|
|
* of libcurl supports, make sure that the test1560 file lists all the schemes
|
|
* that this test will assume to be present!
|
|
*/
|
|
|
|
#include "test.h"
|
|
|
|
#include "testutil.h"
|
|
#include "warnless.h"
|
|
#include "memdebug.h" /* LAST include file */
|
|
|
|
struct part {
|
|
CURLUPart part;
|
|
const char *name;
|
|
};
|
|
|
|
|
|
static int checkparts(CURLU *u, const char *in, const char *wanted,
|
|
unsigned int getflags)
|
|
{
|
|
int i;
|
|
CURLUcode rc;
|
|
char buf[256];
|
|
char *bufp = &buf[0];
|
|
size_t len = sizeof(buf);
|
|
struct part parts[] = {
|
|
{CURLUPART_SCHEME, "scheme"},
|
|
{CURLUPART_USER, "user"},
|
|
{CURLUPART_PASSWORD, "password"},
|
|
{CURLUPART_OPTIONS, "options"},
|
|
{CURLUPART_HOST, "host"},
|
|
{CURLUPART_PORT, "port"},
|
|
{CURLUPART_PATH, "path"},
|
|
{CURLUPART_QUERY, "query"},
|
|
{CURLUPART_FRAGMENT, "fragment"},
|
|
{0, NULL}
|
|
};
|
|
buf[0] = 0;
|
|
|
|
for(i = 0; parts[i].name; i++) {
|
|
char *p = NULL;
|
|
size_t n;
|
|
rc = curl_url_get(u, parts[i].part, &p, getflags);
|
|
if(!rc && p) {
|
|
snprintf(bufp, len, "%s%s", buf[0]?" | ":"", p);
|
|
}
|
|
else
|
|
snprintf(bufp, len, "%s[%d]", buf[0]?" | ":"", (int)rc);
|
|
|
|
n = strlen(bufp);
|
|
bufp += n;
|
|
len -= n;
|
|
curl_free(p);
|
|
}
|
|
if(strcmp(buf, wanted)) {
|
|
fprintf(stderr, "in: %s\nwanted: %s\ngot: %s\n", in, wanted, buf);
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
struct redircase {
|
|
const char *in;
|
|
const char *set;
|
|
const char *out;
|
|
unsigned int urlflags;
|
|
unsigned int setflags;
|
|
CURLUcode ucode;
|
|
};
|
|
|
|
struct setcase {
|
|
const char *in;
|
|
const char *set;
|
|
const char *out;
|
|
unsigned int urlflags;
|
|
unsigned int setflags;
|
|
CURLUcode ucode;
|
|
};
|
|
|
|
struct testcase {
|
|
const char *in;
|
|
const char *out;
|
|
unsigned int urlflags;
|
|
unsigned int getflags;
|
|
CURLUcode ucode;
|
|
};
|
|
|
|
struct urltestcase {
|
|
const char *in;
|
|
const char *out;
|
|
unsigned int urlflags; /* pass to curl_url() */
|
|
unsigned int getflags; /* pass to curl_url_get() */
|
|
CURLUcode ucode;
|
|
};
|
|
|
|
struct querycase {
|
|
const char *in;
|
|
const char *q;
|
|
const char *out;
|
|
unsigned int urlflags; /* pass to curl_url() */
|
|
unsigned int qflags; /* pass to curl_url_get() */
|
|
CURLUcode ucode;
|
|
};
|
|
|
|
static struct testcase get_parts_list[] ={
|
|
{"https://[::1%252]:1234",
|
|
"https | [11] | [12] | [13] | [::1%252] | 1234 | / | [16] | [17]",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
|
{"https://127.0.0.1:443",
|
|
"https | [11] | [12] | [13] | 127.0.0.1 | [15] | / | [16] | [17]",
|
|
0, CURLU_NO_DEFAULT_PORT, CURLUE_OK},
|
|
{"http://%3a:%3a@ex%0ample/%3f+?+%3f+%23#+%23%3f%g7",
|
|
"http | : | : | [13] | [6] | [15] | /?+ | ? # | +#?%g7",
|
|
0, CURLU_URLDECODE, CURLUE_OK},
|
|
{"http://%3a:%3a@ex%0ample/%3f?%3f%35#%35%3f%g7",
|
|
"http | %3a | %3a | [13] | ex%0ample | [15] | /%3f | %3f%35 | %35%3f%g7",
|
|
0, 0, CURLUE_OK},
|
|
{"http://HO0_-st%41/",
|
|
"http | [11] | [12] | [13] | HO0_-st%41 | [15] | / | [16] | [17]",
|
|
0, 0, CURLUE_OK},
|
|
{"file://hello.html",
|
|
"",
|
|
0, 0, CURLUE_MALFORMED_INPUT},
|
|
{"http://HO0_-st/",
|
|
"http | [11] | [12] | [13] | HO0_-st | [15] | / | [16] | [17]",
|
|
0, 0, CURLUE_OK},
|
|
{"imap://user:pass;option@server/path",
|
|
"imap | user | pass | option | server | [15] | /path | [16] | [17]",
|
|
0, 0, CURLUE_OK},
|
|
{"http://user:pass;option@server/path",
|
|
"http | user | pass;option | [13] | server | [15] | /path | [16] | [17]",
|
|
0, 0, CURLUE_OK},
|
|
{"file:/hello.html",
|
|
"file | [11] | [12] | [13] | [14] | [15] | /hello.html | [16] | [17]",
|
|
0, 0, CURLUE_OK},
|
|
{"file://127.0.0.1/hello.html",
|
|
"file | [11] | [12] | [13] | [14] | [15] | /hello.html | [16] | [17]",
|
|
0, 0, CURLUE_OK},
|
|
{"file:////hello.html",
|
|
"file | [11] | [12] | [13] | [14] | [15] | //hello.html | [16] | [17]",
|
|
0, 0, CURLUE_OK},
|
|
{"file:///hello.html",
|
|
"file | [11] | [12] | [13] | [14] | [15] | /hello.html | [16] | [17]",
|
|
0, 0, CURLUE_OK},
|
|
{"https://127.0.0.1",
|
|
"https | [11] | [12] | [13] | 127.0.0.1 | 443 | / | [16] | [17]",
|
|
0, CURLU_DEFAULT_PORT, CURLUE_OK},
|
|
{"https://127.0.0.1",
|
|
"https | [11] | [12] | [13] | 127.0.0.1 | [15] | / | [16] | [17]",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
|
{"https://[::1]:1234",
|
|
"https | [11] | [12] | [13] | [::1] | 1234 | / | [16] | [17]",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
|
{"https://127abc.com",
|
|
"https | [11] | [12] | [13] | 127abc.com | [15] | / | [16] | [17]",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
|
{"https:// example.com?check",
|
|
"",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_MALFORMED_INPUT},
|
|
{"https://e x a m p l e.com?check",
|
|
"",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_MALFORMED_INPUT},
|
|
{"https://example.com?check",
|
|
"https | [11] | [12] | [13] | example.com | [15] | / | check | [17]",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
|
{"https://example.com:65536",
|
|
"",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_BAD_PORT_NUMBER},
|
|
{"https://example.com:0#moo",
|
|
"",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_BAD_PORT_NUMBER},
|
|
{"https://example.com:01#moo",
|
|
"https | [11] | [12] | [13] | example.com | 1 | / | "
|
|
"[16] | moo",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
|
{"https://example.com:1#moo",
|
|
"https | [11] | [12] | [13] | example.com | 1 | / | "
|
|
"[16] | moo",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
|
{"http://example.com#moo",
|
|
"http | [11] | [12] | [13] | example.com | [15] | / | "
|
|
"[16] | moo",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
|
{"http://example.com",
|
|
"http | [11] | [12] | [13] | example.com | [15] | / | "
|
|
"[16] | [17]",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
|
{"http://example.com/path/html",
|
|
"http | [11] | [12] | [13] | example.com | [15] | /path/html | "
|
|
"[16] | [17]",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
|
{"http://example.com/path/html?query=name",
|
|
"http | [11] | [12] | [13] | example.com | [15] | /path/html | "
|
|
"query=name | [17]",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
|
{"http://example.com/path/html?query=name#anchor",
|
|
"http | [11] | [12] | [13] | example.com | [15] | /path/html | "
|
|
"query=name | anchor",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
|
{"http://example.com:1234/path/html?query=name#anchor",
|
|
"http | [11] | [12] | [13] | example.com | 1234 | /path/html | "
|
|
"query=name | anchor",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
|
{"http:///user:password@example.com:1234/path/html?query=name#anchor",
|
|
"http | user | password | [13] | example.com | 1234 | /path/html | "
|
|
"query=name | anchor",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
|
{"https://user:password@example.com:1234/path/html?query=name#anchor",
|
|
"https | user | password | [13] | example.com | 1234 | /path/html | "
|
|
"query=name | anchor",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
|
{"http://user:password@example.com:1234/path/html?query=name#anchor",
|
|
"http | user | password | [13] | example.com | 1234 | /path/html | "
|
|
"query=name | anchor",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
|
{"http:/user:password@example.com:1234/path/html?query=name#anchor",
|
|
"http | user | password | [13] | example.com | 1234 | /path/html | "
|
|
"query=name | anchor",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
|
{"http:////user:password@example.com:1234/path/html?query=name#anchor",
|
|
"",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_MALFORMED_INPUT},
|
|
{NULL, NULL, 0, 0, CURLUE_OK},
|
|
};
|
|
|
|
static struct urltestcase get_url_list[] = {
|
|
{"smtp.example.com/path/html",
|
|
"smtp://smtp.example.com/path/html",
|
|
CURLU_GUESS_SCHEME, 0, CURLUE_OK},
|
|
{"https.example.com/path/html",
|
|
"http://https.example.com/path/html",
|
|
CURLU_GUESS_SCHEME, 0, CURLUE_OK},
|
|
{"dict.example.com/path/html",
|
|
"dict://dict.example.com/path/html",
|
|
CURLU_GUESS_SCHEME, 0, CURLUE_OK},
|
|
{"pop3.example.com/path/html",
|
|
"pop3://pop3.example.com/path/html",
|
|
CURLU_GUESS_SCHEME, 0, CURLUE_OK},
|
|
{"ldap.example.com/path/html",
|
|
"ldap://ldap.example.com/path/html",
|
|
CURLU_GUESS_SCHEME, 0, CURLUE_OK},
|
|
{"imap.example.com/path/html",
|
|
"imap://imap.example.com/path/html",
|
|
CURLU_GUESS_SCHEME, 0, CURLUE_OK},
|
|
{"ftp.example.com/path/html",
|
|
"ftp://ftp.example.com/path/html",
|
|
CURLU_GUESS_SCHEME, 0, CURLUE_OK},
|
|
{"example.com/path/html",
|
|
"http://example.com/path/html",
|
|
CURLU_GUESS_SCHEME, 0, CURLUE_OK},
|
|
{"HTTP://test/", "http://test/", 0, 0, CURLUE_OK},
|
|
{"http://HO0_-st..~./", "http://HO0_-st..~./", 0, 0, CURLUE_OK},
|
|
{"http:/@example.com: 123/", "", 0, 0, CURLUE_BAD_PORT_NUMBER},
|
|
{"http:/@example.com:123 /", "", 0, 0, CURLUE_BAD_PORT_NUMBER},
|
|
{"http:/@example.com:123a/", "", 0, 0, CURLUE_BAD_PORT_NUMBER},
|
|
{"http://host/file\r", "", 0, 0, CURLUE_MALFORMED_INPUT},
|
|
{"http://host/file\n\x03", "", 0, 0, CURLUE_MALFORMED_INPUT},
|
|
{"htt\x02://host/file", "",
|
|
CURLU_NON_SUPPORT_SCHEME, 0, CURLUE_MALFORMED_INPUT},
|
|
{" http://host/file", "", 0, 0, CURLUE_MALFORMED_INPUT},
|
|
/* here the password ends at the semicolon and options is 'word' */
|
|
{"imap://user:pass;word@host/file",
|
|
"imap://user:pass;word@host/file",
|
|
0, 0, CURLUE_OK},
|
|
/* here the password has the semicolon */
|
|
{"http://user:pass;word@host/file",
|
|
"http://user:pass;word@host/file",
|
|
0, 0, CURLUE_OK},
|
|
{"file:///file.txt#moo",
|
|
"file:///file.txt#moo",
|
|
0, 0, CURLUE_OK},
|
|
{"file:////file.txt",
|
|
"file:////file.txt",
|
|
0, 0, CURLUE_OK},
|
|
{"file:///file.txt",
|
|
"file:///file.txt",
|
|
0, 0, CURLUE_OK},
|
|
{"file:./",
|
|
"file://",
|
|
0, 0, CURLUE_MALFORMED_INPUT},
|
|
{"http://example.com/hello/../here",
|
|
"http://example.com/hello/../here",
|
|
CURLU_PATH_AS_IS, 0, CURLUE_OK},
|
|
{"http://example.com/hello/../here",
|
|
"http://example.com/here",
|
|
0, 0, CURLUE_OK},
|
|
{"http://example.com:80",
|
|
"http://example.com/",
|
|
0, CURLU_NO_DEFAULT_PORT, CURLUE_OK},
|
|
{"tp://example.com/path/html",
|
|
"",
|
|
0, 0, CURLUE_UNSUPPORTED_SCHEME},
|
|
{"http://hello:fool@example.com",
|
|
"",
|
|
CURLU_DISALLOW_USER, 0, CURLUE_USER_NOT_ALLOWED},
|
|
{"http:/@example.com:123",
|
|
"http://example.com:123/",
|
|
0, 0, CURLUE_OK},
|
|
{"http:/:password@example.com",
|
|
"http://:password@example.com/",
|
|
0, 0, CURLUE_OK},
|
|
{"http://user@example.com?#",
|
|
"http://user@example.com/",
|
|
0, 0, CURLUE_OK},
|
|
{"http://user@example.com?",
|
|
"http://user@example.com/",
|
|
0, 0, CURLUE_OK},
|
|
{"http://user@example.com#anchor",
|
|
"http://user@example.com/#anchor",
|
|
0, 0, CURLUE_OK},
|
|
{"example.com/path/html",
|
|
"https://example.com/path/html",
|
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
|
{"example.com/path/html",
|
|
"",
|
|
0, 0, CURLUE_MALFORMED_INPUT},
|
|
{"http://user:password@example.com:1234/path/html?query=name#anchor",
|
|
"http://user:password@example.com:1234/path/html?query=name#anchor",
|
|
0, 0, CURLUE_OK},
|
|
{"http://example.com:1234/path/html?query=name#anchor",
|
|
"http://example.com:1234/path/html?query=name#anchor",
|
|
0, 0, CURLUE_OK},
|
|
{"http://example.com/path/html?query=name#anchor",
|
|
"http://example.com/path/html?query=name#anchor",
|
|
0, 0, CURLUE_OK},
|
|
{"http://example.com/path/html?query=name",
|
|
"http://example.com/path/html?query=name",
|
|
0, 0, CURLUE_OK},
|
|
{"http://example.com/path/html",
|
|
"http://example.com/path/html",
|
|
0, 0, CURLUE_OK},
|
|
{"tp://example.com/path/html",
|
|
"tp://example.com/path/html",
|
|
CURLU_NON_SUPPORT_SCHEME, 0, CURLUE_OK},
|
|
{NULL, NULL, 0, 0, 0}
|
|
};
|
|
|
|
static int checkurl(const char *url, const char *out)
|
|
{
|
|
if(strcmp(out, url)) {
|
|
fprintf(stderr, "Wanted: %s\nGot : %s\n",
|
|
out, url);
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* !checksrc! disable SPACEBEFORECOMMA 1 */
|
|
static struct setcase set_parts_list[] = {
|
|
{"https://host/",
|
|
"path=%4A%4B%4C,",
|
|
"https://host/%4a%4b%4c",
|
|
0, 0, CURLUE_NO_HOST},
|
|
{"https://host/mooo?q#f",
|
|
"path=NULL,query=NULL,fragment=NULL,",
|
|
"https://host/",
|
|
0, 0, CURLUE_NO_HOST},
|
|
{"https://user:secret@host/",
|
|
"user=NULL,password=NULL,",
|
|
"https://host/",
|
|
0, 0, CURLUE_NO_HOST},
|
|
{NULL,
|
|
"scheme=https,user= @:,host=foobar,",
|
|
"https://%20%20%20%40%3a@foobar/",
|
|
0, CURLU_URLENCODE, CURLUE_OK},
|
|
{NULL,
|
|
"scheme=https,host= ,path= ,user= ,password= ,query= ,fragment= ,",
|
|
"https://%20:%20@%20%20/%20?+#%20",
|
|
0, CURLU_URLENCODE, CURLUE_OK},
|
|
{NULL,
|
|
"scheme=https,host=foobar,path=/this /path /is /here,",
|
|
"https://foobar/this%20/path%20/is%20/here",
|
|
0, CURLU_URLENCODE, CURLUE_OK},
|
|
{"imap://user:secret;opt@host/",
|
|
"options=updated,scheme=imaps,password=p4ssw0rd,",
|
|
"imaps://user:p4ssw0rd;updated@host/",
|
|
0, 0, CURLUE_NO_HOST},
|
|
{"imap://user:secret;optit@host/",
|
|
"scheme=https,",
|
|
"https://user:secret@host/",
|
|
0, 0, CURLUE_NO_HOST},
|
|
{"file:///file#anchor",
|
|
"scheme=https,host=example,",
|
|
"https://example/file#anchor",
|
|
0, 0, CURLUE_NO_HOST},
|
|
{NULL, /* start fresh! */
|
|
"scheme=file,host=127.0.0.1,path=/no,user=anonymous,",
|
|
"file:///no",
|
|
0, 0, CURLUE_OK},
|
|
{NULL, /* start fresh! */
|
|
"scheme=ftp,host=127.0.0.1,path=/no,user=anonymous,",
|
|
"ftp://anonymous@127.0.0.1/no",
|
|
0, 0, CURLUE_OK},
|
|
{NULL, /* start fresh! */
|
|
"scheme=https,host=example.com,",
|
|
"https://example.com/",
|
|
0, CURLU_NON_SUPPORT_SCHEME, CURLUE_OK},
|
|
{"http://user:foo@example.com/path?query#frag",
|
|
"fragment=changed,",
|
|
"http://user:foo@example.com/path?query#changed",
|
|
0, CURLU_NON_SUPPORT_SCHEME, CURLUE_OK},
|
|
{"http://example.com/",
|
|
"scheme=foo,", /* not accepted */
|
|
"http://example.com/",
|
|
0, 0, CURLUE_OK},
|
|
{"http://example.com/",
|
|
"scheme=https,path=/hello,fragment=snippet,",
|
|
"https://example.com/hello#snippet",
|
|
0, 0, CURLUE_OK},
|
|
{"http://example.com:80",
|
|
"user=foo,port=1922,",
|
|
"http://foo@example.com:1922/",
|
|
0, 0, CURLUE_OK},
|
|
{"http://example.com:80",
|
|
"user=foo,password=bar,",
|
|
"http://foo:bar@example.com:80/",
|
|
0, 0, CURLUE_OK},
|
|
{"http://example.com:80",
|
|
"user=foo,",
|
|
"http://foo@example.com:80/",
|
|
0, 0, CURLUE_OK},
|
|
{"http://example.com",
|
|
"host=www.example.com,",
|
|
"http://www.example.com/",
|
|
0, 0, CURLUE_OK},
|
|
{"http://example.com:80",
|
|
"scheme=ftp,",
|
|
"ftp://example.com:80/",
|
|
0, 0, CURLUE_OK},
|
|
{NULL, NULL, NULL, 0, 0, 0}
|
|
};
|
|
|
|
static CURLUPart part2id(char *part)
|
|
{
|
|
if(!strcmp("url", part))
|
|
return CURLUPART_URL;
|
|
if(!strcmp("scheme", part))
|
|
return CURLUPART_SCHEME;
|
|
if(!strcmp("user", part))
|
|
return CURLUPART_USER;
|
|
if(!strcmp("password", part))
|
|
return CURLUPART_PASSWORD;
|
|
if(!strcmp("options", part))
|
|
return CURLUPART_OPTIONS;
|
|
if(!strcmp("host", part))
|
|
return CURLUPART_HOST;
|
|
if(!strcmp("port", part))
|
|
return CURLUPART_PORT;
|
|
if(!strcmp("path", part))
|
|
return CURLUPART_PATH;
|
|
if(!strcmp("query", part))
|
|
return CURLUPART_QUERY;
|
|
if(!strcmp("fragment", part))
|
|
return CURLUPART_FRAGMENT;
|
|
return 9999; /* bad input => bad output */
|
|
}
|
|
|
|
static void updateurl(CURLU *u, const char *cmd, unsigned int setflags)
|
|
{
|
|
const char *p = cmd;
|
|
|
|
/* make sure the last command ends with a comma too! */
|
|
while(p) {
|
|
char *e = strchr(p, ',');
|
|
if(e) {
|
|
size_t n = e-p;
|
|
char buf[80];
|
|
char part[80];
|
|
char value[80];
|
|
memcpy(buf, p, n);
|
|
buf[n] = 0;
|
|
if(2 == sscanf(buf, "%79[^=]=%79[^,]", part, value)) {
|
|
CURLUPart what = part2id(part);
|
|
#if 0
|
|
/* for debugging this */
|
|
fprintf(stderr, "%s = %s [%d]\n", part, value, (int)what);
|
|
#endif
|
|
if(!strcmp("NULL", value))
|
|
curl_url_set(u, what, NULL, setflags);
|
|
else
|
|
curl_url_set(u, what, value, setflags);
|
|
}
|
|
p = e + 1;
|
|
continue;
|
|
}
|
|
break;
|
|
}
|
|
|
|
}
|
|
|
|
static struct redircase set_url_list[] = {
|
|
{"file://localhost/path?query#frag",
|
|
"foo#another",
|
|
"file:///foo#another",
|
|
0, 0, 0},
|
|
{"http://example.com/path?query#frag",
|
|
"https://two.example.com/bradnew",
|
|
"https://two.example.com/bradnew",
|
|
0, 0, 0},
|
|
{"http://example.com/path?query#frag",
|
|
"../../newpage#foo",
|
|
"http://example.com/newpage#foo",
|
|
0, 0, 0},
|
|
{"http://user:foo@example.com/path?query#frag",
|
|
"../../newpage",
|
|
"http://user:foo@example.com/newpage",
|
|
0, 0, 0},
|
|
{"http://user:foo@example.com/path?query#frag",
|
|
"../newpage",
|
|
"http://user:foo@example.com/newpage",
|
|
0, 0, 0},
|
|
{NULL, NULL, NULL, 0, 0, 0}
|
|
};
|
|
|
|
static int set_url(void)
|
|
{
|
|
int i;
|
|
CURLUcode rc;
|
|
CURLU *urlp;
|
|
int error = 0;
|
|
|
|
for(i = 0; set_url_list[i].in && !error; i++) {
|
|
char *url = NULL;
|
|
urlp = curl_url();
|
|
if(!urlp)
|
|
break;
|
|
rc = curl_url_set(urlp, CURLUPART_URL, set_url_list[i].in,
|
|
set_url_list[i].urlflags);
|
|
if(!rc) {
|
|
rc = curl_url_set(urlp, CURLUPART_URL, set_url_list[i].set,
|
|
set_url_list[i].setflags);
|
|
if(rc) {
|
|
fprintf(stderr, "%s:%d Set URL %s returned %d\n",
|
|
__FILE__, __LINE__, set_url_list[i].set,
|
|
(int)rc);
|
|
error++;
|
|
}
|
|
else {
|
|
rc = curl_url_get(urlp, CURLUPART_URL, &url, 0);
|
|
if(rc) {
|
|
fprintf(stderr, "%s:%d Get URL returned %d\n",
|
|
__FILE__, __LINE__, (int)rc);
|
|
error++;
|
|
}
|
|
else {
|
|
if(checkurl(url, set_url_list[i].out)) {
|
|
error++;
|
|
}
|
|
}
|
|
}
|
|
curl_free(url);
|
|
}
|
|
else if(rc != set_url_list[i].ucode) {
|
|
fprintf(stderr, "Set URL\nin: %s\nreturned %d (expected %d)\n",
|
|
set_url_list[i].in, (int)rc, set_url_list[i].ucode);
|
|
error++;
|
|
}
|
|
curl_url_cleanup(urlp);
|
|
}
|
|
return error;
|
|
}
|
|
|
|
static int set_parts(void)
|
|
{
|
|
int i;
|
|
CURLUcode rc;
|
|
int error = 0;
|
|
|
|
for(i = 0; set_parts_list[i].set && !error; i++) {
|
|
char *url = NULL;
|
|
CURLU *urlp = curl_url();
|
|
if(!urlp) {
|
|
error++;
|
|
break;
|
|
}
|
|
if(set_parts_list[i].in)
|
|
rc = curl_url_set(urlp, CURLUPART_URL, set_parts_list[i].in,
|
|
set_parts_list[i].urlflags);
|
|
else
|
|
rc = CURLUE_OK;
|
|
if(!rc) {
|
|
updateurl(urlp, set_parts_list[i].set, set_parts_list[i].setflags);
|
|
rc = curl_url_get(urlp, CURLUPART_URL, &url, 0);
|
|
|
|
if(rc) {
|
|
fprintf(stderr, "%s:%d Get URL returned %d\n",
|
|
__FILE__, __LINE__, (int)rc);
|
|
error++;
|
|
}
|
|
else if(checkurl(url, set_parts_list[i].out)) {
|
|
error++;
|
|
}
|
|
}
|
|
else if(rc != set_parts_list[i].ucode) {
|
|
fprintf(stderr, "Set parts\nin: %s\nreturned %d (expected %d)\n",
|
|
set_parts_list[i].in, (int)rc, set_parts_list[i].ucode);
|
|
error++;
|
|
}
|
|
curl_free(url);
|
|
curl_url_cleanup(urlp);
|
|
}
|
|
return error;
|
|
}
|
|
|
|
static int get_url(void)
|
|
{
|
|
int i;
|
|
CURLUcode rc;
|
|
int error = 0;
|
|
for(i = 0; get_url_list[i].in && !error; i++) {
|
|
char *url = NULL;
|
|
CURLU *urlp = curl_url();
|
|
if(!urlp) {
|
|
error++;
|
|
break;
|
|
}
|
|
rc = curl_url_set(urlp, CURLUPART_URL, get_url_list[i].in,
|
|
get_url_list[i].urlflags);
|
|
if(!rc) {
|
|
rc = curl_url_get(urlp, CURLUPART_URL, &url, get_url_list[i].getflags);
|
|
|
|
if(rc) {
|
|
fprintf(stderr, "%s:%d returned %d\n",
|
|
__FILE__, __LINE__, (int)rc);
|
|
error++;
|
|
}
|
|
else {
|
|
if(checkurl(url, get_url_list[i].out)) {
|
|
error++;
|
|
}
|
|
}
|
|
}
|
|
else if(rc != get_url_list[i].ucode) {
|
|
fprintf(stderr, "Get URL\nin: %s\nreturned %d (expected %d)\n",
|
|
get_url_list[i].in, (int)rc, get_url_list[i].ucode);
|
|
error++;
|
|
}
|
|
curl_free(url);
|
|
curl_url_cleanup(urlp);
|
|
}
|
|
return error;
|
|
}
|
|
|
|
static int get_parts(void)
|
|
{
|
|
int i;
|
|
CURLUcode rc;
|
|
CURLU *urlp;
|
|
int error = 0;
|
|
for(i = 0; get_parts_list[i].in && !error; i++) {
|
|
urlp = curl_url();
|
|
if(!urlp) {
|
|
error++;
|
|
break;
|
|
}
|
|
rc = curl_url_set(urlp, CURLUPART_URL,
|
|
get_parts_list[i].in,
|
|
get_parts_list[i].urlflags);
|
|
if(rc != get_parts_list[i].ucode) {
|
|
fprintf(stderr, "Get parts\nin: %s\nreturned %d (expected %d)\n",
|
|
get_parts_list[i].in, (int)rc, get_parts_list[i].ucode);
|
|
error++;
|
|
}
|
|
else if(get_parts_list[i].ucode) {
|
|
/* the expected error happened */
|
|
}
|
|
else if(checkparts(urlp, get_parts_list[i].in, get_parts_list[i].out,
|
|
get_parts_list[i].getflags))
|
|
error++;
|
|
curl_url_cleanup(urlp);
|
|
}
|
|
return error;
|
|
}
|
|
|
|
static struct querycase append_list[] = {
|
|
{"HTTP://test/?s", "name=joe\x02", "http://test/?s&name=joe%02",
|
|
0, CURLU_URLENCODE, CURLUE_OK},
|
|
{"HTTP://test/?size=2#f", "name=joe=", "http://test/?size=2&name=joe=#f",
|
|
0, CURLU_URLENCODE, CURLUE_OK},
|
|
{"HTTP://test/?size=2#f", "name=joe doe",
|
|
"http://test/?size=2&name=joe+doe#f",
|
|
0, CURLU_URLENCODE, CURLUE_OK},
|
|
{"HTTP://test/", "name=joe", "http://test/?name=joe", 0, 0, CURLUE_OK},
|
|
{"HTTP://test/?size=2", "name=joe", "http://test/?size=2&name=joe",
|
|
0, 0, CURLUE_OK},
|
|
{"HTTP://test/?size=2&", "name=joe", "http://test/?size=2&name=joe",
|
|
0, 0, CURLUE_OK},
|
|
{"HTTP://test/?size=2#f", "name=joe", "http://test/?size=2&name=joe#f",
|
|
0, 0, CURLUE_OK},
|
|
{NULL, NULL, NULL, 0, 0, 0}
|
|
};
|
|
|
|
static int append(void)
|
|
{
|
|
int i;
|
|
CURLUcode rc;
|
|
CURLU *urlp;
|
|
int error = 0;
|
|
for(i = 0; append_list[i].in && !error; i++) {
|
|
urlp = curl_url();
|
|
if(!urlp) {
|
|
error++;
|
|
break;
|
|
}
|
|
rc = curl_url_set(urlp, CURLUPART_URL,
|
|
append_list[i].in,
|
|
append_list[i].urlflags);
|
|
if(rc)
|
|
error++;
|
|
else
|
|
rc = curl_url_set(urlp, CURLUPART_QUERY,
|
|
append_list[i].q,
|
|
append_list[i].qflags | CURLU_APPENDQUERY);
|
|
if(error)
|
|
;
|
|
else if(rc != append_list[i].ucode) {
|
|
fprintf(stderr, "Append\nin: %s\nreturned %d (expected %d)\n",
|
|
append_list[i].in, (int)rc, append_list[i].ucode);
|
|
error++;
|
|
}
|
|
else if(append_list[i].ucode) {
|
|
/* the expected error happened */
|
|
}
|
|
else {
|
|
char *url;
|
|
rc = curl_url_get(urlp, CURLUPART_URL, &url, 0);
|
|
if(rc) {
|
|
fprintf(stderr, "%s:%d Get URL returned %d\n",
|
|
__FILE__, __LINE__, (int)rc);
|
|
error++;
|
|
}
|
|
else {
|
|
if(checkurl(url, append_list[i].out)) {
|
|
error++;
|
|
}
|
|
curl_free(url);
|
|
}
|
|
}
|
|
curl_url_cleanup(urlp);
|
|
}
|
|
return error;
|
|
}
|
|
|
|
int test(char *URL)
|
|
{
|
|
(void)URL; /* not used */
|
|
|
|
if(append())
|
|
return 5;
|
|
|
|
if(set_url())
|
|
return 1;
|
|
|
|
if(set_parts())
|
|
return 2;
|
|
|
|
if(get_url())
|
|
return 3;
|
|
|
|
if(get_parts())
|
|
return 4;
|
|
|
|
printf("success\n");
|
|
return 0;
|
|
}
|