From bfef5ce9bc5d3ff660aad805281f80a5b98a0871 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 27 Feb 2020 17:35:18 +1100 Subject: [PATCH 1/8] Call set_resigntime() in receive_secure_serial() With RRSIG records no longer being signed with the full sig-validity-interval we need to ensure the zone->resigntime as it may need to be set to a earlier time. (cherry picked from commit 5d1611afdc61ea8f19ceecc3e88cdb2296ec3914) --- lib/dns/zone.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 3ef2394a5a..893bf475ca 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -14571,6 +14571,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); From 43ff3b3ad5fdebff5f0761351851025175cf5437 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 27 Feb 2020 17:43:26 +1100 Subject: [PATCH 2/8] Always call zone_settimer() zone_needdump() could potentially not call zone_settimer() so explitly call zone_settimer() as zone->resigntime could have gone backward. (cherry picked from commit 5ec57f31b0cca77f2629bac888c323cd619979ee) --- lib/dns/zone.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 893bf475ca..12e1f6d4e8 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -10338,8 +10338,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); From 0536bfc91a1ccc8a0a59cf016f5814d11774aeba Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 27 Feb 2020 17:48:05 +1100 Subject: [PATCH 3/8] Always call set_resigntime with the zone lock held (cherry picked from commit 7212961849510f97146f815fa03f1e90de9d3201) --- lib/dns/zone.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 12e1f6d4e8..d2ce4ef2aa 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -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; @@ -6752,8 +6754,8 @@ zone_resigninc(dns_zone_t *zone) { } else if (db != NULL) dns_db_detach(&db); if (result == ISC_R_SUCCESS) { - set_resigntime(zone); LOCK_ZONE(zone); + set_resigntime(zone); zone_needdump(zone, DNS_DUMP_DELAY); DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_NEEDNOTIFY); UNLOCK_ZONE(zone); @@ -8300,7 +8302,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 +8975,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) { From ef99d6bda0e36f545880deb4f7e5fc09ee9a7d78 Mon Sep 17 00:00:00 2001 From: Matthijs Mekking Date: Thu, 27 Feb 2020 11:59:12 +0100 Subject: [PATCH 4/8] Add more zone locks Add more zone locks around code that touches zone timer setting in failure modes. (cherry picked from commit 143d1c9767e25d35dd939f43f6bae462ee9db477) --- lib/dns/zone.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/dns/zone.c b/lib/dns/zone.c index d2ce4ef2aa..ccf376872c 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -6751,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) { - LOCK_ZONE(zone); set_resigntime(zone); zone_needdump(zone, DNS_DUMP_DELAY); DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_NEEDNOTIFY); - UNLOCK_ZONE(zone); } else { /* * Something failed. Retry in 5 minutes. @@ -6767,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); } @@ -9024,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) @@ -9031,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); } @@ -18526,8 +18531,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; } From 6bf56cdf4daaa8b3824ab7dd99a1a7677eb6eeaa Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 28 Feb 2020 14:01:40 +1100 Subject: [PATCH 5/8] Ensure that resigintime and the zone timer are set (cherry picked from commit a6626594aa348209eb02ec1ba8d3539821144aca) --- lib/dns/zone.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/dns/zone.c b/lib/dns/zone.c index ccf376872c..163ab4e33c 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -14610,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)); } From 14d4bbea612e4021411225b39e7ed69856492fb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 27 Feb 2020 08:45:10 +0100 Subject: [PATCH 6/8] Adjust lock/unlock in zone_rekey() (cherry picked from commit aaaa7e67fa2b0ec618ec4be1af175fd6d73b76a0) --- lib/dns/zone.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 163ab4e33c..54b2ad967c 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -18341,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); @@ -18462,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); /* From 463a9e385c1910605dc7750b6bad6ed57004d42d Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 3 Mar 2020 15:30:52 +1100 Subject: [PATCH 7/8] Add CHANGES note (cherry picked from commit 905549f061dab784c533287db087d3705cfe0a1d) --- CHANGES | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index c18ac554d4..3845cd18a8 100644 --- a/CHANGES +++ b/CHANGES @@ -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 From 63f845b7166ddadf3367c4be8ee605e0ddc5c755 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 3 Mar 2020 15:37:42 +1100 Subject: [PATCH 8/8] add release note entry (cherry picked from commit 23ce0f32e5a770c16a76d19e2a1c9e1322433d69) --- doc/arm/notes-9.11.17.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/arm/notes-9.11.17.xml b/doc/arm/notes-9.11.17.xml index ab6fd05c70..99246480bd 100644 --- a/doc/arm/notes-9.11.17.xml +++ b/doc/arm/notes-9.11.17.xml @@ -26,4 +26,15 @@ +
Bug Fixes + + + + Fixed re-signing issues with inline zones which resulted in + records being re-signed late or not at all. + + + +
+