Skip to content
Permalink
Browse files

url: Fix parsing for when 'file' is the default protocol

Follow-up to 3463408.

Prior to 3463408 file:// hostnames were silently stripped.

Prior to this commit it did not work when a schemeless url was used with
file as the default protocol.

Ref: https://curl.haxx.se/mail/lib-2016-11/0081.html
Closes #1124

Also fix for drive letters:

- Support --proto-default file c:/foo/bar.txt

- Support file://c:/foo/bar.txt

- Fail when a file:// drive letter is detected and not MSDOS/Windows.

Bug: #1187
Reported-by: Anatol Belski
Assisted-by: Anatol Belski
  • Loading branch information...
jay committed Nov 13, 2016
1 parent 807698d commit 1d4202ade602dd4f1192c69aed5cc905e7a9b4e2
Showing with 151 additions and 10 deletions.
  1. +64 −8 lib/url.c
  2. +1 −1 tests/data/Makefile.inc
  3. +40 −0 tests/data/test1145
  4. +45 −0 tests/data/test1146
  5. +1 −1 tests/data/test1534
@@ -4258,11 +4258,12 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data,
char *fragment;
char *path = data->state.path;
char *query;
int i;
int rc;
char protobuf[16] = "";
const char *protop = "";
CURLcode result;
bool rebuild_url = FALSE;
bool url_has_scheme = FALSE;

*prot_missing = FALSE;

@@ -4281,10 +4282,47 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data,
* proxy -- and we don't know if we will need to use SSL until we parse the
* url ...
************************************************************/
if((2 == sscanf(data->change.url, "%15[^:]:%[^\n]",
protobuf, path)) &&
strcasecompare(protobuf, "file")) {
if(path[0] == '/' && path[1] == '/') {
if(data->change.url[0] == ':') {
failf(data, "Bad URL, colon is first character");
return CURLE_URL_MALFORMAT;
}

/* Make sure we don't mistake a drive letter for a scheme, for example:
curld --proto-default file c:/foo/bar.txt */
if((('a' <= data->change.url[0] && data->change.url[0] <= 'z') ||
('A' <= data->change.url[0] && data->change.url[0] <= 'Z')) &&
data->change.url[1] == ':' && data->set.str[STRING_DEFAULT_PROTOCOL] &&
strcasecompare(data->set.str[STRING_DEFAULT_PROTOCOL], "file")) {
; /* do nothing */
}
else { /* check for a scheme */
for(i = 0; i < 16 && data->change.url[i]; ++i) {
if(data->change.url[i] == '/')
break;
if(data->change.url[i] == ':') {
url_has_scheme = TRUE;
break;
}
}
}

/* handle the file: scheme */
if((url_has_scheme && strncasecompare(data->change.url, "file:", 5)) ||
(!url_has_scheme && data->set.str[STRING_DEFAULT_PROTOCOL] &&
strcasecompare(data->set.str[STRING_DEFAULT_PROTOCOL], "file"))) {
bool path_has_drive = FALSE;

if(url_has_scheme)
rc = sscanf(data->change.url, "%*15[^\n/:]:%[^\n]", path);
else
rc = sscanf(data->change.url, "%[^\n]", path);

if(rc != 1) {
failf(data, "Bad URL");
return CURLE_URL_MALFORMAT;
}

if(url_has_scheme && path[0] == '/' && path[1] == '/') {
/* Allow omitted hostname (e.g. file:/<path>). This is not strictly
* speaking a valid file: URL by RFC 1738, but treating file:/<path> as
* file://localhost/<path> is similar to how other schemes treat missing
@@ -4294,18 +4332,25 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data,
memory areas overlap! */
memmove(path, path + 2, strlen(path + 2)+1);
}

/* the path may start with a drive letter. for backwards compatibility
we skip some processing on those paths. */
path_has_drive = (('a' <= path[0] && path[0] <= 'z') ||
('A' <= path[0] && path[0] <= 'Z')) && path[1] == ':';

/*
* we deal with file://<host>/<path> differently since it supports no
* hostname other than "localhost" and "127.0.0.1", which is unique among
* the URL protocols specified in RFC 1738
*/
if(path[0] != '/') {
if(path[0] != '/' && !path_has_drive) {
/* the URL includes a host name, it must match "localhost" or
"127.0.0.1" to be valid */
char *ptr;
if(!checkprefix("localhost/", path) &&
!checkprefix("127.0.0.1/", path)) {
failf(data, "Valid host name with slash missing in URL");
failf(data, "Invalid file://hostname/, "
"expected localhost or 127.0.0.1 or none");
return CURLE_URL_MALFORMAT;
}
ptr = &path[9]; /* now points to the slash after the host */
@@ -4332,17 +4377,28 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data,

/* This cannot be made with strcpy, as the memory chunks overlap! */
memmove(path, ptr, strlen(ptr)+1);

path_has_drive = (('a' <= path[0] && path[0] <= 'z') ||
('A' <= path[0] && path[0] <= 'Z')) && path[1] == ':';
}

#if !defined(MSDOS) && !defined(WIN32) && !defined(__CYGWIN__)
if(path_has_drive) {
failf(data, "File drive letters are only accepted in MSDOS/Windows.");
return CURLE_URL_MALFORMAT;
}
#endif

protop = "file"; /* protocol string */
}
else {
/* clear path */
char protobuf[16];
char slashbuf[4];
path[0]=0;

rc = sscanf(data->change.url,
"%15[^\n:]:%3[/]%[^\n/?#]%[^\n]",
"%15[^\n/:]:%3[/]%[^\n/?#]%[^\n]",
protobuf, slashbuf, conn->host.name, path);
if(2 == rc) {
failf(data, "Bad URL");
@@ -120,7 +120,7 @@ test1112 test1113 test1114 test1115 test1116 test1117 test1118 test1119 \
test1120 test1121 test1122 test1123 test1124 test1125 test1126 test1127 \
test1128 test1129 test1130 test1131 test1132 test1133 test1134 test1135 \
test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \
test1144 \
test1144 test1145 test1146 \
test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \
test1208 test1209 test1210 test1211 test1212 test1213 test1214 test1215 \
test1216 test1217 test1218 test1219 \
@@ -0,0 +1,40 @@
<testcase>
<info>
<keywords>
FILE
</keywords>
</info>

<reply>
</reply>

# Client-side
<client>
<server>
file
</server>
<name>
file:// bad host
</name>
# This command should not succeed since we only accept
# file:/// file://localhost/ file://127.0.0.1/
<command>
file://bad-host%PWD/log/test1145.txt
</command>
<file name="log/test1145.txt">
foo
bar
bar
foo
moo
</file>
</client>

# Verify data after the test has been "shot"
<verify>
# CURLE_URL_MALFORMAT is error code 3
<errorcode>
3
</errorcode>
</verify>
</testcase>
@@ -0,0 +1,45 @@
<testcase>
<info>
<keywords>
FILE
--proto-default
</keywords>
</info>

<reply>
<data>
foo
bar
bar
foo
moo
</data>
</reply>

# Client-side
<client>
<server>
file
</server>
<name>
--proto-default file
</name>
<command>
--proto-default file %PWD/log/test1146.txt
</command>
<file name="log/test1146.txt">
foo
bar
bar
foo
moo
</file>
</client>

# Verify data after the test has been "shot"
<verify>
<errorcode>
0
</errorcode>
</verify>
</testcase>
@@ -27,7 +27,7 @@ http
lib1534
</tool>
<name>
Test CURLINFO_RESPONSE_CODE
CURLINFO_FILETIME init and reset
</name>
<command>
http://%HOSTIP:%HTTPPORT/1534

2 comments on commit 1d4202a

@newboyjeab

This comment has been minimized.

Copy link

replied Jul 29, 2017

SM-920N

@newboyjeab

This comment has been minimized.

Copy link

replied Jul 29, 2017

SM-920N

Please sign in to comment.
You can’t perform that action at this time.