Merge pull request #6014 from aerique/backport/5930-secpoll-order-agn…

…ostic Backport #5930: secpoll order agnostic
PowerDNS · Nov 30, 2017 · 72d524b · 72d524b
2 parents 1e61e68 + 346e878
commit 72d524b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
@@ -2024,7 +2024,19 @@ static void houseKeeping(void *)
 	try {
 	  doSecPoll(&last_secpoll);
 	}
-	catch(...) {}
+	catch(std::exception& e)
+        {
+          L<<Logger::Error<<"Exception while performing security poll: "<<e.what()<<endl;
+        }
+        catch(PDNSException& e)
+        {
+          L<<Logger::Error<<"Exception while performing security poll: "<<e.reason<<endl;
+        }
+        catch(...)
+        {
+          L<<Logger::Error<<"Exception while performing security poll"<<endl;
+        }
+
       }
     }
     s_running=false;

diff --git a/pdns/secpoll-recursor.cc b/pdns/secpoll-recursor.cc
@@ -33,7 +33,7 @@ void doSecPoll(time_t* last_secpoll)
   if (g_dnssecmode != DNSSECMode::Off)
     sr.d_doDNSSEC=true;
   vector<DNSRecord> ret;
-
+  
   string version = "recursor-" +pkgv;
   string qstring(version.substr(0, 63)+ ".security-status."+::arg()["security-poll-suffix"]);
 
@@ -60,16 +60,20 @@ void doSecPoll(time_t* last_secpoll)
   }
 
   if(!res && !ret.empty()) {
-    string content=ret.begin()->d_content->getZoneRepresentation();
+    string content;
+    for(const auto&r : ret) {
+      if(r.d_type == QType::TXT)
+        content = r.d_content->getZoneRepresentation();
+    }
+
     if(!content.empty() && content[0]=='"' && content[content.size()-1]=='"') {
       content=content.substr(1, content.length()-2);
     }
-      
+
     pair<string, string> split = splitField(content, ' ');
 
     g_security_status = std::stoi(split.first);
     g_security_message = split.second;
-
   }
   else {
     if(pkgv.find("0.0."))