Merge branch '1627-call-set_resigntime-and-zone_settimer-v9_11' into 'v9_11'

Resolve "inline re-signing stops"

See merge request isc-projects/bind9!3139
This commit is contained in:
Mark Andrews
2020-03-03 05:56:15 +00:00
3 changed files with 51 additions and 11 deletions
+4
View File
@@ -1,3 +1,7 @@
5357. [bug] Newly added RRSIG records with expiry times before
the previous earliest expiry times might not be
re-signed in time. The was a side effect of 5315.
--- 9.11.16 released ---
5353. [doc] Document port and dscp parameters in forwarders
+11
View File
@@ -26,4 +26,15 @@
</itemizedlist>
</section>
<section xml:id="relnotes-9.11.17-bugs"><info><title>Bug Fixes</title></info>
<itemizedlist>
<listitem>
<para>
Fixed re-signing issues with inline zones which resulted in
records being re-signed late or not at all.
</para>
</listitem>
</itemizedlist>
</section>
</section>
+36 -11
View File
@@ -3642,6 +3642,8 @@ set_resigntime(dns_zone_t *zone) {
uint32_t nanosecs;
dns_db_t *db = NULL;
INSIST(LOCKED_ZONE(zone));
/* We only re-sign zones that can be dynamically updated */
if (zone->update_disabled)
return;
@@ -6749,14 +6751,15 @@ zone_resigninc(dns_zone_t *zone) {
if (version != NULL) {
dns_db_closeversion(db, &version, false);
dns_db_detach(&db);
} else if (db != NULL)
} else if (db != NULL) {
dns_db_detach(&db);
}
LOCK_ZONE(zone);
if (result == ISC_R_SUCCESS) {
set_resigntime(zone);
LOCK_ZONE(zone);
zone_needdump(zone, DNS_DUMP_DELAY);
DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_NEEDNOTIFY);
UNLOCK_ZONE(zone);
} else {
/*
* Something failed. Retry in 5 minutes.
@@ -6765,6 +6768,7 @@ zone_resigninc(dns_zone_t *zone) {
isc_interval_set(&ival, 300, 0);
isc_time_nowplusinterval(&zone->resigntime, &ival);
}
UNLOCK_ZONE(zone);
INSIST(version == NULL);
}
@@ -8300,7 +8304,9 @@ zone_nsec3chain(dns_zone_t *zone) {
nsec3chain = ISC_LIST_HEAD(cleanup);
}
LOCK_ZONE(zone);
set_resigntime(zone);
UNLOCK_ZONE(zone);
failure:
if (result != ISC_R_SUCCESS)
@@ -8971,14 +8977,13 @@ zone_sign(dns_zone_t *zone) {
signing = ISC_LIST_HEAD(cleanup);
}
LOCK_ZONE(zone);
set_resigntime(zone);
if (commit) {
LOCK_ZONE(zone);
DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_NEEDNOTIFY);
zone_needdump(zone, DNS_DUMP_DELAY);
UNLOCK_ZONE(zone);
}
UNLOCK_ZONE(zone);
failure:
if (result != ISC_R_SUCCESS) {
@@ -9021,6 +9026,7 @@ zone_sign(dns_zone_t *zone) {
} else if (db != NULL)
dns_db_detach(&db);
LOCK_ZONE(zone);
if (ISC_LIST_HEAD(zone->signing) != NULL) {
isc_interval_t interval;
if (zone->update_disabled || result != ISC_R_SUCCESS)
@@ -9028,8 +9034,10 @@ zone_sign(dns_zone_t *zone) {
else
isc_interval_set(&interval, 0, 10000000); /* 10 ms */
isc_time_nowplusinterval(&zone->signingtime, &interval);
} else
} else {
isc_time_settoepoch(&zone->signingtime);
}
UNLOCK_ZONE(zone);
INSIST(version == NULL);
}
@@ -10338,8 +10346,14 @@ dns_zone_markdirty(dns_zone_t *zone) {
}
/* XXXMPA make separate call back */
if (result == ISC_R_SUCCESS)
if (result == ISC_R_SUCCESS) {
set_resigntime(zone);
if (zone->task != NULL) {
isc_time_t now;
TIME_NOW(&now);
zone_settimer(zone, &now);
}
}
}
if (secure != NULL)
UNLOCK_ZONE(secure);
@@ -14571,6 +14585,11 @@ receive_secure_serial(isc_task_t *task, isc_event_t *event) {
zone->sourceserialset = true;
zone_needdump(zone, DNS_DUMP_DELAY);
/*
* Set resign time to make sure it is set to the earliest
* signature expiration.
*/
set_resigntime(zone);
TIME_NOW(&timenow);
zone_settimer(zone, &timenow);
UNLOCK_ZONE(zone);
@@ -14591,6 +14610,11 @@ receive_secure_serial(isc_task_t *task, isc_event_t *event) {
dns_zone_detach(&zone->rss_raw);
}
if (result != ISC_R_SUCCESS) {
LOCK_ZONE(zone);
set_resigntime(zone);
TIME_NOW(&timenow);
zone_settimer(zone, &timenow);
UNLOCK_ZONE(zone);
dns_zone_log(zone, level, "receive_secure_serial: %s",
dns_result_totext(result));
}
@@ -18317,10 +18341,11 @@ zone_rekey(dns_zone_t *zone) {
dns_db_closeversion(db, &ver, true);
LOCK_ZONE(zone);
if (commit) {
dns_difftuple_t *tuple;
LOCK_ZONE(zone);
DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_NEEDNOTIFY);
zone_needdump(zone, DNS_DUMP_DELAY);
@@ -18438,10 +18463,8 @@ zone_rekey(dns_zone_t *zone) {
* Schedule the next resigning event
*/
set_resigntime(zone);
UNLOCK_ZONE(zone);
}
LOCK_ZONE(zone);
isc_time_settoepoch(&zone->refreshkeytime);
/*
@@ -18512,8 +18535,10 @@ zone_rekey(dns_zone_t *zone) {
* Something went wrong; try again in ten minutes or
* after a key refresh interval, whichever is shorter.
*/
LOCK_ZONE(zone);
isc_interval_set(&ival, ISC_MIN(zone->refreshkeyinterval, 600), 0);
isc_time_nowplusinterval(&zone->refreshkeytime, &ival);
UNLOCK_ZONE(zone);
goto done;
}