@matheusbsbs / matheus-bagliano / commits / 77eac3f89a

imap-send: URI encode server folder

When trying to send a patch using 'imap-send' with 'curl' and the following configuration: [imap] folder = "[Gmail]/Drafts" host = imaps://imap.gmail.com port = 993 sslverify = false results in the following error, curl_easy_perform() failed: URL using bad/illegal format or missing URL This is a consequence of not URI-encoding the folder portion of the URL which contains characters such as '[' which are not allowed in a URI. According to RFC3986, these characters should be URI-encoded. So, URI-encode the folder before adding it to the URI to ensure it doesn't contain characters that aren't allowed in a URI. Reported-by: Doron Behar <doron.behar@gmail.com> Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com> Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Nicolas Morey-Chaisemartin committed Dec 19, 2017 at 00:41 UTC 77eac3f89a7b49424e7bb3498d20421878705485

1 file changed +7 -1

imap-send.c

+7 -1

@@ -1412,6 +1412,7 @@ static CURL *setup_curl(struct imap_server_conf *srvc, struct credential *cred)

1412 {

1413 CURL *curl;

1414 struct strbuf path = STRBUF_INIT;

1415 + char *uri_encoded_folder;

1416

1417 if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK)

1418 die("curl_global_init failed");

@@ -1429,7 +1430,12 @@ static CURL *setup_curl(struct imap_server_conf *srvc, struct credential *cred)

1430 strbuf_addstr(&path, server.host);

1431 if (!path.len || path.buf[path.len - 1] != '/')

1432 strbuf_addch(&path, '/');

1432 - strbuf_addstr(&path, server.folder);

1433 +

1434 + uri_encoded_folder = curl_easy_escape(curl, server.folder, 0);

1435 + if (!uri_encoded_folder)

1436 + die("failed to encode server folder");

1437 + strbuf_addstr(&path, uri_encoded_folder);

1438 + curl_free(uri_encoded_folder);

1439

1440 curl_easy_setopt(curl, CURLOPT_URL, path.buf);

1441 strbuf_release(&path);