From: bert hubert <bert.hubert@netherlabs.nl>
Date: Mon, 20 Oct 2014 14:49:20 +0000 (+0200)
Subject: actually add the relevant files
X-Git-Tag: rec-3.7.0-rc1~201^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=806c95f2cc970133df888fcd12e5eff4b084653d;p=thirdparty%2Fpdns.git

actually add the relevant files
---

diff --git a/pdns/secpoll-recursor.cc b/pdns/secpoll-recursor.cc
new file mode 100644
index 0000000000..284be75910
--- /dev/null
+++ b/pdns/secpoll-recursor.cc
@@ -0,0 +1,50 @@
+#include "secpoll-recursor.hh"
+#include "syncres.hh"
+#include "logger.hh"
+#include "arguments.hh"
+
+#ifndef PACKAGEVERSION 
+#define PACKAGEVERSION VERSION
+#endif
+
+uint32_t g_security_status;
+string g_security_message;
+
+void doSecPoll(time_t* last_secpoll)
+{
+  if(::arg()["security-poll-suffix"].empty())
+    return;
+
+  struct timeval now;
+  gettimeofday(&now, 0);
+  SyncRes sr(now);
+  
+  vector<DNSResourceRecord> ret;
+
+  int res=sr.beginResolve("recursor-" PACKAGEVERSION ".security-status."+::arg()["security-poll-suffix"], QType(QType::TXT), 1, ret);
+  if(!res && !ret.empty()) {
+    string content=ret.begin()->content;
+    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 = atoi(split.first.c_str());
+    g_security_message = split.second;
+
+    *last_secpoll=now.tv_sec;
+  }
+  else {
+    L<<Logger::Warning<<"Could not retrieve security status update for '" PACKAGEVERSION "', RCODE = "<< RCode::to_s(res)<<endl;
+    if(g_security_status == 1)
+      g_security_status = 0;
+  }
+
+  if(g_security_status == 2) {
+    L<<Logger::Error<<"PowerDNS Security Update Recommended: "<<g_security_message<<endl;
+  }
+  else if(g_security_status == 3) {
+    L<<Logger::Error<<"PowerDNS Security Update Mandatory: "<<g_security_message<<endl;
+  }
+}
diff --git a/pdns/secpoll-recursor.hh b/pdns/secpoll-recursor.hh
new file mode 100644
index 0000000000..629b1e81df
--- /dev/null
+++ b/pdns/secpoll-recursor.hh
@@ -0,0 +1,10 @@
+#ifndef PDNS_SECPOLL_RECURSOR_HH
+#define PDNS_SECPOLL_RECURSOR_HH
+#include <time.h>
+#include "namespaces.hh"
+
+void doSecPoll(time_t* );
+extern uint32_t g_security_status;
+extern std::string g_security_message;
+
+#endif