@matheusbsbs / matheus-bagliano / commits / dd4676299d
Fork 0

Cleaned up git-daemon virtual hosting support.

Standardized on lowercase hostnames from client. Added interpolation values for the IP address, port and canonical hostname of the server as it is contacted and named by the client and passed in via the extended args. Added --listen=host_or_ipaddr option suport. Renamed port variable as "listen_port" correspondingly as well. Documented mutual exclusivity of --inetd option with --user, --group, --listen and --port options. Added compat/inet_pton.c from Paul Vixie as needed. Small memory leaks need to be cleaned up still. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Jon Loeliger committed Sep 26, 2006 at 09:47 UTC dd4676299dde0a4c6f8a471e6353170f86a78c8a
4 files changed +389 -28
Documentation/git-daemon.txt
+37 -6
@@ -8,14 +8,15 @@ git-daemon - A really simple server for git repositories
8 SYNOPSIS
9 --------
10 [verse]
11 -'git-daemon' [--verbose] [--syslog] [--inetd | --port=n] [--export-all]
11 +'git-daemon' [--verbose] [--syslog] [--export-all]
12 [--timeout=n] [--init-timeout=n] [--strict-paths]
13 [--base-path=path] [--user-path | --user-path=path]
14 [--interpolated-path=pathtemplate]
15 + [--reuseaddr] [--detach] [--pid-file=file]
16 [--enable=service] [--disable=service]
17 [--allow-override=service] [--forbid-override=service]
17 - [--reuseaddr] [--detach] [--pid-file=file]
18 - [--user=user [--group=group]] [directory...]
18 + [--inetd | [--listen=host_or_ipaddr] [--port=n] [--user=user [--group=group]]
19 + [directory...]
20
21 DESCRIPTION
22 -----------
@@ -54,8 +55,12 @@ OPTIONS
55 --interpolated-path=pathtemplate::
56 To support virtual hosting, an interpolated path template can be
57 used to dynamically construct alternate paths. The template
57 - supports %H for the target hostname as supplied by the client,
58 + supports %H for the target hostname as supplied by the client but
59 + converted to all lowercase, %CH for the canonical hostname,
60 + %IP for the server's IP address, %P for the port number,
61 and %D for the absolute path of the named repository.
62 + After interpolation, the path is validated against the directory
63 + whitelist.
64
65 --export-all::
66 Allow pulling from all directories that look like GIT repositories
@@ -64,9 +69,17 @@ OPTIONS
69
70 --inetd::
71 Have the server run as an inetd service. Implies --syslog.
72 + Incompatible with --port, --listen, --user and --group options.
73 +
74 +--listen=host_or_ipaddr::
75 + Listen on an a specific IP address or hostname. IP addresses can
76 + be either an IPv4 address or an IPV6 address if supported. If IPv6
77 + is not supported, then --listen=hostname is also not supported and
78 + --listen must be given an IPv4 address.
79 + Incompatible with '--inetd' option.
80
68 ---port::
69 - Listen on an alternative port.
81 +--port=n::
82 + Listen on an alternative port. Incompatible with '--inetd' option.
83
84 --init-timeout::
85 Timeout between the moment the connection is established and the
@@ -182,6 +195,24 @@ clients, a symlink from `/software` into the appropriate
195 default repository could be made as well.
196
197
198 +git-daemon as regular daemon for virtual hosts::
199 + To set up `git-daemon` as a regular, non-inetd service that
200 + handles repositories for multiple virtual hosts based on
201 + their IP addresses, start the daemon like this:
202 ++
203 +------------------------------------------------
204 + git-daemon --verbose --export-all
205 + --interpolated-path=/pub/%IP/%D
206 + /pub/192.168.1.200/software
207 + /pub/10.10.220.23/software
208 +------------------------------------------------
209 ++
210 +In this example, the root-level directory `/pub` will contain
211 +a subdirectory for each virtual host IP address supported.
212 +Repositories can still be accessed by hostname though, assuming
213 +they correspond to these IP addresses.
214 +
215 +
216 Author
217 ------
218 Written by Linus Torvalds <torvalds@osdl.org>, YOSHIFUJI Hideaki
Makefile
+3
@@ -524,6 +524,9 @@ endif
524 ifdef NO_INET_NTOP
525 LIB_OBJS += compat/inet_ntop.o
526 endif
527 +ifdef NO_INET_PTON
528 + LIB_OBJS += compat/inet_pton.o
529 +endif
530
531 ifdef NO_ICONV
532 ALL_CFLAGS += -DNO_ICONV
compat/inet_pton.c new
+220
@@ -0,0 +1,220 @@
1 +/*
2 + * Copyright (C) 1996-2001 Internet Software Consortium.
3 + *
4 + * Permission to use, copy, modify, and distribute this software for any
5 + * purpose with or without fee is hereby granted, provided that the above
6 + * copyright notice and this permission notice appear in all copies.
7 + *
8 + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
9 + * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
10 + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
11 + * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
12 + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
13 + * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
14 + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
15 + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 + */
17 +
18 +#include <errno.h>
19 +#include <sys/types.h>
20 +#include <sys/socket.h>
21 +#include <sys/socket.h>
22 +#include <netinet/in.h>
23 +#include <arpa/inet.h>
24 +#include <stdio.h>
25 +#include <string.h>
26 +
27 +#ifndef NS_INT16SZ
28 +#define NS_INT16SZ 2
29 +#endif
30 +
31 +#ifndef NS_INADDRSZ
32 +#define NS_INADDRSZ 4
33 +#endif
34 +
35 +#ifndef NS_IN6ADDRSZ
36 +#define NS_IN6ADDRSZ 16
37 +#endif
38 +
39 +/*
40 + * WARNING: Don't even consider trying to compile this on a system where
41 + * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX.
42 + */
43 +
44 +static int inet_pton4(const char *src, unsigned char *dst);
45 +static int inet_pton6(const char *src, unsigned char *dst);
46 +
47 +/* int
48 + * inet_pton4(src, dst)
49 + * like inet_aton() but without all the hexadecimal and shorthand.
50 + * return:
51 + * 1 if `src' is a valid dotted quad, else 0.
52 + * notice:
53 + * does not touch `dst' unless it's returning 1.
54 + * author:
55 + * Paul Vixie, 1996.
56 + */
57 +static int
58 +inet_pton4(const char *src, unsigned char *dst)
59 +{
60 + static const char digits[] = "0123456789";
61 + int saw_digit, octets, ch;
62 + unsigned char tmp[NS_INADDRSZ], *tp;
63 +
64 + saw_digit = 0;
65 + octets = 0;
66 + *(tp = tmp) = 0;
67 + while ((ch = *src++) != '\0') {
68 + const char *pch;
69 +
70 + if ((pch = strchr(digits, ch)) != NULL) {
71 + unsigned int new = *tp * 10 + (pch - digits);
72 +
73 + if (new > 255)
74 + return (0);
75 + *tp = new;
76 + if (! saw_digit) {
77 + if (++octets > 4)
78 + return (0);
79 + saw_digit = 1;
80 + }
81 + } else if (ch == '.' && saw_digit) {
82 + if (octets == 4)
83 + return (0);
84 + *++tp = 0;
85 + saw_digit = 0;
86 + } else
87 + return (0);
88 + }
89 + if (octets < 4)
90 + return (0);
91 + memcpy(dst, tmp, NS_INADDRSZ);
92 + return (1);
93 +}
94 +
95 +/* int
96 + * inet_pton6(src, dst)
97 + * convert presentation level address to network order binary form.
98 + * return:
99 + * 1 if `src' is a valid [RFC1884 2.2] address, else 0.
100 + * notice:
101 + * (1) does not touch `dst' unless it's returning 1.
102 + * (2) :: in a full address is silently ignored.
103 + * credit:
104 + * inspired by Mark Andrews.
105 + * author:
106 + * Paul Vixie, 1996.
107 + */
108 +
109 +#ifndef NO_IPV6
110 +static int
111 +inet_pton6(const char *src, unsigned char *dst)
112 +{
113 + static const char xdigits_l[] = "0123456789abcdef",
114 + xdigits_u[] = "0123456789ABCDEF";
115 + unsigned char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
116 + const char *xdigits, *curtok;
117 + int ch, saw_xdigit;
118 + unsigned int val;
119 +
120 + memset((tp = tmp), '\0', NS_IN6ADDRSZ);
121 + endp = tp + NS_IN6ADDRSZ;
122 + colonp = NULL;
123 + /* Leading :: requires some special handling. */
124 + if (*src == ':')
125 + if (*++src != ':')
126 + return (0);
127 + curtok = src;
128 + saw_xdigit = 0;
129 + val = 0;
130 + while ((ch = *src++) != '\0') {
131 + const char *pch;
132 +
133 + if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
134 + pch = strchr((xdigits = xdigits_u), ch);
135 + if (pch != NULL) {
136 + val <<= 4;
137 + val |= (pch - xdigits);
138 + if (val > 0xffff)
139 + return (0);
140 + saw_xdigit = 1;
141 + continue;
142 + }
143 + if (ch == ':') {
144 + curtok = src;
145 + if (!saw_xdigit) {
146 + if (colonp)
147 + return (0);
148 + colonp = tp;
149 + continue;
150 + }
151 + if (tp + NS_INT16SZ > endp)
152 + return (0);
153 + *tp++ = (unsigned char) (val >> 8) & 0xff;
154 + *tp++ = (unsigned char) val & 0xff;
155 + saw_xdigit = 0;
156 + val = 0;
157 + continue;
158 + }
159 + if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
160 + inet_pton4(curtok, tp) > 0) {
161 + tp += NS_INADDRSZ;
162 + saw_xdigit = 0;
163 + break; /* '\0' was seen by inet_pton4(). */
164 + }
165 + return (0);
166 + }
167 + if (saw_xdigit) {
168 + if (tp + NS_INT16SZ > endp)
169 + return (0);
170 + *tp++ = (unsigned char) (val >> 8) & 0xff;
171 + *tp++ = (unsigned char) val & 0xff;
172 + }
173 + if (colonp != NULL) {
174 + /*
175 + * Since some memmove()'s erroneously fail to handle
176 + * overlapping regions, we'll do the shift by hand.
177 + */
178 + const int n = tp - colonp;
179 + int i;
180 +
181 + for (i = 1; i <= n; i++) {
182 + endp[- i] = colonp[n - i];
183 + colonp[n - i] = 0;
184 + }
185 + tp = endp;
186 + }
187 + if (tp != endp)
188 + return (0);
189 + memcpy(dst, tmp, NS_IN6ADDRSZ);
190 + return (1);
191 +}
192 +#endif
193 +
194 +/* int
195 + * isc_net_pton(af, src, dst)
196 + * convert from presentation format (which usually means ASCII printable)
197 + * to network format (which is usually some kind of binary format).
198 + * return:
199 + * 1 if the address was valid for the specified address family
200 + * 0 if the address wasn't valid (`dst' is untouched in this case)
201 + * -1 if some other error occurred (`dst' is untouched in this case, too)
202 + * author:
203 + * Paul Vixie, 1996.
204 + */
205 +int
206 +inet_pton(int af, const char *src, void *dst)
207 +{
208 + switch (af) {
209 + case AF_INET:
210 + return (inet_pton4(src, dst));
211 +#ifndef NO_IPV6
212 + case AF_INET6:
213 + return (inet_pton6(src, dst));
214 +#endif
215 + default:
216 + errno = EAFNOSUPPORT;
217 + return (-1);
218 + }
219 + /* NOTREACHED */
220 +}
daemon.c
+129 -22
@@ -9,6 +9,7 @@
9 #include <syslog.h>
10 #include <pwd.h>
11 #include <grp.h>
12 +#include <limits.h>
13 #include "pkt-line.h"
14 #include "cache.h"
15 #include "exec_cmd.h"
@@ -19,13 +20,15 @@ static int verbose;
20 static int reuseaddr;
21
22 static const char daemon_usage[] =
22 -"git-daemon [--verbose] [--syslog] [--inetd | --port=n] [--export-all]\n"
23 +"git-daemon [--verbose] [--syslog] [--export-all]\n"
24 " [--timeout=n] [--init-timeout=n] [--strict-paths]\n"
25 " [--base-path=path] [--user-path | --user-path=path]\n"
26 " [--interpolated-path=path]\n"
27 " [--reuseaddr] [--detach] [--pid-file=file]\n"
28 " [--[enable|disable|allow-override|forbid-override]=service]\n"
28 -" [--user=user [[--group=group]] [directory...]";
29 +" [--inetd | [--listen=host_or_ipaddr] [--port=n]\n"
30 +" [--user=user [--group=group]]\n"
31 +" [directory...]";
32
33 /* List of acceptable pathname prefixes */
34 static char **ok_paths;
@@ -56,11 +59,17 @@ static unsigned int init_timeout;
59 * Feel free to make dynamic as needed.
60 */
61 #define INTERP_SLOT_HOST (0)
59 -#define INTERP_SLOT_DIR (1)
60 -#define INTERP_SLOT_PERCENT (2)
62 +#define INTERP_SLOT_CANON_HOST (1)
63 +#define INTERP_SLOT_IP (2)
64 +#define INTERP_SLOT_PORT (3)
65 +#define INTERP_SLOT_DIR (4)
66 +#define INTERP_SLOT_PERCENT (5)
67
68 static struct interp interp_table[] = {
69 { "%H", 0},
70 + { "%CH", 0},
71 + { "%IP", 0},
72 + { "%P", 0},
73 { "%D", 0},
74 { "%%", "%"},
75 };
@@ -408,9 +417,17 @@ static void parse_extra_args(char *extra_args, int buflen)
417 val = extra_args + 5;
418 vallen = strlen(val) + 1;
419 if (*val) {
411 - char *save = xmalloc(vallen);
420 + char *port;
421 + char *save = xmalloc(vallen); /* FIXME: Leak */
422 +
423 interp_table[INTERP_SLOT_HOST].value = save;
424 strlcpy(save, val, vallen);
425 + port = strrchr(save, ':');
426 + if (port) {
427 + *port = 0;
428 + port++;
429 + interp_table[INTERP_SLOT_PORT].value = port;
430 + }
431 }
432 /* On to the next one */
433 extra_args = val + vallen;
@@ -418,6 +435,73 @@ static void parse_extra_args(char *extra_args, int buflen)
435 }
436 }
437
438 +void fill_in_extra_table_entries(struct interp *itable)
439 +{
440 + char *hp;
441 + char *canon_host = NULL;
442 + char *ipaddr = NULL;
443 +
444 + /*
445 + * Replace literal host with lowercase-ized hostname.
446 + */
447 + hp = interp_table[INTERP_SLOT_HOST].value;
448 + for ( ; *hp; hp++)
449 + *hp = tolower(*hp);
450 +
451 + /*
452 + * Locate canonical hostname and its IP address.
453 + */
454 +#ifndef NO_IPV6
455 + {
456 + struct addrinfo hints;
457 + struct addrinfo *ai, *ai0;
458 + int gai;
459 + static char addrbuf[HOST_NAME_MAX + 1];
460 +
461 + memset(&hints, 0, sizeof(hints));
462 + hints.ai_flags = AI_CANONNAME;
463 +
464 + gai = getaddrinfo(interp_table[INTERP_SLOT_HOST].value, 0, &hints, &ai0);
465 + if (!gai) {
466 + for (ai = ai0; ai; ai = ai->ai_next) {
467 + struct sockaddr_in *sin_addr = (void *)ai->ai_addr;
468 +
469 + canon_host = xstrdup(ai->ai_canonname);
470 + inet_ntop(AF_INET, &sin_addr->sin_addr,
471 + addrbuf, sizeof(addrbuf));
472 + ipaddr = addrbuf;
473 + break;
474 + }
475 + freeaddrinfo(ai0);
476 + }
477 + }
478 +#else
479 + {
480 + struct hostent *hent;
481 + struct sockaddr_in sa;
482 + char **ap;
483 + static char addrbuf[HOST_NAME_MAX + 1];
484 +
485 + hent = gethostbyname(interp_table[INTERP_SLOT_HOST].value);
486 + canon_host = xstrdup(hent->h_name);
487 +
488 + ap = hent->h_addr_list;
489 + memset(&sa, 0, sizeof sa);
490 + sa.sin_family = hent->h_addrtype;
491 + sa.sin_port = htons(0);
492 + memcpy(&sa.sin_addr, *ap, hent->h_length);
493 +
494 + inet_ntop(hent->h_addrtype, &sa.sin_addr,
495 + addrbuf, sizeof(addrbuf));
496 + ipaddr = addrbuf;
497 + }
498 +#endif
499 +
500 + interp_table[INTERP_SLOT_CANON_HOST].value = canon_host; /* FIXME: Leak */
501 + interp_table[INTERP_SLOT_IP].value = xstrdup(ipaddr); /* FIXME: Leak */
502 +}
503 +
504 +
505 static int execute(struct sockaddr *addr)
506 {
507 static char line[1000];
@@ -458,8 +542,10 @@ static int execute(struct sockaddr *addr)
542 if (len && line[len-1] == '\n')
543 line[--len] = 0;
544
461 - if (len != pktlen)
545 + if (len != pktlen) {
546 parse_extra_args(line + len + 1, pktlen - len - 1);
547 + fill_in_extra_table_entries(interp_table);
548 + }
549
550 for (i = 0; i < ARRAY_SIZE(daemon_service); i++) {
551 struct daemon_service *s = &(daemon_service[i]);
@@ -663,23 +749,22 @@ static int set_reuse_addr(int sockfd)
749
750 #ifndef NO_IPV6
751
666 -static int socksetup(int port, int **socklist_p)
752 +static int socksetup(char *listen_addr, int listen_port, int **socklist_p)
753 {
754 int socknum = 0, *socklist = NULL;
755 int maxfd = -1;
756 char pbuf[NI_MAXSERV];
671 -
757 struct addrinfo hints, *ai0, *ai;
758 int gai;
759
675 - sprintf(pbuf, "%d", port);
760 + sprintf(pbuf, "%d", listen_port);
761 memset(&hints, 0, sizeof(hints));
762 hints.ai_family = AF_UNSPEC;
763 hints.ai_socktype = SOCK_STREAM;
764 hints.ai_protocol = IPPROTO_TCP;
765 hints.ai_flags = AI_PASSIVE;
766
682 - gai = getaddrinfo(NULL, pbuf, &hints, &ai0);
767 + gai = getaddrinfo(listen_addr, pbuf, &hints, &ai0);
768 if (gai)
769 die("getaddrinfo() failed: %s\n", gai_strerror(gai));
770
@@ -733,20 +818,27 @@ static int socksetup(int port, int **socklist_p)
818
819 #else /* NO_IPV6 */
820
736 -static int socksetup(int port, int **socklist_p)
821 +static int socksetup(char *lisen_addr, int listen_port, int **socklist_p)
822 {
823 struct sockaddr_in sin;
824 int sockfd;
825
826 + memset(&sin, 0, sizeof sin);
827 + sin.sin_family = AF_INET;
828 + sin.sin_port = htons(listen_port);
829 +
830 + if (listen_addr) {
831 + /* Well, host better be an IP address here. */
832 + if (inet_pton(AF_INET, listen_addr, &sin.sin_addr.s_addr) <= 0)
833 + return 0;
834 + } else {
835 + sin.sin_addr.s_addr = htonl(INADDR_ANY);
836 + }
837 +
838 sockfd = socket(AF_INET, SOCK_STREAM, 0);
839 if (sockfd < 0)
840 return 0;
841
745 - memset(&sin, 0, sizeof sin);
746 - sin.sin_family = AF_INET;
747 - sin.sin_addr.s_addr = htonl(INADDR_ANY);
748 - sin.sin_port = htons(port);
749 -
842 if (set_reuse_addr(sockfd)) {
843 close(sockfd);
844 return 0;
@@ -855,13 +947,14 @@ static void store_pid(const char *path)
947 fclose(f);
948 }
949
858 -static int serve(int port, struct passwd *pass, gid_t gid)
950 +static int serve(char *listen_addr, int listen_port, struct passwd *pass, gid_t gid)
951 {
952 int socknum, *socklist;
953
862 - socknum = socksetup(port, &socklist);
954 + socknum = socksetup(listen_addr, listen_port, &socklist);
955 if (socknum == 0)
864 - die("unable to allocate any listen sockets on port %u", port);
956 + die("unable to allocate any listen sockets on host %s port %u",
957 + listen_addr, listen_port);
958
959 if (pass && gid &&
960 (initgroups(pass->pw_name, gid) || setgid (gid) ||
@@ -873,7 +966,8 @@ static int serve(int port, struct passwd *pass, gid_t gid)
966
967 int main(int argc, char **argv)
968 {
876 - int port = DEFAULT_GIT_PORT;
969 + int listen_port = 0;
970 + char *listen_addr = NULL;
971 int inetd_mode = 0;
972 const char *pid_file = NULL, *user_name = NULL, *group_name = NULL;
973 int detach = 0;
@@ -890,12 +984,20 @@ int main(int argc, char **argv)
984 for (i = 1; i < argc; i++) {
985 char *arg = argv[i];
986
987 + if (!strncmp(arg, "--listen=", 9)) {
988 + char *p = arg + 9;
989 + char *ph = listen_addr = xmalloc(strlen(arg + 9) + 1);
990 + while (*p)
991 + *ph++ = tolower(*p++);
992 + *ph = 0;
993 + continue;
994 + }
995 if (!strncmp(arg, "--port=", 7)) {
996 char *end;
997 unsigned long n;
998 n = strtoul(arg+7, &end, 0);
999 if (arg[7] && !*end) {
898 - port = n;
1000 + listen_port = n;
1001 continue;
1002 }
1003 }
@@ -995,6 +1097,11 @@ int main(int argc, char **argv)
1097 if (inetd_mode && (group_name || user_name))
1098 die("--user and --group are incompatible with --inetd");
1099
1100 + if (inetd_mode && (listen_port || listen_addr))
1101 + die("--listen= and --port= are incompatible with --inetd");
1102 + else if (listen_port == 0)
1103 + listen_port = DEFAULT_GIT_PORT;
1104 +
1105 if (group_name && !user_name)
1106 die("--group supplied without --user");
1107
@@ -1043,5 +1150,5 @@ int main(int argc, char **argv)
1150 if (pid_file)
1151 store_pid(pid_file);
1152
1046 - return serve(port, pass, gid);
1153 + return serve(listen_addr, listen_port, pass, gid);
1154 }