From: Kees Monshouwer <mind04@monshouwer.org>
Date: Sat, 28 Dec 2013 20:31:45 +0000 (+0100)
Subject: catch ComboClass exceptions in communicator
X-Git-Tag: rec-3.6.0-rc1~263^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79a454efaab654c61a586b89cb3a8543ad2be7f6;p=pdns

catch ComboClass exceptions in communicator
---

diff --git a/pdns/communicator.cc b/pdns/communicator.cc
index 1a9ad891a..34be6a54c 100644
--- a/pdns/communicator.cc
+++ b/pdns/communicator.cc
@@ -63,12 +63,27 @@ void CommunicatorClass::go()
     pthread_create(&tid, 0, &retrieveLaunchhelper, this); // Starts CommunicatorClass::retrievalLoopThread()
 
   d_preventSelfNotification = ::arg().mustDo("prevent-self-notification");
-  d_onlyNotify.toMasks(::arg()["only-notify"]);
+
+  try {
+    d_onlyNotify.toMasks(::arg()["only-notify"]);
+  }
+  catch(PDNSException &e) {
+    L<<Logger::Error<<"Unparseable IP in only-notify. Error: "<<e.reason<<endl;
+    exit(0);
+  }
 
   vector<string> parts;
   stringtok(parts, ::arg()["also-notify"], ", \t");
-  for (vector<string>::const_iterator iter = parts.begin(); iter != parts.end(); ++iter)
-    d_alsoNotify.insert(*iter);
+  for (vector<string>::const_iterator iter = parts.begin(); iter != parts.end(); ++iter) {
+    try {
+      ComboAddress caIp(*iter, 53);
+      d_alsoNotify.insert(caIp.toStringWithPort());
+    }
+    catch(PDNSException &e) {
+      L<<Logger::Error<<"Unparseable IP in also-notify. Error: "<<e.reason<<endl;
+      exit(0);
+    }
+  }
 }
 
 void CommunicatorClass::mainloop(void)
diff --git a/pdns/mastercommunicator.cc b/pdns/mastercommunicator.cc
index 61e79ca2f..1d88c58f8 100644
--- a/pdns/mastercommunicator.cc
+++ b/pdns/mastercommunicator.cc
@@ -78,17 +78,22 @@ void CommunicatorClass::queueNotifyDomain(const string &domain, DNSBackend *B)
   B->alsoNotifies(domain, &alsoNotify);
 
   for(set<string>::const_iterator j=alsoNotify.begin();j!=alsoNotify.end();++j) {
-    const ComboAddress caIp(*j, 53);
-    L<<Logger::Warning<<"Queued also-notification of domain '"<<domain<<"' to "<<caIp.toStringWithPort()<<endl;
-    if (!ips.count(caIp.toStringWithPort())) {
-      ips.insert(caIp.toStringWithPort());
-      d_nq.add(domain, caIp.toStringWithPort());
+    try {
+      const ComboAddress caIp(*j, 53);
+      L<<Logger::Warning<<"Queued also-notification of domain '"<<domain<<"' to "<<caIp.toStringWithPort()<<endl;
+      if (!ips.count(caIp.toStringWithPort())) {
+        ips.insert(caIp.toStringWithPort());
+        d_nq.add(domain, caIp.toStringWithPort());
+      }
+      hasQueuedItem=true;
+    }
+    catch(PDNSException &e) {
+      L<<Logger::Warning<<"Unparseable IP in ALSO-NOTIFY metadata of domain '"<<domain<<"'. Warning: "<<e.reason<<endl;
     }
-    hasQueuedItem=true;
   }
 
   if (!hasQueuedItem)
-    L<<Logger::Warning<<"Request to queue notification for domain '"<<domain<<"' was processed, but no nameservers or ALSO-NOTIFYs found. Not notifying!"<<endl;
+    L<<Logger::Warning<<"Request to queue notification for domain '"<<domain<<"' was processed, but no valid nameservers or ALSO-NOTIFYs found. Not notifying!"<<endl;
 }