2a0e11479f
The IPC socket used by the fsmonitor on Darwin is usually contained in the Git repository itself. When the repository is hosted on a networked filesystem though, we instead create the socket path in the user's home directory or the socket directory. In that case, we derive the path by hashing the repository path. But while we always use SHA1 to hash the repository path, we then end up using `hash_to_hex()` to append the computed hash to the socket path. This is wrong because `hash_to_hex()` uses the hash algorithm configured in `the_repository`, which may not be SHA1. The consequence is that we may append uninitialized bytes to the path when operating in a SHA256 repository. Fix this bug by using `hash_to_hex_algop()` with SHA1. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
58 lines
1.5 KiB
C
58 lines
1.5 KiB
C
#include "git-compat-util.h"
|
|
#include "config.h"
|
|
#include "gettext.h"
|
|
#include "hex.h"
|
|
#include "path.h"
|
|
#include "repository.h"
|
|
#include "strbuf.h"
|
|
#include "fsmonitor-ll.h"
|
|
#include "fsmonitor-ipc.h"
|
|
#include "fsmonitor-path-utils.h"
|
|
|
|
static GIT_PATH_FUNC(fsmonitor_ipc__get_default_path, "fsmonitor--daemon.ipc")
|
|
|
|
const char *fsmonitor_ipc__get_path(struct repository *r)
|
|
{
|
|
static const char *ipc_path = NULL;
|
|
git_SHA_CTX sha1ctx;
|
|
char *sock_dir = NULL;
|
|
struct strbuf ipc_file = STRBUF_INIT;
|
|
unsigned char hash[GIT_SHA1_RAWSZ];
|
|
|
|
if (!r)
|
|
BUG("No repository passed into fsmonitor_ipc__get_path");
|
|
|
|
if (ipc_path)
|
|
return ipc_path;
|
|
|
|
|
|
/* By default the socket file is created in the .git directory */
|
|
if (fsmonitor__is_fs_remote(r->gitdir) < 1) {
|
|
ipc_path = fsmonitor_ipc__get_default_path();
|
|
return ipc_path;
|
|
}
|
|
|
|
git_SHA1_Init(&sha1ctx);
|
|
git_SHA1_Update(&sha1ctx, r->worktree, strlen(r->worktree));
|
|
git_SHA1_Final(hash, &sha1ctx);
|
|
|
|
repo_config_get_string(r, "fsmonitor.socketdir", &sock_dir);
|
|
|
|
/* Create the socket file in either socketDir or $HOME */
|
|
if (sock_dir && *sock_dir) {
|
|
strbuf_addf(&ipc_file, "%s/.git-fsmonitor-%s",
|
|
sock_dir, hash_to_hex_algop(hash, &hash_algos[GIT_HASH_SHA1]));
|
|
} else {
|
|
strbuf_addf(&ipc_file, "~/.git-fsmonitor-%s",
|
|
hash_to_hex_algop(hash, &hash_algos[GIT_HASH_SHA1]));
|
|
}
|
|
free(sock_dir);
|
|
|
|
ipc_path = interpolate_path(ipc_file.buf, 1);
|
|
if (!ipc_path)
|
|
die(_("Invalid path: %s"), ipc_file.buf);
|
|
|
|
strbuf_release(&ipc_file);
|
|
return ipc_path;
|
|
}
|