mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'nd/git-daemon-error-msgs' into next
* nd/git-daemon-error-msgs: daemon: return "access denied" if a service is not allowed
This commit is contained in:
commit
209126d108
12
daemon.c
12
daemon.c
|
@ -257,11 +257,11 @@ static int run_service(char *dir, struct daemon_service *service)
|
|||
if (!enabled && !service->overridable) {
|
||||
logerror("'%s': service not enabled.", service->name);
|
||||
errno = EACCES;
|
||||
return -1;
|
||||
goto failed;
|
||||
}
|
||||
|
||||
if (!(path = path_ok(dir)))
|
||||
return -1;
|
||||
goto failed;
|
||||
|
||||
/*
|
||||
* Security on the cheap.
|
||||
|
@ -277,7 +277,7 @@ static int run_service(char *dir, struct daemon_service *service)
|
|||
if (!export_all_trees && access("git-daemon-export-ok", F_OK)) {
|
||||
logerror("'%s': repository not exported.", path);
|
||||
errno = EACCES;
|
||||
return -1;
|
||||
goto failed;
|
||||
}
|
||||
|
||||
if (service->overridable) {
|
||||
|
@ -291,7 +291,7 @@ static int run_service(char *dir, struct daemon_service *service)
|
|||
logerror("'%s': service not enabled for '%s'",
|
||||
service->name, path);
|
||||
errno = EACCES;
|
||||
return -1;
|
||||
goto failed;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -301,6 +301,10 @@ static int run_service(char *dir, struct daemon_service *service)
|
|||
signal(SIGTERM, SIG_IGN);
|
||||
|
||||
return service->fn();
|
||||
|
||||
failed:
|
||||
packet_write(1, "ERR %s: access denied", dir);
|
||||
return -1;
|
||||
}
|
||||
|
||||
static void copy_to_log(int fd)
|
||||
|
|
Loading…
Reference in a new issue