Changeset 996

Timestamp:

03/25/07 20:11:19 (6 years ago)

Author:

ahu

Message:

fix TXT storage and processing model. Each TXT record must now be in "quotes", and for records that need it, we support multiple TXT records which are then all parsed or sent out

Location:

trunk/pdns/pdns

Files:

• dnsparser.cc (modified) (1 diff)
• dnsparser.hh (modified) (2 diffs)
• dnsrecords.cc (modified) (2 diffs)
• dnswriter.cc (modified) (2 diffs)
• dnswriter.hh (modified) (1 diff)
• rcpgenerator.cc (modified) (2 diffs)
• rcpgenerator.hh (modified) (2 diffs)
• zoneparser-tng.cc (modified) (1 diff)

trunk/pdns/pdns/dnsparser.cc

@@ -359 +359 @@
 }
 
-string PacketReader::getText()
+static string txtEscape(const string &name)
+{
+  string ret;
+
+  for(string::const_iterator i=name.begin();i!=name.end();++i)
+    if(*i=='"' || *i=='\\'){
+      ret += '\\';
+      ret += *i;
+    }
+    else
+      ret += *i;
+  return ret;
+}
+
+// exceptions thrown here do not result in logging in the main pdns auth server - just so you know!
+string PacketReader::getText(bool multi)
 {
   string ret;
   ret.reserve(40);
-
-  unsigned char labellen=d_content.at(d_pos++);
-  ret.append(&d_content.at(d_pos), &d_content.at(d_pos+labellen-1)+1); // the end is one beyond the packet
-  d_pos+=labellen;
-  return ret;
-}
+  while(d_pos < d_startrecordpos + d_recordlen ) {
+    if(!ret.empty()) {
+      ret.append(1,' ');
+    }
+    unsigned char labellen=d_content.at(d_pos++);
+    
+    ret.append(1,'"');
+    string val(&d_content.at(d_pos), &d_content.at(d_pos+labellen-1)+1);
+    
+    ret.append(txtEscape(val)); // the end is one beyond the packet
+    ret.append(1,'"');
+    d_pos+=labellen;
+    if(!multi)
+      break;
+  }
+
+  return ret;
+}
+
 
 void PacketReader::getLabelFromContent(const vector<uint8_t>& content, uint16_t& frompos, string& ret, int recurs) 

trunk/pdns/pdns/dnsparser.hh

@@ -110 +110 @@
   }
 
-  void xfrText(string &text)
-  {
-    text=getText();
+  void xfrText(string &text, bool multi=false)
+  {
+    text=getText(multi);
   }
 
@@ -126 +126 @@
 
   string getLabel(unsigned int recurs=0);
-  string getText();
+  string getText(bool multi);
 
   uint16_t d_pos;

trunk/pdns/pdns/dnsrecords.cc

@@ -1 +1 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2005 - 2006  PowerDNS.COM BV
+    Copyright (C) 2005 - 2007  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
@@ -178 +178 @@
 boilerplate_conv(PTR, ns_t_ptr, conv.xfrLabel(d_content, true));
 boilerplate_conv(CNAME, ns_t_cname, conv.xfrLabel(d_content, true));
-boilerplate_conv(TXT, ns_t_txt, conv.xfrText(d_text));
-boilerplate_conv(SPF, 99, conv.xfrText(d_text));
+boilerplate_conv(TXT, ns_t_txt, conv.xfrText(d_text, true));
+boilerplate_conv(SPF, 99, conv.xfrText(d_text, true));
 boilerplate_conv(HINFO, ns_t_hinfo,  conv.xfrText(d_cpu);   conv.xfrText(d_host));
 

trunk/pdns/pdns/dnswriter.cc

@@ -2 +2 @@
 #include "misc.hh"
 #include "dnsparser.hh"
+#include <boost/tokenizer.hpp>
 
 DNSPacketWriter::DNSPacketWriter(vector<uint8_t>& content, const string& qname, uint16_t  qtype, uint16_t qclass, uint8_t opcode)
@@ -116 +117 @@
 }
 
-void DNSPacketWriter::xfrText(const string& text)
-{
-  d_record.push_back(text.length());
-  const uint8_t* ptr=(uint8_t*)(text.c_str());
-  d_record.insert(d_record.end(), ptr, ptr+text.size());
+void DNSPacketWriter::xfrText(const string& text, bool)
+{
+  escaped_list_separator<char> sep('\\', ' ' , '"');
+  tokenizer<escaped_list_separator<char> > tok(text, sep);
+
+  tokenizer<escaped_list_separator<char> >::iterator beg=tok.begin();
+
+  if(beg==tok.end()) {
+    d_record.push_back(0);
+  }
+  else 
+    for(; beg!=tok.end(); ++beg){
+      d_record.push_back(beg->length());
+      const uint8_t* ptr=(uint8_t*)(beg->c_str());
+      d_record.insert(d_record.end(), ptr, ptr+beg->length());
+    }
 }
 

trunk/pdns/pdns/dnswriter.hh

@@ -84 +84 @@
 
   void xfrLabel(const string& label, bool compress=false);
-  void xfrText(const string& text);
+  void xfrText(const string& text, bool multi=false);
   void xfrBlob(const string& blob);
   void xfrHexBlob(const string& blob);

trunk/pdns/pdns/rcpgenerator.cc

@@ -207 +207 @@
 }
 
-
-void RecordTextReader::xfrText(string& val)
-{
-  skipSpaces();
-  if(d_string[d_pos]!='"')
-    throw RecordTextException("Data field in DNS should start with quote (\") at position "+lexical_cast<string>(d_pos)+" of '"+d_string+"'");
-
+void RecordTextReader::xfrText(string& val, bool multi)
+{
   val.clear();
   val.reserve(d_end - d_pos);
-  
-  while(++d_pos < d_end && d_string[d_pos]!='"') {
-    if(d_string[d_pos]=='\\' && d_pos+1!=d_end) {
-      ++d_pos;
+
+  while(d_pos != d_end) {
+    if(!val.empty())
+      val.append(1, ' ');
+
+    skipSpaces();
+    if(d_string[d_pos]!='"')
+      throw RecordTextException("Data field in DNS should start with quote (\") at position "+lexical_cast<string>(d_pos)+" of '"+d_string+"'");
+
+    val.append(1, '"');
+    while(++d_pos < d_end && d_string[d_pos]!='"') {
+      if(d_string[d_pos]=='\\' && d_pos+1!=d_end) {
+        val.append(1, d_string[d_pos++]);
+      }
+      val.append(1, d_string[d_pos]);
     }
-    val.append(1, d_string[d_pos]);
-  }
-  if(d_pos == d_end)
-    throw RecordTextException("Data field in DNS should end on a quote (\") in '"+d_string+"'");
-  d_pos++;
+    val.append(1,'"');
+    if(d_pos == d_end)
+      throw RecordTextException("Data field in DNS should end on a quote (\") in '"+d_string+"'");
+    d_pos++;
+    if(!multi)
+      break;
+  }
 }
 
@@ -384 +392 @@
 }
 
-void RecordTextWriter::xfrText(const string& val)
-{
-  if(!d_string.empty())
-    d_string.append(1,' ');
-  d_string.append(1,'"');
-
-  if(val.find_first_of("\\\"") == string::npos)
-    d_string+=val;
-  else {
-    string::size_type end=val.size();
-    
-    for(string::size_type pos=0; pos < end; ++pos) {
-      if(val[pos]=='\'' || val[pos]=='"')
-        d_string.append(1,'\\');
-      d_string.append(1, val[pos]);
-    }
-  }
-
-  d_string.append(1,'"');
+void RecordTextWriter::xfrText(const string& val, bool multi)
+{
+  if(!d_string.empty())
+    d_string.append(1,' ');
+
+  d_string.append(val);
 }
 

trunk/pdns/pdns/rcpgenerator.hh

@@ -51 +51 @@
 
   void xfrLabel(string& val, bool compress=false);
-  void xfrText(string& val);
+  void xfrText(string& val, bool multi=false);
   void xfrHexBlob(string& val);
   void xfrBlob(string& val);
@@ -76 +76 @@
   void xfrType(const uint16_t& val);
   void xfrLabel(const string& val, bool compress=false);
-  void xfrText(const string& val);
+  void xfrText(const string& val, bool multi=false);
   void xfrBlob(const string& val);
   void xfrHexBlob(const string& val);

trunk/pdns/pdns/zoneparser-tng.cc

@@ -281 +281 @@
     }
     catch(...) {
-      cerr<<"Oops, this doesn't look like a qtype, stopping loop\n";
-      break;
+      throw runtime_error("Parsing zone content line: '"+nextpart+"' doesn't look like a qtype, stopping loop");
     }
   }