From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 27 Nov 2015 15:55:03 +0000 (+0100)
Subject: teach getZoneRepresentation to optionally skip the trailing dot on non-root names
X-Git-Tag: dnsdist-1.0.0-alpha1~159^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f21fc0aafaebecb97571d425da2ae9da1dc4ac4e;p=pdns

teach getZoneRepresentation to optionally skip the trailing dot on non-root names
---

diff --git a/pdns/dns.hh b/pdns/dns.hh
index 24e40aa92..ae0a2033d 100644
--- a/pdns/dns.hh
+++ b/pdns/dns.hh
@@ -77,7 +77,7 @@ public:
   enum Place : uint8_t {QUESTION=0, ANSWER=1, AUTHORITY=2, ADDITIONAL=3}; //!< Type describing the positioning of a DNSResourceRecord within, say, a DNSPacket
 
   void setContent(const string& content);
-  string getZoneRepresentation() const;
+  string getZoneRepresentation(bool noDot=false) const;
 
   // data
   DNSName qname; //!< the name of this record, for example: www.powerdns.com
diff --git a/pdns/dnsparser.cc b/pdns/dnsparser.cc
index 5589ad8ff..03d4b1338 100644
--- a/pdns/dnsparser.cc
+++ b/pdns/dnsparser.cc
@@ -59,7 +59,7 @@ public:
     d_record.insert(d_record.end(), out.begin(), out.end());
   }
 
-  string getZoneRepresentation() const override
+  string getZoneRepresentation(bool noDot) const override
   {
     ostringstream str;
     str<<"\\# "<<(unsigned int)d_record.size()<<" ";
diff --git a/pdns/dnsparser.hh b/pdns/dnsparser.hh
index b03600f21..50e241050 100644
--- a/pdns/dnsparser.hh
+++ b/pdns/dnsparser.hh
@@ -120,7 +120,7 @@ public:
   }
 
 
-  void xfrName(DNSName &name, bool compress=false)
+  void xfrName(DNSName &name, bool compress=false, bool noDot=false)
   {
     name=getName();
   }
@@ -165,7 +165,7 @@ public:
   static DNSRecordContent* mastermake(uint16_t qtype, uint16_t qclass, const string& zone);
   static std::unique_ptr<DNSRecordContent> makeunique(uint16_t qtype, uint16_t qclass, const string& content);
 
-  virtual std::string getZoneRepresentation() const = 0;
+  virtual std::string getZoneRepresentation(bool noDot=false) const = 0;
   virtual ~DNSRecordContent() {}
   virtual void toPacket(DNSPacketWriter& pw)=0;
   virtual string serialize(const DNSName& qname, bool canonic=false, bool lowerCase=false) // it would rock if this were const, but it is too hard
diff --git a/pdns/dnsrecords.cc b/pdns/dnsrecords.cc
index 4829a1a54..8684c2d75 100644
--- a/pdns/dnsrecords.cc
+++ b/pdns/dnsrecords.cc
@@ -42,15 +42,18 @@ void DNSResourceRecord::setContent(const string &cont) {
   }
 }
 
-string DNSResourceRecord::getZoneRepresentation() const {
+string DNSResourceRecord::getZoneRepresentation(bool noDot) const {
   ostringstream ret;
   switch(qtype.getCode()) {
     case QType::SRV:
     case QType::MX:
     case QType::CNAME:
     case QType::NS:
-      if (*(content.rbegin()) != '.')
-        ret<<content<<".";
+      if (*(content.rbegin()) != '.') {
+        ret<<content;
+        if(!noDot)
+          ret<<".";
+      }
       break;
     default:
       ret<<content;
@@ -407,7 +410,7 @@ void EUI48RecordContent::toPacket(DNSPacketWriter& pw)
     string blob(d_eui48, d_eui48+6);
     pw.xfrBlob(blob); 
 }
-string EUI48RecordContent::getZoneRepresentation() const
+string EUI48RecordContent::getZoneRepresentation(bool noDot) const
 {
     char tmp[18]; 
     snprintf(tmp,18,"%02x-%02x-%02x-%02x-%02x-%02x", 
@@ -451,7 +454,7 @@ void EUI64RecordContent::toPacket(DNSPacketWriter& pw)
     string blob(d_eui64, d_eui64+8);
     pw.xfrBlob(blob);
 }
-string EUI64RecordContent::getZoneRepresentation() const
+string EUI64RecordContent::getZoneRepresentation(bool noDot) const
 {
     char tmp[24]; 
     snprintf(tmp,24,"%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x",
diff --git a/pdns/dnsrecords.hh b/pdns/dnsrecords.hh
index f7eb2441b..cc38d1b05 100644
--- a/pdns/dnsrecords.hh
+++ b/pdns/dnsrecords.hh
@@ -37,10 +37,10 @@
   static void unreport(void);                                                                    \
   static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);                          \
   static DNSRecordContent* make(const string& zonedata);                                         \
-  string getZoneRepresentation() const override;                                                 \
+  string getZoneRepresentation(bool noDot=false) const override;                                 \
   void toPacket(DNSPacketWriter& pw) override;                                                   \
   uint16_t getType() const override { return QType::RNAME; }                                   \
-  template<class Convertor> void xfrPacket(Convertor& conv);
+  template<class Convertor> void xfrPacket(Convertor& conv, bool noDot=false);
 
 class NAPTRRecordContent : public DNSRecordContent
 {
@@ -469,7 +469,7 @@ public:
 
   static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
   static DNSRecordContent* make(const string& content);
-  string getZoneRepresentation() const override;
+  string getZoneRepresentation(bool noDot=false) const override;
   void toPacket(DNSPacketWriter& pw) override;
   uint16_t getType() const override
   {
@@ -490,7 +490,7 @@ public:
 
   static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
   static DNSRecordContent* make(const string& content);
-  string getZoneRepresentation() const override;
+  string getZoneRepresentation(bool noDot=false) const override;
   void toPacket(DNSPacketWriter& pw) override;
 
   uint8_t d_algorithm, d_flags;
@@ -521,7 +521,7 @@ public:
 
   static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
   static DNSRecordContent* make(const string& content);
-  string getZoneRepresentation() const override;
+  string getZoneRepresentation(bool noDot=false) const override;
   void toPacket(DNSPacketWriter& pw) override;
 
   uint16_t getType() const override
@@ -547,7 +547,7 @@ public:
 
   static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
   static DNSRecordContent* make(const string& content);
-  string getZoneRepresentation() const override;
+  string getZoneRepresentation(bool noDot=false) const override;
   void toPacket(DNSPacketWriter& pw) override;
 
   uint8_t d_version, d_size, d_horizpre, d_vertpre;
@@ -571,7 +571,7 @@ public:
 
   static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
   static DNSRecordContent* make(const string& content);
-  string getZoneRepresentation() const override;
+  string getZoneRepresentation(bool noDot=false) const override;
   void toPacket(DNSPacketWriter& pw) override;
 
   uint32_t d_ip;
@@ -586,7 +586,7 @@ public:
   static void report(void);
   static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
   static DNSRecordContent* make(const string& zone); // FIXME400: DNSName& zone?
-  string getZoneRepresentation() const override;
+  string getZoneRepresentation(bool noDot=false) const override;
   void toPacket(DNSPacketWriter& pw) override;
   uint16_t getType() const override { return QType::EUI48; }
 private:
@@ -601,7 +601,7 @@ public:
   static void report(void);
   static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
   static DNSRecordContent* make(const string& zone); // FIXME400: DNSName& zone?
-  string getZoneRepresentation() const override;
+  string getZoneRepresentation(bool noDot=false) const override;
   void toPacket(DNSPacketWriter& pw) override;
   uint16_t getType() const override { return QType::EUI64; }
 private:
@@ -674,10 +674,10 @@ RNAME##RecordContent::RNAME##RecordContent(const string& zoneData)
   }        											   \
 }                                                                                                  \
                                                                                                    \
-string RNAME##RecordContent::getZoneRepresentation() const                                         \
+string RNAME##RecordContent::getZoneRepresentation(bool noDot) const                               \
 {                                                                                                  \
   string ret;                                                                                      \
-  RecordTextWriter rtw(ret);                                                                       \
+  RecordTextWriter rtw(ret, noDot);                                                                       \
   const_cast<RNAME##RecordContent*>(this)->xfrPacket(rtw);                                         \
   return ret;                                                                                      \
 }                                                                                                  
@@ -686,7 +686,7 @@ string RNAME##RecordContent::getZoneRepresentation() const
 #define boilerplate_conv(RNAME, TYPE, CONV)                       \
 boilerplate(RNAME, TYPE)                                          \
 template<class Convertor>                                         \
-void RNAME##RecordContent::xfrPacket(Convertor& conv)             \
+void RNAME##RecordContent::xfrPacket(Convertor& conv, bool noDot) \
 {                                                                 \
   CONV;                                                           \
   if (conv.eof() == false) throw MOADNSException("All data was not consumed"); \
diff --git a/pdns/dnswriter.cc b/pdns/dnswriter.cc
index dc03874be..d7e58374a 100644
--- a/pdns/dnswriter.cc
+++ b/pdns/dnswriter.cc
@@ -203,7 +203,7 @@ DNSPacketWriter::lmap_t::iterator find(DNSPacketWriter::lmap_t& nmap, const DNSN
 // }
 
 // this is the absolute hottest function in the pdns recursor
-void DNSPacketWriter::xfrName(const DNSName& name, bool compress)
+void DNSPacketWriter::xfrName(const DNSName& name, bool compress, bool)
 {
   //cerr<<"xfrName: name=["<<name.toString()<<"] compress="<<compress<<endl;
   // string label = d_lowerCase ? toLower(Label) : Label;
diff --git a/pdns/dnswriter.hh b/pdns/dnswriter.hh
index da40920e6..c5554ef7e 100644
--- a/pdns/dnswriter.hh
+++ b/pdns/dnswriter.hh
@@ -86,7 +86,7 @@ public:
 
   void xfr8BitInt(uint8_t val);
 
-  void xfrName(const DNSName& label, bool compress=false);
+  void xfrName(const DNSName& label, bool compress=false, bool noDot=false);
   void xfrText(const string& text, bool multi=false);
   void xfrBlob(const string& blob, int len=-1);
   void xfrBlobNoSpaces(const string& blob, int len=-1);
diff --git a/pdns/nsecrecords.cc b/pdns/nsecrecords.cc
index 1bfe97daf..5aaf2d0b0 100644
--- a/pdns/nsecrecords.cc
+++ b/pdns/nsecrecords.cc
@@ -94,7 +94,7 @@ NSECRecordContent::DNSRecordContent* NSECRecordContent::make(const DNSRecord &dr
   return ret;
 }
 
-string NSECRecordContent::getZoneRepresentation() const
+string NSECRecordContent::getZoneRepresentation(bool noDot) const
 {
   string ret;
   RecordTextWriter rtw(ret);
@@ -227,7 +227,7 @@ NSEC3RecordContent::DNSRecordContent* NSEC3RecordContent::make(const DNSRecord &
   return ret;
 }
 
-string NSEC3RecordContent::getZoneRepresentation() const
+string NSEC3RecordContent::getZoneRepresentation(bool noDot) const
 {
   string ret;
   RecordTextWriter rtw(ret);
@@ -288,7 +288,7 @@ NSEC3PARAMRecordContent::DNSRecordContent* NSEC3PARAMRecordContent::make(const D
   return ret;
 }
 
-string NSEC3PARAMRecordContent::getZoneRepresentation() const
+string NSEC3PARAMRecordContent::getZoneRepresentation(bool noDot) const
 {
   string ret;
   RecordTextWriter rtw(ret);
diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 4e60842a3..927658412 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -478,7 +478,7 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const DNSName& zone)
     try {
       shared_ptr<DNSRecordContent> drc(DNSRecordContent::mastermake(rr.qtype.getCode(), 1, rr.content));
       string tmp=drc->serialize(rr.qname);
-      tmp = drc->getZoneRepresentation();
+      tmp = drc->getZoneRepresentation(true);
       if (rr.qtype.getCode() != QType::AAAA) {
         if (!pdns_iequals(tmp, rr.content)) {
           cout<<"[Warning] Parsed and original record content are not equal: "<<rr.qname.toString()<<" IN " <<rr.qtype.getName()<< " '" << rr.content<<"' (Content parsed as '"<<tmp<<"')"<<endl;
diff --git a/pdns/rcpgenerator.cc b/pdns/rcpgenerator.cc
index 8d6f6448b..30390108d 100644
--- a/pdns/rcpgenerator.cc
+++ b/pdns/rcpgenerator.cc
@@ -188,7 +188,7 @@ void RecordTextReader::xfr8BitInt(uint8_t &val)
 }
 
 // this code should leave all the escapes around 
-void RecordTextReader::xfrName(DNSName& val, bool) 
+void RecordTextReader::xfrName(DNSName& val, bool, bool)
 {
   skipSpaces();
   string sval;
@@ -398,9 +398,10 @@ void RecordTextReader::skipSpaces()
 }
 
 
-RecordTextWriter::RecordTextWriter(string& str) : d_string(str)
+RecordTextWriter::RecordTextWriter(string& str, bool noDot) : d_string(str)
 {
   d_string.clear();
+  d_nodot=noDot;
 }
 
 void RecordTextWriter::xfr48BitInt(const uint64_t& val)
@@ -503,12 +504,21 @@ void RecordTextWriter::xfr8BitInt(const uint8_t& val)
 }
 
 // should not mess with the escapes
-void RecordTextWriter::xfrName(const DNSName& val, bool)
+void RecordTextWriter::xfrName(const DNSName& val, bool, bool noDot)
 {
   if(!d_string.empty())
     d_string.append(1,' ');
   
-  d_string+=val.toString();
+  if(d_nodot) {
+    if(val.isRoot())
+      d_string+=".";
+    else
+      d_string+=val.toStringNoDot();
+  }
+  else
+  {
+    d_string+=val.toString();
+  }
 }
 
 void RecordTextWriter::xfrBlobNoSpaces(const string& val, int size)
diff --git a/pdns/rcpgenerator.hh b/pdns/rcpgenerator.hh
index 2c14eca6e..f5af2ea64 100644
--- a/pdns/rcpgenerator.hh
+++ b/pdns/rcpgenerator.hh
@@ -52,7 +52,7 @@ public:
   void xfrIP6(std::string& val);
   void xfrTime(uint32_t& val);
 
-  void xfrName(DNSName& val, bool compress=false);
+  void xfrName(DNSName& val, bool compress=false, bool noDot=false);
   void xfrText(string& val, bool multi=false);
   void xfrHexBlob(string& val, bool keepReading=false);
   void xfrBase32HexBlob(string& val);
@@ -72,7 +72,7 @@ private:
 class RecordTextWriter
 {
 public:
-  RecordTextWriter(string& str);
+  RecordTextWriter(string& str, bool noDot=false);
   void xfr48BitInt(const uint64_t& val);
   void xfr32BitInt(const uint32_t& val);
   void xfr16BitInt(const uint16_t& val);
@@ -83,7 +83,7 @@ public:
   void xfrBase32HexBlob(const string& val);
 
   void xfrType(const uint16_t& val);
-  void xfrName(const DNSName& val, bool compress=false);
+  void xfrName(const DNSName& val, bool compress=false, bool noDot=false);
   void xfrText(const string& val, bool multi=false);
   void xfrBlobNoSpaces(const string& val, int len=-1);
   void xfrBlob(const string& val, int len=-1);
@@ -91,5 +91,6 @@ public:
   bool eof() { return true; };
 private:
   string& d_string;
+  bool d_nodot;
 };
 #endif
diff --git a/pdns/sillyrecords.cc b/pdns/sillyrecords.cc
index 3a4109dfa..b2a7ea188 100644
--- a/pdns/sillyrecords.cc
+++ b/pdns/sillyrecords.cc
@@ -290,7 +290,7 @@ LOCRecordContent::LOCRecordContent(const string& content, const string& zone)
 }
 
 
-string LOCRecordContent::getZoneRepresentation() const
+string LOCRecordContent::getZoneRepresentation(bool noDot) const
 {
   // convert d_version, d_size, d_horiz/vertpre, d_latitude, d_longitude, d_altitude to:
   // 51 59 00.000 N 5 55 00.000 E 4.00m 1.00m 10000.00m 10.00m