[PATCH] http: add custom hostname to IP address resolves
- From
Christian Couder <christian.couder@gmail.com>
- Date
- May 2, 2022, 08:36 UTC
- Message-ID
- <20220502083639.610279-1-chriscool@tuxfamily.org>
Libcurl has a CURLOPT_RESOLVE easy option that allows hostname resolve information in the following form to be passed:
[+]HOST:PORT:ADDRESS[,ADDRESS]
This way, redirects and everything operating against the HOST+PORT will use the provided ADDRESS(s).
The following form is also allowed to stop using these resolves:
-HOST:PORT
Let's add a corresponding "http.hostResolve" config option that takes advantage of CURLOPT_RESOLVE.
Each value configured for the "http.hostResolve" key is passed "as is" to curl through CURLOPT_RESOLVE, so it should be in one of the above 2 forms. This keeps the implementation simple and makes us consistent with libcurl's CURLOPT_RESOLVE, and with curl's corresponding `--resolve` command line option.
The implementation is similar to what is done for the "http.extraHeader" config option, except that we use CURLOPT_RESOLVE only in get_active_slot() which is called by all the HTTP request sending functions.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> ---
I am not sure if some tests could/should be added. Ideas about how to test this are welcome.
Documentation/config/http.txt | 16 ++++++++++++++++ http.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+)
diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt index 7003661c0d..37b293a73b 100644 --- a/Documentation/config/http.txt +++ b/Documentation/config/http.txt @@ -98,6 +98,22 @@ http.version:: - HTTP/2 - HTTP/1.1 +http.hostResolve:: + Hostname resolve information that will be used first when sending + HTTP requests. This information should be in one of the following + forms: + + - [+]HOST:PORT:ADDRESS[,ADDRESS] + - -HOST:PORT + ++ +The first form redirects all requests to the given `HOST:PORT` +to the provided `ADDRESS`(s). The second form clears all previous +config values for that `HOST:PORT` combination. To allow easy +overriding of all the settings inherited from the system config, +an empty value will reset all resolve information to the empty +list. + http.sslVersion:: The SSL version to use when negotiating an SSL connection, if you want to force the default. The available and default version diff --git a/http.c b/http.c index 229da4d148..e9cc46ee52 100644 --- a/http.c +++ b/http.c @@ -128,6 +128,9 @@ static struct curl_slist *pragma_header; static struct curl_slist *no_pragma_header; static struct string_list extra_http_headers = STRING_LIST_INIT_DUP; +static struct curl_slist *host_resolves; +static struct string_list http_host_resolve = STRING_LIST_INIT_DUP; + static struct active_request_slot *active_queue_head; static char *cached_accept_language; @@ -393,6 +396,17 @@ static int http_options(const char *var, const char *value, void *cb) return 0; } + if (!strcmp("http.hostresolve", var)) { + if (!value) { + return config_error_nonbool(var); + } else if (!*value) { + string_list_clear(&http_host_resolve, 0); + } else { + string_list_append(&http_host_resolve, value); + } + return 0; + } + if (!strcmp("http.followredirects", var)) { if (value && !strcmp(value, "initial")) http_follow_config = HTTP_FOLLOW_INITIAL; @@ -985,6 +999,17 @@ static void set_from_env(const char **var, const char *envname) *var = val; } +static struct curl_slist *http_copy_host_resolve(void) +{ + struct curl_slist *hosts = NULL; + const struct string_list_item *item; + + for_each_string_list_item(item, &http_host_resolve) + hosts = curl_slist_append(hosts, item->string); + + return hosts; +} + void http_init(struct remote *remote, const char *url, int proactive_auth) { char *low_speed_limit; @@ -1048,6 +1073,8 @@ void http_init(struct remote *remote, const char *url, int proactive_auth) no_pragma_header = curl_slist_append(http_copy_default_headers(), "Pragma:"); + host_resolves = http_copy_host_resolve(); + { char *http_max_requests = getenv("GIT_HTTP_MAX_REQUESTS"); if (http_max_requests != NULL) @@ -1124,6 +1151,7 @@ void http_cleanup(void) curl_global_cleanup(); string_list_clear(&extra_http_headers, 0); + string_list_clear(&http_host_resolve, 0); curl_slist_free_all(pragma_header); pragma_header = NULL; @@ -1131,6 +1159,9 @@ void http_cleanup(void) curl_slist_free_all(no_pragma_header); no_pragma_header = NULL; + curl_slist_free_all(host_resolves); + host_resolves = NULL; + if (curl_http_proxy) { free((void *)curl_http_proxy); curl_http_proxy = NULL; @@ -1211,6 +1242,7 @@ struct active_request_slot *get_active_slot(void) if (curl_save_cookies) curl_easy_setopt(slot->curl, CURLOPT_COOKIEJAR, curl_cookie_file); curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, pragma_header); + curl_easy_setopt(slot->curl, CURLOPT_RESOLVE, host_resolves); curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, curl_errorstr); curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, NULL); curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, NULL);
-- 2.36.0