undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/partial-urlmatch'

Browse Source 
The same as js/partial-urlmatch-2.17, built on more recent codebase
to avoid unnecessary merge conflicts.

* js/partial-urlmatch:
  credential: handle `credential.<partial-URL>.<key>` again
  credential: optionally allow partial URLs in credential_from_url_gently()
This commit is contained in:
Junio C Hamano 2020-05-05 14:54:29 -07:00
commit 568324f31b
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
credential.c
View File

@ -86,6 +86,22 @@ static int select_all(const struct urlmatch_item *a,
return 0;
}
static int match_partial_url(const char *url, void *cb)
{
struct credential *c = cb;
struct credential want = CREDENTIAL_INIT;
int matches = 0;
if (credential_from_potentially_partial_url(&want, url) < 0)
warning(_("skipping credential lookup for key: credential.%s"),
url);
else
matches = credential_match(&want, c);
credential_clear(&want);
return matches;
}
static void credential_apply_config(struct credential *c)
{
char *normalized_url;
@ -105,6 +121,7 @@ static void credential_apply_config(struct credential *c)
config.collect_fn = credential_config_callback;
config.cascade_fn = NULL;
config.select_fn = select_all;
config.fallback_match_fn = match_partial_url;
config.cb = c;
credential_format(c, &url);

10
urlmatch.c
View File

@ -572,10 +572,14 @@ int urlmatch_config_entry(const char *var, const char *value, void *cb)
config_url = xmemdupz(key, dot - key);
norm_url = url_normalize_1(config_url, &norm_info, 1);
if (norm_url)
retval = match_urls(url, &norm_info, &matched);
else if (collect->fallback_match_fn)
retval = collect->fallback_match_fn(config_url,
collect->cb);
else
retval = 0;
free(config_url);
if (!norm_url)
return 0;
retval = match_urls(url, &norm_info, &matched);
free(norm_url);
if (!retval)
return 0;

5
urlmatch.h
View File

@ -59,6 +59,11 @@ struct urlmatch_config {
* specificity rules) than existing.
*/
int (*select_fn)(const struct urlmatch_item *found, const struct urlmatch_item *existing);
/*
* An optional callback to allow e.g. for partial URLs; it shall
* return 1 or 0 depending whether `url` matches or not.
*/
int (*fallback_match_fn)(const char *url, void *cb);
};
int urlmatch_config_entry(const char *var, const char *value, void *cb);