mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-04 20:38:50 +01:00
20cb9319d9
* dirmngr/server.c (cmd_ks_get): Add option --first and --next.
(start_command_handler): Free that new ldap state.
* dirmngr/ks-engine-ldap.c (struct ks_engine_ldap_local_s): New.
(ks_ldap_new_state, ks_ldap_clear_state): New.
(ks_ldap_free_state): New.
(return_one_keyblock): New. Mostly factored out from ....
(ks_ldap_get): here. Implement --first/--next feature.
* dirmngr/ks-action.c (ks_action_get): Rename arg ldap_only to
ks_get_flags.
* dirmngr/ks-engine.h (KS_GET_FLAG_ONLY_LDAP): New.
(KS_GET_FLAG_FIRST): New.
(KS_GET_FLAG_NEXT): New.
* dirmngr/dirmngr.h (struct server_control_s): Add member
ks_get_state.
(struct ks_engine_ldap_local_s): New forward reference.
--
This feature allows to fetch keyblock by keyblock from an LDAP server.
This way tools can process and maybe filter each keyblock in a more
flexible way. Here is an example where two keyblocks for one mail
address are returned:
$ gpg-connect-agent --dirmngr
> ks_get --ldap --first <foo@example.org>
[... First keyblock is returned ]
OK
> ks_get --next
[ ... Next keyblock is returned ]
OK
> ks_get --next
ERR 167772218 No data <Dirmngr>
GnuPG_bug_id: 6224
Backported-from-master: 4de98d4468
84 lines
3.2 KiB
C
84 lines
3.2 KiB
C
/* ks-engine.h - Keyserver engines definitions
|
|
* Copyright (C) 2011 Free Software Foundation, Inc.
|
|
* Copyright (C) 2015 g10 Code GmbH
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef DIRMNGR_KS_ENGINE_H
|
|
#define DIRMNGR_KS_ENGINE_H 1
|
|
|
|
#include "http.h"
|
|
|
|
/* Flags for engine functions. */
|
|
#define KS_GET_FLAG_ONLY_LDAP 1
|
|
#define KS_GET_FLAG_FIRST 2
|
|
#define KS_GET_FLAG_NEXT 4
|
|
|
|
|
|
/*-- ks-action.c --*/
|
|
gpg_error_t ks_print_help (ctrl_t ctrl, const char *text);
|
|
gpg_error_t ks_printf_help (ctrl_t ctrl, const char *format,
|
|
...) GPGRT_ATTR_PRINTF(2,3);
|
|
|
|
/*-- ks-engine-hkp.c --*/
|
|
gpg_error_t ks_hkp_resolve (ctrl_t ctrl, parsed_uri_t uri);
|
|
gpg_error_t ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive);
|
|
gpg_error_t ks_hkp_print_hosttable (ctrl_t ctrl);
|
|
gpg_error_t ks_hkp_help (ctrl_t ctrl, parsed_uri_t uri);
|
|
gpg_error_t ks_hkp_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
|
|
estream_t *r_fp, unsigned int *r_http_status);
|
|
gpg_error_t ks_hkp_get (ctrl_t ctrl, parsed_uri_t uri,
|
|
const char *keyspec, estream_t *r_fp);
|
|
gpg_error_t ks_hkp_put (ctrl_t ctrl, parsed_uri_t uri,
|
|
const void *data, size_t datalen);
|
|
|
|
/*-- ks-engine-http.c --*/
|
|
|
|
/* Flags for the ks_http_fetch. */
|
|
#define KS_HTTP_FETCH_NOCACHE 1 /* Request no caching. */
|
|
#define KS_HTTP_FETCH_TRUST_CFG 2 /* Requests HTTP_FLAG_TRUST_CFG. */
|
|
#define KS_HTTP_FETCH_NO_CRL 4 /* Requests HTTP_FLAG_NO_CRL. */
|
|
#define KS_HTTP_FETCH_ALLOW_DOWNGRADE 8 /* Allow redirect https -> http. */
|
|
|
|
gpg_error_t ks_http_help (ctrl_t ctrl, parsed_uri_t uri);
|
|
gpg_error_t ks_http_fetch (ctrl_t ctrl, const char *url, unsigned int flags,
|
|
estream_t *r_fp);
|
|
|
|
|
|
/*-- ks-engine-finger.c --*/
|
|
gpg_error_t ks_finger_help (ctrl_t ctrl, parsed_uri_t uri);
|
|
gpg_error_t ks_finger_fetch (ctrl_t ctrl, parsed_uri_t uri, estream_t *r_fp);
|
|
|
|
/*-- ks-engine-kdns.c --*/
|
|
gpg_error_t ks_kdns_help (ctrl_t ctrl, parsed_uri_t uri);
|
|
gpg_error_t ks_kdns_fetch (ctrl_t ctrl, parsed_uri_t uri, estream_t *r_fp);
|
|
|
|
/*-- ks-engine-ldap.c --*/
|
|
gpg_error_t ks_ldap_help (ctrl_t ctrl, parsed_uri_t uri);
|
|
void ks_ldap_free_state (struct ks_engine_ldap_local_s *state);
|
|
gpg_error_t ks_ldap_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
|
|
estream_t *r_fp);
|
|
gpg_error_t ks_ldap_get (ctrl_t ctrl, parsed_uri_t uri,
|
|
const char *keyspec, unsigned int ks_get_flags,
|
|
estream_t *r_fp);
|
|
gpg_error_t ks_ldap_put (ctrl_t ctrl, parsed_uri_t uri,
|
|
void *data, size_t datalen,
|
|
void *info, size_t infolen);
|
|
|
|
|
|
#endif /*DIRMNGR_KS_ENGINE_H*/
|