From 137e59a6a5c5cd89091471811bf7c7c67de5890d Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 11 Apr 2022 17:57:14 +0200 Subject: sm: Print diagnostic about CRL problems due to Tor mode. * dirmngr/crlfetch.c (crl_fetch, crl_fetch_default) (ca_cert_fetch, start_cert_fetch): Factor Tor error out to ... (no_crl_due_to_tor): new. Print status note. * dirmngr/ks-engine-ldap.c (ks_ldap_get) (ks_ldap_search, ks_ldap_put): Factor Tor error out to ... (no_ldap_due_to_tor): new. Print status note. * dirmngr/ocsp.c (do_ocsp_request): Print status note. * sm/misc.c (gpgsm_print_further_info): New. * sm/call-dirmngr.c (warning_and_note_printer): New. (isvalid_status_cb): Call it. (lookup_status_cb): Ditto. (run_command_status_cb): Ditto. * common/asshelp2.c (vprint_assuan_status): Strip a possible trailing LF. -- --- dirmngr/crlfetch.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'dirmngr/crlfetch.c') diff --git a/dirmngr/crlfetch.c b/dirmngr/crlfetch.c index b3fdc0cc6..2e0859861 100644 --- a/dirmngr/crlfetch.c +++ b/dirmngr/crlfetch.c @@ -147,6 +147,19 @@ my_es_read (void *opaque, char *buffer, size_t nbytes, size_t *nread) } +/* For now we do not support LDAP over Tor. */ +static gpg_error_t +no_crl_due_to_tor (ctrl_t ctrl) +{ + gpg_error_t err = gpg_error (GPG_ERR_NOT_SUPPORTED); + const char *text = _("CRL access not possible due to Tor mode"); + + log_error ("%s", text); + dirmngr_status_printf (ctrl, "NOTE", "no_crl_due_to_tor %u %s", err, text); + return gpg_error (GPG_ERR_NOT_SUPPORTED); +} + + /* Fetch CRL from URL and return the entire CRL using new ksba reader object in READER. Note that this reader object should be closed only using ldap_close_reader. */ @@ -233,9 +246,7 @@ crl_fetch (ctrl_t ctrl, const char *url, ksba_reader_t *reader) } else if (dirmngr_use_tor ()) { - /* For now we do not support LDAP over Tor. */ - log_error (_("CRL access not possible due to Tor mode\n")); - err = gpg_error (GPG_ERR_NOT_SUPPORTED); + err = no_crl_due_to_tor (ctrl); } else { @@ -259,9 +270,7 @@ crl_fetch_default (ctrl_t ctrl, const char *issuer, ksba_reader_t *reader) { if (dirmngr_use_tor ()) { - /* For now we do not support LDAP over Tor. */ - log_error (_("CRL access not possible due to Tor mode\n")); - return gpg_error (GPG_ERR_NOT_SUPPORTED); + return no_crl_due_to_tor (ctrl); } if (opt.disable_ldap) { @@ -291,9 +300,7 @@ ca_cert_fetch (ctrl_t ctrl, cert_fetch_context_t *context, const char *dn) { if (dirmngr_use_tor ()) { - /* For now we do not support LDAP over Tor. */ - log_error (_("CRL access not possible due to Tor mode\n")); - return gpg_error (GPG_ERR_NOT_SUPPORTED); + return no_crl_due_to_tor (ctrl); } if (opt.disable_ldap) { @@ -318,9 +325,7 @@ start_cert_fetch (ctrl_t ctrl, cert_fetch_context_t *context, { if (dirmngr_use_tor ()) { - /* For now we do not support LDAP over Tor. */ - log_error (_("CRL access not possible due to Tor mode\n")); - return gpg_error (GPG_ERR_NOT_SUPPORTED); + return no_crl_due_to_tor (ctrl); } if (opt.disable_ldap) { -- cgit v1.2.3