[1574b] added check for # of NSEC3 RDATA (only 1 is supported)

diff --git a/src/lib/datasrc/memory_datasrc.cc b/src/lib/datasrc/memory_datasrc.cc
index f7344578cd41fee072ae31bbdf54f33e41a56a93..126d52eebbd366d3e5caaaa9d310dd13a9750ba2 100644 (file)
--- a/src/lib/datasrc/memory_datasrc.cc
+++ b/src/lib/datasrc/memory_datasrc.cc
@@ -237,11 +237,12 @@ struct InMemoryZoneFinder::InMemoryZoneFinderImpl {
             isc_throw(AddError, "multiple RRs of singleton type for "
                       << rrset->getName());
         }
-        // NSEC3PARAM is not a "singleton" per protocol, but this
+        // NSEC3/NSEC3PARAM is not a "singleton" per protocol, but this
         // implementation doesn't request it be so at the moment.
-        if (rrset->getType() == RRType::NSEC3PARAM() &&
+        if ((rrset->getType() == RRType::NSEC3() ||
+             rrset->getType() == RRType::NSEC3PARAM()) &&
             rrset->getRdataCount() > 1) {
-            isc_throw(AddError, "Multiple NSEC3PARAM RDATA is given for "
+            isc_throw(AddError, "Multiple NSEC3/NSEC3PARAM RDATA is given for "
                       << rrset->getName() << " which isn't supported");
         }
 
@@ -289,7 +290,7 @@ struct InMemoryZoneFinder::InMemoryZoneFinderImpl {
              origin_.getLabelCount() + 1)) {
             LOG_ERROR(logger, DATASRC_BAD_NSEC3_NAME).
                 arg(rrset->getName());
-            isc_throw(AddError, "Invalid NSEC3 owner name (wildcard): " <<
+            isc_throw(AddError, "Invalid NSEC3 owner name: " <<
                       rrset->getName());
         }
     }

diff --git a/src/lib/datasrc/tests/memory_datasrc_unittest.cc b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
index 5a0084e2773cb3f2f8b4cebe39e40e3d8dee1589..08e414ee9527ee1e0046aa0e584a20bdffe20e8c 100644 (file)
--- a/src/lib/datasrc/tests/memory_datasrc_unittest.cc
+++ b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
@@ -1432,6 +1432,17 @@ TEST_F(InMemoryZoneFinderTest, badNSEC3Name) {
                  InMemoryZoneFinder::AddError);
 }
 
+TEST_F(InMemoryZoneFinderTest, addMultiNSEC3) {
+    // In this current implementation multiple NSEC3 RDATA isn't supported.
+    RRsetPtr nsec3(new RRset(Name(string(apex_hash) + ".example.org"),
+                             RRClass::IN(), RRType::NSEC3(), RRTTL(300)));
+    nsec3->addRdata(
+        generic::NSEC3("1 0 12 aabbccdd 2T7B4G4VSA5SMI47K61MV5BV1A22BOJR A"));
+    nsec3->addRdata(
+        generic::NSEC3("1 1 1 ddccbbaa 2T7B4G4VSA5SMI47K61MV5BV1A22BOJR A"));
+    EXPECT_THROW(zone_finder_.add(nsec3), InMemoryZoneFinder::AddError);
+}
+
 TEST_F(InMemoryZoneFinderTest, addNSEC3WithRRSIG) {
     // Adding NSEC3 and its RRSIG
     const string nsec3_text = string(apex_hash) + ".example.org." +
@@ -1521,7 +1532,6 @@ TEST_F(InMemoryZoneFinderTest, multiNSEC3PARAM) {
 }
 
 // TODO
-// - multiple NSEC3 RDATA
 // - existence of NSEC3PARAM
 // - add NSEC3PARAM at non origin (should be ignored)
 }