rec: Also check the validity of the RRSIG labels count when looking for a wildcard

Signed-off-by: Remi Gacogne <remi.gacogne@powerdns.com>

diff --git a/pdns/recursordist/test-syncres_cc5.cc b/pdns/recursordist/test-syncres_cc5.cc
index a38531b59f1602d04e73eb882f60f43b0564579b..64ae794f8a3833dfb4355f0ec8ef32e614bd8e45 100644 (file)
--- a/pdns/recursordist/test-syncres_cc5.cc
+++ b/pdns/recursordist/test-syncres_cc5.cc
@@ -2535,7 +2535,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_out_of_zone_wildcard)
   int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
   BOOST_CHECK_EQUAL(res, RCode::NoError);
   BOOST_CHECK_EQUAL(sr->getValidationState(), vState::BogusNoValidRRSIG);
-  BOOST_REQUIRE_EQUAL(ret.size(), 4U);
+  BOOST_REQUIRE_EQUAL(ret.size(), 2U);
   BOOST_CHECK_EQUAL(queriesCount, 7U);
 
   /* make sure that the bogus wildcard entry has not been cached! */

diff --git a/pdns/validate.cc b/pdns/validate.cc
index 033623169e18800e9782a5ac2b49db4d4a8a9fef..ed43785b986d43612b45c79f9cdb9d064f9153dc 100644 (file)
--- a/pdns/validate.cc
+++ b/pdns/validate.cc
@@ -234,6 +234,12 @@ bool denialProvesNoDelegation(const DNSName& zone, const std::vector<DNSRecord>&
   return false;
 }
 
+static bool isRRSIGLabelCountValid(const RRSIGRecordContent& sign)
+{
+  const auto signerLabelCount = sign.d_signer.countLabels();
+  return sign.d_labels >= signerLabelCount;
+}
+
 /* RFC 4035 section-5.3.4:
    "If the number of labels in an RRset's owner name is greater than the
    Labels field of the covering RRSIG RR, then the RRset and its
@@ -241,7 +247,7 @@ bool denialProvesNoDelegation(const DNSName& zone, const std::vector<DNSRecord>&
 */
 bool isWildcardExpanded(unsigned int labelCount, const RRSIGRecordContent& sign)
 {
-  return sign.d_labels < labelCount;
+  return sign.d_labels < labelCount && isRRSIGLabelCountValid(sign);
 }
 
 static bool isWildcardExpanded(const DNSName& owner, const std::vector<std::shared_ptr<const RRSIGRecordContent>>& signatures)
@@ -258,7 +264,7 @@ static bool isWildcardExpanded(const DNSName& owner, const std::vector<std::shar
 bool isWildcardExpandedOntoItself(const DNSName& owner, unsigned int labelCount, const RRSIGRecordContent& sign)
 {
   /* this is a wildcard alright, but it has not been expanded */
-  return owner.isWildcard() && (labelCount - 1) == sign.d_labels;
+  return owner.isWildcard() && (labelCount - 1) == sign.d_labels && isRRSIGLabelCountValid(sign);
 }
 
 static bool isWildcardExpandedOntoItself(const DNSName& owner, const std::vector<std::shared_ptr<const RRSIGRecordContent>>& signatures)
@@ -284,7 +290,7 @@ DNSName getNSECOwnerName(const DNSName& initialOwner, const std::vector<std::sha
 
   const auto& sign = signatures.at(0);
   unsigned int labelsCount = initialOwner.countLabels();
-  if (sign && sign->d_labels < labelsCount) {
+  if (sign && sign->d_labels < labelsCount && isRRSIGLabelCountValid(*sign)) {
     do {
       result.chopOff();
       labelsCount--;
@@ -1085,9 +1091,8 @@ vState validateWithKeySet(time_t now, const DNSName& name, const sortedRecords_t
       VLOG(log, name << ": Discarding invalid RRSIG whose label count is " << signature->d_labels << " while the RRset owner name has only " << labelCount << endl);
       continue;
     }
-    const auto signerLabelsCount = signature->d_signer.countLabels();
-    if (signature->d_labels < signerLabelsCount) {
-      VLOG(log, name << ": Discarding invalid RRSIG whose label count is " << signature->d_labels << " while the signer has only " << signerLabelsCount << endl);
+    if (!isRRSIGLabelCountValid(*signature)) {
+      VLOG(log, name << ": Discarding invalid RRSIG whose label count is " << signature->d_labels << " while the signer has only " << signature->d_signer.countLabels() << endl);
       continue;
     }
     allDiscarded = false;