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

safe.directory: allow "lead/ing/path/*" match

Browse Source 
When safe.directory was introduced in v2.30.3 timeframe, 8959555c
(setup_git_directory(): add an owner check for the top-level
directory, 2022-03-02), it only allowed specific opt-out
directories.  Immediately after an embargoed release that included
the change, 0f85c4a3 (setup: opt-out of check with safe.directory=*,
2022-04-13) was done as a response to loosen the check so that a
single '*' can be used to say "I trust all repositories" for folks
who host too many repositories to list individually.

Let's further loosen the check to allow people to say "everything
under this hierarchy is deemed safe" by specifying such a leading
directory with "/*" appended to it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2024-05-29 09:02:16 -07:00
parent 786a3e4b8d
commit 313eec177a
3 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
setup.c
View File

@ -1176,13 +1176,21 @@ static int safe_directory_cb(const char *key, const char *value,
} else if (!strcmp(value, "*")) {
data->is_safe = 1;
} else {
const char *interpolated = NULL;
const char *allowed = NULL;
if (!git_config_pathname(&interpolated, key, value) &&
!fspathcmp(data->path, interpolated ? interpolated : value))
data->is_safe = 1;
free((char *)interpolated);
if (!git_config_pathname(&allowed, key, value)) {
if (!allowed)
allowed = value;
if (ends_with(allowed, "/*")) {
size_t len = strlen(allowed);
if (!fspathncmp(allowed, data->path, len - 1))
data->is_safe = 1;
} else if (!fspathcmp(data->path, allowed)) {
data->is_safe = 1;
}
}
if (allowed != value)
free((char *)allowed);
}
return 0;