summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-25 23:43:41 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-25 23:43:41 (GMT)
commit5e7bfe256755ef2862e960864db1edb829c82b77 (patch)
tree4015ea6443610bdf69724975fbc520c18b1bdcac /setup.c
parent5d318ce6a9fb18448e4a1a9b61d355d391ddc5ec (diff)
downloadgit-5e7bfe256755ef2862e960864db1edb829c82b77.zip
git-5e7bfe256755ef2862e960864db1edb829c82b77.tar.gz
git-5e7bfe256755ef2862e960864db1edb829c82b77.tar.bz2
setup_git_directory: make sure GIT_DIR is a valid repository.
setup_git_directory() always trusted what the user told where GIT_DIR was, and assumed that is a valid .git/ directory. This commit changes it to at least do the same level validation as is_toplevel_directory() does -- has refs/, has objects/ unless GIT_OBJECT_DIRECTORY is set, and has valid HEAD symlink or symref. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'setup.c')
-rw-r--r--setup.c42
1 files changed, 37 insertions, 5 deletions
diff --git a/setup.c b/setup.c
index c487d7e..ab3c778 100644
--- a/setup.c
+++ b/setup.c
@@ -73,8 +73,8 @@ const char **get_pathspec(const char *prefix, const char **pathspec)
}
/*
- * Test it it looks like we're at the top
- * level git directory. We want to see a
+ * Test if it looks like we're at the top level git directory.
+ * We want to see:
*
* - either a .git/objects/ directory _or_ the proper
* GIT_OBJECT_DIRECTORY environment variable
@@ -92,17 +92,43 @@ static int is_toplevel_directory(void)
return 1;
}
-const char *setup_git_directory(void)
+static const char *setup_git_directory_1(void)
{
static char cwd[PATH_MAX+1];
int len, offset;
/*
* If GIT_DIR is set explicitly, we're not going
- * to do any discovery
+ * to do any discovery, but we still do repository
+ * validation.
*/
- if (getenv(GIT_DIR_ENVIRONMENT))
+ if (getenv(GIT_DIR_ENVIRONMENT)) {
+ char path[PATH_MAX];
+ int len = strlen(getenv(GIT_DIR_ENVIRONMENT));
+ if (sizeof(path) - 40 < len)
+ die("'$%s' too big", GIT_DIR_ENVIRONMENT);
+ memcpy(path, getenv(GIT_DIR_ENVIRONMENT), len);
+
+ strcpy(path + len, "/refs");
+ if (access(path, X_OK))
+ goto bad_dir_environ;
+ strcpy(path + len, "/HEAD");
+ if (validate_symref(path))
+ goto bad_dir_environ;
+ if (getenv(DB_ENVIRONMENT)) {
+ if (access(DB_ENVIRONMENT, X_OK))
+ goto bad_dir_environ;
+ }
+ else {
+ strcpy(path + len, "/objects");
+ if (access(path, X_OK))
+ goto bad_dir_environ;
+ }
return NULL;
+ bad_dir_environ:
+ path[len] = 0;
+ die("Not a git repository: '%s'", path);
+ }
if (!getcwd(cwd, sizeof(cwd)) || cwd[0] != '/')
die("Unable to read current working directory");
@@ -127,3 +153,9 @@ const char *setup_git_directory(void)
cwd[len] = 0;
return cwd + offset;
}
+
+const char *setup_git_directory(void)
+{
+ const char *retval = setup_git_directory_1();
+ return retval;
+}