mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-04 20:38:50 +01:00
9b43220b8a
* dirmngr/dirmngr.c (oConnectTimeout, oConnectQuickTimeout): New enums. (opts): New options --connect-timeout and --connect-quick-timeout. (DEFAULT_CONNECT_TIMEOUT): New. (DEFAULT_CONNECT_QUICK_TIMEOUT): New. (parse_rereadable_options): Handle new options. (post_option_parsing): New. Use instead of direct calls to set_debug() and set_tor_mode (). (main): Setup default timeouts. (dirmngr_init_default_ctrl): Set standard connect timeout. * dirmngr/dirmngr.h (opt): New fields connect_timeout and connect_quick_timeout. (server_control_s): New field timeout. * dirmngr/ks-engine-finger.c (ks_finger_fetch): Pass timeout to http_raw_connect. * dirmngr/ks-engine-hkp.c (send_request): Call http_session_set_timeout. * dirmngr/ks-engine-http.c (ks_http_fetch): Ditto. * dirmngr/server.c (cmd_wkd_get, cmd_ks_search, cmd_ks_get) (cmd_ks_fetch): Implement --quick option. -- The standard connect timeouts are way to long so we add a timeout to the connect calls. Also implement the --quick option which is already used by gpg for non-important requests (e.g. looking up a key for verification). Signed-off-by: Werner Koch <wk@gnupg.org>
128 lines
3.1 KiB
C
128 lines
3.1 KiB
C
/* ks-engine-finger.c - Finger OpenPGP key access
|
|
* Copyright (C) 2011 Free Software Foundation, Inc.
|
|
*
|
|
* 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/>.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
#include "dirmngr.h"
|
|
#include "misc.h"
|
|
#include "../common/userids.h"
|
|
#include "ks-engine.h"
|
|
|
|
/* Print a help output for the schemata supported by this module. */
|
|
gpg_error_t
|
|
ks_finger_help (ctrl_t ctrl, parsed_uri_t uri)
|
|
{
|
|
char const data[] =
|
|
"Handler for FINGER:\n"
|
|
" finger:<user>@<host>\n"
|
|
"Supported methods: fetch\n"
|
|
"Example:\n"
|
|
" finger:joe@example.org\n";
|
|
gpg_error_t err;
|
|
|
|
if (!uri)
|
|
err = ks_print_help (ctrl, " finger");
|
|
else if (!strcmp (uri->scheme, "finger"))
|
|
err = ks_print_help (ctrl, data);
|
|
else
|
|
err = 0;
|
|
|
|
return err;
|
|
}
|
|
|
|
|
|
/* Get the key from URI which is expected to specify a finger scheme.
|
|
On success R_FP has an open stream to read the data. */
|
|
gpg_error_t
|
|
ks_finger_fetch (ctrl_t ctrl, parsed_uri_t uri, estream_t *r_fp)
|
|
{
|
|
gpg_error_t err;
|
|
estream_t fp;
|
|
char *server;
|
|
char *name;
|
|
http_t http;
|
|
|
|
(void)ctrl;
|
|
*r_fp = NULL;
|
|
|
|
if (strcmp (uri->scheme, "finger") || !uri->opaque || !uri->path)
|
|
return gpg_error (GPG_ERR_INV_ARG);
|
|
|
|
name = xtrystrdup (uri->path);
|
|
if (!name)
|
|
return gpg_error_from_syserror ();
|
|
|
|
server = strchr (name, '@');
|
|
if (!server)
|
|
{
|
|
err = gpg_error (GPG_ERR_INV_URI);
|
|
xfree (name);
|
|
return err;
|
|
}
|
|
*server++ = 0;
|
|
|
|
err = http_raw_connect (&http, server, 79,
|
|
((dirmngr_use_tor ()? HTTP_FLAG_FORCE_TOR : 0)
|
|
| (opt.disable_ipv4? HTTP_FLAG_IGNORE_IPv4 : 0)
|
|
| (opt.disable_ipv6? HTTP_FLAG_IGNORE_IPv6 : 0)),
|
|
NULL, ctrl->timeout);
|
|
if (err)
|
|
{
|
|
xfree (name);
|
|
return err;
|
|
}
|
|
|
|
fp = http_get_write_ptr (http);
|
|
if (!fp)
|
|
{
|
|
err = gpg_error (GPG_ERR_INTERNAL);
|
|
http_close (http, 0);
|
|
xfree (name);
|
|
return err;
|
|
}
|
|
|
|
if (es_fputs (name, fp) || es_fputs ("\r\n", fp) || es_fflush (fp))
|
|
{
|
|
err = gpg_error_from_syserror ();
|
|
http_close (http, 0);
|
|
xfree (name);
|
|
return err;
|
|
}
|
|
xfree (name);
|
|
es_fclose (fp);
|
|
|
|
fp = http_get_read_ptr (http);
|
|
if (!fp)
|
|
{
|
|
err = gpg_error (GPG_ERR_INTERNAL);
|
|
http_close (http, 0);
|
|
return err;
|
|
}
|
|
|
|
http_close (http, 1 /* Keep read ptr. */);
|
|
|
|
*r_fp = fp;
|
|
return 0;
|
|
}
|