Add ZONEMD checking options
This commit is contained in:
@@ -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\
|
||||
"
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -41,4 +41,7 @@ zone <string> [ <class> ] {
|
||||
try-tcp-refresh <boolean>;
|
||||
zero-no-soa-ttl <boolean>;
|
||||
zone-statistics ( full | terse | none | <boolean> );
|
||||
zonemd-check <boolean>;
|
||||
zonemd-dnssec-only <boolean>;
|
||||
zonemd-required <boolean>;
|
||||
};
|
||||
|
||||
@@ -320,6 +320,9 @@ options {
|
||||
zero-no-soa-ttl <boolean>;
|
||||
zero-no-soa-ttl-cache <boolean>;
|
||||
zone-statistics ( full | terse | none | <boolean> );
|
||||
zonemd-check <boolean>;
|
||||
zonemd-dnssec-only <boolean>;
|
||||
zonemd-required <boolean>;
|
||||
};
|
||||
|
||||
plugin ( query ) <string> [ { <unspecified-text> } ]; // may occur multiple times
|
||||
@@ -595,5 +598,8 @@ view <string> [ <class> ] {
|
||||
zero-no-soa-ttl <boolean>;
|
||||
zero-no-soa-ttl-cache <boolean>;
|
||||
zone-statistics ( full | terse | none | <boolean> );
|
||||
zonemd-check <boolean>;
|
||||
zonemd-dnssec-only <boolean>;
|
||||
zonemd-required <boolean>;
|
||||
}; // may occur multiple times
|
||||
|
||||
|
||||
@@ -61,4 +61,7 @@ zone <string> [ <class> ] {
|
||||
update-policy ( local | { ( deny | grant ) <string> ( 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 ) [ <string> ] <rrtypelist>; ... } );
|
||||
zero-no-soa-ttl <boolean>;
|
||||
zone-statistics ( full | terse | none | <boolean> );
|
||||
zonemd-check <boolean>;
|
||||
zonemd-dnssec-only <boolean>;
|
||||
zonemd-required <boolean>;
|
||||
};
|
||||
|
||||
@@ -64,4 +64,7 @@ zone <string> [ <class> ] {
|
||||
update-check-ksk <boolean>; // obsolete
|
||||
zero-no-soa-ttl <boolean>;
|
||||
zone-statistics ( full | terse | none | <boolean> );
|
||||
zonemd-check <boolean>;
|
||||
zonemd-dnssec-only <boolean>;
|
||||
zonemd-required <boolean>;
|
||||
};
|
||||
|
||||
@@ -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);
|
||||
/*%<
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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 }
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user