Check iterations in isdelegation()

When looking up an NSEC3 as part of an insecurity proof, check the
number of iterations. If this is too high, treat the answer as insecure
by marking the answer with trust level "answer", indicating that they
did not validate, but could be cached as insecure.

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index de0765b8c2738a59c746b801a61438c8a05044b5..a2da24e0128d0cb0a5630b0f17ae95cc5af700ed 100644 (file)
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -244,12 +244,25 @@ validator_done(dns_validator_t *val, isc_result_t result) {
 }
 
 /*%
- * Look in the NSEC record returned from a DS query to see if there is
- * a NS RRset at this name.  If it is found we are at a delegation point.
+ * The isdelegation() function is called as part of seeking the DS record.
+ * Look in the NSEC or NSEC3 record returned from a DS query to see if the
+ * record has the NS bitmap set. If so, we are at a delegation point.
+ *
+ * If the response contains NSEC3 records with too high iterations, we cannot
+ * (or rather we are not going to) validate the insecurity proof. Instead we
+ * are going to treat the message as insecure and just assume the DS was at
+ * the delegation.
+ *
+ * Returns:
+ *\li  #ISC_R_SUCCESS  the NS bitmap was set in the NSEC or NSEC3 record, or
+ *                     the NSEC3 covers the name (in case of opt-out), or
+ *                     we cannot validate the insecurity proof and are going
+ *                     to treat the message as isnecure.
+ *\li  #ISC_R_NOTFOUND the NS bitmap was not set,
  */
-static bool
-isdelegation(dns_name_t *name, dns_rdataset_t *rdataset,
-            isc_result_t dbresult) {
+static isc_result_t
+isdelegation(dns_validator_t *val, dns_name_t *name, dns_rdataset_t *rdataset,
+            isc_result_t dbresult, const char *caller) {
        dns_fixedname_t fixed;
        dns_label_t hashlabel;
        dns_name_t nsec3name;
@@ -276,7 +289,7 @@ isdelegation(dns_name_t *name, dns_rdataset_t *rdataset,
                        goto trynsec3;
                }
                if (result != ISC_R_SUCCESS) {
-                       return false;
+                       return ISC_R_NOTFOUND;
                }
        }
 
@@ -290,7 +303,7 @@ isdelegation(dns_name_t *name, dns_rdataset_t *rdataset,
                found = dns_nsec_typepresent(&rdata, dns_rdatatype_ns);
        }
        dns_rdataset_disassociate(&set);
-       return found;
+       return found ? ISC_R_SUCCESS : ISC_R_NOTFOUND;
 
 trynsec3:
        /*
@@ -325,6 +338,18 @@ trynsec3:
                        if (nsec3.next_length > NSEC3_MAX_HASH_LENGTH) {
                                continue;
                        }
+                       /*
+                        * If there are too many iterations assume bad things
+                        * are happening and bail out early. Treat as if the
+                        * DS was at the delegation.
+                        */
+                       if (nsec3.iterations > DNS_NSEC3_MAXITERATIONS) {
+                               validator_log(val, ISC_LOG_DEBUG(3),
+                                             "%s: too many iterations",
+                                             caller);
+                               dns_rdataset_disassociate(&set);
+                               return ISC_R_SUCCESS;
+                       }
                        length = isc_iterated_hash(
                                hash, nsec3.hash, nsec3.iterations, nsec3.salt,
                                nsec3.salt_length, name->ndata, name->length);
@@ -336,7 +361,7 @@ trynsec3:
                                found = dns_nsec3_typepresent(&rdata,
                                                              dns_rdatatype_ns);
                                dns_rdataset_disassociate(&set);
-                               return found;
+                               return found ? ISC_R_SUCCESS : ISC_R_NOTFOUND;
                        }
                        if ((nsec3.flags & DNS_NSEC3FLAG_OPTOUT) == 0) {
                                continue;
@@ -352,12 +377,12 @@ trynsec3:
                              memcmp(hash, nsec3.next, length) < 0)))
                        {
                                dns_rdataset_disassociate(&set);
-                               return true;
+                               return ISC_R_SUCCESS;
                        }
                }
                dns_rdataset_disassociate(&set);
        }
-       return found;
+       return found ? ISC_R_SUCCESS : ISC_R_NOTFOUND;
 }
 
 static void
@@ -593,9 +618,10 @@ fetch_callback_ds(void *arg) {
                        break;
                case DNS_R_NXRRSET:
                case DNS_R_NCACHENXRRSET:
-                       if (isdelegation(resp->foundname, &val->frdataset,
-                                        eresult))
-                       {
+                       result = isdelegation(val, resp->foundname,
+                                             &val->frdataset, eresult,
+                                             "fetch_callback_ds");
+                       if (result == ISC_R_SUCCESS) {
                                /*
                                 * Failed to find a DS while trying to prove
                                 * insecurity. If this is a zone cut, that
@@ -708,10 +734,13 @@ validator_callback_ds(void *arg) {
                              dns_trust_totext(val->frdataset.trust));
                have_dsset = (val->frdataset.type == dns_rdatatype_ds);
                name = dns_fixedname_name(&val->fname);
+
                if ((val->attributes & VALATTR_INSECURITY) != 0 &&
                    val->frdataset.covers == dns_rdatatype_ds &&
                    NEGATIVE(&val->frdataset) &&
-                   isdelegation(name, &val->frdataset, DNS_R_NCACHENXRRSET))
+                   isdelegation(val, name, &val->frdataset,
+                                DNS_R_NCACHENXRRSET,
+                                "validator_callback_ds") == ISC_R_SUCCESS)
                {
                        result = markanswer(val, "validator_callback_ds");
                } else if ((val->attributes & VALATTR_INSECURITY) != 0) {
@@ -2902,7 +2931,8 @@ validate_nx(dns_validator_t *val, bool resume) {
                        result = findnsec3proofs(val);
                        if (result == DNS_R_NSEC3ITERRANGE) {
                                validator_log(val, ISC_LOG_DEBUG(3),
-                                             "too many iterations");
+                                             "%s: too many iterations",
+                                             __func__);
                                markanswer(val, "validate_nx (3)");
                                return ISC_R_SUCCESS;
                        }
@@ -2938,7 +2968,7 @@ validate_nx(dns_validator_t *val, bool resume) {
                result = findnsec3proofs(val);
                if (result == DNS_R_NSEC3ITERRANGE) {
                        validator_log(val, ISC_LOG_DEBUG(3),
-                                     "too many iterations");
+                                     "%s: too many iterations", __func__);
                        markanswer(val, "validate_nx (4)");
                        return ISC_R_SUCCESS;
                }
@@ -3272,7 +3302,9 @@ seek_ds(dns_validator_t *val, isc_result_t *resp) {
                        return ISC_R_COMPLETE;
                }
 
-               if (isdelegation(tname, &val->frdataset, result)) {
+               result = isdelegation(val, tname, &val->frdataset, result,
+                                     "seek_ds");
+               if (result == ISC_R_SUCCESS) {
                        *resp = markanswer(val, "seek_ds (3)");
                        return ISC_R_COMPLETE;
                }