Daniel Stenberg napsal(a):
> On Tue, 9 Jun 2009, A. Craig West wrote:
>
>> All browsers that I know of implement ftp authentication with the user-name
>> and password in the URL, so I expect that the proxies will expect it that
>> way.
>
> I guess so. Let's get this thing in, Michal! You up to completing the
> uncomplete patch?
I'm back, sorry :)
Here is the patch without leaks and with a testcase. I'll commit it
unless anyone objects.
Michal
Index: lib/http.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/http.c,v
retrieving revision 1.421
diff -u -p -r1.421 http.c
--- lib/http.c 10 Jun 2009 21:26:11 -0000 1.421
+++ lib/http.c 15 Jun 2009 13:40:13 -0000
@@ -2060,6 +2060,7 @@ CURLcode Curl_http(struct connectdata *c
CURLcode result=CURLE_OK;
struct HTTP *http;
const char *ppath = data->state.path;
+ bool paste_ftp_userpwd = FALSE;
char ftp_typecode[sizeof(";type=?")] = "";
const char *host = conn->host.name;
const char *te = ""; /* transfer-encoding */
@@ -2288,24 +2289,26 @@ CURLcode Curl_http(struct connectdata *c
}
}
ppath = data->change.url;
- if (data->set.proxy_transfer_mode) {
- /* when doing ftp, append ;type=<a|i> if not present */
- if(checkprefix("ftp://";, ppath) || checkprefix("ftps://", ppath)) {
- char *p = strstr(ppath, ";type=");
- if(p && p[6] && p[7] == 0) {
- switch (Curl_raw_toupper(p[6])) {
- case 'A':
- case 'D':
- case 'I':
- break;
- default:
- p = NULL;
+ if(checkprefix("ftp://";, ppath)) {
+ if (data->set.proxy_transfer_mode) {
+ /* when doing ftp, append ;type=<a|i> if not present */
+ char *p = strstr(ppath, ";type=");
+ if(p && p[6] && p[7] == 0) {
+ switch (Curl_raw_toupper(p[6])) {
+ case 'A':
+ case 'D':
+ case 'I':
+ break;
+ default:
+ p = NULL;
+ }
}
- }
- if(!p)
- snprintf(ftp_typecode, sizeof(ftp_typecode), ";type=%c",
- data->set.prefer_ascii ? 'a' : 'i');
+ if(!p)
+ snprintf(ftp_typecode, sizeof(ftp_typecode), ";type=%c",
+ data->set.prefer_ascii ? 'a' : 'i');
}
+ if (conn->bits.user_passwd && !conn->bits.userpwd_in_url)
+ paste_ftp_userpwd = TRUE;
}
}
#endif /* CURL_DISABLE_PROXY */
@@ -2464,10 +2467,23 @@ CURLcode Curl_http(struct connectdata *c
return CURLE_OUT_OF_MEMORY;
/* add the main request stuff */
- result =
- add_bufferf(req_buffer,
- "%s " /* GET/HEAD/POST/PUT */
- "%s%s HTTP/%s\r\n" /* path + HTTP version */
+ /* GET/HEAD/POST/PUT */
+ result = add_bufferf(req_buffer, "%s ", request);
+ if (result)
+ return result;
+
+ /* url */
+ if (paste_ftp_userpwd)
+ result = add_bufferf(req_buffer, "ftp://%s:%...@%s";,
+ conn->user, conn->passwd, ppath + sizeof("ftp://";) - 1);
+ else
+ result = add_buffer(req_buffer, ppath, strlen(ppath));
+ if (result)
+ return result;
+
+ result = add_bufferf(req_buffer,
+ "%s" /* ftp typecode (;type=x) */
+ " HTTP/%s\r\n" /* HTTP version */
"%s" /* proxyuserpwd */
"%s" /* userpwd */
"%s" /* range */
@@ -2479,8 +2495,6 @@ CURLcode Curl_http(struct connectdata *c
"%s" /* Proxy-Connection */
"%s",/* transfer-encoding */
- request,
- ppath,
ftp_typecode,
httpstring,
conn->allocptr.proxyuserpwd?
Index: lib/url.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/url.c,v
retrieving revision 1.805
diff -u -p -r1.805 url.c
--- lib/url.c 12 Jun 2009 02:47:35 -0000 1.805
+++ lib/url.c 15 Jun 2009 13:40:13 -0000
@@ -3831,6 +3831,7 @@ static CURLcode parse_url_userpass(struc
* set user/passwd, but doing that first adds more cases here :-(
*/
+ conn->bits.userpwd_in_url = 1;
if(data->set.use_netrc != CURL_NETRC_REQUIRED) {
/* We could use the one in the URL */
Index: lib/urldata.h
===================================================================
RCS file: /cvsroot/curl/curl/lib/urldata.h,v
retrieving revision 1.413
diff -u -p -r1.413 urldata.h
--- lib/urldata.h 8 Jun 2009 21:25:17 -0000 1.413
+++ lib/urldata.h 15 Jun 2009 13:40:13 -0000
@@ -625,6 +625,7 @@ struct ConnectBits {
EPRT doesn't work we disable it for the forthcoming
requests */
bool netrc; /* name+password provided by netrc */
+ bool userpwd_in_url; /* name+password found in url */
bool done; /* set to FALSE when Curl_do() is called and set to TRUE
when Curl_done() is called, to prevent Curl_done() to
Index: tests/data/test299
===================================================================
RCS file: tests/data/test299
diff -N tests/data/test299
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/data/test299 15 Jun 2009 13:40:13 -0000
@@ -0,0 +1,53 @@
+<testcase>
+<info>
+<keywords>
+FTP
+HTTP
+CURLOPT_USERPWD
+HTTP proxy
+</keywords>
+</info>
+
+# Server-side
+<reply>
+<data>
+HTTP/1.0 200 OK swsclose
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+blablabla
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+<features>
+ftp
+</features>
+ <name>
+FTP over HTTP proxy with user:pass not in url
+ </name>
+ <command>
+-x http://%HOSTIP:%HTTPPORT -u michal:aybabtu ftp://host.com/we/want/299
+</command>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET ftp://michal:[email protected]/we/want/299 HTTP/1.1
+Authorization: Basic bWljaGFsOmF5YmFidHU=
+Host: host.com:21
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+</protocol>
+</verify>
+</testcase>
