From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Thu, 30 Oct 2014 11:02:40 +0000 (+0100)
Subject: fully abort query resolving if we hit more than 50 outqueries
X-Git-Tag: rec-3.7.0-rc1~180^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44971ca02bfdcd6e9f9453d72fa1ecd4e1620a1f;p=thirdparty%2Fpdns.git

fully abort query resolving if we hit more than 50 outqueries
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index a6e71a007f..7cc7462fd5 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -563,7 +563,14 @@ void startDoResolve(void *p)
 
     // if there is a RecursorLua active, and it 'took' the query in preResolve, we don't launch beginResolve      
     if(!t_pdl->get() || !(*t_pdl)->preresolve(dc->d_remote, local, dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), ret, res, &variableAnswer)) {
-      res = sr.beginResolve(dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), dc->d_mdp.d_qclass, ret);
+      try {
+        res = sr.beginResolve(dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), dc->d_mdp.d_qclass, ret);
+      }
+      catch(ImmediateServFailException &e) {
+        L<<Logger::Error<<"Sending SERVFAIL during resolve of '"<<dc->d_mdp.d_qname<<"' because: "<<e.reason<<endl;
+
+        res = RCode::ServFail;
+      }
 
       if(t_pdl->get()) {
         if(res == RCode::NoError) {
diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 533adb87f6..d605573731 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -923,6 +923,7 @@ int SyncRes::doResolveAt(set<string, CIStringCompare> nameservers, string auth,
           }
           else {
             s_outqueries++; d_outqueries++;
+            if(d_outqueries > 50) throw ImmediateServFailException("more than 50 queries sent while resolving "+qname);
           TryTCP:
             if(doTCP) {
               LOG(prefix<<qname<<": using TCP with "<< remoteIP->toStringWithPort() <<endl);
diff --git a/pdns/syncres.hh b/pdns/syncres.hh
index c68aca49b0..74a26cf120 100644
--- a/pdns/syncres.hh
+++ b/pdns/syncres.hh
@@ -593,6 +593,13 @@ private:
   static AtomicCounter s_currentConnections; //!< total number of current TCP connections
 };
 
+class ImmediateServFailException
+{
+public:
+  ImmediateServFailException(string r){reason=r;};
+
+  string reason; //! Print this to tell the user what went wrong
+};
 
 struct RemoteKeeper
 {