diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-04-24 11:49:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-29 15:37:36 (GMT) |
| commit | 9a121b0d226dd0017318be0d18120aeb766f1235 (patch) | |
| tree | 04944a76b4e56059b833e564bce2db6e91780295 /credential.c | |
| parent | 6828e5972b82f474cc14ca9cb9e01e897f205f4c (diff) | |
| download | git-9a121b0d226dd0017318be0d18120aeb766f1235.zip git-9a121b0d226dd0017318be0d18120aeb766f1235.tar.gz git-9a121b0d226dd0017318be0d18120aeb766f1235.tar.bz2 | |
credential: handle `credential.<partial-URL>.<key>` again
In the patches for CVE-2020-11008, the ability to specify credential
settings in the config for partial URLs got lost. For example, it used
to be possible to specify a credential helper for a specific protocol:
[credential "https://"]
helper = my-https-helper
Likewise, it used to be possible to configure settings for a specific
host, e.g.:
[credential "dev.azure.com"]
useHTTPPath = true
Let's reinstate this behavior.
While at it, increase the test coverage to document and verify the
behavior with a couple other categories of partial URLs.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'credential.c')
| -rw-r--r-- | credential.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/credential.c b/credential.c index 7dbbf26..c1a9ca4 100644 --- a/credential.c +++ b/credential.c @@ -35,6 +35,10 @@ int credential_match(const struct credential *want, #undef CHECK } + +static int credential_from_potentially_partial_url(struct credential *c, + const char *url); + static int credential_config_callback(const char *var, const char *value, void *data) { @@ -53,7 +57,13 @@ static int credential_config_callback(const char *var, const char *value, char *url = xmemdupz(key, dot - key); int matched; - credential_from_url(&want, url); + if (credential_from_potentially_partial_url(&want, url) < 0) { + warning(_("skipping credential lookup for key: %s"), + var); + credential_clear(&want); + free(url); + return 0; + } matched = credential_match(&want, c); credential_clear(&want); @@ -430,6 +440,12 @@ static int credential_from_url_1(struct credential *c, const char *url, return 0; } +static int credential_from_potentially_partial_url(struct credential *c, + const char *url) +{ + return credential_from_url_1(c, url, 1, 0); +} + int credential_from_url_gently(struct credential *c, const char *url, int quiet) { return credential_from_url_1(c, url, 0, quiet); |