mirror of
https://github.com/git/git
synced 2024-10-30 04:01:21 +00:00
Merge master.kernel.org:/home/hpa/git/daemon
This commit is contained in:
commit
d710b2655c
2 changed files with 74 additions and 6 deletions
72
daemon.c
72
daemon.c
|
@ -12,7 +12,13 @@
|
|||
static int log_syslog;
|
||||
static int verbose;
|
||||
|
||||
static const char daemon_usage[] = "git-daemon [--verbose] [--syslog] [--inetd | --port=n]";
|
||||
static const char daemon_usage[] = "git-daemon [--verbose] [--syslog] [--inetd | --port=n] [--export-all] [directory...]";
|
||||
|
||||
/* List of acceptable pathname prefixes */
|
||||
static char **ok_paths = NULL;
|
||||
|
||||
/* If this is set, git-daemon-export-ok is not required */
|
||||
static int export_all_trees = 0;
|
||||
|
||||
|
||||
static void logreport(int priority, const char *err, va_list params)
|
||||
|
@ -69,14 +75,62 @@ void loginfo(const char *err, ...)
|
|||
va_end(params);
|
||||
}
|
||||
|
||||
static int path_ok(const char *dir)
|
||||
{
|
||||
const char *p = dir;
|
||||
char **pp;
|
||||
int sl = 1, ndot = 0;
|
||||
|
||||
for (;;) {
|
||||
if ( *p == '.' ) {
|
||||
ndot++;
|
||||
} else if ( *p == '/' || *p == '\0' ) {
|
||||
if ( sl && ndot > 0 && ndot < 3 )
|
||||
return 0; /* . or .. in path */
|
||||
sl = 1;
|
||||
if ( *p == '\0' )
|
||||
break; /* End of string and all is good */
|
||||
} else {
|
||||
sl = ndot = 0;
|
||||
}
|
||||
p++;
|
||||
}
|
||||
|
||||
if ( ok_paths && *ok_paths ) {
|
||||
int ok = 0;
|
||||
int dirlen = strlen(dir); /* read_packet_line can return embedded \0 */
|
||||
|
||||
for ( pp = ok_paths ; *pp ; pp++ ) {
|
||||
int len = strlen(*pp);
|
||||
if ( len <= dirlen &&
|
||||
!strncmp(*pp, dir, len) &&
|
||||
(dir[len] == '/' || dir[len] == '\0') ) {
|
||||
ok = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ( !ok )
|
||||
return 0; /* Path not in whitelist */
|
||||
}
|
||||
|
||||
return 1; /* Path acceptable */
|
||||
}
|
||||
|
||||
static int upload(char *dir, int dirlen)
|
||||
{
|
||||
loginfo("Request for '%s'", dir);
|
||||
|
||||
if (!path_ok(dir)) {
|
||||
logerror("Forbidden directory: %s\n", dir);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (chdir(dir) < 0) {
|
||||
logerror("Cannot chdir('%s'): %s", dir, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
chdir(".git");
|
||||
|
||||
/*
|
||||
|
@ -86,10 +140,10 @@ static int upload(char *dir, int dirlen)
|
|||
* a "git-daemon-export-ok" flag that says that the other side
|
||||
* is ok with us doing this.
|
||||
*/
|
||||
if (access("git-daemon-export-ok", F_OK) ||
|
||||
if ((!export_all_trees && access("git-daemon-export-ok", F_OK)) ||
|
||||
access("objects/00", X_OK) ||
|
||||
access("HEAD", R_OK)) {
|
||||
logerror("Not a valid gitd-enabled repository: '%s'", dir);
|
||||
logerror("Not a valid git-daemon-enabled repository: '%s'", dir);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -441,7 +495,6 @@ int main(int argc, char **argv)
|
|||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (!strcmp(arg, "--inetd")) {
|
||||
inetd_mode = 1;
|
||||
continue;
|
||||
|
@ -455,6 +508,17 @@ int main(int argc, char **argv)
|
|||
openlog("git-daemon", 0, LOG_DAEMON);
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--export-all")) {
|
||||
export_all_trees = 1;
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--")) {
|
||||
ok_paths = &argv[i+1];
|
||||
break;
|
||||
} else if (arg[0] != '-') {
|
||||
ok_paths = &argv[i];
|
||||
break;
|
||||
}
|
||||
|
||||
usage(daemon_usage);
|
||||
}
|
||||
|
|
|
@ -23,12 +23,12 @@ elsewhere for tools for ordinary humans layered on top of this.
|
|||
%setup -q
|
||||
|
||||
%build
|
||||
make COPTS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \
|
||||
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \
|
||||
prefix=%{_prefix} all %{!?_without_docs: doc}
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \
|
||||
make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \
|
||||
prefix=%{_prefix} mandir=%{_mandir} \
|
||||
install %{!?_without_docs: install-doc}
|
||||
|
||||
|
@ -45,6 +45,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{!?_without_docs: %{_mandir}/man7/*.7*}
|
||||
|
||||
%changelog
|
||||
* Tue Sep 27 2005 H. Peter Anvin <hpa@zytor.com>
|
||||
- parallelize build
|
||||
- COPTS -> CFLAGS
|
||||
|
||||
* Fri Sep 16 2005 Chris Wright <chrisw@osdl.org> 0.99.6-1
|
||||
- update to 0.99.6
|
||||
|
||||
|
|
Loading…
Reference in a new issue