mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
![brian m. carlson](/assets/img/avatar_default.png)
In some cases, a user will want to use a specific credential helper for a wildcard pattern, such as https://*.corp.example.com. We have code that handles this already with the urlmatch code, so let's use that instead of our custom code. Since the urlmatch code is a superset of our current matching in terms of capabilities, there shouldn't be any cases of things that matched previously that don't match now. However, in addition to wildcard matching, we now use partial path matching, which can cause slightly different behavior in the case that a helper applies to the prefix (considering path components) of the remote URL. While different, this is probably the behavior people were wanting anyway. Since we're using the urlmatch code, we need to encode the components we've gotten into a URL to match, so add a function to percent-encode data and format the URL with it. We now also no longer need to the custom code to match URLs, so let's remove it. Additionally, the urlmatch code always looks for the best match, whereas we want all matches for credential helpers to preserve existing behavior. Let's add an optional field, select_fn, that lets us control which items we want (in this case, all of them) and default it to the best-match code that already exists for other users. Signed-off-by: brian m. carlson <bk2204@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
67 lines
2.5 KiB
C
67 lines
2.5 KiB
C
#ifndef URL_MATCH_H
|
|
#define URL_MATCH_H
|
|
|
|
#include "string-list.h"
|
|
|
|
struct url_info {
|
|
/* normalized url on success, must be freed, otherwise NULL */
|
|
char *url;
|
|
/* if !url, a brief reason for the failure, otherwise NULL */
|
|
const char *err;
|
|
|
|
/* the rest of the fields are only set if url != NULL */
|
|
|
|
size_t url_len; /* total length of url (which is now normalized) */
|
|
size_t scheme_len; /* length of scheme name (excluding final :) */
|
|
size_t user_off; /* offset into url to start of user name (0 => none) */
|
|
size_t user_len; /* length of user name; if user_off != 0 but
|
|
user_len == 0, an empty user name was given */
|
|
size_t passwd_off; /* offset into url to start of passwd (0 => none) */
|
|
size_t passwd_len; /* length of passwd; if passwd_off != 0 but
|
|
passwd_len == 0, an empty passwd was given */
|
|
size_t host_off; /* offset into url to start of host name (0 => none) */
|
|
size_t host_len; /* length of host name;
|
|
* file urls may have host_len == 0 */
|
|
size_t port_off; /* offset into url to start of port number (0 => none) */
|
|
size_t port_len; /* if a portnum is present (port_off != 0), it has
|
|
* this length (excluding the leading ':') starting
|
|
* from port_off (always 0 for file urls) */
|
|
size_t path_off; /* offset into url to the start of the url path;
|
|
* this will always point to a '/' character
|
|
* after the url has been normalized */
|
|
size_t path_len; /* length of path portion excluding any trailing
|
|
* '?...' and '#...' portion; will always be >= 1 */
|
|
};
|
|
|
|
char *url_normalize(const char *, struct url_info *);
|
|
|
|
struct urlmatch_item {
|
|
size_t hostmatch_len;
|
|
size_t pathmatch_len;
|
|
char user_matched;
|
|
};
|
|
|
|
struct urlmatch_config {
|
|
struct string_list vars;
|
|
struct url_info url;
|
|
const char *section;
|
|
const char *key;
|
|
|
|
void *cb;
|
|
int (*collect_fn)(const char *var, const char *value, void *cb);
|
|
int (*cascade_fn)(const char *var, const char *value, void *cb);
|
|
/*
|
|
* Compare the two matches, the one just discovered and the existing
|
|
* best match and return a negative value if the found item is to be
|
|
* rejected or a non-negative value if it is to be accepted. If this
|
|
* field is set to NULL, use the default comparison technique, which
|
|
* checks to ses if found is better (according to the urlmatch
|
|
* specificity rules) than existing.
|
|
*/
|
|
int (*select_fn)(const struct urlmatch_item *found, const struct urlmatch_item *existing);
|
|
};
|
|
|
|
int urlmatch_config_entry(const char *var, const char *value, void *cb);
|
|
|
|
#endif /* URL_MATCH_H */
|