2014-02-16 13:03:17 -08:00
|
|
|
/*
|
2018-02-23 09:53:12 +01:00
|
|
|
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
2014-02-16 13:03:17 -08:00
|
|
|
*
|
2021-06-03 08:37:05 +02:00
|
|
|
* SPDX-License-Identifier: MPL-2.0
|
|
|
|
*
|
2016-06-27 14:56:38 +10:00
|
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
2020-09-14 16:20:40 -07:00
|
|
|
* file, you can obtain one at https://mozilla.org/MPL/2.0/.
|
2018-02-23 09:53:12 +01:00
|
|
|
*
|
|
|
|
* See the COPYRIGHT file distributed with this work for additional
|
|
|
|
* information regarding copyright ownership.
|
2014-02-16 13:03:17 -08:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <arpa/inet.h>
|
2021-05-20 15:53:50 +02:00
|
|
|
#include <bind.keys.h>
|
|
|
|
#include <inttypes.h>
|
2020-03-09 16:17:26 +01:00
|
|
|
#include <netdb.h>
|
2020-02-12 13:59:18 +01:00
|
|
|
#include <netinet/in.h>
|
2020-03-09 16:17:26 +01:00
|
|
|
#include <signal.h>
|
2018-04-17 08:29:14 -07:00
|
|
|
#include <stdbool.h>
|
2014-02-16 13:03:17 -08:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2021-05-20 15:53:50 +02:00
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <sys/types.h>
|
2014-02-26 19:00:05 -08:00
|
|
|
#include <unistd.h>
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
#include <isc/app.h>
|
2018-08-07 16:46:53 +02:00
|
|
|
#include <isc/attributes.h>
|
2014-02-16 13:03:17 -08:00
|
|
|
#include <isc/base64.h>
|
|
|
|
#include <isc/buffer.h>
|
2019-09-18 19:45:20 -07:00
|
|
|
#include <isc/hex.h>
|
2014-02-16 13:03:17 -08:00
|
|
|
#include <isc/log.h>
|
2021-04-27 00:07:43 +02:00
|
|
|
#include <isc/managers.h>
|
2019-09-18 19:45:20 -07:00
|
|
|
#include <isc/md.h>
|
2014-02-16 13:03:17 -08:00
|
|
|
#include <isc/mem.h>
|
Refactor taskmgr to run on top of netmgr
This commit changes the taskmgr to run the individual tasks on the
netmgr internal workers. While an effort has been put into keeping the
taskmgr interface intact, couple of changes have been made:
* The taskmgr has no concept of universal privileged mode - rather the
tasks are either privileged or unprivileged (normal). The privileged
tasks are run as a first thing when the netmgr is unpaused. There
are now four different queues in in the netmgr:
1. priority queue - netievent on the priority queue are run even when
the taskmgr enter exclusive mode and netmgr is paused. This is
needed to properly start listening on the interfaces, free
resources and resume.
2. privileged task queue - only privileged tasks are queued here and
this is the first queue that gets processed when network manager
is unpaused using isc_nm_resume(). All netmgr workers need to
clean the privileged task queue before they all proceed normal
operation. Both task queues are processed when the workers are
finished.
3. task queue - only (traditional) task are scheduled here and this
queue along with privileged task queues are process when the
netmgr workers are finishing. This is needed to process the task
shutdown events.
4. normal queue - this is the queue with netmgr events, e.g. reading,
sending, callbacks and pretty much everything is processed here.
* The isc_taskmgr_create() now requires initialized netmgr (isc_nm_t)
object.
* The isc_nm_destroy() function now waits for indefinite time, but it
will print out the active objects when in tracing mode
(-DNETMGR_TRACE=1 and -DNETMGR_TRACE_VERBOSE=1), the netmgr has been
made a little bit more asynchronous and it might take longer time to
shutdown all the active networking connections.
* Previously, the isc_nm_stoplistening() was a synchronous operation.
This has been changed and the isc_nm_stoplistening() just schedules
the child sockets to stop listening and exits. This was needed to
prevent a deadlock as the the (traditional) tasks are now executed on
the netmgr threads.
* The socket selection logic in isc__nm_udp_send() was flawed, but
fortunatelly, it was broken, so we never hit the problem where we
created uvreq_t on a socket from nmhandle_t, but then a different
socket could be picked up and then we were trying to run the send
callback on a socket that had different threadid than currently
running.
2021-04-09 11:31:19 +02:00
|
|
|
#include <isc/netmgr.h>
|
2014-02-16 13:03:17 -08:00
|
|
|
#include <isc/parseint.h>
|
2014-02-17 09:19:25 +11:00
|
|
|
#include <isc/print.h>
|
2021-10-04 17:14:53 +02:00
|
|
|
#include <isc/result.h>
|
2014-02-16 13:03:17 -08:00
|
|
|
#include <isc/sockaddr.h>
|
2014-02-16 16:30:47 -08:00
|
|
|
#include <isc/string.h>
|
2014-02-16 13:03:17 -08:00
|
|
|
#include <isc/task.h>
|
|
|
|
#include <isc/timer.h>
|
|
|
|
#include <isc/util.h>
|
|
|
|
|
|
|
|
#include <dns/byaddr.h>
|
|
|
|
#include <dns/client.h>
|
|
|
|
#include <dns/fixedname.h>
|
|
|
|
#include <dns/keytable.h>
|
|
|
|
#include <dns/keyvalues.h>
|
|
|
|
#include <dns/log.h>
|
|
|
|
#include <dns/masterdump.h>
|
|
|
|
#include <dns/name.h>
|
|
|
|
#include <dns/rdata.h>
|
|
|
|
#include <dns/rdataclass.h>
|
|
|
|
#include <dns/rdataset.h>
|
|
|
|
#include <dns/rdatastruct.h>
|
|
|
|
#include <dns/rdatatype.h>
|
|
|
|
#include <dns/secalg.h>
|
|
|
|
#include <dns/view.h>
|
|
|
|
|
2020-03-09 16:17:26 +01:00
|
|
|
#include <dst/dst.h>
|
|
|
|
|
2020-02-12 13:59:18 +01:00
|
|
|
#include <isccfg/log.h>
|
|
|
|
#include <isccfg/namedconf.h>
|
|
|
|
|
|
|
|
#include <irs/resconf.h>
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2020-02-12 13:59:18 +01:00
|
|
|
#define CHECK(r) \
|
|
|
|
do { \
|
|
|
|
result = (r); \
|
2014-02-16 13:03:17 -08:00
|
|
|
if (result != ISC_R_SUCCESS) \
|
2020-02-12 13:59:18 +01:00
|
|
|
goto cleanup; \
|
2014-02-16 13:03:17 -08:00
|
|
|
} while (0)
|
|
|
|
|
2020-02-12 13:59:18 +01:00
|
|
|
#define MAXNAME (DNS_NAME_MAXTEXT + 1)
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2014-04-23 11:14:12 -07:00
|
|
|
/* Variables used internally by delv. */
|
2020-02-13 14:44:37 -08:00
|
|
|
char *progname;
|
2014-02-16 13:03:17 -08:00
|
|
|
static isc_mem_t *mctx = NULL;
|
|
|
|
static isc_log_t *lctx = NULL;
|
|
|
|
|
|
|
|
/* Configurables */
|
2020-02-13 14:44:37 -08:00
|
|
|
static char *server = NULL;
|
|
|
|
static const char *port = "53";
|
2014-02-16 13:03:17 -08:00
|
|
|
static isc_sockaddr_t *srcaddr4 = NULL, *srcaddr6 = NULL;
|
2020-02-13 14:44:37 -08:00
|
|
|
static isc_sockaddr_t a4, a6;
|
|
|
|
static char *curqname = NULL, *qname = NULL;
|
|
|
|
static bool classset = false;
|
2014-02-16 13:03:17 -08:00
|
|
|
static dns_rdatatype_t qtype = dns_rdatatype_none;
|
2020-02-13 14:44:37 -08:00
|
|
|
static bool typeset = false;
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
static unsigned int styleflags = 0;
|
2020-02-13 14:44:37 -08:00
|
|
|
static uint32_t splitwidth = 0xffffffff;
|
|
|
|
static bool showcomments = true, showdnssec = true, showtrust = true,
|
2020-02-12 13:59:18 +01:00
|
|
|
rrcomments = true, noclass = false, nocrypto = false, nottl = false,
|
|
|
|
multiline = false, short_form = false, print_unknown_format = false,
|
|
|
|
yaml = false;
|
2018-04-17 08:29:14 -07:00
|
|
|
|
2020-02-12 13:59:18 +01:00
|
|
|
static bool resolve_trace = false, validator_trace = false,
|
|
|
|
message_trace = false;
|
2018-04-17 08:29:14 -07:00
|
|
|
|
2020-02-12 13:59:18 +01:00
|
|
|
static bool use_ipv4 = true, use_ipv6 = true;
|
2018-04-17 08:29:14 -07:00
|
|
|
|
2020-02-12 13:59:18 +01:00
|
|
|
static bool cdflag = false, no_sigs = false, root_validation = true;
|
2018-04-17 08:29:14 -07:00
|
|
|
|
|
|
|
static bool use_tcp = false;
|
2014-11-21 09:37:04 -08:00
|
|
|
|
2014-02-16 13:03:17 -08:00
|
|
|
static char *anchorfile = NULL;
|
|
|
|
static char *trust_anchor = NULL;
|
2020-02-13 14:44:37 -08:00
|
|
|
static int num_keys = 0;
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2019-08-06 09:34:27 -07:00
|
|
|
static dns_fixedname_t afn;
|
2020-02-13 14:44:37 -08:00
|
|
|
static dns_name_t *anchor_name = NULL;
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
/* Default bind.keys contents */
|
2019-12-04 11:06:40 +01:00
|
|
|
static char anchortext[] = TRUST_ANCHORS;
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Static function prototypes
|
|
|
|
*/
|
2020-02-14 08:14:03 +01:00
|
|
|
static isc_result_t
|
|
|
|
get_reverse(char *reverse, size_t len, char *value, bool strict);
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2020-02-14 08:14:03 +01:00
|
|
|
static isc_result_t
|
|
|
|
parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc);
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
static void
|
2020-02-13 14:44:37 -08:00
|
|
|
usage(void) {
|
2020-04-02 18:51:06 -07:00
|
|
|
fprintf(stderr,
|
|
|
|
"Usage: delv [@server] {q-opt} {d-opt} [domain] [q-type] "
|
|
|
|
"[q-class]\n"
|
|
|
|
"Where: domain is in the Domain Name System\n"
|
|
|
|
" q-class is one of (in,hs,ch,...) [default: in]\n"
|
|
|
|
" q-type is one of "
|
|
|
|
"(a,any,mx,ns,soa,hinfo,axfr,txt,...) "
|
|
|
|
"[default:a]\n"
|
|
|
|
" q-opt is one of:\n"
|
|
|
|
" -4 (use IPv4 query "
|
|
|
|
"transport "
|
|
|
|
"only)\n"
|
|
|
|
" -6 (use IPv6 query "
|
|
|
|
"transport "
|
|
|
|
"only)\n"
|
|
|
|
" -a anchor-file (specify root trust "
|
|
|
|
"anchor)\n"
|
|
|
|
" -b address[#port] (bind to source "
|
|
|
|
"address/port)\n"
|
|
|
|
" -c class (option included for "
|
|
|
|
"compatibility;\n"
|
|
|
|
" -d level (set debugging level)\n"
|
|
|
|
" -h (print help and exit)\n"
|
|
|
|
" -i (disable DNSSEC "
|
|
|
|
"validation)\n"
|
|
|
|
" -m (enable memory usage "
|
|
|
|
"debugging)\n"
|
|
|
|
" -p port (specify port number)\n"
|
|
|
|
" -q name (specify query name)\n"
|
|
|
|
" -t type (specify query type)\n"
|
|
|
|
" only IN is supported)\n"
|
|
|
|
" -v (print version and "
|
|
|
|
"exit)\n"
|
|
|
|
" -x dot-notation (shortcut for reverse "
|
|
|
|
"lookups)\n"
|
|
|
|
" d-opt is of the form +keyword[=value], where "
|
|
|
|
"keyword "
|
|
|
|
"is:\n"
|
|
|
|
" +[no]all (Set or clear all "
|
|
|
|
"display "
|
|
|
|
"flags)\n"
|
|
|
|
" +[no]class (Control display of "
|
|
|
|
"class)\n"
|
|
|
|
" +[no]comments (Control display of "
|
|
|
|
"comment lines)\n"
|
|
|
|
" +[no]crypto (Control display of "
|
|
|
|
"cryptographic\n"
|
|
|
|
" fields in records)\n"
|
|
|
|
" +[no]dlv (Obsolete)\n"
|
|
|
|
" +[no]dnssec (Display DNSSEC "
|
|
|
|
"records)\n"
|
|
|
|
" +[no]mtrace (Trace messages "
|
|
|
|
"received)\n"
|
|
|
|
" +[no]multiline (Print records in an "
|
|
|
|
"expanded format)\n"
|
|
|
|
" +[no]root (DNSSEC validation trust "
|
|
|
|
"anchor)\n"
|
|
|
|
" +[no]rrcomments (Control display of "
|
|
|
|
"per-record "
|
|
|
|
"comments)\n"
|
|
|
|
" +[no]rtrace (Trace resolver "
|
|
|
|
"fetches)\n"
|
|
|
|
" +[no]short (Short form answer)\n"
|
|
|
|
" +[no]split=## (Split hex/base64 fields "
|
|
|
|
"into chunks)\n"
|
|
|
|
" +[no]tcp (TCP mode)\n"
|
|
|
|
" +[no]ttl (Control display of ttls "
|
|
|
|
"in records)\n"
|
|
|
|
" +[no]trust (Control display of "
|
|
|
|
"trust "
|
|
|
|
"level)\n"
|
|
|
|
" +[no]unknownformat (Print RDATA in RFC 3597 "
|
|
|
|
"\"unknown\" format)\n"
|
|
|
|
" +[no]vtrace (Trace validation "
|
|
|
|
"process)\n"
|
|
|
|
" +[no]yaml (Present the results as "
|
|
|
|
"YAML)\n");
|
2014-02-16 13:03:17 -08:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2018-08-07 16:46:53 +02:00
|
|
|
ISC_NORETURN static void
|
|
|
|
fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
|
2014-02-19 07:25:29 +11:00
|
|
|
|
2014-02-16 13:03:17 -08:00
|
|
|
static void
|
2020-02-13 14:44:37 -08:00
|
|
|
fatal(const char *format, ...) {
|
2014-02-16 13:03:17 -08:00
|
|
|
va_list args;
|
|
|
|
|
|
|
|
fflush(stdout);
|
|
|
|
fprintf(stderr, "%s: ", progname);
|
|
|
|
va_start(args, format);
|
|
|
|
vfprintf(stderr, format, args);
|
|
|
|
va_end(args);
|
|
|
|
fprintf(stderr, "\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2020-02-14 08:14:03 +01:00
|
|
|
static void
|
|
|
|
warn(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
|
2014-02-19 07:25:29 +11:00
|
|
|
|
2014-02-16 13:03:17 -08:00
|
|
|
static void
|
2020-02-13 14:44:37 -08:00
|
|
|
warn(const char *format, ...) {
|
2014-02-16 13:03:17 -08:00
|
|
|
va_list args;
|
|
|
|
|
|
|
|
fflush(stdout);
|
|
|
|
fprintf(stderr, "%s: warning: ", progname);
|
|
|
|
va_start(args, format);
|
|
|
|
vfprintf(stderr, format, args);
|
|
|
|
va_end(args);
|
|
|
|
fprintf(stderr, "\n");
|
|
|
|
}
|
|
|
|
|
2020-02-12 13:59:18 +01:00
|
|
|
static isc_logcategory_t categories[] = { { "delv", 0 }, { NULL, 0 } };
|
|
|
|
#define LOGCATEGORY_DEFAULT (&categories[0])
|
2020-02-13 14:44:37 -08:00
|
|
|
#define LOGMODULE_DEFAULT (&modules[0])
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2020-02-12 13:59:18 +01:00
|
|
|
static isc_logmodule_t modules[] = { { "delv", 0 }, { NULL, 0 } };
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2020-02-14 08:14:03 +01:00
|
|
|
static void
|
|
|
|
delv_log(int level, const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3);
|
2014-02-19 07:25:29 +11:00
|
|
|
|
2014-02-16 13:03:17 -08:00
|
|
|
static void
|
2020-02-13 14:44:37 -08:00
|
|
|
delv_log(int level, const char *fmt, ...) {
|
2014-02-16 13:03:17 -08:00
|
|
|
va_list ap;
|
2020-02-13 14:44:37 -08:00
|
|
|
char msgbuf[2048];
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2020-02-13 21:48:23 +01:00
|
|
|
if (!isc_log_wouldlog(lctx, level)) {
|
2014-02-16 13:03:17 -08:00
|
|
|
return;
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
|
|
|
|
vsnprintf(msgbuf, sizeof(msgbuf), fmt, ap);
|
2020-02-12 13:59:18 +01:00
|
|
|
isc_log_write(lctx, LOGCATEGORY_DEFAULT, LOGMODULE_DEFAULT, level, "%s",
|
|
|
|
msgbuf);
|
2014-02-16 13:03:17 -08:00
|
|
|
va_end(ap);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int loglevel = 0;
|
|
|
|
|
|
|
|
static void
|
2020-02-13 14:44:37 -08:00
|
|
|
setup_logging(FILE *errout) {
|
|
|
|
isc_result_t result;
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_logdestination_t destination;
|
2020-02-13 14:44:37 -08:00
|
|
|
isc_logconfig_t *logconfig = NULL;
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2020-03-18 14:17:55 +11:00
|
|
|
isc_log_create(mctx, &lctx, &logconfig);
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_log_registercategories(lctx, categories);
|
|
|
|
isc_log_registermodules(lctx, modules);
|
|
|
|
isc_log_setcontext(lctx);
|
|
|
|
dns_log_init(lctx);
|
|
|
|
dns_log_setcontext(lctx);
|
|
|
|
cfg_log_init(lctx);
|
|
|
|
|
|
|
|
destination.file.stream = errout;
|
|
|
|
destination.file.name = NULL;
|
|
|
|
destination.file.versions = ISC_LOG_ROLLNEVER;
|
|
|
|
destination.file.maximum_size = 0;
|
2020-03-18 14:17:55 +11:00
|
|
|
isc_log_createchannel(logconfig, "stderr", ISC_LOG_TOFILEDESC,
|
|
|
|
ISC_LOG_DYNAMIC, &destination,
|
|
|
|
ISC_LOG_PRINTPREFIX);
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
isc_log_setdebuglevel(lctx, loglevel);
|
2020-03-18 14:17:55 +11:00
|
|
|
isc_log_settag(logconfig, ";; ");
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
result = isc_log_usechannel(logconfig, "stderr",
|
|
|
|
ISC_LOGCATEGORY_DEFAULT, NULL);
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("Couldn't attach to log channel 'stderr'");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
if (resolve_trace && loglevel < 1) {
|
2020-03-18 14:17:55 +11:00
|
|
|
isc_log_createchannel(logconfig, "resolver", ISC_LOG_TOFILEDESC,
|
|
|
|
ISC_LOG_DEBUG(1), &destination,
|
|
|
|
ISC_LOG_PRINTPREFIX);
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
result = isc_log_usechannel(logconfig, "resolver",
|
|
|
|
DNS_LOGCATEGORY_RESOLVER,
|
|
|
|
DNS_LOGMODULE_RESOLVER);
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("Couldn't attach to log channel 'resolver'");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (validator_trace && loglevel < 3) {
|
2020-03-18 14:17:55 +11:00
|
|
|
isc_log_createchannel(logconfig, "validator",
|
|
|
|
ISC_LOG_TOFILEDESC, ISC_LOG_DEBUG(3),
|
|
|
|
&destination, ISC_LOG_PRINTPREFIX);
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
result = isc_log_usechannel(logconfig, "validator",
|
|
|
|
DNS_LOGCATEGORY_DNSSEC,
|
|
|
|
DNS_LOGMODULE_VALIDATOR);
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("Couldn't attach to log channel 'validator'");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (message_trace && loglevel < 10) {
|
2020-03-18 14:17:55 +11:00
|
|
|
isc_log_createchannel(logconfig, "messages", ISC_LOG_TOFILEDESC,
|
|
|
|
ISC_LOG_DEBUG(10), &destination,
|
|
|
|
ISC_LOG_PRINTPREFIX);
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
result = isc_log_usechannel(logconfig, "messages",
|
|
|
|
DNS_LOGCATEGORY_RESOLVER,
|
|
|
|
DNS_LOGMODULE_PACKETS);
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("Couldn't attach to log channel 'messagse'");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2020-02-13 14:44:37 -08:00
|
|
|
print_status(dns_rdataset_t *rdataset) {
|
2019-07-20 17:24:41 -04:00
|
|
|
char buf[1024] = { 0 };
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
REQUIRE(rdataset != NULL);
|
|
|
|
|
2019-07-20 17:24:41 -04:00
|
|
|
if (!showtrust || !dns_rdataset_isassociated(rdataset)) {
|
2014-02-16 13:03:17 -08:00
|
|
|
return;
|
2019-07-20 17:24:41 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
buf[0] = '\0';
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2019-07-20 17:24:41 -04:00
|
|
|
if ((rdataset->attributes & DNS_RDATASETATTR_NEGATIVE) != 0) {
|
|
|
|
strlcat(buf, "negative response", sizeof(buf));
|
|
|
|
strlcat(buf, (yaml ? "_" : ", "), sizeof(buf));
|
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
switch (rdataset->trust) {
|
|
|
|
case dns_trust_none:
|
2019-07-20 17:24:41 -04:00
|
|
|
strlcat(buf, "untrusted", sizeof(buf));
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
|
|
|
case dns_trust_pending_additional:
|
2019-07-20 17:24:41 -04:00
|
|
|
strlcat(buf, "signed additional data", sizeof(buf));
|
|
|
|
if (!yaml) {
|
|
|
|
strlcat(buf, ", ", sizeof(buf));
|
|
|
|
}
|
|
|
|
strlcat(buf, "pending validation", sizeof(buf));
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
|
|
|
case dns_trust_pending_answer:
|
2019-07-20 17:24:41 -04:00
|
|
|
strlcat(buf, "signed answer", sizeof(buf));
|
|
|
|
if (!yaml) {
|
|
|
|
strlcat(buf, ", ", sizeof(buf));
|
|
|
|
}
|
|
|
|
strlcat(buf, "pending validation", sizeof(buf));
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
|
|
|
case dns_trust_additional:
|
2019-07-20 17:24:41 -04:00
|
|
|
strlcat(buf, "unsigned additional data", sizeof(buf));
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
|
|
|
case dns_trust_glue:
|
2019-07-20 17:24:41 -04:00
|
|
|
strlcat(buf, "glue data", sizeof(buf));
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
|
|
|
case dns_trust_answer:
|
2019-08-06 09:34:27 -07:00
|
|
|
if (root_validation) {
|
2019-07-20 17:24:41 -04:00
|
|
|
strlcat(buf, "unsigned answer", sizeof(buf));
|
|
|
|
} else {
|
|
|
|
strlcat(buf, "answer not validated", sizeof(buf));
|
2019-08-06 09:34:27 -07:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
|
|
|
case dns_trust_authauthority:
|
2019-07-20 17:24:41 -04:00
|
|
|
strlcat(buf, "authority data", sizeof(buf));
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
|
|
|
case dns_trust_authanswer:
|
2019-07-20 17:24:41 -04:00
|
|
|
strlcat(buf, "authoritative", sizeof(buf));
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
|
|
|
case dns_trust_secure:
|
2019-07-20 17:24:41 -04:00
|
|
|
strlcat(buf, "fully validated", sizeof(buf));
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
|
|
|
case dns_trust_ultimate:
|
2019-07-20 17:24:41 -04:00
|
|
|
strlcat(buf, "ultimate trust", sizeof(buf));
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2019-07-20 17:24:41 -04:00
|
|
|
if (yaml) {
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
/* Convert spaces to underscores for YAML */
|
|
|
|
for (p = buf; p != NULL && *p != '\0'; p++) {
|
|
|
|
if (*p == ' ') {
|
|
|
|
*p = '_';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
printf(" - %s:\n", buf);
|
|
|
|
} else {
|
|
|
|
printf("; %s\n", buf);
|
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
static isc_result_t
|
|
|
|
printdata(dns_rdataset_t *rdataset, dns_name_t *owner,
|
2020-02-13 14:44:37 -08:00
|
|
|
dns_master_style_t *style) {
|
|
|
|
isc_result_t result = ISC_R_SUCCESS;
|
2014-02-16 13:03:17 -08:00
|
|
|
static dns_trust_t trust;
|
2020-02-13 14:44:37 -08:00
|
|
|
static bool first = true;
|
|
|
|
isc_buffer_t target;
|
|
|
|
isc_region_t r;
|
|
|
|
char *t = NULL;
|
|
|
|
int len = 2048;
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
if (!dns_rdataset_isassociated(rdataset)) {
|
|
|
|
char namebuf[DNS_NAME_FORMATSIZE];
|
|
|
|
dns_name_format(owner, namebuf, sizeof(namebuf));
|
2020-02-12 13:59:18 +01:00
|
|
|
delv_log(ISC_LOG_DEBUG(4), "WARN: empty rdataset %s", namebuf);
|
2014-02-16 13:03:17 -08:00
|
|
|
return (ISC_R_SUCCESS);
|
|
|
|
}
|
|
|
|
|
2020-02-13 21:48:23 +01:00
|
|
|
if (!showdnssec && rdataset->type == dns_rdatatype_rrsig) {
|
2014-02-16 13:03:17 -08:00
|
|
|
return (ISC_R_SUCCESS);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
if (first || rdataset->trust != trust) {
|
2019-07-20 17:24:41 -04:00
|
|
|
if (!first && showtrust && !short_form && !yaml) {
|
2014-02-16 13:03:17 -08:00
|
|
|
putchar('\n');
|
2019-07-20 17:24:41 -04:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
print_status(rdataset);
|
|
|
|
trust = rdataset->trust;
|
2018-04-17 08:29:14 -07:00
|
|
|
first = false;
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
do {
|
|
|
|
t = isc_mem_get(mctx, len);
|
|
|
|
|
|
|
|
isc_buffer_init(&target, t, len);
|
|
|
|
if (short_form) {
|
|
|
|
dns_rdata_t rdata = DNS_RDATA_INIT;
|
|
|
|
for (result = dns_rdataset_first(rdataset);
|
|
|
|
result == ISC_R_SUCCESS;
|
2020-02-13 14:44:37 -08:00
|
|
|
result = dns_rdataset_next(rdataset))
|
|
|
|
{
|
2014-02-16 13:03:17 -08:00
|
|
|
if ((rdataset->attributes &
|
2020-02-13 21:48:23 +01:00
|
|
|
DNS_RDATASETATTR_NEGATIVE) != 0) {
|
2014-02-16 13:03:17 -08:00
|
|
|
continue;
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
dns_rdataset_current(rdataset, &rdata);
|
2020-02-12 13:59:18 +01:00
|
|
|
result = dns_rdata_tofmttext(
|
|
|
|
&rdata, dns_rootname, styleflags, 0,
|
|
|
|
splitwidth, " ", &target);
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2015-01-20 13:29:18 -08:00
|
|
|
if (isc_buffer_availablelength(&target) < 1) {
|
2014-02-16 13:03:17 -08:00
|
|
|
result = ISC_R_NOSPACE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2015-01-20 13:29:18 -08:00
|
|
|
isc_buffer_putstr(&target, "\n");
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
dns_rdata_reset(&rdata);
|
|
|
|
}
|
|
|
|
} else {
|
2019-11-18 20:46:58 +11:00
|
|
|
dns_indent_t indent = { " ", 2 };
|
2019-07-20 17:24:41 -04:00
|
|
|
if (!yaml && (rdataset->attributes &
|
2020-02-12 13:59:18 +01:00
|
|
|
DNS_RDATASETATTR_NEGATIVE) != 0) {
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_buffer_putstr(&target, "; ");
|
2019-07-20 17:24:41 -04:00
|
|
|
}
|
2020-02-12 13:59:18 +01:00
|
|
|
result = dns_master_rdatasettotext(
|
|
|
|
owner, rdataset, style, yaml ? &indent : NULL,
|
|
|
|
&target);
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (result == ISC_R_NOSPACE) {
|
|
|
|
isc_mem_put(mctx, t, len);
|
|
|
|
len += 1024;
|
2020-02-13 21:48:23 +01:00
|
|
|
} else if (result == ISC_R_NOMORE) {
|
2014-02-16 13:25:53 -08:00
|
|
|
result = ISC_R_SUCCESS;
|
2020-02-13 21:48:23 +01:00
|
|
|
} else {
|
2014-02-16 13:03:17 -08:00
|
|
|
CHECK(result);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
} while (result == ISC_R_NOSPACE);
|
|
|
|
|
|
|
|
isc_buffer_usedregion(&target, &r);
|
|
|
|
printf("%.*s", (int)r.length, (char *)r.base);
|
|
|
|
|
2020-02-12 13:59:18 +01:00
|
|
|
cleanup:
|
2020-02-13 21:48:23 +01:00
|
|
|
if (t != NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_mem_put(mctx, t, len);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
return (ISC_R_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
static isc_result_t
|
2020-02-13 14:44:37 -08:00
|
|
|
setup_style(dns_master_style_t **stylep) {
|
|
|
|
isc_result_t result;
|
2014-02-16 13:03:17 -08:00
|
|
|
dns_master_style_t *style = NULL;
|
|
|
|
|
2019-09-27 08:46:03 +02:00
|
|
|
REQUIRE(stylep != NULL && *stylep == NULL);
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
styleflags |= DNS_STYLEFLAG_REL_OWNER;
|
2019-07-20 17:24:41 -04:00
|
|
|
if (yaml) {
|
|
|
|
styleflags |= DNS_STYLEFLAG_YAML;
|
|
|
|
} else {
|
|
|
|
if (showcomments) {
|
|
|
|
styleflags |= DNS_STYLEFLAG_COMMENT;
|
|
|
|
}
|
|
|
|
if (print_unknown_format) {
|
|
|
|
styleflags |= DNS_STYLEFLAG_UNKNOWNFORMAT;
|
|
|
|
}
|
|
|
|
if (rrcomments) {
|
|
|
|
styleflags |= DNS_STYLEFLAG_RRCOMMENT;
|
|
|
|
}
|
|
|
|
if (nottl) {
|
|
|
|
styleflags |= DNS_STYLEFLAG_NO_TTL;
|
|
|
|
}
|
|
|
|
if (noclass) {
|
|
|
|
styleflags |= DNS_STYLEFLAG_NO_CLASS;
|
|
|
|
}
|
|
|
|
if (nocrypto) {
|
|
|
|
styleflags |= DNS_STYLEFLAG_NOCRYPTO;
|
|
|
|
}
|
|
|
|
if (multiline) {
|
|
|
|
styleflags |= DNS_STYLEFLAG_MULTILINE;
|
|
|
|
styleflags |= DNS_STYLEFLAG_COMMENT;
|
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
|
2019-07-20 17:24:41 -04:00
|
|
|
if (multiline || (nottl && noclass)) {
|
2020-02-12 13:59:18 +01:00
|
|
|
result = dns_master_stylecreate(&style, styleflags, 24, 24, 24,
|
|
|
|
32, 80, 8, splitwidth, mctx);
|
2019-07-20 17:24:41 -04:00
|
|
|
} else if (nottl || noclass) {
|
2020-02-12 13:59:18 +01:00
|
|
|
result = dns_master_stylecreate(&style, styleflags, 24, 24, 32,
|
|
|
|
40, 80, 8, splitwidth, mctx);
|
2019-07-20 17:24:41 -04:00
|
|
|
} else {
|
2020-02-12 13:59:18 +01:00
|
|
|
result = dns_master_stylecreate(&style, styleflags, 24, 32, 40,
|
|
|
|
48, 80, 8, splitwidth, mctx);
|
2019-07-20 17:24:41 -04:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2019-07-20 17:24:41 -04:00
|
|
|
if (result == ISC_R_SUCCESS) {
|
2014-02-16 13:03:17 -08:00
|
|
|
*stylep = style;
|
2019-07-20 17:24:41 -04:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
return (result);
|
|
|
|
}
|
|
|
|
|
|
|
|
static isc_result_t
|
2020-02-13 14:44:37 -08:00
|
|
|
convert_name(dns_fixedname_t *fn, dns_name_t **name, const char *text) {
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_result_t result;
|
|
|
|
isc_buffer_t b;
|
2020-02-13 14:44:37 -08:00
|
|
|
dns_name_t *n;
|
2014-02-26 19:00:05 -08:00
|
|
|
unsigned int len;
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
REQUIRE(fn != NULL && name != NULL && text != NULL);
|
|
|
|
len = strlen(text);
|
|
|
|
|
|
|
|
isc_buffer_constinit(&b, text, len);
|
|
|
|
isc_buffer_add(&b, len);
|
2018-03-28 14:38:09 +02:00
|
|
|
n = dns_fixedname_initname(fn);
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
result = dns_name_fromtext(n, &b, dns_rootname, 0, NULL);
|
|
|
|
if (result != ISC_R_SUCCESS) {
|
2020-02-12 13:59:18 +01:00
|
|
|
delv_log(ISC_LOG_ERROR, "failed to convert QNAME %s: %s", text,
|
|
|
|
isc_result_totext(result));
|
2014-02-16 13:03:17 -08:00
|
|
|
return (result);
|
|
|
|
}
|
|
|
|
|
|
|
|
*name = n;
|
|
|
|
return (ISC_R_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
static isc_result_t
|
2020-02-13 14:44:37 -08:00
|
|
|
key_fromconfig(const cfg_obj_t *key, dns_client_t *client) {
|
2019-09-18 19:45:20 -07:00
|
|
|
dns_rdata_dnskey_t dnskey;
|
2020-02-13 14:44:37 -08:00
|
|
|
dns_rdata_ds_t ds;
|
|
|
|
uint32_t rdata1, rdata2, rdata3;
|
|
|
|
const char *datastr = NULL, *keynamestr = NULL, *atstr = NULL;
|
|
|
|
unsigned char data[4096];
|
|
|
|
isc_buffer_t databuf;
|
|
|
|
unsigned char rrdata[4096];
|
|
|
|
isc_buffer_t rrdatabuf;
|
|
|
|
isc_region_t r;
|
|
|
|
dns_fixedname_t fkeyname;
|
|
|
|
dns_name_t *keyname;
|
|
|
|
isc_result_t result;
|
|
|
|
bool match_root = false;
|
2020-08-24 09:23:19 +02:00
|
|
|
enum {
|
|
|
|
INITIAL_KEY,
|
|
|
|
STATIC_KEY,
|
|
|
|
INITIAL_DS,
|
|
|
|
STATIC_DS,
|
|
|
|
TRUSTED
|
|
|
|
} anchortype;
|
2020-05-20 14:22:40 +10:00
|
|
|
const cfg_obj_t *obj;
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
keynamestr = cfg_obj_asstring(cfg_tuple_get(key, "name"));
|
|
|
|
CHECK(convert_name(&fkeyname, &keyname, keynamestr));
|
|
|
|
|
2019-08-06 09:34:27 -07:00
|
|
|
if (!root_validation) {
|
2014-02-16 13:03:17 -08:00
|
|
|
return (ISC_R_SUCCESS);
|
2019-08-06 09:34:27 -07:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2019-08-06 09:34:27 -07:00
|
|
|
if (anchor_name) {
|
2017-10-03 00:28:31 -07:00
|
|
|
match_root = dns_name_equal(keyname, anchor_name);
|
2019-08-06 09:34:27 -07:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2019-08-06 09:34:27 -07:00
|
|
|
if (!match_root) {
|
2014-02-16 13:03:17 -08:00
|
|
|
return (ISC_R_SUCCESS);
|
2019-08-06 09:34:27 -07:00
|
|
|
}
|
2019-09-09 14:05:31 +02:00
|
|
|
|
|
|
|
if (!root_validation) {
|
2014-02-16 13:03:17 -08:00
|
|
|
return (ISC_R_SUCCESS);
|
2019-08-06 09:34:27 -07:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2019-09-09 14:05:31 +02:00
|
|
|
delv_log(ISC_LOG_DEBUG(3), "adding trust anchor %s", trust_anchor);
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2019-09-15 22:15:29 -07:00
|
|
|
/* if DNSKEY, flags; if DS, key tag */
|
2019-12-02 09:29:02 +01:00
|
|
|
rdata1 = cfg_obj_asuint32(cfg_tuple_get(key, "rdata1"));
|
2019-09-15 22:15:29 -07:00
|
|
|
|
|
|
|
/* if DNSKEY, protocol; if DS, algorithm */
|
2019-12-02 09:29:02 +01:00
|
|
|
rdata2 = cfg_obj_asuint32(cfg_tuple_get(key, "rdata2"));
|
2019-09-15 22:15:29 -07:00
|
|
|
|
|
|
|
/* if DNSKEY, algorithm; if DS, digest type */
|
2019-12-02 09:29:02 +01:00
|
|
|
rdata3 = cfg_obj_asuint32(cfg_tuple_get(key, "rdata3"));
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2019-09-18 19:45:20 -07:00
|
|
|
/* What type of trust anchor is this? */
|
2020-05-20 14:22:40 +10:00
|
|
|
obj = cfg_tuple_get(key, "anchortype");
|
|
|
|
if (cfg_obj_isvoid(obj)) {
|
|
|
|
/*
|
|
|
|
* "anchortype" is not defined, this must be a static-key
|
|
|
|
* configured with trusted-keys.
|
|
|
|
*/
|
2019-09-18 19:45:20 -07:00
|
|
|
anchortype = STATIC_KEY;
|
|
|
|
} else {
|
2020-05-20 14:22:40 +10:00
|
|
|
atstr = cfg_obj_asstring(obj);
|
|
|
|
if (strcasecmp(atstr, "static-key") == 0) {
|
|
|
|
anchortype = STATIC_KEY;
|
|
|
|
} else if (strcasecmp(atstr, "static-ds") == 0) {
|
|
|
|
anchortype = STATIC_DS;
|
|
|
|
} else if (strcasecmp(atstr, "initial-key") == 0) {
|
|
|
|
anchortype = INITIAL_KEY;
|
|
|
|
} else if (strcasecmp(atstr, "initial-ds") == 0) {
|
|
|
|
anchortype = INITIAL_DS;
|
|
|
|
} else {
|
|
|
|
delv_log(ISC_LOG_ERROR,
|
|
|
|
"key '%s': invalid initialization method '%s'",
|
|
|
|
keynamestr, atstr);
|
|
|
|
result = ISC_R_FAILURE;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2019-09-18 19:45:20 -07:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2019-09-18 19:45:20 -07:00
|
|
|
isc_buffer_init(&databuf, data, sizeof(data));
|
|
|
|
isc_buffer_init(&rrdatabuf, rrdata, sizeof(rrdata));
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2019-12-02 09:29:02 +01:00
|
|
|
if (rdata1 > 0xffff) {
|
2014-02-16 13:03:17 -08:00
|
|
|
CHECK(ISC_R_RANGE);
|
2019-09-15 22:15:29 -07:00
|
|
|
}
|
2019-12-02 09:29:02 +01:00
|
|
|
if (rdata2 > 0xff) {
|
2014-02-16 13:03:17 -08:00
|
|
|
CHECK(ISC_R_RANGE);
|
2019-09-15 22:15:29 -07:00
|
|
|
}
|
2019-12-02 09:29:02 +01:00
|
|
|
if (rdata3 > 0xff) {
|
2014-02-16 13:03:17 -08:00
|
|
|
CHECK(ISC_R_RANGE);
|
2019-09-15 22:15:29 -07:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2019-09-18 19:45:20 -07:00
|
|
|
switch (anchortype) {
|
|
|
|
case STATIC_KEY:
|
|
|
|
case INITIAL_KEY:
|
|
|
|
case TRUSTED:
|
|
|
|
dnskey.common.rdclass = dns_rdataclass_in;
|
|
|
|
dnskey.common.rdtype = dns_rdatatype_dnskey;
|
|
|
|
dnskey.mctx = NULL;
|
|
|
|
|
|
|
|
ISC_LINK_INIT(&dnskey.common, link);
|
|
|
|
|
2019-12-02 09:29:02 +01:00
|
|
|
dnskey.flags = (uint16_t)rdata1;
|
|
|
|
dnskey.protocol = (uint8_t)rdata2;
|
|
|
|
dnskey.algorithm = (uint8_t)rdata3;
|
2019-09-18 19:45:20 -07:00
|
|
|
|
|
|
|
datastr = cfg_obj_asstring(cfg_tuple_get(key, "data"));
|
|
|
|
CHECK(isc_base64_decodestring(datastr, &databuf));
|
|
|
|
isc_buffer_usedregion(&databuf, &r);
|
|
|
|
dnskey.datalen = r.length;
|
|
|
|
dnskey.data = r.base;
|
|
|
|
|
|
|
|
CHECK(dns_rdata_fromstruct(NULL, dnskey.common.rdclass,
|
2020-02-12 13:59:18 +01:00
|
|
|
dnskey.common.rdtype, &dnskey,
|
|
|
|
&rrdatabuf));
|
2019-09-18 19:45:20 -07:00
|
|
|
CHECK(dns_client_addtrustedkey(client, dns_rdataclass_in,
|
2020-02-12 13:59:18 +01:00
|
|
|
dns_rdatatype_dnskey, keyname,
|
|
|
|
&rrdatabuf));
|
2019-09-18 19:45:20 -07:00
|
|
|
break;
|
|
|
|
case INITIAL_DS:
|
|
|
|
case STATIC_DS:
|
|
|
|
ds.common.rdclass = dns_rdataclass_in;
|
|
|
|
ds.common.rdtype = dns_rdatatype_ds;
|
|
|
|
ds.mctx = NULL;
|
|
|
|
|
|
|
|
ISC_LINK_INIT(&ds.common, link);
|
|
|
|
|
2019-12-02 09:29:02 +01:00
|
|
|
ds.key_tag = (uint16_t)rdata1;
|
|
|
|
ds.algorithm = (uint8_t)rdata2;
|
|
|
|
ds.digest_type = (uint8_t)rdata3;
|
2019-09-18 19:45:20 -07:00
|
|
|
|
|
|
|
datastr = cfg_obj_asstring(cfg_tuple_get(key, "data"));
|
|
|
|
CHECK(isc_hex_decodestring(datastr, &databuf));
|
|
|
|
isc_buffer_usedregion(&databuf, &r);
|
|
|
|
|
|
|
|
switch (ds.digest_type) {
|
|
|
|
case DNS_DSDIGEST_SHA1:
|
|
|
|
if (r.length != ISC_SHA1_DIGESTLENGTH) {
|
|
|
|
CHECK(ISC_R_UNEXPECTEDEND);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case DNS_DSDIGEST_SHA256:
|
|
|
|
if (r.length != ISC_SHA256_DIGESTLENGTH) {
|
|
|
|
CHECK(ISC_R_UNEXPECTEDEND);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case DNS_DSDIGEST_SHA384:
|
|
|
|
if (r.length != ISC_SHA384_DIGESTLENGTH) {
|
|
|
|
CHECK(ISC_R_UNEXPECTEDEND);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2019-09-18 19:45:20 -07:00
|
|
|
ds.length = r.length;
|
|
|
|
ds.digest = r.base;
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2019-09-18 19:45:20 -07:00
|
|
|
CHECK(dns_rdata_fromstruct(NULL, ds.common.rdclass,
|
2020-02-12 13:59:18 +01:00
|
|
|
ds.common.rdtype, &ds, &rrdatabuf));
|
2019-09-18 19:45:20 -07:00
|
|
|
CHECK(dns_client_addtrustedkey(client, dns_rdataclass_in,
|
2020-02-12 13:59:18 +01:00
|
|
|
dns_rdatatype_ds, keyname,
|
|
|
|
&rrdatabuf));
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2018-10-05 12:00:42 -07:00
|
|
|
num_keys++;
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2020-02-12 13:59:18 +01:00
|
|
|
cleanup:
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result == DST_R_NOCRYPTO) {
|
2014-02-16 13:03:17 -08:00
|
|
|
cfg_obj_log(key, lctx, ISC_LOG_ERROR, "no crypto support");
|
2020-02-13 21:48:23 +01:00
|
|
|
} else if (result == DST_R_UNSUPPORTEDALG) {
|
2014-02-16 13:03:17 -08:00
|
|
|
cfg_obj_log(key, lctx, ISC_LOG_WARNING,
|
2020-02-12 13:59:18 +01:00
|
|
|
"skipping trusted key '%s': %s", keynamestr,
|
|
|
|
isc_result_totext(result));
|
2014-02-16 13:03:17 -08:00
|
|
|
result = ISC_R_SUCCESS;
|
|
|
|
} else if (result != ISC_R_SUCCESS) {
|
|
|
|
cfg_obj_log(key, lctx, ISC_LOG_ERROR,
|
2020-02-12 13:59:18 +01:00
|
|
|
"failed to add trusted key '%s': %s", keynamestr,
|
|
|
|
isc_result_totext(result));
|
2014-02-16 13:03:17 -08:00
|
|
|
result = ISC_R_FAILURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return (result);
|
|
|
|
}
|
|
|
|
|
|
|
|
static isc_result_t
|
2020-02-13 14:44:37 -08:00
|
|
|
load_keys(const cfg_obj_t *keys, dns_client_t *client) {
|
2014-02-16 13:03:17 -08:00
|
|
|
const cfg_listelt_t *elt, *elt2;
|
2020-02-13 14:44:37 -08:00
|
|
|
const cfg_obj_t *key, *keylist;
|
|
|
|
isc_result_t result = ISC_R_SUCCESS;
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2020-02-13 14:44:37 -08:00
|
|
|
for (elt = cfg_list_first(keys); elt != NULL; elt = cfg_list_next(elt))
|
|
|
|
{
|
2014-02-16 13:03:17 -08:00
|
|
|
keylist = cfg_listelt_value(elt);
|
|
|
|
|
2020-02-12 13:59:18 +01:00
|
|
|
for (elt2 = cfg_list_first(keylist); elt2 != NULL;
|
|
|
|
elt2 = cfg_list_next(elt2)) {
|
2014-02-16 13:03:17 -08:00
|
|
|
key = cfg_listelt_value(elt2);
|
2014-02-16 23:46:32 +00:00
|
|
|
CHECK(key_fromconfig(key, client));
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-02-12 13:59:18 +01:00
|
|
|
cleanup:
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result == DST_R_NOCRYPTO) {
|
2014-02-16 13:03:17 -08:00
|
|
|
result = ISC_R_SUCCESS;
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
return (result);
|
|
|
|
}
|
|
|
|
|
|
|
|
static isc_result_t
|
2020-02-13 14:44:37 -08:00
|
|
|
setup_dnsseckeys(dns_client_t *client) {
|
|
|
|
isc_result_t result;
|
|
|
|
cfg_parser_t *parser = NULL;
|
2018-10-05 12:00:42 -07:00
|
|
|
const cfg_obj_t *trusted_keys = NULL;
|
2014-02-16 13:03:17 -08:00
|
|
|
const cfg_obj_t *managed_keys = NULL;
|
2019-12-04 11:06:40 +01:00
|
|
|
const cfg_obj_t *trust_anchors = NULL;
|
2020-02-13 14:44:37 -08:00
|
|
|
cfg_obj_t *bindkeys = NULL;
|
|
|
|
const char *filename = anchorfile;
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2019-08-06 09:34:27 -07:00
|
|
|
if (!root_validation) {
|
2014-02-16 13:03:17 -08:00
|
|
|
return (ISC_R_SUCCESS);
|
2018-10-05 12:00:42 -07:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2014-02-26 19:00:05 -08:00
|
|
|
if (filename == NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
filename = SYSCONFDIR "/bind.keys";
|
2014-02-26 19:00:05 -08:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2014-10-02 22:36:50 -07:00
|
|
|
if (trust_anchor == NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
trust_anchor = isc_mem_strdup(mctx, ".");
|
2014-10-02 22:36:50 -07:00
|
|
|
}
|
|
|
|
|
2018-10-05 12:00:42 -07:00
|
|
|
if (trust_anchor != NULL) {
|
2017-10-03 00:28:31 -07:00
|
|
|
CHECK(convert_name(&afn, &anchor_name, trust_anchor));
|
2018-10-05 12:00:42 -07:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
CHECK(cfg_parser_create(mctx, dns_lctx, &parser));
|
|
|
|
|
|
|
|
if (access(filename, R_OK) != 0) {
|
2018-10-05 12:00:42 -07:00
|
|
|
if (anchorfile != NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("Unable to read key file '%s'", anchorfile);
|
2018-10-05 12:00:42 -07:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
} else {
|
2020-02-12 13:59:18 +01:00
|
|
|
result = cfg_parse_file(parser, filename, &cfg_type_bindkeys,
|
|
|
|
&bindkeys);
|
2018-10-05 12:00:42 -07:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
|
|
|
if (anchorfile != NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("Unable to load keys from '%s'",
|
|
|
|
anchorfile);
|
2018-10-05 12:00:42 -07:00
|
|
|
}
|
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (bindkeys == NULL) {
|
|
|
|
isc_buffer_t b;
|
|
|
|
|
|
|
|
isc_buffer_init(&b, anchortext, sizeof(anchortext) - 1);
|
|
|
|
isc_buffer_add(&b, sizeof(anchortext) - 1);
|
2019-01-21 20:03:45 -08:00
|
|
|
result = cfg_parse_buffer(parser, &b, NULL, 0,
|
|
|
|
&cfg_type_bindkeys, 0, &bindkeys);
|
2018-10-05 12:00:42 -07:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("Unable to parse built-in keys");
|
2018-10-05 12:00:42 -07:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
INSIST(bindkeys != NULL);
|
2018-10-05 12:00:42 -07:00
|
|
|
cfg_map_get(bindkeys, "trusted-keys", &trusted_keys);
|
2014-02-16 13:03:17 -08:00
|
|
|
cfg_map_get(bindkeys, "managed-keys", &managed_keys);
|
2019-12-04 11:06:40 +01:00
|
|
|
cfg_map_get(bindkeys, "trust-anchors", &trust_anchors);
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2018-10-05 12:00:42 -07:00
|
|
|
if (trusted_keys != NULL) {
|
|
|
|
CHECK(load_keys(trusted_keys, client));
|
|
|
|
}
|
|
|
|
if (managed_keys != NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
CHECK(load_keys(managed_keys, client));
|
2018-10-05 12:00:42 -07:00
|
|
|
}
|
2019-12-04 11:06:40 +01:00
|
|
|
if (trust_anchors != NULL) {
|
|
|
|
CHECK(load_keys(trust_anchors, client));
|
2018-10-05 12:00:42 -07:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
result = ISC_R_SUCCESS;
|
|
|
|
|
2018-10-05 12:00:42 -07:00
|
|
|
if (num_keys == 0) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("No trusted keys were loaded");
|
2018-10-05 12:00:42 -07:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2020-02-12 13:59:18 +01:00
|
|
|
cleanup:
|
2018-11-19 13:31:36 +00:00
|
|
|
if (bindkeys != NULL) {
|
|
|
|
cfg_obj_destroy(parser, &bindkeys);
|
|
|
|
}
|
|
|
|
if (parser != NULL) {
|
|
|
|
cfg_parser_destroy(&parser);
|
|
|
|
}
|
2018-10-05 12:00:42 -07:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-04-23 11:14:12 -07:00
|
|
|
delv_log(ISC_LOG_ERROR, "setup_dnsseckeys: %s",
|
2020-02-12 13:59:18 +01:00
|
|
|
isc_result_totext(result));
|
2018-10-05 12:00:42 -07:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
return (result);
|
|
|
|
}
|
|
|
|
|
|
|
|
static isc_result_t
|
2020-02-13 14:44:37 -08:00
|
|
|
addserver(dns_client_t *client) {
|
|
|
|
struct addrinfo hints, *res, *cur;
|
|
|
|
int gaierror;
|
|
|
|
struct in_addr in4;
|
|
|
|
struct in6_addr in6;
|
|
|
|
isc_sockaddr_t *sa;
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_sockaddrlist_t servers;
|
2020-02-13 14:44:37 -08:00
|
|
|
uint32_t destport;
|
|
|
|
isc_result_t result;
|
|
|
|
dns_name_t *name = NULL;
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
result = parse_uint(&destport, port, 0xffff, "port");
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("Couldn't parse port number");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
ISC_LIST_INIT(servers);
|
|
|
|
|
2017-08-21 09:18:13 +02:00
|
|
|
if (inet_pton(AF_INET, server, &in4) == 1) {
|
|
|
|
if (!use_ipv4) {
|
|
|
|
fatal("Use of IPv4 disabled by -6");
|
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
sa = isc_mem_get(mctx, sizeof(*sa));
|
|
|
|
ISC_LINK_INIT(sa, link);
|
|
|
|
isc_sockaddr_fromin(sa, &in4, destport);
|
|
|
|
ISC_LIST_APPEND(servers, sa, link);
|
2017-08-21 09:18:13 +02:00
|
|
|
} else if (inet_pton(AF_INET6, server, &in6) == 1) {
|
|
|
|
if (!use_ipv6) {
|
|
|
|
fatal("Use of IPv6 disabled by -4");
|
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
sa = isc_mem_get(mctx, sizeof(*sa));
|
|
|
|
ISC_LINK_INIT(sa, link);
|
|
|
|
isc_sockaddr_fromin6(sa, &in6, destport);
|
|
|
|
ISC_LIST_APPEND(servers, sa, link);
|
|
|
|
} else {
|
|
|
|
memset(&hints, 0, sizeof(hints));
|
2020-02-13 21:48:23 +01:00
|
|
|
if (!use_ipv6) {
|
2014-02-16 13:03:17 -08:00
|
|
|
hints.ai_family = AF_INET;
|
2020-02-13 21:48:23 +01:00
|
|
|
} else if (!use_ipv4) {
|
2014-02-16 13:03:17 -08:00
|
|
|
hints.ai_family = AF_INET6;
|
2020-02-13 21:48:23 +01:00
|
|
|
} else {
|
2014-02-16 13:03:17 -08:00
|
|
|
hints.ai_family = AF_UNSPEC;
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
hints.ai_socktype = SOCK_DGRAM;
|
|
|
|
hints.ai_protocol = IPPROTO_UDP;
|
2016-06-28 21:25:30 -04:00
|
|
|
gaierror = getaddrinfo(server, port, &hints, &res);
|
|
|
|
if (gaierror != 0) {
|
2020-02-12 13:59:18 +01:00
|
|
|
delv_log(ISC_LOG_ERROR, "getaddrinfo failed: %s",
|
|
|
|
gai_strerror(gaierror));
|
2014-02-16 13:03:17 -08:00
|
|
|
return (ISC_R_FAILURE);
|
|
|
|
}
|
|
|
|
|
2014-02-18 02:07:37 +11:00
|
|
|
result = ISC_R_SUCCESS;
|
|
|
|
for (cur = res; cur != NULL; cur = cur->ai_next) {
|
|
|
|
if (cur->ai_family != AF_INET &&
|
2020-02-13 21:48:23 +01:00
|
|
|
cur->ai_family != AF_INET6) {
|
2014-02-18 02:07:37 +11:00
|
|
|
continue;
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
sa = isc_mem_get(mctx, sizeof(*sa));
|
|
|
|
memset(sa, 0, sizeof(*sa));
|
|
|
|
ISC_LINK_INIT(sa, link);
|
2014-02-18 02:07:37 +11:00
|
|
|
memmove(&sa->type, cur->ai_addr, cur->ai_addrlen);
|
2014-02-26 19:00:05 -08:00
|
|
|
sa->length = (unsigned int)cur->ai_addrlen;
|
2014-02-16 13:03:17 -08:00
|
|
|
ISC_LIST_APPEND(servers, sa, link);
|
|
|
|
}
|
2014-02-18 02:07:37 +11:00
|
|
|
freeaddrinfo(res);
|
|
|
|
CHECK(result);
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
CHECK(dns_client_setservers(client, dns_rdataclass_in, name, &servers));
|
|
|
|
|
2020-02-12 13:59:18 +01:00
|
|
|
cleanup:
|
2014-02-16 13:03:17 -08:00
|
|
|
while (!ISC_LIST_EMPTY(servers)) {
|
|
|
|
sa = ISC_LIST_HEAD(servers);
|
|
|
|
ISC_LIST_UNLINK(servers, sa, link);
|
|
|
|
isc_mem_put(mctx, sa, sizeof(*sa));
|
|
|
|
}
|
|
|
|
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-04-23 11:14:12 -07:00
|
|
|
delv_log(ISC_LOG_ERROR, "addserver: %s",
|
2020-02-12 13:59:18 +01:00
|
|
|
isc_result_totext(result));
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
return (result);
|
|
|
|
}
|
|
|
|
|
|
|
|
static isc_result_t
|
2020-02-13 14:44:37 -08:00
|
|
|
findserver(dns_client_t *client) {
|
|
|
|
isc_result_t result;
|
|
|
|
irs_resconf_t *resconf = NULL;
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_sockaddrlist_t *nameservers;
|
2020-02-13 14:44:37 -08:00
|
|
|
isc_sockaddr_t *sa, *next;
|
|
|
|
uint32_t destport;
|
2014-02-24 09:38:28 +11:00
|
|
|
|
|
|
|
result = parse_uint(&destport, port, 0xffff, "port");
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-02-24 09:38:28 +11:00
|
|
|
fatal("Couldn't parse port number");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
result = irs_resconf_load(mctx, "/etc/resolv.conf", &resconf);
|
|
|
|
if (result != ISC_R_SUCCESS && result != ISC_R_FILENOTFOUND) {
|
2014-04-23 11:14:12 -07:00
|
|
|
delv_log(ISC_LOG_ERROR, "irs_resconf_load: %s",
|
2020-02-12 13:59:18 +01:00
|
|
|
isc_result_totext(result));
|
2014-02-16 13:03:17 -08:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get nameservers from resolv.conf */
|
|
|
|
nameservers = irs_resconf_getnameservers(resconf);
|
|
|
|
for (sa = ISC_LIST_HEAD(*nameservers); sa != NULL; sa = next) {
|
|
|
|
next = ISC_LIST_NEXT(sa, link);
|
2014-02-24 09:38:28 +11:00
|
|
|
|
|
|
|
/* Set destination port */
|
|
|
|
if (sa->type.sa.sa_family == AF_INET && use_ipv4) {
|
|
|
|
sa->type.sin.sin_port = htons(destport);
|
|
|
|
continue;
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
2014-02-24 09:38:28 +11:00
|
|
|
if (sa->type.sa.sa_family == AF_INET6 && use_ipv6) {
|
|
|
|
sa->type.sin6.sin6_port = htons(destport);
|
|
|
|
continue;
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
2014-02-24 09:38:28 +11:00
|
|
|
|
|
|
|
/* Incompatible protocol family */
|
|
|
|
ISC_LIST_UNLINK(*nameservers, sa, link);
|
|
|
|
isc_mem_put(mctx, sa, sizeof(*sa));
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* None found, use localhost */
|
|
|
|
if (ISC_LIST_EMPTY(*nameservers)) {
|
|
|
|
if (use_ipv4) {
|
|
|
|
struct in_addr localhost;
|
|
|
|
localhost.s_addr = htonl(INADDR_LOOPBACK);
|
|
|
|
sa = isc_mem_get(mctx, sizeof(*sa));
|
|
|
|
isc_sockaddr_fromin(sa, &localhost, destport);
|
|
|
|
|
|
|
|
ISC_LINK_INIT(sa, link);
|
|
|
|
ISC_LIST_APPEND(*nameservers, sa, link);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (use_ipv6) {
|
|
|
|
sa = isc_mem_get(mctx, sizeof(*sa));
|
2014-02-24 09:38:28 +11:00
|
|
|
isc_sockaddr_fromin6(sa, &in6addr_loopback, destport);
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
ISC_LINK_INIT(sa, link);
|
|
|
|
ISC_LIST_APPEND(*nameservers, sa, link);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
result = dns_client_setservers(client, dns_rdataclass_in, NULL,
|
|
|
|
nameservers);
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-04-23 11:14:12 -07:00
|
|
|
delv_log(ISC_LOG_ERROR, "dns_client_setservers: %s",
|
2020-02-12 13:59:18 +01:00
|
|
|
isc_result_totext(result));
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
cleanup:
|
2020-02-13 21:48:23 +01:00
|
|
|
if (resconf != NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
irs_resconf_destroy(&resconf);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
return (result);
|
|
|
|
}
|
|
|
|
|
|
|
|
static isc_result_t
|
2020-02-13 14:44:37 -08:00
|
|
|
parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc) {
|
|
|
|
uint32_t n;
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_result_t result = isc_parse_uint32(&n, value, 10);
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result == ISC_R_SUCCESS && n > max) {
|
2014-02-16 13:03:17 -08:00
|
|
|
result = ISC_R_RANGE;
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2020-02-12 13:59:18 +01:00
|
|
|
printf("invalid %s '%s': %s\n", desc, value,
|
|
|
|
isc_result_totext(result));
|
2014-02-16 13:03:17 -08:00
|
|
|
return (result);
|
|
|
|
}
|
|
|
|
*uip = n;
|
|
|
|
return (ISC_R_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2020-02-13 14:44:37 -08:00
|
|
|
plus_option(char *option) {
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_result_t result;
|
2020-02-13 14:44:37 -08:00
|
|
|
char *cmd, *value, *last = NULL;
|
|
|
|
bool state = true;
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2018-05-01 16:03:46 +10:00
|
|
|
INSIST(option != NULL);
|
|
|
|
|
2018-03-21 21:08:29 +00:00
|
|
|
cmd = strtok_r(option, "=", &last);
|
2014-02-16 13:03:17 -08:00
|
|
|
if (cmd == NULL) {
|
2018-03-21 21:08:29 +00:00
|
|
|
printf(";; Invalid option %s\n", option);
|
2014-02-16 13:03:17 -08:00
|
|
|
return;
|
2018-04-12 18:42:39 +01:00
|
|
|
}
|
2020-02-12 13:59:18 +01:00
|
|
|
if (strncasecmp(cmd, "no", 2) == 0) {
|
2014-02-16 13:03:17 -08:00
|
|
|
cmd += 2;
|
2018-04-17 08:29:14 -07:00
|
|
|
state = false;
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
|
2018-03-21 21:08:29 +00:00
|
|
|
value = strtok_r(NULL, "\0", &last);
|
|
|
|
|
2020-02-12 13:59:18 +01:00
|
|
|
#define FULLCHECK(A) \
|
|
|
|
do { \
|
|
|
|
size_t _l = strlen(cmd); \
|
2014-02-16 13:03:17 -08:00
|
|
|
if (_l >= sizeof(A) || strncasecmp(cmd, A, _l) != 0) \
|
2020-02-12 13:59:18 +01:00
|
|
|
goto invalid_option; \
|
2014-02-16 13:03:17 -08:00
|
|
|
} while (0)
|
|
|
|
|
|
|
|
switch (cmd[0]) {
|
|
|
|
case 'a': /* all */
|
|
|
|
FULLCHECK("all");
|
|
|
|
showcomments = state;
|
|
|
|
rrcomments = state;
|
|
|
|
showtrust = state;
|
|
|
|
break;
|
|
|
|
case 'c':
|
|
|
|
switch (cmd[1]) {
|
|
|
|
case 'd': /* cdflag */
|
|
|
|
FULLCHECK("cdflag");
|
|
|
|
cdflag = state;
|
|
|
|
break;
|
|
|
|
case 'l': /* class */
|
|
|
|
FULLCHECK("class");
|
2018-04-17 08:29:14 -07:00
|
|
|
noclass = !state;
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
|
|
|
case 'o': /* comments */
|
|
|
|
FULLCHECK("comments");
|
|
|
|
showcomments = state;
|
|
|
|
break;
|
|
|
|
case 'r': /* crypto */
|
|
|
|
FULLCHECK("crypto");
|
2018-04-17 08:29:14 -07:00
|
|
|
nocrypto = !state;
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
goto invalid_option;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'd':
|
|
|
|
switch (cmd[1]) {
|
|
|
|
case 'l': /* dlv */
|
|
|
|
FULLCHECK("dlv");
|
2019-08-06 09:34:27 -07:00
|
|
|
if (state) {
|
|
|
|
fprintf(stderr, "Invalid option: "
|
|
|
|
"+dlv is obsolete\n");
|
|
|
|
exit(1);
|
2014-10-02 22:36:50 -07:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
|
|
|
case 'n': /* dnssec */
|
|
|
|
FULLCHECK("dnssec");
|
|
|
|
showdnssec = state;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
goto invalid_option;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'm':
|
|
|
|
switch (cmd[1]) {
|
|
|
|
case 't': /* mtrace */
|
|
|
|
message_trace = state;
|
2020-02-13 21:48:23 +01:00
|
|
|
if (state) {
|
2014-02-16 13:03:17 -08:00
|
|
|
resolve_trace = state;
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
|
|
|
case 'u': /* multiline */
|
|
|
|
FULLCHECK("multiline");
|
|
|
|
multiline = state;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
goto invalid_option;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'r':
|
|
|
|
switch (cmd[1]) {
|
|
|
|
case 'o': /* root */
|
|
|
|
FULLCHECK("root");
|
2020-02-13 21:48:23 +01:00
|
|
|
if (state && no_sigs) {
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
root_validation = state;
|
2014-10-02 22:36:50 -07:00
|
|
|
if (value != NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
trust_anchor = isc_mem_strdup(mctx, value);
|
2014-10-02 22:36:50 -07:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
|
|
|
case 'r': /* rrcomments */
|
|
|
|
FULLCHECK("rrcomments");
|
|
|
|
rrcomments = state;
|
|
|
|
break;
|
|
|
|
case 't': /* rtrace */
|
|
|
|
FULLCHECK("rtrace");
|
|
|
|
resolve_trace = state;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
goto invalid_option;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
switch (cmd[1]) {
|
|
|
|
case 'h': /* short */
|
|
|
|
FULLCHECK("short");
|
|
|
|
short_form = state;
|
|
|
|
if (short_form) {
|
2018-04-17 08:29:14 -07:00
|
|
|
multiline = false;
|
|
|
|
showcomments = false;
|
|
|
|
showtrust = false;
|
|
|
|
showdnssec = false;
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'p': /* split */
|
|
|
|
FULLCHECK("split");
|
2020-02-13 21:48:23 +01:00
|
|
|
if (value != NULL && !state) {
|
2014-02-16 13:03:17 -08:00
|
|
|
goto invalid_option;
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
if (!state) {
|
|
|
|
splitwidth = 0;
|
|
|
|
break;
|
2020-02-13 21:48:23 +01:00
|
|
|
} else if (value == NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2020-02-12 13:59:18 +01:00
|
|
|
result = parse_uint(&splitwidth, value, 1023, "split");
|
2014-02-16 13:03:17 -08:00
|
|
|
if (splitwidth % 4 != 0) {
|
|
|
|
splitwidth = ((splitwidth + 3) / 4) * 4;
|
|
|
|
warn("split must be a multiple of 4; "
|
2020-02-12 13:59:18 +01:00
|
|
|
"adjusting to %d",
|
|
|
|
splitwidth);
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
* There is an adjustment done in the
|
|
|
|
* totext_<rrtype>() functions which causes
|
|
|
|
* splitwidth to shrink. This is okay when we're
|
|
|
|
* using the default width but incorrect in this
|
|
|
|
* case, so we correct for it
|
|
|
|
*/
|
2020-02-13 21:48:23 +01:00
|
|
|
if (splitwidth) {
|
2014-02-16 13:03:17 -08:00
|
|
|
splitwidth += 3;
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("Couldn't parse split");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
goto invalid_option;
|
|
|
|
}
|
|
|
|
break;
|
2016-02-09 15:38:34 +05:30
|
|
|
case 'u':
|
|
|
|
FULLCHECK("unknownformat");
|
|
|
|
print_unknown_format = state;
|
|
|
|
break;
|
2014-02-16 13:03:17 -08:00
|
|
|
case 't':
|
|
|
|
switch (cmd[1]) {
|
2014-11-21 09:37:04 -08:00
|
|
|
case 'c': /* tcp */
|
|
|
|
FULLCHECK("tcp");
|
|
|
|
use_tcp = state;
|
|
|
|
break;
|
2014-02-16 13:03:17 -08:00
|
|
|
case 'r': /* trust */
|
|
|
|
FULLCHECK("trust");
|
|
|
|
showtrust = state;
|
|
|
|
break;
|
|
|
|
case 't': /* ttl */
|
|
|
|
FULLCHECK("ttl");
|
2018-04-17 08:29:14 -07:00
|
|
|
nottl = !state;
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
goto invalid_option;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'v': /* vtrace */
|
|
|
|
FULLCHECK("vtrace");
|
|
|
|
validator_trace = state;
|
2020-02-13 21:48:23 +01:00
|
|
|
if (state) {
|
2014-02-16 13:03:17 -08:00
|
|
|
resolve_trace = state;
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
2019-07-20 17:24:41 -04:00
|
|
|
case 'y': /* yaml */
|
|
|
|
FULLCHECK("yaml");
|
|
|
|
yaml = state;
|
|
|
|
if (state) {
|
|
|
|
rrcomments = false;
|
|
|
|
}
|
|
|
|
break;
|
2014-02-16 13:03:17 -08:00
|
|
|
default:
|
|
|
|
invalid_option:
|
|
|
|
/*
|
|
|
|
* We can also add a "need_value:" case here if we ever
|
|
|
|
* add a plus-option that requires a specified value
|
|
|
|
*/
|
|
|
|
fprintf(stderr, "Invalid option: +%s\n", option);
|
|
|
|
usage();
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* options: "46a:b:c:d:himp:q:t:vx:";
|
|
|
|
*/
|
|
|
|
static const char *single_dash_opts = "46himv";
|
2018-11-14 11:30:50 +11:00
|
|
|
static const char *dash_opts = "46abcdhimpqtvx";
|
|
|
|
|
2018-04-17 08:29:14 -07:00
|
|
|
static bool
|
2020-02-13 14:44:37 -08:00
|
|
|
dash_option(char *option, char *next, bool *open_type_class) {
|
|
|
|
char opt, *value;
|
|
|
|
isc_result_t result;
|
|
|
|
bool value_from_next;
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_textregion_t tr;
|
2020-02-13 14:44:37 -08:00
|
|
|
dns_rdatatype_t rdtype;
|
2014-02-16 13:03:17 -08:00
|
|
|
dns_rdataclass_t rdclass;
|
2020-02-13 14:44:37 -08:00
|
|
|
char textname[MAXNAME];
|
|
|
|
struct in_addr in4;
|
|
|
|
struct in6_addr in6;
|
|
|
|
in_port_t srcport;
|
|
|
|
uint32_t num;
|
|
|
|
char *hash;
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
while (strpbrk(option, single_dash_opts) == &option[0]) {
|
|
|
|
/*
|
|
|
|
* Since the -[46himv] options do not take an argument,
|
|
|
|
* account for them (in any number and/or combination)
|
|
|
|
* if they appear as the first character(s) of a q-opt.
|
|
|
|
*/
|
|
|
|
opt = option[0];
|
|
|
|
switch (opt) {
|
|
|
|
case '4':
|
2020-02-13 21:48:23 +01:00
|
|
|
if (isc_net_probeipv4() != ISC_R_SUCCESS) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("IPv4 networking not available");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
if (use_ipv6) {
|
|
|
|
isc_net_disableipv6();
|
2018-04-17 08:29:14 -07:00
|
|
|
use_ipv6 = false;
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case '6':
|
2020-02-13 21:48:23 +01:00
|
|
|
if (isc_net_probeipv6() != ISC_R_SUCCESS) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("IPv6 networking not available");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
if (use_ipv4) {
|
|
|
|
isc_net_disableipv4();
|
2018-04-17 08:29:14 -07:00
|
|
|
use_ipv4 = false;
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'h':
|
|
|
|
usage();
|
|
|
|
exit(0);
|
2020-02-13 21:48:23 +01:00
|
|
|
/* NOTREACHED */
|
2014-02-16 13:03:17 -08:00
|
|
|
case 'i':
|
2018-04-17 08:29:14 -07:00
|
|
|
no_sigs = true;
|
|
|
|
root_validation = false;
|
2014-02-16 13:03:17 -08:00
|
|
|
break;
|
|
|
|
case 'm':
|
|
|
|
/* handled in preparse_args() */
|
|
|
|
break;
|
|
|
|
case 'v':
|
2018-08-07 16:46:53 +02:00
|
|
|
fprintf(stderr, "delv %s\n", PACKAGE_VERSION);
|
2014-02-16 13:03:17 -08:00
|
|
|
exit(0);
|
2020-02-13 21:48:23 +01:00
|
|
|
/* NOTREACHED */
|
2014-02-16 13:03:17 -08:00
|
|
|
default:
|
|
|
|
INSIST(0);
|
2018-11-07 15:00:07 +07:00
|
|
|
ISC_UNREACHABLE();
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
2020-02-13 21:48:23 +01:00
|
|
|
if (strlen(option) > 1U) {
|
2014-02-16 13:03:17 -08:00
|
|
|
option = &option[1];
|
2020-02-13 21:48:23 +01:00
|
|
|
} else {
|
2018-04-17 08:29:14 -07:00
|
|
|
return (false);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
opt = option[0];
|
|
|
|
if (strlen(option) > 1U) {
|
2018-04-17 08:29:14 -07:00
|
|
|
value_from_next = false;
|
2014-02-16 13:03:17 -08:00
|
|
|
value = &option[1];
|
|
|
|
} else {
|
2018-04-17 08:29:14 -07:00
|
|
|
value_from_next = true;
|
2014-02-16 13:03:17 -08:00
|
|
|
value = next;
|
|
|
|
}
|
2020-02-13 21:48:23 +01:00
|
|
|
if (value == NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
goto invalid_option;
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
switch (opt) {
|
|
|
|
case 'a':
|
|
|
|
anchorfile = isc_mem_strdup(mctx, value);
|
|
|
|
return (value_from_next);
|
|
|
|
case 'b':
|
|
|
|
hash = strchr(value, '#');
|
|
|
|
if (hash != NULL) {
|
|
|
|
result = parse_uint(&num, hash + 1, 0xffff, "port");
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("Couldn't parse port number");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
srcport = num;
|
|
|
|
*hash = '\0';
|
2020-02-13 21:48:23 +01:00
|
|
|
} else {
|
2014-02-16 13:03:17 -08:00
|
|
|
srcport = 0;
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
if (inet_pton(AF_INET, value, &in4) == 1) {
|
2020-02-13 21:48:23 +01:00
|
|
|
if (srcaddr4 != NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("Only one local address per family "
|
|
|
|
"can be specified\n");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_sockaddr_fromin(&a4, &in4, srcport);
|
|
|
|
srcaddr4 = &a4;
|
|
|
|
} else if (inet_pton(AF_INET6, value, &in6) == 1) {
|
2020-02-13 21:48:23 +01:00
|
|
|
if (srcaddr6 != NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("Only one local address per family "
|
|
|
|
"can be specified\n");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_sockaddr_fromin6(&a6, &in6, srcport);
|
|
|
|
srcaddr6 = &a6;
|
|
|
|
} else {
|
2020-02-13 21:48:23 +01:00
|
|
|
if (hash != NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
*hash = '#';
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("Invalid address %s", value);
|
|
|
|
}
|
2020-02-13 21:48:23 +01:00
|
|
|
if (hash != NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
*hash = '#';
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
return (value_from_next);
|
|
|
|
case 'c':
|
2020-02-13 21:48:23 +01:00
|
|
|
if (classset) {
|
2014-02-16 13:03:17 -08:00
|
|
|
warn("extra query class");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2018-04-17 08:29:14 -07:00
|
|
|
*open_type_class = false;
|
2014-02-16 13:03:17 -08:00
|
|
|
tr.base = value;
|
|
|
|
tr.length = strlen(value);
|
|
|
|
result = dns_rdataclass_fromtext(&rdclass,
|
|
|
|
(isc_textregion_t *)&tr);
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result == ISC_R_SUCCESS) {
|
2018-04-17 08:29:14 -07:00
|
|
|
classset = true;
|
2020-02-13 21:48:23 +01:00
|
|
|
} else if (rdclass != dns_rdataclass_in) {
|
2014-02-16 13:03:17 -08:00
|
|
|
warn("ignoring non-IN query class");
|
2020-02-13 21:48:23 +01:00
|
|
|
} else {
|
2014-02-16 13:03:17 -08:00
|
|
|
warn("ignoring invalid class");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
return (value_from_next);
|
|
|
|
case 'd':
|
|
|
|
result = parse_uint(&num, value, 99, "debug level");
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("Couldn't parse debug level");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
loglevel = num;
|
|
|
|
return (value_from_next);
|
|
|
|
case 'p':
|
|
|
|
port = value;
|
|
|
|
return (value_from_next);
|
|
|
|
case 'q':
|
2014-10-02 22:36:50 -07:00
|
|
|
if (curqname != NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
warn("extra query name");
|
2014-10-02 22:36:50 -07:00
|
|
|
isc_mem_free(mctx, curqname);
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
2014-10-02 22:36:50 -07:00
|
|
|
curqname = isc_mem_strdup(mctx, value);
|
2014-02-16 13:03:17 -08:00
|
|
|
return (value_from_next);
|
|
|
|
case 't':
|
2018-04-17 08:29:14 -07:00
|
|
|
*open_type_class = false;
|
2014-02-16 13:03:17 -08:00
|
|
|
tr.base = value;
|
|
|
|
tr.length = strlen(value);
|
|
|
|
result = dns_rdatatype_fromtext(&rdtype,
|
2020-02-12 13:59:18 +01:00
|
|
|
(isc_textregion_t *)&tr);
|
2014-02-16 13:03:17 -08:00
|
|
|
if (result == ISC_R_SUCCESS) {
|
2020-02-13 21:48:23 +01:00
|
|
|
if (typeset) {
|
2014-02-16 13:03:17 -08:00
|
|
|
warn("extra query type");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
if (rdtype == dns_rdatatype_ixfr ||
|
2020-02-13 21:48:23 +01:00
|
|
|
rdtype == dns_rdatatype_axfr) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("Transfer not supported");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
qtype = rdtype;
|
2018-04-17 08:29:14 -07:00
|
|
|
typeset = true;
|
2020-02-13 21:48:23 +01:00
|
|
|
} else {
|
2014-02-16 13:03:17 -08:00
|
|
|
warn("ignoring invalid type");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
return (value_from_next);
|
|
|
|
case 'x':
|
2020-02-12 13:59:18 +01:00
|
|
|
result = get_reverse(textname, sizeof(textname), value, false);
|
2014-02-16 13:03:17 -08:00
|
|
|
if (result == ISC_R_SUCCESS) {
|
2014-10-02 22:36:50 -07:00
|
|
|
if (curqname != NULL) {
|
|
|
|
isc_mem_free(mctx, curqname);
|
2014-02-16 13:03:17 -08:00
|
|
|
warn("extra query name");
|
2014-10-02 22:36:50 -07:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
curqname = isc_mem_strdup(mctx, textname);
|
2020-02-13 21:48:23 +01:00
|
|
|
if (typeset) {
|
2014-02-16 13:03:17 -08:00
|
|
|
warn("extra query type");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
qtype = dns_rdatatype_ptr;
|
2018-04-17 08:29:14 -07:00
|
|
|
typeset = true;
|
2014-02-16 13:03:17 -08:00
|
|
|
} else {
|
|
|
|
fprintf(stderr, "Invalid IP address %s\n", value);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
return (value_from_next);
|
|
|
|
invalid_option:
|
|
|
|
default:
|
|
|
|
fprintf(stderr, "Invalid option: -%s\n", option);
|
|
|
|
usage();
|
|
|
|
}
|
|
|
|
/* NOTREACHED */
|
2018-04-17 08:29:14 -07:00
|
|
|
return (false);
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check for -m first to determine whether to enable
|
|
|
|
* memory debugging when setting up the memory context.
|
|
|
|
*/
|
|
|
|
static void
|
2020-02-13 14:44:37 -08:00
|
|
|
preparse_args(int argc, char **argv) {
|
|
|
|
bool ipv4only = false, ipv6only = false;
|
2014-02-16 13:03:17 -08:00
|
|
|
char *option;
|
|
|
|
|
|
|
|
for (argc--, argv++; argc > 0; argc--, argv++) {
|
2018-11-13 16:41:54 -08:00
|
|
|
if (argv[0][0] != '-') {
|
2014-02-16 13:03:17 -08:00
|
|
|
continue;
|
2018-11-13 16:41:54 -08:00
|
|
|
}
|
|
|
|
|
2014-02-16 13:03:17 -08:00
|
|
|
option = &argv[0][1];
|
|
|
|
while (strpbrk(option, single_dash_opts) == &option[0]) {
|
2017-08-16 11:10:24 +02:00
|
|
|
switch (option[0]) {
|
|
|
|
case 'm':
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_mem_debugging = ISC_MEM_DEBUGTRACE |
|
2020-02-12 13:59:18 +01:00
|
|
|
ISC_MEM_DEBUGRECORD;
|
2017-08-16 11:10:24 +02:00
|
|
|
break;
|
|
|
|
case '4':
|
|
|
|
if (ipv6only) {
|
|
|
|
fatal("only one of -4 and -6 allowed");
|
|
|
|
}
|
2018-04-17 08:29:14 -07:00
|
|
|
ipv4only = true;
|
2017-08-16 11:10:24 +02:00
|
|
|
break;
|
|
|
|
case '6':
|
|
|
|
if (ipv4only) {
|
|
|
|
fatal("only one of -4 and -6 allowed");
|
|
|
|
}
|
2018-04-17 08:29:14 -07:00
|
|
|
ipv6only = true;
|
2017-08-16 11:10:24 +02:00
|
|
|
break;
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
option = &option[1];
|
|
|
|
}
|
2018-11-13 16:41:54 -08:00
|
|
|
|
2018-11-14 11:30:50 +11:00
|
|
|
if (strlen(option) == 0U) {
|
|
|
|
continue;
|
|
|
|
}
|
2018-11-13 16:41:54 -08:00
|
|
|
|
2018-11-14 11:30:50 +11:00
|
|
|
/* Look for dash value option. */
|
|
|
|
if (strpbrk(option, dash_opts) != &option[0] ||
|
2020-02-12 13:59:18 +01:00
|
|
|
strlen(option) > 1U) {
|
2018-11-14 11:30:50 +11:00
|
|
|
/* Error or value in option. */
|
|
|
|
continue;
|
|
|
|
}
|
2018-11-13 16:41:54 -08:00
|
|
|
|
2018-11-14 11:30:50 +11:00
|
|
|
/* Dash value is next argument so we need to skip it. */
|
2018-11-13 16:41:54 -08:00
|
|
|
argc--;
|
|
|
|
argv++;
|
|
|
|
|
2018-11-14 11:30:50 +11:00
|
|
|
/* Handle missing argument */
|
2018-11-13 16:41:54 -08:00
|
|
|
if (argc == 0) {
|
2018-11-14 11:30:50 +11:00
|
|
|
break;
|
2018-11-13 16:41:54 -08:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Argument parsing is based on dig, but simplified: only one
|
|
|
|
* QNAME/QCLASS/QTYPE tuple can be specified, and options have
|
2014-04-23 11:14:12 -07:00
|
|
|
* been removed that aren't applicable to delv. The interface
|
2014-02-16 13:03:17 -08:00
|
|
|
* should be familiar to dig users, however.
|
|
|
|
*/
|
|
|
|
static void
|
2020-02-13 14:44:37 -08:00
|
|
|
parse_args(int argc, char **argv) {
|
|
|
|
isc_result_t result;
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_textregion_t tr;
|
2020-02-13 14:44:37 -08:00
|
|
|
dns_rdatatype_t rdtype;
|
2014-02-16 13:03:17 -08:00
|
|
|
dns_rdataclass_t rdclass;
|
2020-02-13 14:44:37 -08:00
|
|
|
bool open_type_class = true;
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
for (; argc > 0; argc--, argv++) {
|
|
|
|
if (argv[0][0] == '@') {
|
|
|
|
server = &argv[0][1];
|
|
|
|
} else if (argv[0][0] == '+') {
|
|
|
|
plus_option(&argv[0][1]);
|
|
|
|
} else if (argv[0][0] == '-') {
|
|
|
|
if (argc <= 1) {
|
|
|
|
if (dash_option(&argv[0][1], NULL,
|
2020-02-12 13:59:18 +01:00
|
|
|
&open_type_class)) {
|
2014-02-16 13:03:17 -08:00
|
|
|
argc--;
|
|
|
|
argv++;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (dash_option(&argv[0][1], argv[1],
|
2020-02-12 13:59:18 +01:00
|
|
|
&open_type_class)) {
|
2014-02-16 13:03:17 -08:00
|
|
|
argc--;
|
|
|
|
argv++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Anything which isn't an option
|
|
|
|
*/
|
|
|
|
if (open_type_class) {
|
|
|
|
tr.base = argv[0];
|
|
|
|
tr.length = strlen(argv[0]);
|
2020-02-12 13:59:18 +01:00
|
|
|
result = dns_rdatatype_fromtext(
|
|
|
|
&rdtype, (isc_textregion_t *)&tr);
|
2014-02-16 13:03:17 -08:00
|
|
|
if (result == ISC_R_SUCCESS) {
|
2020-02-13 21:48:23 +01:00
|
|
|
if (typeset) {
|
2014-02-16 13:03:17 -08:00
|
|
|
warn("extra query type");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
if (rdtype == dns_rdatatype_ixfr ||
|
2020-02-13 21:48:23 +01:00
|
|
|
rdtype == dns_rdatatype_axfr) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("Transfer not supported");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
qtype = rdtype;
|
2018-04-17 08:29:14 -07:00
|
|
|
typeset = true;
|
2014-02-16 13:03:17 -08:00
|
|
|
continue;
|
|
|
|
}
|
2020-02-12 13:59:18 +01:00
|
|
|
result = dns_rdataclass_fromtext(
|
|
|
|
&rdclass, (isc_textregion_t *)&tr);
|
2014-02-16 13:03:17 -08:00
|
|
|
if (result == ISC_R_SUCCESS) {
|
2020-02-13 21:48:23 +01:00
|
|
|
if (classset) {
|
2014-02-16 13:03:17 -08:00
|
|
|
warn("extra query class");
|
2020-02-13 14:44:37 -08:00
|
|
|
} else if (rdclass != dns_rdataclass_in)
|
|
|
|
{
|
2014-02-16 13:03:17 -08:00
|
|
|
warn("ignoring non-IN "
|
|
|
|
"query class");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-10-02 22:36:50 -07:00
|
|
|
if (curqname == NULL) {
|
|
|
|
curqname = isc_mem_strdup(mctx, argv[0]);
|
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If no qname or qtype specified, search for root/NS
|
|
|
|
* If no qtype specified, use A
|
|
|
|
*/
|
2020-02-13 21:48:23 +01:00
|
|
|
if (!typeset) {
|
2014-02-16 13:03:17 -08:00
|
|
|
qtype = dns_rdatatype_a;
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
if (curqname == NULL) {
|
|
|
|
qname = isc_mem_strdup(mctx, ".");
|
2014-10-02 22:36:50 -07:00
|
|
|
|
2020-02-13 21:48:23 +01:00
|
|
|
if (!typeset) {
|
2014-02-16 13:03:17 -08:00
|
|
|
qtype = dns_rdatatype_ns;
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
|
|
|
} else {
|
2014-10-02 22:36:50 -07:00
|
|
|
qname = curqname;
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
static isc_result_t
|
2020-02-13 14:44:37 -08:00
|
|
|
append_str(const char *text, int len, char **p, char *end) {
|
2020-02-13 21:48:23 +01:00
|
|
|
if (len > end - *p) {
|
2014-02-16 13:03:17 -08:00
|
|
|
return (ISC_R_NOSPACE);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
memmove(*p, text, len);
|
|
|
|
*p += len;
|
|
|
|
return (ISC_R_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
static isc_result_t
|
2020-02-13 14:44:37 -08:00
|
|
|
reverse_octets(const char *in, char **p, char *end) {
|
2014-02-16 13:03:17 -08:00
|
|
|
char *dot = strchr(in, '.');
|
2020-02-13 14:44:37 -08:00
|
|
|
int len;
|
2014-02-16 13:03:17 -08:00
|
|
|
if (dot != NULL) {
|
|
|
|
isc_result_t result;
|
|
|
|
result = reverse_octets(dot + 1, p, end);
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-02-16 13:03:17 -08:00
|
|
|
return (result);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
result = append_str(".", 1, p, end);
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-02-16 13:03:17 -08:00
|
|
|
return (result);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
len = (int)(dot - in);
|
2020-02-13 21:48:23 +01:00
|
|
|
} else {
|
2014-02-16 13:03:17 -08:00
|
|
|
len = strlen(in);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
return (append_str(in, len, p, end));
|
|
|
|
}
|
|
|
|
|
|
|
|
static isc_result_t
|
2020-02-13 14:44:37 -08:00
|
|
|
get_reverse(char *reverse, size_t len, char *value, bool strict) {
|
|
|
|
int r;
|
|
|
|
isc_result_t result;
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_netaddr_t addr;
|
|
|
|
|
|
|
|
addr.family = AF_INET6;
|
|
|
|
r = inet_pton(AF_INET6, value, &addr.type.in6);
|
|
|
|
if (r > 0) {
|
|
|
|
/* This is a valid IPv6 address. */
|
|
|
|
dns_fixedname_t fname;
|
2020-02-13 14:44:37 -08:00
|
|
|
dns_name_t *name;
|
|
|
|
unsigned int options = 0;
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2018-03-28 14:38:09 +02:00
|
|
|
name = dns_fixedname_initname(&fname);
|
2018-04-03 13:10:07 +02:00
|
|
|
result = dns_byaddr_createptrname(&addr, options, name);
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-02-16 13:03:17 -08:00
|
|
|
return (result);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
dns_name_format(name, reverse, (unsigned int)len);
|
|
|
|
return (ISC_R_SUCCESS);
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Not a valid IPv6 address. Assume IPv4.
|
|
|
|
* If 'strict' is not set, construct the
|
|
|
|
* in-addr.arpa name by blindly reversing
|
|
|
|
* octets whether or not they look like integers,
|
|
|
|
* so that this can be used for RFC2317 names
|
|
|
|
* and such.
|
|
|
|
*/
|
|
|
|
char *p = reverse;
|
|
|
|
char *end = reverse + len;
|
2020-02-13 21:48:23 +01:00
|
|
|
if (strict && inet_pton(AF_INET, value, &addr.type.in) != 1) {
|
2014-02-16 13:03:17 -08:00
|
|
|
return (DNS_R_BADDOTTEDQUAD);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
result = reverse_octets(value, &p, end);
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-02-16 13:03:17 -08:00
|
|
|
return (result);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
result = append_str(".in-addr.arpa.", 15, &p, end);
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-02-16 13:03:17 -08:00
|
|
|
return (result);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
return (ISC_R_SUCCESS);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2020-02-13 14:44:37 -08:00
|
|
|
main(int argc, char *argv[]) {
|
|
|
|
dns_client_t *client = NULL;
|
|
|
|
isc_result_t result;
|
|
|
|
dns_fixedname_t qfn;
|
|
|
|
dns_name_t *query_name, *response_name;
|
|
|
|
char namestr[DNS_NAME_FORMATSIZE];
|
|
|
|
dns_rdataset_t *rdataset;
|
|
|
|
dns_namelist_t namelist;
|
2020-04-22 13:26:19 +02:00
|
|
|
unsigned int resopt;
|
2020-02-13 14:44:37 -08:00
|
|
|
isc_appctx_t *actx = NULL;
|
Refactor taskmgr to run on top of netmgr
This commit changes the taskmgr to run the individual tasks on the
netmgr internal workers. While an effort has been put into keeping the
taskmgr interface intact, couple of changes have been made:
* The taskmgr has no concept of universal privileged mode - rather the
tasks are either privileged or unprivileged (normal). The privileged
tasks are run as a first thing when the netmgr is unpaused. There
are now four different queues in in the netmgr:
1. priority queue - netievent on the priority queue are run even when
the taskmgr enter exclusive mode and netmgr is paused. This is
needed to properly start listening on the interfaces, free
resources and resume.
2. privileged task queue - only privileged tasks are queued here and
this is the first queue that gets processed when network manager
is unpaused using isc_nm_resume(). All netmgr workers need to
clean the privileged task queue before they all proceed normal
operation. Both task queues are processed when the workers are
finished.
3. task queue - only (traditional) task are scheduled here and this
queue along with privileged task queues are process when the
netmgr workers are finishing. This is needed to process the task
shutdown events.
4. normal queue - this is the queue with netmgr events, e.g. reading,
sending, callbacks and pretty much everything is processed here.
* The isc_taskmgr_create() now requires initialized netmgr (isc_nm_t)
object.
* The isc_nm_destroy() function now waits for indefinite time, but it
will print out the active objects when in tracing mode
(-DNETMGR_TRACE=1 and -DNETMGR_TRACE_VERBOSE=1), the netmgr has been
made a little bit more asynchronous and it might take longer time to
shutdown all the active networking connections.
* Previously, the isc_nm_stoplistening() was a synchronous operation.
This has been changed and the isc_nm_stoplistening() just schedules
the child sockets to stop listening and exits. This was needed to
prevent a deadlock as the the (traditional) tasks are now executed on
the netmgr threads.
* The socket selection logic in isc__nm_udp_send() was flawed, but
fortunatelly, it was broken, so we never hit the problem where we
created uvreq_t on a socket from nmhandle_t, but then a different
socket could be picked up and then we were trying to run the send
callback on a socket that had different threadid than currently
running.
2021-04-09 11:31:19 +02:00
|
|
|
isc_nm_t *netmgr = NULL;
|
2020-02-13 14:44:37 -08:00
|
|
|
isc_taskmgr_t *taskmgr = NULL;
|
|
|
|
isc_timermgr_t *timermgr = NULL;
|
2014-02-16 13:03:17 -08:00
|
|
|
dns_master_style_t *style = NULL;
|
|
|
|
struct sigaction sa;
|
|
|
|
|
|
|
|
progname = argv[0];
|
2017-08-16 11:10:24 +02:00
|
|
|
preparse_args(argc, argv);
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2014-02-26 19:00:05 -08:00
|
|
|
argc--;
|
|
|
|
argv++;
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2021-09-15 01:40:31 -07:00
|
|
|
isc_mem_create(&mctx);
|
|
|
|
|
|
|
|
result = dst_lib_init(mctx, NULL);
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2021-09-15 01:40:31 -07:00
|
|
|
fatal("dst_lib_init failed: %d", result);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
CHECK(isc_appctx_create(mctx, &actx));
|
2021-01-14 13:02:57 -08:00
|
|
|
|
2021-10-03 00:27:52 -07:00
|
|
|
isc_managers_create(mctx, 1, 0, &netmgr, &taskmgr, &timermgr);
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
parse_args(argc, argv);
|
|
|
|
|
|
|
|
CHECK(setup_style(&style));
|
|
|
|
|
|
|
|
setup_logging(stderr);
|
|
|
|
|
|
|
|
CHECK(isc_app_ctxstart(actx));
|
|
|
|
|
|
|
|
/* Unblock SIGINT if it's been blocked by isc_app_ctxstart() */
|
|
|
|
memset(&sa, 0, sizeof(sa));
|
|
|
|
sa.sa_handler = SIG_DFL;
|
2020-02-13 21:48:23 +01:00
|
|
|
if (sigfillset(&sa.sa_mask) != 0 || sigaction(SIGINT, &sa, NULL) < 0) {
|
2014-02-16 13:03:17 -08:00
|
|
|
fatal("Couldn't set up signal handler");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
/* Create client */
|
2021-01-14 13:02:57 -08:00
|
|
|
result = dns_client_create(mctx, actx, taskmgr, netmgr, timermgr, 0,
|
2021-03-22 18:16:28 -07:00
|
|
|
&client, srcaddr4, srcaddr6);
|
2014-02-16 13:03:17 -08:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-04-23 11:14:12 -07:00
|
|
|
delv_log(ISC_LOG_ERROR, "dns_client_create: %s",
|
2020-02-12 13:59:18 +01:00
|
|
|
isc_result_totext(result));
|
2014-02-16 13:03:17 -08:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set the nameserver */
|
2020-02-13 21:48:23 +01:00
|
|
|
if (server != NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
addserver(client);
|
2020-02-13 21:48:23 +01:00
|
|
|
} else {
|
2014-02-16 13:03:17 -08:00
|
|
|
findserver(client);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
CHECK(setup_dnsseckeys(client));
|
|
|
|
|
|
|
|
/* Construct QNAME */
|
2014-03-16 11:21:32 +11:00
|
|
|
CHECK(convert_name(&qfn, &query_name, qname));
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
/* Set up resolution options */
|
2021-03-22 18:16:28 -07:00
|
|
|
resopt = DNS_CLIENTRESOPT_NOCDFLAG;
|
2019-08-06 09:34:27 -07:00
|
|
|
if (no_sigs) {
|
2014-02-16 13:03:17 -08:00
|
|
|
resopt |= DNS_CLIENTRESOPT_NODNSSEC;
|
2019-08-06 09:34:27 -07:00
|
|
|
}
|
|
|
|
if (!root_validation) {
|
2014-02-16 13:03:17 -08:00
|
|
|
resopt |= DNS_CLIENTRESOPT_NOVALIDATE;
|
2019-08-06 09:34:27 -07:00
|
|
|
}
|
|
|
|
if (cdflag) {
|
2014-02-16 13:03:17 -08:00
|
|
|
resopt &= ~DNS_CLIENTRESOPT_NOCDFLAG;
|
2019-08-06 09:34:27 -07:00
|
|
|
}
|
|
|
|
if (use_tcp) {
|
2014-11-21 09:37:04 -08:00
|
|
|
resopt |= DNS_CLIENTRESOPT_TCP;
|
2019-08-06 09:34:27 -07:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
|
|
|
/* Perform resolution */
|
|
|
|
ISC_LIST_INIT(namelist);
|
|
|
|
result = dns_client_resolve(client, query_name, dns_rdataclass_in,
|
|
|
|
qtype, resopt, &namelist);
|
2019-07-20 17:24:41 -04:00
|
|
|
if (result != ISC_R_SUCCESS && !yaml) {
|
2014-04-23 11:14:12 -07:00
|
|
|
delv_log(ISC_LOG_ERROR, "resolution failed: %s",
|
2020-02-12 13:59:18 +01:00
|
|
|
isc_result_totext(result));
|
2019-07-20 17:24:41 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (yaml) {
|
|
|
|
printf("type: DELV_RESULT\n");
|
|
|
|
dns_name_format(query_name, namestr, sizeof(namestr));
|
|
|
|
printf("query_name: %s\n", namestr);
|
|
|
|
printf("status: %s\n", isc_result_totext(result));
|
|
|
|
printf("records:\n");
|
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2020-02-12 13:59:18 +01:00
|
|
|
for (response_name = ISC_LIST_HEAD(namelist); response_name != NULL;
|
2020-02-13 14:44:37 -08:00
|
|
|
response_name = ISC_LIST_NEXT(response_name, link))
|
|
|
|
{
|
2014-02-16 13:03:17 -08:00
|
|
|
for (rdataset = ISC_LIST_HEAD(response_name->list);
|
2020-02-13 14:44:37 -08:00
|
|
|
rdataset != NULL; rdataset = ISC_LIST_NEXT(rdataset, link))
|
|
|
|
{
|
2014-02-16 13:03:17 -08:00
|
|
|
result = printdata(rdataset, response_name, style);
|
2020-02-13 21:48:23 +01:00
|
|
|
if (result != ISC_R_SUCCESS) {
|
2014-04-23 11:14:12 -07:00
|
|
|
delv_log(ISC_LOG_ERROR, "print data failed");
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
dns_client_freeresanswer(client, &namelist);
|
|
|
|
|
|
|
|
cleanup:
|
2020-02-13 21:48:23 +01:00
|
|
|
if (trust_anchor != NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_mem_free(mctx, trust_anchor);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
|
|
|
if (anchorfile != NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_mem_free(mctx, anchorfile);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
|
|
|
if (qname != NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_mem_free(mctx, qname);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
|
|
|
if (style != NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
dns_master_styledestroy(&style, mctx);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
|
|
|
if (client != NULL) {
|
2021-08-12 13:51:47 -07:00
|
|
|
dns_client_detach(&client);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2021-01-14 13:02:57 -08:00
|
|
|
|
2021-10-03 00:27:52 -07:00
|
|
|
isc_managers_destroy(&netmgr, &taskmgr, &timermgr);
|
2021-01-14 13:02:57 -08:00
|
|
|
|
2020-02-13 21:48:23 +01:00
|
|
|
if (actx != NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_appctx_destroy(&actx);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
|
|
|
if (lctx != NULL) {
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_log_destroy(&lctx);
|
2020-02-13 21:48:23 +01:00
|
|
|
}
|
2014-02-16 13:03:17 -08:00
|
|
|
isc_mem_detach(&mctx);
|
|
|
|
|
2021-09-15 01:40:31 -07:00
|
|
|
dst_lib_destroy();
|
2014-02-16 13:03:17 -08:00
|
|
|
|
2014-02-19 07:15:27 +11:00
|
|
|
return (0);
|
2014-02-16 13:03:17 -08:00
|
|
|
}
|