Commit f51f66468ae890dbd639242216977b300bd3b437
2022-07-02T15:36:07
Revert "repo: allow administrator to own the configuration" This reverts commit cdff2f0237f663e0f68155655a8b66d05c1ec716. This change erroneously allowed system users to own a worktree; this should only be allowed when the current user is in the Administrator group on Windows as well.
diff --git a/src/libgit2/repository.c b/src/libgit2/repository.c
index d248431..48a0b70 100644
--- a/src/libgit2/repository.c
+++ b/src/libgit2/repository.c
@@ -512,7 +512,7 @@ static int validate_ownership(const char *repo_path)
bool is_safe;
int error;
- if ((error = git_fs_path_owner_is_system_or_current_user(&is_safe, repo_path)) < 0) {
+ if ((error = git_fs_path_owner_is_current_user(&is_safe, repo_path)) < 0) {
if (error == GIT_ENOTFOUND)
error = 0;
diff --git a/tests/libgit2/repo/open.c b/tests/libgit2/repo/open.c
index 5c66eca..4b6609a 100644
--- a/tests/libgit2/repo/open.c
+++ b/tests/libgit2/repo/open.c
@@ -484,10 +484,9 @@ void test_repo_open__validates_dir_ownership(void)
cl_git_pass(git_repository_open(&repo, "empty_standard_repo"));
git_repository_free(repo);
- /* When the system user owns the repo config, also acceptable */
+ /* When the system user owns the repo config, fail */
git_fs_path__set_owner(GIT_FS_PATH_MOCK_OWNER_SYSTEM);
- cl_git_pass(git_repository_open(&repo, "empty_standard_repo"));
- git_repository_free(repo);
+ cl_git_fail(git_repository_open(&repo, "empty_standard_repo"));
/* When an unknown user owns the repo config, fail */
git_fs_path__set_owner(GIT_FS_PATH_MOCK_OWNER_OTHER);