From: Kees Monshouwer <mind04@monshouwer.org>
Date: Mon, 9 Sep 2013 22:20:32 +0000 (+0200)
Subject: make pdnssec check-all-zones case independent (Issue #684)
X-Git-Tag: rec-3.6.0-rc1~447^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb0bbee2430b12f77e5c94735e47bab3cec1b769;p=pdns

make pdnssec check-all-zones case independent (Issue #684)
---

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index 29453ea13..8abcb8e3e 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -336,65 +336,72 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const std::string& zone)
   if(!B.getSOA(zone, sd)) {
     cout<<"No SOA for zone '"<<zone<<"'"<<endl;
     return -1;
-  } 
+  }
+  bool presigned=dk.isPresigned(zone);
   sd.db->list(zone, sd.domain_id);
   DNSResourceRecord rr;
   uint64_t numrecords=0, numerrors=0, numwarnings=0;
 
   set<string> records, cnames, noncnames;
-  map<string, int> ttl;
+  map<string, unsigned int> ttl;
 
   ostringstream content;
-  pair<map<string, int>::iterator,bool> ret;
+  pair<map<string, unsigned int>::iterator,bool> ret;
 
   while(sd.db->get(rr)) {
     if(!rr.qtype.getCode())
       continue;
 
     if(!endsOn(rr.qname, zone)) {
-      cout<<"[Warning] The record '"<<rr.qname<<"' with type "<<rr.qtype.getName()<<" in zone "<<zone<<" is out-of-zone."<<endl;
+      cout<<"[Warning] Record '"<<rr.qname<<" IN "<<rr.qtype.getName()<<" "<<rr.content<<"' in zone '"<<zone<<"' is out-of-zone."<<endl;
       numwarnings++;
       continue;
     }
 
+    if(rr.qtype.getCode() == QType::SOA)
+    {
+      fillSOAData(rr.content, sd);
+      rr.content = serializeSOAData(sd);
+    }
+
     content.str("");
     content<<rr.qname<<" "<<rr.qtype.getName();
     if (rr.qtype.getCode() == QType::MX || rr.qtype.getCode() == QType::SRV)
       content<<" "<<rr.priority;
     content<<" "<<rr.content;
-    if (records.count(content.str())) {
-      cout<<"[Error] Duplicate record found in rrset '"<<rr.qname<<"' with type "<<rr.qtype.getName()<<"."<<endl;
+    if (records.count(toLower(content.str()))) {
+      cout<<"[Error] Duplicate record found in rrset: '"<<rr.qname<<" IN "<<rr.qtype.getName()<<" "<<rr.content<<"'"<<endl;
       numerrors++;
       continue;
     } else
-      records.insert(content.str());
+      records.insert(toLower(content.str()));
 
     content.str("");
     content<<rr.qname<<" "<<rr.qtype.getName();
-    ret = ttl.insert(pair<string ,int>(content.str(), rr.ttl));
-    if (ret.second==false && ret.first->second != rr.ttl) {
-      cout<<"[Error] TTL mismatch in rrset '"<<rr.qname<<"' with type "<<rr.qtype.getName()<<" ("<<ret.first->second<<" <> "<<rr.ttl<<")"<<endl;
+    ret = ttl.insert(pair<string, unsigned int>(toLower(content.str()), rr.ttl));
+    if (ret.second == false && ret.first->second != rr.ttl) {
+      cout<<"[Error] TTL mismatch in rrset: '"<<rr.qname<<" IN " <<rr.qtype.getName()<<" "<<rr.content<<"' ("<<ret.first->second<<" != "<<rr.ttl<<")"<<endl;
       numerrors++;
       continue;
     }
 
     if (rr.qtype.getCode() == QType::CNAME) {
-      if (!cnames.count(rr.qname))
-        cnames.insert(rr.qname);
+      if (!cnames.count(toLower(rr.qname)))
+        cnames.insert(toLower(rr.qname));
       else {
-        cout<<"[Error] Duplicate CNAME found at '"<<rr.qname<<"'."<<endl;
+        cout<<"[Error] Duplicate CNAME found at '"<<rr.qname<<"'"<<endl;
         numerrors++;
         continue;
       }
     } else {
       if (rr.qtype.getCode() == QType::RRSIG) {
-        if(!dk.isPresigned(zone)) {
+        if(presigned) {
           cout<<"[Error] RRSIG found at '"<<rr.qname<<"' in non-presigned zone. These do not belong in the database."<<endl;
           numerrors++;
           continue;
         }
       } else
-        noncnames.insert(rr.qname);
+        noncnames.insert(toLower(rr.qname));
     }
 
     if(rr.qtype.getCode() == QType::NSEC || rr.qtype.getCode() == QType::NSEC3)
@@ -406,7 +413,7 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const std::string& zone)
 
     if(rr.qtype.getCode() == QType::DNSKEY)
     {
-      if(!dk.isPresigned(zone))
+      if(presigned)
       {
         if(::arg().mustDo("experimental-direct-dnskey"))
         {
@@ -424,24 +431,18 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const std::string& zone)
       }
     }
 
-    if(rr.qtype.getCode() == QType::SOA)
-    {
-      fillSOAData(rr.content, sd);
-      rr.content = serializeSOAData(sd);
-    }
-    
     if(rr.qtype.getCode() == QType::URL || rr.qtype.getCode() == QType::MBOXFW) {
       cout<<"[Error] The recordtype "<<rr.qtype.getName()<<" for record '"<<rr.qname<<"' is no longer supported."<<endl;
       numerrors++;
       continue;
     }
-      
+
     if (rr.qname[rr.qname.size()-1] == '.') {
       cout<<"[Error] Record '"<<rr.qname<<"' has a trailing dot. PowerDNS will ignore this record!"<<endl;
       numerrors++;
     }
-      
-    if(rr.qtype.getCode() == QType::MX || rr.qtype.getCode() == QType::SRV) 
+
+    if(rr.qtype.getCode() == QType::MX || rr.qtype.getCode() == QType::SRV)
       rr.content = lexical_cast<string>(rr.priority)+" "+rr.content;
 
     if ( (rr.qtype.getCode() == QType::NS || rr.qtype.getCode() == QType::SRV || rr.qtype.getCode() == QType::MX || rr.qtype.getCode() == QType::CNAME) &&
@@ -451,8 +452,8 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const std::string& zone)
     }
 
     if(rr.qtype.getCode() == QType::TXT && !rr.content.empty() && rr.content[0]!='"')
-      rr.content = "\""+rr.content+"\"";  
-      
+      rr.content = "\""+rr.content+"\"";
+
     if(rr.auth == 0 && rr.qtype.getCode()!=QType::NS && rr.qtype.getCode()!=QType::A && rr.qtype.getCode()!=QType::AAAA)
     {
       cout<<"[Error] Following record is auth=0, run pdnssec rectify-zone?: "<<rr.qname<<" IN " <<rr.qtype.getName()<< " " << rr.content<<endl;
@@ -462,7 +463,7 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const std::string& zone)
       shared_ptr<DNSRecordContent> drc(DNSRecordContent::mastermake(rr.qtype.getCode(), 1, rr.content));
       string tmp=drc->serialize(rr.qname);
     }
-    catch(std::exception& e) 
+    catch(std::exception& e)
     {
       cout<<"[Error] Following record had a problem: "<<rr.qname<<" IN " <<rr.qtype.getName()<< " " << rr.content<<endl;
       cout<<"[Error] Error was: "<<e.what()<<endl;
@@ -478,8 +479,6 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const std::string& zone)
     }
   }
 
-
-
   cout<<"Checked "<<numrecords<<" records of '"<<zone<<"', "<<numerrors<<" errors, "<<numwarnings<<" warnings."<<endl;
   return numerrors;
 }