git-daemon: set REMOTE_ADDR to client address

joeyh · gitster · commit 53ffb878a94c · 2008-10-24T16:34:01.000-07:00
This allows hooks like pre-receive to look at the client's IP
address.

Of course the IP address can't be used to get strong security;
git-daemon isn't the right thing to use if you need that. However,
basic IP address checking can be good enough in some situations.

REMOTE_ADDR is the same environment variable used to communicate the
client's address to CGI scripts.

Signed-off-by: Joey Hess &lt;joey@kitenet.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
@@ -270,6 +270,15 @@ selectively enable/disable services per repository::
 ----------------------------------------------------------------
 
 
+ENVIRONMENT
+-----------
+'git-daemon' will set REMOTE_ADDR to the IP address of the client
+that connected to it, if the IP address is available. REMOTE_ADDR will
+be available in the environment of hooks called when
+services are performed.
+
+
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>, YOSHIFUJI Hideaki
diff --git a/daemon.c b/daemon.c
@@ -537,6 +537,10 @@ static int execute(struct sockaddr *addr)
 #endif
 		}
 		loginfo("Connection from %s:%d", addrbuf, port);
+		setenv("REMOTE_ADDR", addrbuf, 1);
+	}
+	else {
+		unsetenv("REMOTE_ADDR");
 	}
 
 	alarm(init_timeout ? init_timeout : timeout);

Original file line number	Diff line number	Diff line change
`@@ -537,6 +537,10 @@ static int execute(struct sockaddr *addr)`
`537`	`537`	`#endif`
`538`	`538`	`}`
`539`	`539`	`loginfo("Connection from %s:%d", addrbuf, port);`
	`540`	`+ setenv("REMOTE_ADDR", addrbuf, 1);`
	`541`	`+ }`
	`542`	`+ else {`
	`543`	`+ unsetenv("REMOTE_ADDR");`
`540`	`544`	`}`
`541`	`545`
`542`	`546`	`alarm(init_timeout ? init_timeout : timeout);`