diff --git a/bin/named/config.c b/bin/named/config.c index 3ac41a80b2..934c3711ad 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -249,6 +249,9 @@ options {\n\ try-tcp-refresh yes; /* BIND 8 compat */\n\ zero-no-soa-ttl yes;\n\ zone-statistics terse;\n\ + zonemd-check yes;\n\ + zonemd-dnssec-only yes;\n\ + zonemd-required no;\n\ };\n\ " diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index 9b2dd18a76..00b3b71dbc 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -1517,6 +1517,25 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, dns_zone_setrad(zone, rad); } } + + obj = NULL; + result = named_config_get(maps, "zonemd-check", &obj); + INSIST(result == ISC_R_SUCCESS && obj != NULL); + dns_zone_setzonemd(zone, DNS_ZONEMDOPT_CHECK, + cfg_obj_asboolean(obj)); + + obj = NULL; + result = named_config_get(maps, "zonemd-dnssec-only", &obj); + INSIST(result == ISC_R_SUCCESS && obj != NULL); + dns_zone_setzonemd(zone, DNS_ZONEMDOPT_DNSSECONLY, + cfg_obj_asboolean(obj)); + + obj = NULL; + result = named_config_get(maps, "zonemd-required", &obj); + INSIST(result == ISC_R_SUCCESS && obj != NULL); + dns_zone_setzonemd(zone, DNS_ZONEMDOPT_REQUIRED, + cfg_obj_asboolean(obj)); + } else if (ztype == dns_zone_redirect) { dns_zone_setnotifytype(zone, dns_notifytype_no); diff --git a/doc/misc/mirror.zoneopt b/doc/misc/mirror.zoneopt index b1c5c08ea7..09bd60f3bf 100644 --- a/doc/misc/mirror.zoneopt +++ b/doc/misc/mirror.zoneopt @@ -41,4 +41,7 @@ zone [ ] { try-tcp-refresh ; zero-no-soa-ttl ; zone-statistics ( full | terse | none | ); + zonemd-check ; + zonemd-dnssec-only ; + zonemd-required ; }; diff --git a/doc/misc/options b/doc/misc/options index 3fa81f4bae..e518253f25 100644 --- a/doc/misc/options +++ b/doc/misc/options @@ -320,6 +320,9 @@ options { zero-no-soa-ttl ; zero-no-soa-ttl-cache ; zone-statistics ( full | terse | none | ); + zonemd-check ; + zonemd-dnssec-only ; + zonemd-required ; }; plugin ( query ) [ { } ]; // may occur multiple times @@ -595,5 +598,8 @@ view [ ] { zero-no-soa-ttl ; zero-no-soa-ttl-cache ; zone-statistics ( full | terse | none | ); + zonemd-check ; + zonemd-dnssec-only ; + zonemd-required ; }; // may occur multiple times diff --git a/doc/misc/primary.zoneopt b/doc/misc/primary.zoneopt index dfa2b79661..19c855fa87 100644 --- a/doc/misc/primary.zoneopt +++ b/doc/misc/primary.zoneopt @@ -61,4 +61,7 @@ zone [ ] { update-policy ( local | { ( deny | grant ) ( 6to4-self | external | krb5-self | krb5-selfsub | krb5-subdomain | krb5-subdomain-self-rhs | ms-self | ms-selfsub | ms-subdomain | ms-subdomain-self-rhs | name | self | selfsub | selfwild | subdomain | tcp-self | wildcard | zonesub ) [ ] ; ... } ); zero-no-soa-ttl ; zone-statistics ( full | terse | none | ); + zonemd-check ; + zonemd-dnssec-only ; + zonemd-required ; }; diff --git a/doc/misc/secondary.zoneopt b/doc/misc/secondary.zoneopt index 6fbe1fbaf5..f4585bbd31 100644 --- a/doc/misc/secondary.zoneopt +++ b/doc/misc/secondary.zoneopt @@ -64,4 +64,7 @@ zone [ ] { update-check-ksk ; // obsolete zero-no-soa-ttl ; zone-statistics ( full | terse | none | ); + zonemd-check ; + zonemd-dnssec-only ; + zonemd-required ; }; diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h index 02ae1e99d5..114e10a2bb 100644 --- a/lib/dns/include/dns/zone.h +++ b/lib/dns/include/dns/zone.h @@ -105,6 +105,14 @@ typedef enum { DNS_ZONEOPT___MAX = UINT64_MAX, /* trick to make the ENUM 64-bit wide */ } dns_zoneopt_t; +typedef enum { + DNS_ZONEMDOPT_CHECK = 1 << 0, /*%< zonemd check */ + DNS_ZONEMDOPT_DNSSECONLY = 1 << 1, /*%< zonemd DNSSEC only */ + DNS_ZONEMDOPT_REQUIRED = 1 << 2, /*%< zonemd required */ + DNS_ZONEMDOPT_ACCEPTEXPIRED = 1 << 3, /*%< accept expired RRSIG when + * verifying zonemd */ +} dns_zonemdopt_t; + /* * Zone key maintenance options */ @@ -759,6 +767,25 @@ dns_zone_getoptions(dns_zone_t *zone); *\li 'zone' to be a valid zone. */ +void +dns_zone_setzonemd(dns_zone_t *zone, dns_zonemdopt_t option, bool value); +/*%< + * Set the given options on ('value' == true) or off + * ('value' == #false). + * + * Require: + *\li 'zone' to be a valid zone. + */ + +dns_zoneopt_t +dns_zone_getzonemd(dns_zone_t *zone); +/*%< + * Returns the current zonemd options. + * + * Require: + *\li 'zone' to be a valid zone. + */ + void dns_zone_setkeyopt(dns_zone_t *zone, unsigned int option, bool value); /*%< diff --git a/lib/dns/zone.c b/lib/dns/zone.c index b1c0f5d8a0..fe8eedd461 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -291,6 +291,7 @@ struct dns_zone { dns_zonetype_t type; atomic_uint_fast64_t flags; atomic_uint_fast64_t options; + atomic_uint_fast64_t zonemd; unsigned int db_argc; char **db_argv; isc_time_t expiretime; @@ -581,6 +582,10 @@ typedef enum { #define DNS_ZONEKEY_SETOPTION(z, o) atomic_fetch_or(&(z)->keyopts, (o)) #define DNS_ZONEKEY_CLROPTION(z, o) atomic_fetch_and(&(z)->keyopts, ~(o)) +#define DNS_ZONEMD_OPTION(z, o) ((atomic_load_relaxed(&(z)->zonemd) & (o)) != 0) +#define DNS_ZONEMD_SETOPTION(z, o) atomic_fetch_or(&(z)->zonemd, (o)) +#define DNS_ZONEMD_CLROPTION(z, o) atomic_fetch_and(&(z)->zonemd, ~(o)) + /* Flags for zone_load() */ typedef enum { DNS_ZONELOADFLAG_NOSTAT = 0x00000001U, /* Do not stat() master files */ @@ -5980,6 +5985,24 @@ dns_zone_getoptions(dns_zone_t *zone) { return atomic_load_relaxed(&zone->options); } +void +dns_zone_setzonemd(dns_zone_t *zone, dns_zonemdopt_t option, bool value) { + REQUIRE(DNS_ZONE_VALID(zone)); + + if (value) { + DNS_ZONEMD_SETOPTION(zone, option); + } else { + DNS_ZONEMD_CLROPTION(zone, option); + } +} + +dns_zoneopt_t +dns_zone_getzonemd(dns_zone_t *zone) { + REQUIRE(DNS_ZONE_VALID(zone)); + + return atomic_load_relaxed(&zone->zonemd); +} + void dns_zone_setkeyopt(dns_zone_t *zone, unsigned int keyopt, bool value) { REQUIRE(DNS_ZONE_VALID(zone)); diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index 85d1c531c0..ef1988f380 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -2389,6 +2389,12 @@ static cfg_clausedef_t zone_clauses[] = { { "zone-statistics", &cfg_type_zonestat, CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_ZONE_MIRROR | CFG_ZONE_STUB | CFG_ZONE_STATICSTUB | CFG_ZONE_REDIRECT }, + { "zonemd-check", &cfg_type_boolean, + CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_ZONE_MIRROR }, + { "zonemd-dnssec-only", &cfg_type_boolean, + CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_ZONE_MIRROR }, + { "zonemd-required", &cfg_type_boolean, + CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_ZONE_MIRROR }, { NULL, NULL, 0 } };