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

Eric Vergnaud pointed out that libcurl didn't treat ?-letters in the user name

Browse source 
and password fields properly in URLs, like
ftp://us?er:pass?word@site.com/. Added test 191 to verify the fix.
This commit is contained in:
Daniel Stenberg 2004-10-14 13:44:54 +00:00
parent 1aba99b1e7
commit e8f85cba0f
6 changed files with 67 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lib/url.c
View file

@ -2175,6 +2175,7 @@ static CURLcode CreateConnection(struct SessionHandle *data,
bool *async)
{
char *tmp;
char *at;
CURLcode result=CURLE_OK;
struct connectdata *conn;
struct connectdata *conn_temp;
@ -2349,13 +2350,8 @@ static CURLcode CreateConnection(struct SessionHandle *data,
/* Set default path */
strcpy(conn->path, "/");
/* We need to search for '/' OR '?' - whichever comes first after host
* name but before the path. We need to change that to handle things like
* http://example.com?param= (notice the missing '/'). Later we'll insert
* that missing slash at the beginning of the path.
*/
if (2 > sscanf(data->change.url,
"%15[^\n:]://%[^\n/?]%[^\n]",
"%15[^\n:]://%[^\n/]%[^\n]",
conn->protostr,
conn->host.name, conn->path)) {
@ -2363,7 +2359,7 @@ static CURLcode CreateConnection(struct SessionHandle *data,
* The URL was badly formatted, let's try the browser-style _without_
* protocol specified like 'http://'.
*/
if((1 > sscanf(data->change.url, "%[^\n/?]%[^\n]",
if((1 > sscanf(data->change.url, "%[^\n/]%[^\n]",
conn->host.name, conn->path)) ) {
/*
* We couldn't even get this format.
@ -2404,6 +2400,27 @@ static CURLcode CreateConnection(struct SessionHandle *data,
}
}
/* We search for '?' in the host name (but only on the right side of a
* @-letter to allow ?-letters in username and password) to handle things
* like http://example.com?param= (notice the missing '/').
*/
at = strchr(conn->host.name, '@');
if(at)
tmp = strchr(at+1, '?');
else
tmp = strchr(conn->host.name, '?');
if(tmp) {
/* The right part of the ?-letter needs to be moved to prefix
the current path buffer! */
size_t len = strlen(tmp);
/* move the existing path plus the zero byte */
memmove(conn->path+len+1, conn->path, strlen(conn->path)+1);
conn->path[0]='/'; /* prepend the missing slash */
memcpy(conn->path+1, tmp, len); /* now copy the prefix part */
*tmp=0; /* now cut off the hostname at the ? */
}
/* If the URL is malformatted (missing a '/' after hostname before path) we
* insert a slash here. The only letter except '/' we accept to start a path
* is '?'.