Skip to content

Commit 6f96320

Browse files
dschoGit for Windows Build Agent
authored and
Git for Windows Build Agent
committed
http: use new "best effort" strategy for Secure Channel revoke checking
The native Windows HTTPS backend is based on Secure Channel which lets the caller decide how to handle revocation checking problems caused by missing information in the certificate or offline CRL distribution points. Unfortunately, cURL chose to handle these problems differently than OpenSSL by default: while OpenSSL happily ignores those problems (essentially saying "¯\_(ツ)_/¯"), the Secure Channel backend will error out instead. As a remedy, the "no revoke" mode was introduced, which turns off revocation checking altogether. This is a bit heavy-handed. We support this via the `http.schannelCheckRevoke` setting. In curl/curl#4981, we contributed an opt-in "best effort" strategy that emulates what OpenSSL seems to do. In Git for Windows, we actually want this to be the default. This patch makes it so, introducing it as a new value for the `http.schannelCheckRevoke" setting, which now becmes a tristate: it accepts the values "false", "true" or "best-effort" (defaulting to the last one). Signed-off-by: Johannes Schindelin <[email protected]>
1 parent aacc234 commit 6f96320

File tree

2 files changed

+29
-9
lines changed

2 files changed

+29
-9
lines changed

Documentation/config/http.adoc

+7-5
Original file line numberDiff line numberDiff line change
@@ -233,11 +233,13 @@ http.sslKeyType::
233233

234234
http.schannelCheckRevoke::
235235
Used to enforce or disable certificate revocation checks in cURL
236-
when http.sslBackend is set to "schannel". Defaults to `true` if
237-
unset. Only necessary to disable this if Git consistently errors
238-
and the message is about checking the revocation status of a
239-
certificate. This option is ignored if cURL lacks support for
240-
setting the relevant SSL option at runtime.
236+
when http.sslBackend is set to "schannel" via "true" and "false",
237+
respectively. Another accepted value is "best-effort" (the default)
238+
in which case revocation checks are performed, but errors due to
239+
revocation list distribution points that are offline are silently
240+
ignored, as well as errors due to certificates missing revocation
241+
list distribution points. This option is ignored if cURL lacks
242+
support for setting the relevant SSL option at runtime.
241243

242244
http.schannelUseSSLCAInfo::
243245
As of cURL v7.60.0, the Secure Channel backend can use the

http.c

+22-4
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,13 @@ static char *cached_accept_language;
143143

144144
static char *http_ssl_backend;
145145

146-
static int http_schannel_check_revoke = 1;
146+
static int http_schannel_check_revoke_mode =
147+
#ifdef CURLSSLOPT_REVOKE_BEST_EFFORT
148+
CURLSSLOPT_REVOKE_BEST_EFFORT;
149+
#else
150+
CURLSSLOPT_NO_REVOKE;
151+
#endif
152+
147153
/*
148154
* With the backend being set to `schannel`, setting sslCAinfo would override
149155
* the Certificate Store in cURL v7.60.0 and later, which is not what we want
@@ -418,7 +424,19 @@ static int http_options(const char *var, const char *value,
418424
}
419425

420426
if (!strcmp("http.schannelcheckrevoke", var)) {
421-
http_schannel_check_revoke = git_config_bool(var, value);
427+
if (value && !strcmp(value, "best-effort")) {
428+
http_schannel_check_revoke_mode =
429+
#ifdef CURLSSLOPT_REVOKE_BEST_EFFORT
430+
CURLSSLOPT_REVOKE_BEST_EFFORT;
431+
#else
432+
CURLSSLOPT_NO_REVOKE;
433+
warning(_("%s=%s unsupported by current cURL"),
434+
var, value);
435+
#endif
436+
} else
437+
http_schannel_check_revoke_mode =
438+
(git_config_bool(var, value) ?
439+
0 : CURLSSLOPT_NO_REVOKE);
422440
return 0;
423441
}
424442

@@ -1044,8 +1062,8 @@ static CURL *get_curl_handle(void)
10441062
#endif
10451063

10461064
if (http_ssl_backend && !strcmp("schannel", http_ssl_backend) &&
1047-
!http_schannel_check_revoke) {
1048-
curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NO_REVOKE);
1065+
http_schannel_check_revoke_mode) {
1066+
curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, http_schannel_check_revoke_mode);
10491067
}
10501068

10511069
if (http_proactive_auth != PROACTIVE_AUTH_NONE)

0 commit comments

Comments
 (0)