From: Tay Ray Chuan Date: Thu, 08 Apr 2010 02:15:18 GMT Subject: [PATCH v3 3/3] remote-curl: ensure that URLs have a trailing slash Message-ID: <1270692918-4300-3-git-send-email-rctay89@gmail.com> In-Reply-To: <1270692918-4300-2-git-send-email-rctay89@gmail.com> Previously, we blindly assumed that URLs passed to the remote-curl helper did not end with a trailing slash. Use the convenience function end_url_with_slash() from http.[ch] to ensure that URLs have a trailing slash on invocation of the remote-curl helper, and use the URL as one with a trailing slash throughout. It is possible for users to pass a URL with a trailing slash to remote-curl, by, say, setting it in remote..url in their git config. The resulting requests have an empty path component (//) and may break implementations of the http git protocol. Signed-off-by: Tay Ray Chuan --- remote-curl.c | 16 +++++++++++----- t/t5541-http-push.sh | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/remote-curl.c b/remote-curl.c index 0782756..ae14137 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -9,6 +9,10 @@ #include "sideband.h" static struct remote *remote; + +/* At assignment-time, we append a trailing slash; always use this as + * if it ends with a slash. + */ static const char *url; struct options { @@ -101,7 +105,7 @@ static struct discovery* discover_refs(const char *service) return last; free_discovery(last); - strbuf_addf(&buffer, "%s/info/refs", url); + strbuf_addf(&buffer, "%sinfo/refs", url); if (!prefixcmp(url, "http://") || !prefixcmp(url, "https://")) { is_http = 1; if (!strchr(url, '?')) @@ -120,7 +124,7 @@ static struct discovery* discover_refs(const char *service) strbuf_reset(&buffer); proto_git_candidate = 0; - strbuf_addf(&buffer, "%s/info/refs", url); + strbuf_addf(&buffer, "%sinfo/refs", url); refs_url = strbuf_detach(&buffer, NULL); http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE); @@ -511,7 +515,7 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads) rpc->out = client.out; strbuf_init(&rpc->result, 0); - strbuf_addf(&buf, "%s/%s", url, svc); + strbuf_addf(&buf, "%s%s", url, svc); rpc->service_url = strbuf_detach(&buf, NULL); strbuf_addf(&buf, "Content-Type: application/x-%s-request", svc); @@ -800,11 +804,13 @@ int main(int argc, const char **argv) remote = remote_get(argv[1]); if (argc > 2) { - url = argv[2]; + end_url_with_slash(&buf, argv[2]); } else { - url = remote->url[0]; + end_url_with_slash(&buf, remote->url[0]); } + url = strbuf_detach(&buf, NULL); + http_init(remote); do { diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh index e94ac78..17e1bdc 100755 --- a/t/t5541-http-push.sh +++ b/t/t5541-http-push.sh @@ -38,7 +38,7 @@ cat >exp <