security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

dirmngr: Auto-switch from Tor port to Torbrowser port. 

* dirmngr/dns-stuff.c (libdns_tor_port): New var.
(set_dns_nameserver): Clear that var.
(libdns_init): Init var to the default port.
(libdns_switch_port_p): New func.
(resolve_dns_name): Use function to switch the port
(get_dns_cert): Ditto.
(getsrv): Ditto.
(get_dns_cname): Ditto.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-12-16 21:56:23 +01:00
parent c4e8a3194d
commit 024dbd7162
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 61 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
dirmngr/dns-stuff.c
View File

@ -137,6 +137,9 @@ struct libdns_s
/* If this flag is set, libdns shall be reinited for the next use. */
static int libdns_reinit_pending;
/* The Tor port to be used. */
static int libdns_tor_port;
#endif /*USE_LIBDNS*/
@ -210,6 +213,7 @@ set_dns_nameserver (const char *ipaddr)
sizeof tor_nameserver -1);
tor_nameserver[sizeof tor_nameserver -1] = 0;
libdns_reinit_pending = 1;
libdns_tor_port = 0; /* Start again with the default port. */
}
@ -341,6 +345,9 @@ libdns_init (void)
if (!*tor_nameserver)
set_dns_nameserver (NULL);
if (!libdns_tor_port)
libdns_tor_port = TOR_PORT;
cfgstr = xtryasprintf ("[%s]:53", tor_nameserver);
if (!cfgstr)
err = gpg_error_from_syserror ();
@ -356,7 +363,7 @@ libdns_init (void)
ld.resolv_conf->options.tcp = DNS_RESCONF_TCP_SOCKS;
xfree (cfgstr);
cfgstr = xtryasprintf ("[%s]:%d", "127.0.0.1", TOR_PORT);
cfgstr = xtryasprintf ("[%s]:%d", "127.0.0.1", libdns_tor_port);
if (!cfgstr)
err = gpg_error_from_syserror ();
else
@ -437,6 +444,7 @@ libdns_deinit (void)
}
#endif /*USE_LIBDNS*/
/* SIGHUP action handler for this module. With FORCE set objects are
* all immediately released. */
void
@ -493,6 +501,25 @@ libdns_res_open (struct dns_resolver **r_res)
#endif /*USE_LIBDNS*/
#ifdef USE_LIBDNS
/* Helper to test whether we need totry again after having swicthed
* the Tor port. */
static int
libdns_switch_port_p (gpg_error_t err)
{
if (tor_mode && gpg_err_code (err) == GPG_ERR_ECONNREFUSED
&& libdns_tor_port == TOR_PORT)
{
/* Switch port and try again. */
libdns_tor_port = TOR_PORT2;
libdns_reinit_pending = 1;
return 1;
}
return 0;
}
#endif /*USE_LIBDNS*/
#ifdef USE_LIBDNS
/* Wrapper around dns_res_submit. */
static gpg_error_t
@ -834,8 +861,16 @@ resolve_dns_name (const char *name, unsigned short port,
{
#ifdef USE_LIBDNS
if (!standard_resolver)
return resolve_name_libdns (name, port, want_family, want_socktype,
r_ai, r_canonname);
{
gpg_error_t err;
err = resolve_name_libdns (name, port, want_family, want_socktype,
r_ai, r_canonname);
if (err && libdns_switch_port_p (err))
err = resolve_name_libdns (name, port, want_family, want_socktype,
r_ai, r_canonname);
return err;
}
#endif /*USE_LIBDNS*/
return resolve_name_standard (name, port, want_family, want_socktype,
@ -1335,8 +1370,16 @@ get_dns_cert (const char *name, int want_certtype,
#ifdef USE_LIBDNS
if (!standard_resolver)
return get_dns_cert_libdns (name, want_certtype, r_key, r_keylen,
r_fpr, r_fprlen, r_url);
{
gpg_error_t err;
err = get_dns_cert_libdns (name, want_certtype, r_key, r_keylen,
r_fpr, r_fprlen, r_url);
if (err && libdns_switch_port_p (err))
err = get_dns_cert_libdns (name, want_certtype, r_key, r_keylen,
r_fpr, r_fprlen, r_url);
return err;
}
#endif /*USE_LIBDNS*/
return get_dns_cert_standard (name, want_certtype, r_key, r_keylen,
@ -1593,7 +1636,11 @@ getsrv (const char *name, struct srventry **list)
srvcount = 0;
#ifdef USE_LIBDNS
if (!standard_resolver)
err = getsrv_libdns (name, list, &srvcount);
{
err = getsrv_libdns (name, list, &srvcount);
if (err && libdns_switch_port_p (err))
err = getsrv_libdns (name, list, &srvcount);
}
else
#endif /*USE_LIBDNS*/
err = getsrv_standard (name, list, &srvcount);
@ -1834,7 +1881,14 @@ get_dns_cname (const char *name, char **r_cname)
#ifdef USE_LIBDNS
if (!standard_resolver)
return get_dns_cname_libdns (name, r_cname);
{
gpg_error_t err;
err = get_dns_cname_libdns (name, r_cname);
if (err && libdns_switch_port_p (err))
err = get_dns_cname_libdns (name, r_cname);
return err;
}
#endif /*USE_LIBDNS*/
return get_dns_cname_standard (name, r_cname);