# [PATCH] http-push: support full URI in handle_remote_ls_ctx() 3 messages from 2009-01-18 to 2009-01-18. Participants: Kirill A. Korinskiy, Johannes Schindelin, Junio C Hamano. Thread: https://gitlist.dev/t/17234 ## Kirill A. Korinskiy, 2009-01-18 11:28 Subject: [PATCH] http-push: support full URI in handle_remote_ls_ctx() Message-ID: <1232278116-6631-1-git-send-email-catap@catap.ru> URL: https://gitlist.dev/e/1232278116-6631-1-git-send-email-catap%40catap.ru ``` The program calls remote_ls() to get list of files from the server over HTTP; handle_remote_ls_ctx() is used to parse its response to populate "struct remote_ls_ctx" that is returned from remote_ls(). The handle_remote_ls_ctx() function assumed that the server returns a local path in href field, but RFC 4918 (14.7) demand of support full URI (e.g. "http://localhost:8080/repo.git"). This resulted in push failure (e.g. git-http-push issues a PROPFIND request to "/repo.git/alhost:8080/repo.git/refs/" to the server). Signed-off-by: Kirill A. Korinskiy --- http-push.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/http-push.c b/http-push.c index 7c6460919bf3eba10c46cede11ffdd9c53fd2dd2..2cb925a9ad857b6d79858d5187f14072167282e7 100644 --- a/http-push.c +++ b/http-push.c @@ -87,6 +87,7 @@ static struct object_list *objects; struct repo { char *url; + char *path; int path_len; int has_info_refs; int can_update_info_refs; @@ -1424,9 +1425,18 @@ static void handle_remote_ls_ctx(struct xml_ctx *ctx, int tag_closed) ls->userFunc(ls); } } else if (!strcmp(ctx->name, DAV_PROPFIND_NAME) && ctx->cdata) { - ls->dentry_name = xmalloc(strlen(ctx->cdata) - + char *path = ctx->cdata; + if (!strcmp(ctx->cdata, "http://")) { + path = strchr(path + sizeof("http://") - 1, '/'); + } else if (!strcmp(ctx->cdata, "https://")) { + path = strchr(path + sizeof("https://") - 1, '/'); + } + + path += remote->path_len; + + ls->dentry_name = xmalloc(strlen(path) - remote->path_len + 1); - strcpy(ls->dentry_name, ctx->cdata + remote->path_len); + strcpy(ls->dentry_name, path + remote->path_len); } else if (!strcmp(ctx->name, DAV_PROPFIND_COLLECTION)) { ls->dentry_flags |= IS_DIR; } @@ -2206,10 +2216,11 @@ int main(int argc, char **argv) if (!remote->url) { char *path = strstr(arg, "//"); remote->url = arg; + remote->path_len = strlen(arg); if (path) { - path = strchr(path+2, '/'); - if (path) - remote->path_len = strlen(path); + remote->path = strchr(path+2, '/'); + if (remote->path) + remote->path_len = strlen(remote->path); } continue; } @@ -2238,8 +2249,9 @@ int main(int argc, char **argv) rewritten_url = xmalloc(strlen(remote->url)+2); strcpy(rewritten_url, remote->url); strcat(rewritten_url, "/"); + remote->path = rewritten_url + (remote->path - remote->url); + remote->path_len++; remote->url = rewritten_url; - ++remote->path_len; } /* Verify DAV compliance/lock support */ -- 1.5.6.5 ``` ## Johannes Schindelin, 2009-01-18 14:51 Subject: Re: [PATCH] http-push: support full URI in handle_remote_ls_ctx() Message-ID: URL: https://gitlist.dev/e/alpine.DEB.1.00.0901181546100.3586%40pacific.mpi-cbg.de In-Reply-To: <1232278116-6631-1-git-send-email-catap@catap.ru> ``` Hi, On Sun, 18 Jan 2009, Kirill A. Korinskiy wrote: > The program calls remote_ls() to get list of files from the server > over HTTP; handle_remote_ls_ctx() is used to parse its response to > populate "struct remote_ls_ctx" that is returned from remote_ls(). > > The handle_remote_ls_ctx() function assumed that the server returns a > local path in href field, but RFC 4918 (14.7) demand of support full > URI (e.g. "http://localhost:8080/repo.git"). > > This resulted in push failure (e.g. git-http-push issues a PROPFIND > request to "/repo.git/alhost:8080/repo.git/refs/" to the server). > > Signed-off-by: Kirill A. Korinskiy > --- > http-push.c | 24 ++++++++++++++++++------ > 1 files changed, 18 insertions(+), 6 deletions(-) > > diff --git a/http-push.c b/http-push.c > index 7c6460919bf3eba10c46cede11ffdd9c53fd2dd2..2cb925a9ad857b6d79858d5187f14072167282e7 100644 You mean this patch is not vs junio/next(bbe7a8ed3dac72b7a1372cd92f68f47965c10100) or junio/master or junio/maint(both a4b7d08663504a57008f66a39fffe293f62c1d08) but tags/v1.6.1-rc4~13? Ciao, Dscho ``` ## Junio C Hamano, 2009-01-18 21:28 Subject: Re: [PATCH] http-push: support full URI in handle_remote_ls_ctx() Message-ID: <7v63kcuwwr.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7v63kcuwwr.fsf%40gitster.siamese.dyndns.org In-Reply-To: <1232278116-6631-1-git-send-email-catap@catap.ru> ``` "Kirill A. Korinskiy" writes: > @@ -1424,9 +1425,18 @@ static void handle_remote_ls_ctx(struct xml_ctx *ctx, int tag_closed) > ls->userFunc(ls); > } > } else if (!strcmp(ctx->name, DAV_PROPFIND_NAME) && ctx->cdata) { > - ls->dentry_name = xmalloc(strlen(ctx->cdata) - > + char *path = ctx->cdata; > + if (!strcmp(ctx->cdata, "http://")) { > + path = strchr(path + sizeof("http://") - 1, '/'); > + } else if (!strcmp(ctx->cdata, "https://")) { > + path = strchr(path + sizeof("https://") - 1, '/'); > + } > + > + path += remote->path_len; I see you chose to address the issue I pointed out in: http://thread.gmane.org/gmane.comp.version-control.git/103804/focus=104363 by being more strict. That's the only change I can spot compared to e1f33ef (http-push: support full URI in handle_remote_ls_ctx(), 2008-12-23) that is already in maint. Could you make this into an incremental patch? ```