Re: [PATCH] git-daemon virtual hosting implementation.
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:37
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] git-daemon virtual hosting implementation. · Pierre Habouzit <hidden>
- 2016-06-15 · Re: [PATCH] git-daemon virtual hosting implementation. · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] git-daemon virtual hosting implementation. · Jon Loeliger <hidden>
Pierre Habouzit [off-list ref] writes:
just add the hostname in the path when using --base-path and --user-path. this should be enough for most needs. Signed-off-by: Pierre Habouzit <redacted> --- Here is a proposal for daemon side virtualhosting support.
quoted hunk
@@ -158,6 +160,11 @@ static char *path_ok(char *dir) return NULL; } + if (use_vhosts && !vhost) { + logerror("using virtual hosting, and not host= was specified !"); + return NULL; + } +
This part is objectionable -- older clients do not give "host=". I think the plan, when virtual hosting was proposed and we added this to the client side first, was to treat older clients as if they specified the "primary" host. So we would need some mechanism to say where the repositories of the "primary" host lives.
+ if (use_vhosts) {
+ loginfo("host <%s>, "
+ "userpath <%s>, request <%s>, "
+ "namlen %d, restlen %d, slash <%s>",
+ vhost,
+ user_path, dir,
+ namlen, restlen, slash);
+ snprintf(rpath, PATH_MAX, "%.*s/%s/%s%.*s",
+ namlen, dir, user_path, vhost,
+ restlen, slash);I am not sure if the interaction between user-path and vhost should go like this, but I do not think of a good alternative to suggest right now. Your code allows ~user/host1 and ~user/host2 to host different set of repositories, but I suspect if somebody is setting up a virtual hosting of two hosts, he might want to have two distinct set of users (iow to pretend that ~user exist only on host1 but not on host2). I dunno.