undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jg/credential-cache-chdir-to-sockdir'

Browse Source 
The "credential-cache" daemon process used to run in whatever
directory it happened to start in, but this made umount(2)ing the
filesystem that houses the repository harder; now the process
chdir()s to the directory that house its own socket on startup.

* jg/credential-cache-chdir-to-sockdir:
  credential-cache--daemon: change to the socket dir on startup
  credential-cache--daemon: disallow relative socket path
  credential-cache--daemon: refactor check_socket_directory
This commit is contained in:
Junio C Hamano 2016-02-26 13:37:20 -08:00
commit 2a24444aae
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-credential-cache.txt
View File

@ -36,7 +36,7 @@ OPTIONS
cache daemon if one is not started). Defaults to cache daemon if one is not started). Defaults to
`~/.git-credential-cache/socket`. If your home directory is on a `~/.git-credential-cache/socket`. If your home directory is on a
network-mounted filesystem, you may need to change this to a network-mounted filesystem, you may need to change this to a
local filesystem. local filesystem. You must specify an absolute path.
CONTROLLING THE DAEMON CONTROLLING THE DAEMON
---------------------- ----------------------

22
credential-cache--daemon.c
View File

@ -215,7 +215,7 @@ static const char permissions_advice[] =
"users may be able to read your cached credentials. Consider running:\n" "users may be able to read your cached credentials. Consider running:\n"
"\n" "\n"
" chmod 0700 %s"; " chmod 0700 %s";
static void check_socket_directory(const char *path) static void init_socket_directory(const char *path)
{ {
struct stat st; struct stat st;
char *path_copy = xstrdup(path); char *path_copy = xstrdup(path);
@ -224,10 +224,7 @@ static void check_socket_directory(const char *path)
if (!stat(dir, &st)) { if (!stat(dir, &st)) {
if (st.st_mode & 077) if (st.st_mode & 077)
die(permissions_advice, dir); die(permissions_advice, dir);
free(path_copy); } else {
return;
}
/* /*
* We must be sure to create the directory with the correct mode, * We must be sure to create the directory with the correct mode,
* not just chmod it after the fact; otherwise, there is a race * not just chmod it after the fact; otherwise, there is a race
@ -238,6 +235,16 @@ static void check_socket_directory(const char *path)
die_errno("unable to create directories for '%s'", dir); die_errno("unable to create directories for '%s'", dir);
if (mkdir(dir, 0700) < 0) if (mkdir(dir, 0700) < 0)
die_errno("unable to mkdir '%s'", dir); die_errno("unable to mkdir '%s'", dir);
}
if (chdir(dir))
/*
* We don't actually care what our cwd is; we chdir here just to
* be a friendly daemon and avoid tying up our original cwd.
* If this fails, it's OK to just continue without that benefit.
*/
;
free(path_copy); free(path_copy);
} }
@ -264,7 +271,10 @@ int main(int argc, const char **argv)
if (!socket_path) if (!socket_path)
usage_with_options(usage, options); usage_with_options(usage, options);
check_socket_directory(socket_path); if (!is_absolute_path(socket_path))
die("socket directory must be an absolute path");
init_socket_directory(socket_path);
register_tempfile(&socket_file, socket_path); register_tempfile(&socket_file, socket_path);
if (ignore_sighup) if (ignore_sighup)