mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

safe.directory: normalize the checked path

Browse Source 
The pathname of a repository comes from getcwd() and it could be a
path aliased via symbolic links, e.g., the real directory may be
/home/u/repository but a symbolic link /home/u/repo may point at it,
and the clone request may come as "git clone file:///home/u/repo/".

A request to check if /home/u/repo is safe would be rejected if the
safe.directory configuration allows /home/u/repository/ but not its
alias /home/u/repo/.  Normalize the path being checked before
comparing with safe.directory value(s).

Suggested-by: Phillip Wood <phillip.wood123@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2024-07-30 11:43:50 -07:00
parent 1048aa8b7a
commit 7f547c99a6
2 changed files with 69 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
setup.c
View File

@ -1215,7 +1215,7 @@ static int canonicalize_ceiling_entry(struct string_list_item *item,
}
struct safe_directory_data {
const char *path;
char *path;
int is_safe;
};
@ -1261,9 +1261,7 @@ static int ensure_valid_ownership(const char *gitfile,
const char *worktree, const char *gitdir,
struct strbuf *report)
{
struct safe_directory_data data = {
.path = worktree ? worktree : gitdir
};
struct safe_directory_data data = { 0 };
if (!git_env_bool("GIT_TEST_ASSUME_DIFFERENT_OWNER", 0) &&
(!gitfile || is_path_owned_by_current_user(gitfile, report)) &&
@ -1271,6 +1269,15 @@ static int ensure_valid_ownership(const char *gitfile,
(!gitdir || is_path_owned_by_current_user(gitdir, report)))
return 1;
/*
* normalize the data.path for comparison with normalized paths
* that come from the configuration file. The path is unsafe
* if it cannot be normalized.
*/
data.path = real_pathdup(worktree ? worktree : gitdir, 0);
if (!data.path)
return 0;
/*
* data.path is the "path" that identifies the repository and it is
* constant regardless of what failed above. data.is_safe should be
@ -1278,6 +1285,7 @@ static int ensure_valid_ownership(const char *gitfile,
*/
git_protected_config(safe_directory_cb, &data);
free(data.path);
return data.is_safe;
}