From 864ea251983977b91a7f6ff5964e497cf4b208dc Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 8 Jun 2021 08:46:59 +0200 Subject: dirmngr: Rewrite the LDAP wrapper tool * dirmngr/ldap-misc.c: New. * dirmngr/ldap-misc.h: New. * dirmngr/ks-engine-ldap.c: Include ldap-misc.h. (ldap_err_to_gpg_err, ldap_to_gpg_err): Move to ldap-misc.c. * dirmngr/ldap-wrapper.c (ldap_wrapper): Print list of args in debug mode. * dirmngr/server.c (lookup_cert_by_pattern): Handle GPG_ERR_NOT_FOUND the saqme as GPG_ERR_NO_DATA. * dirmngr/ldap.c (run_ldap_wrapper): Add args tls_mode and ntds. Remove arg url. Adjust for changes in dirmngr_ldap. (url_fetch_ldap): Remove args host and port. Parse the URL and use these values to call run_ldap_wrapper. (attr_fetch_ldap): Pass tls flags to run_ldap_wrapper. (rfc2254_need_escape, rfc2254_escape): New. (extfilt_need_escape, extfilt_escape): New. (parse_one_pattern): Rename to ... (make_one_filter): this. Change for new dirmngr_ldap calling convention. Make issuer DN searching partly work. (escape4url, make_url): Remove. (start_cert_fetch_ldap): Change for new dirmngr_ldap calling convention. * dirmngr/dirmngr_ldap.c: Major rewrite. * dirmngr/t-ldap-misc.c: New. * dirmngr/t-support.h (DIM, DIMof): New. * dirmngr/Makefile.am (dirmngr_ldap_SOURCES): Add ldap-misc.c (module_tests) [USE_LDAP]: Add t-ldap-misc. (t_ldap_parse_uri_SOURCES): Ditto. (t_ldap_misc_SOURCES): New. -- This rewrite allows to properly handle TLS and avoids some code duplication. Signed-off-by: Werner Koch (cherry picked from commit 39815c023f0371dea01f7c51469b19c06ad18718) --- dirmngr/ldap-wrapper.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'dirmngr/ldap-wrapper.c') diff --git a/dirmngr/ldap-wrapper.c b/dirmngr/ldap-wrapper.c index 31de6e030..629c5c277 100644 --- a/dirmngr/ldap-wrapper.c +++ b/dirmngr/ldap-wrapper.c @@ -548,7 +548,7 @@ ldap_reaper_launch_thread (void) #ifdef HAVE_W32_SYSTEM /* Static init does not yet work in W32 nPth. */ if (npth_cond_init (&reaper_run_cond, NULL)) - log_fatal ("%s: failed to init condition variabale: %s\n", + log_fatal ("%s: failed to init condition variable: %s\n", __func__, gpg_strerror (gpg_error_from_syserror ())); #endif @@ -857,9 +857,9 @@ ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[]) err = gnupg_spawn_process (pgmname, arg_list, NULL, NULL, GNUPG_SPAWN_NONBLOCK, NULL, &outfp, &errfp, &pid); - xfree (arg_list); if (err) { + xfree (arg_list); xfree (ctx); log_error ("error running '%s': %s\n", pgmname, gpg_strerror (err)); return err; @@ -878,6 +878,7 @@ ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[]) err = ksba_reader_set_cb (*reader, reader_callback, ctx); if (err) { + xfree (arg_list); log_error (_("error initializing reader object: %s\n"), gpg_strerror (err)); destroy_wrapper (ctx); @@ -899,8 +900,15 @@ ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[]) unlock_reaper_list (); if (DBG_EXTPROG) - log_debug ("ldap wrapper %d started (%p, %s)\n", - (int)ctx->pid, ctx->reader, pgmname); + { + log_debug ("ldap wrapper %d started (%p, %s)", + (int)ctx->pid, ctx->reader, pgmname); + for (i=0; arg_list[i]; i++) + log_printf (" [%s]", arg_list[i]); + log_printf ("\n"); + } + xfree (arg_list); + /* Need to wait for the first byte so we are able to detect an empty output and not let the consumer see an EOF without further error -- cgit v1.2.3