[PATCH v5.1 2/3] http-backend: Use http.getanyfile to disable dumb HTTP serving

From

Shawn O. Pearce <spearce@spearce.org>

Date

Nov 5, 2009, 01:16 UTC

Message-ID

<1257383798-29826-2-git-send-email-spearce@spearce.org>

In-Reply-To

<1257383798-29826-1-git-send-email-spearce@spearce.org>

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 Documentation/git-http-backend.txt |    8 ++++++++
 http-backend.c                     |   34 ++++++++++++++++++++++++++++------
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/Documentation/git-http-backend.txt b/Documentation/git-http-backend.txt
index f17251a..67aec06 100644
--- a/Documentation/git-http-backend.txt
+++ b/Documentation/git-http-backend.txt
@@ -29,6 +29,14 @@ SERVICES
 These services can be enabled/disabled using the per-repository
 configuration file:
 
+http.getanyfile::
+	This serves older Git clients which are unable to use the
+	upload pack service.  When enabled, clients are able to read
+	any file within the repository, including objects that are
+	no longer reachable from a branch but are still present.
+	It is enabled by default, but a repository can disable it
+	by setting this configuration item to `false`.
+
 http.uploadpack::
 	This serves 'git-fetch-pack' and 'git-ls-remote' clients.
 	It is enabled by default, but a repository can disable it
diff --git a/http-backend.c b/http-backend.c
index 7900cda..9021266 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -10,6 +10,7 @@
 static const char content_type[] = "Content-Type";
 static const char content_length[] = "Content-Length";
 static const char last_modified[] = "Last-Modified";
+static int getanyfile = 1;
 
 static struct string_list *query_params;
 
@@ -194,6 +195,12 @@ static NORETURN void forbidden(const char *err, ...)
 	exit(0);
 }
 
+static void select_getanyfile(void)
+{
+	if (!getanyfile)
+		forbidden("Unsupported service: getanyfile");
+}
+
 static void send_strbuf(const char *type, struct strbuf *buf)
 {
 	hdr_int(content_length, buf->len);
@@ -238,38 +245,51 @@ static void send_file(const char *the_type, const char *name)
 
 static void get_text_file(char *name)
 {
+	select_getanyfile();
 	hdr_nocache();
 	send_file("text/plain", name);
 }
 
 static void get_loose_object(char *name)
 {
+	select_getanyfile();
 	hdr_cache_forever();
 	send_file("application/x-git-loose-object", name);
 }
 
 static void get_pack_file(char *name)
 {
+	select_getanyfile();
 	hdr_cache_forever();
 	send_file("application/x-git-packed-objects", name);
 }
 
 static void get_idx_file(char *name)
 {
+	select_getanyfile();
 	hdr_cache_forever();
 	send_file("application/x-git-packed-objects-toc", name);
 }
 
 static int http_config(const char *var, const char *value, void *cb)
 {
-	struct rpc_service *svc = cb;
-
-	if (!prefixcmp(var, "http.") &&
-	    !strcmp(var + 5, svc->config_name)) {
-		svc->enabled = git_config_bool(var, value);
+	if (!strcmp(var, "http.getanyfile")) {
+		getanyfile = git_config_bool(var, value);
 		return 0;
 	}
 
+	if (!prefixcmp(var, "http.")) {
+		int i;
+
+		for (i = 0; i < ARRAY_SIZE(rpc_service); i++) {
+			struct rpc_service *svc = &rpc_service[i];
+			if (!strcmp(var + 5, svc->config_name)) {
+				svc->enabled = git_config_bool(var, value);
+				return 0;
+			}
+		}
+	}
+
 	/* we are not interested in parsing any other configuration here */
 	return 0;
 }
@@ -293,7 +313,6 @@ static struct rpc_service *select_service(const char *name)
 	if (!svc)
 		forbidden("Unsupported service: '%s'", name);
 
-	git_config(http_config, svc);
 	if (svc->enabled < 0) {
 		const char *user = getenv("REMOTE_USER");
 		svc->enabled = (user && *user) ? 1 : 0;
@@ -442,6 +461,7 @@ static void get_info_refs(char *arg)
 		run_service(argv);
 
 	} else {
+		select_getanyfile();
 		for_each_ref(show_text_ref, &buf);
 		send_strbuf("text/plain", &buf);
 	}
@@ -455,6 +475,7 @@ static void get_info_packs(char *arg)
 	struct packed_git *p;
 	size_t cnt = 0;
 
+	select_getanyfile();
 	prepare_packed_git();
 	for (p = packed_git; p; p = p->next) {
 		if (p->pack_local)
@@ -621,6 +642,7 @@ int main(int argc, char **argv)
 	if (!enter_repo(dir, 0))
 		not_found("Not a git repository: '%s'", dir);
 
+	git_config(http_config, NULL);
 	cmd->imp(cmd_arg);
 	return 0;
 }

-- 
1.6.5.2.295.g0d105