diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-02-26 11:24:26 +0100 |
---|---|---|
committer | Jay Satiro <raysatiro@yahoo.com> | 2020-03-18 03:23:39 -0400 |
commit | 54504284918a4ba19bc7b1efb486a64629d376aa (patch) | |
tree | d945df3518472bcb02efcd95caf16bbdadd52d33 /src | |
parent | a268ad5d7e84189d8dfec3705d84a88ae064f7fc (diff) |
schannel: add "best effort" revocation check option
- Implement new option CURLSSLOPT_REVOKE_BEST_EFFORT and
--ssl-revoke-best-effort to allow a "best effort" revocation check.
A best effort revocation check ignores errors that the revocation check
was unable to take place. The reasoning is described in detail below and
discussed further in the PR.
---
When running e.g. with Fiddler, the schannel backend fails with an
unhelpful error message:
Unknown error (0x80092012) - The revocation function was unable
to check revocation for the certificate.
Sadly, many enterprise users who are stuck behind MITM proxies suffer
the very same problem.
This has been discussed in plenty of issues:
https://github.com/curl/curl/issues/3727,
https://github.com/curl/curl/issues/264, for example.
In the latter, a Microsoft Edge developer even made the case that the
common behavior is to ignore issues when a certificate has no recorded
distribution point for revocation lists, or when the server is offline.
This is also known as "best effort" strategy and addresses the Fiddler
issue.
Unfortunately, this strategy was not chosen as the default for schannel
(and is therefore a backend-specific behavior: OpenSSL seems to happily
ignore the offline servers and missing distribution points).
To maintain backward-compatibility, we therefore add a new flag
(`CURLSSLOPT_REVOKE_BEST_EFFORT`) and a new option
(`--ssl-revoke-best-effort`) to select the new behavior.
Due to the many related issues Git for Windows and GitHub Desktop, the
plan is to make this behavior the default in these software packages.
The test 2070 was added to verify this behavior, adapted from 310.
Based-on-work-by: georgeok <giorgos.n.oikonomou@gmail.com>
Co-authored-by: Markus Olsson <j.markus.olsson@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Closes https://github.com/curl/curl/pull/4981
Diffstat (limited to 'src')
-rw-r--r-- | src/tool_cfgable.h | 3 | ||||
-rw-r--r-- | src/tool_getparam.c | 6 | ||||
-rw-r--r-- | src/tool_help.c | 2 | ||||
-rw-r--r-- | src/tool_operate.c | 4 | ||||
-rw-r--r-- | src/tool_setopt.c | 1 |
5 files changed, 15 insertions, 1 deletions
diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h index e093b2c84..2ae7944e3 100644 --- a/src/tool_cfgable.h +++ b/src/tool_cfgable.h @@ -254,6 +254,9 @@ struct OperationConfig { bool ssl_no_revoke; /* disable SSL certificate revocation checks */ /*bool proxy_ssl_no_revoke; */ + bool ssl_revoke_best_effort; /* ignore SSL revocation offline/missing + revocation list errors */ + bool use_metalink; /* process given URLs as metalink XML file */ metalinkfile *metalinkfile_list; /* point to the first node */ metalinkfile *metalinkfile_last; /* point to the last/current node */ diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 764caa203..0c555cc96 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -249,6 +249,7 @@ static const struct LongShort aliases[]= { {"Eq", "cert-status", ARG_BOOL}, {"Er", "false-start", ARG_BOOL}, {"Es", "ssl-no-revoke", ARG_BOOL}, + {"ES", "ssl-revoke-best-effort", ARG_BOOL}, {"Et", "tcp-fastopen", ARG_BOOL}, {"Eu", "proxy-tlsuser", ARG_STRING}, {"Ev", "proxy-tlspassword", ARG_STRING}, @@ -1606,6 +1607,11 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ config->ssl_no_revoke = TRUE; break; + case 'S': /* --ssl-revoke-best-effort */ + if(curlinfo->features & CURL_VERSION_SSL) + config->ssl_revoke_best_effort = TRUE; + break; + case 't': /* --tcp-fastopen */ config->tcp_fastopen = TRUE; break; diff --git a/src/tool_help.c b/src/tool_help.c index 9ee99d174..4fe9e4ce0 100644 --- a/src/tool_help.c +++ b/src/tool_help.c @@ -437,6 +437,8 @@ static const struct helptxt helptext[] = { "Allow security flaw to improve interop"}, {" --ssl-no-revoke", "Disable cert revocation checks (Schannel)"}, + {" --ssl-revoke-best-effort", + "Ignore revocation offline or missing revocation list errors (Schannel)"}, {" --ssl-reqd", "Require SSL/TLS"}, {"-2, --sslv2", diff --git a/src/tool_operate.c b/src/tool_operate.c index ab06b71c5..3c7dd6829 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -1898,9 +1898,11 @@ static CURLcode single_transfer(struct GlobalConfig *global, my_setopt_str(curl, CURLOPT_GSSAPI_DELEGATION, config->gssapi_delegation); - /* new in 7.25.0 and 7.44.0 */ + /* new in 7.25.0, 7.44.0 and 7.70.0 */ { long mask = (config->ssl_allow_beast ? CURLSSLOPT_ALLOW_BEAST : 0) | + (config->ssl_revoke_best_effort ? + CURLSSLOPT_REVOKE_BEST_EFFORT : 0) | (config->ssl_no_revoke ? CURLSSLOPT_NO_REVOKE : 0); if(mask) my_setopt_bitmask(curl, CURLOPT_SSL_OPTIONS, mask); diff --git a/src/tool_setopt.c b/src/tool_setopt.c index 9b308bf4a..ef90e6e4a 100644 --- a/src/tool_setopt.c +++ b/src/tool_setopt.c @@ -125,6 +125,7 @@ const NameValueUnsigned setopt_nv_CURLSSLOPT[] = { NV(CURLSSLOPT_ALLOW_BEAST), NV(CURLSSLOPT_NO_REVOKE), NV(CURLSSLOPT_NO_PARTIALCHAIN), + NV(CURLSSLOPT_REVOKE_BEST_EFFORT), NVEND, }; |