From 753d0aee03c97de3e2df4233c640a6566d2fc7f3 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Wed, 2 May 2018 12:18:44 +0530 Subject: [PATCH 1/3] Don't validate non-pending glue when adding to the additional section (cherry picked from commit 31bd3147d118106faa62fe90ec39f36c64239e5d) --- lib/ns/query.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/ns/query.c b/lib/ns/query.c index d46503c11f..56a743236a 100644 --- a/lib/ns/query.c +++ b/lib/ns/query.c @@ -1880,8 +1880,7 @@ query_addadditional(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) { mname = NULL; have_a = ISC_TRUE; if (additionaltype == dns_rdatasetadditional_fromcache && - (DNS_TRUST_PENDING(rdataset->trust) || - DNS_TRUST_GLUE(rdataset->trust)) && + DNS_TRUST_PENDING(rdataset->trust) && !validate(client, db, fname, rdataset, sigrdataset)) { dns_rdataset_disassociate(rdataset); @@ -1945,8 +1944,7 @@ query_addadditional(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) { !dns_rdataset_isassociated(sigrdataset))))) goto addname; if (additionaltype == dns_rdatasetadditional_fromcache && - (DNS_TRUST_PENDING(rdataset->trust) || - DNS_TRUST_GLUE(rdataset->trust)) && + DNS_TRUST_PENDING(rdataset->trust) && !validate(client, db, fname, rdataset, sigrdataset)) { dns_rdataset_disassociate(rdataset); From d6a4760031e2e56bbb257648a2bae55f7ba66b44 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Wed, 2 May 2018 13:07:14 +0530 Subject: [PATCH 2/3] Add system test (cherry picked from commit 303391ea415cd3c09c285a1e11c988e11c540974) --- bin/tests/system/dnssec/tests.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh index 54c68e65e9..c86e5174cb 100644 --- a/bin/tests/system/dnssec/tests.sh +++ b/bin/tests/system/dnssec/tests.sh @@ -73,6 +73,18 @@ stripns () { awk '($4 == "NS") || ($4 == "RRSIG" && $5 == "NS") { next} { print }' $1 } +# Check that for a query against a validating resolver where the +# authoritative zone is unsigned (insecure delegation), glue is returned +# in the additional section +echo_i "checking that additional glue is returned for unsigned delegation ($n)" +ret=0 +$DIG +tcp +dnssec -p ${PORT} a.insecure.example. @10.53.0.4 a > dig.out.ns4.test$n || ret=1 +grep "ANSWER: 1, AUTHORITY: 1, ADDITIONAL: 2" dig.out.ns4.test$n > /dev/null || ret=1 +grep "ns\.insecure\.example\..*A.10\.53\.0\.3" dig.out.ns4.test$n > /dev/null || ret=1 +n=`expr $n + 1` +if [ $ret != 0 ]; then echo_i "failed"; fi +status=`expr $status + $ret` + # Check the example. domain echo_i "checking that zone transfer worked ($n)" From e66183119986d25b818cc2b460271f1742c285b7 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Wed, 2 May 2018 13:17:36 +0530 Subject: [PATCH 3/3] Add CHANGES entry (cherry picked from commit dfd73d7e169b601049912ee9c29620971a526d50) --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index 49382988c4..9d772d4fe9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +4946. [bug] Additional glue was not being returned by resolver + for unsigned zones since change 4596. [GL #209] + 4944. [cleanup] Silence cppcheck portability warnings in lib/isc/tests/buffer_test.c. [GL #239]