Merge pull request #7908 from omoerbeek/rec-4.1.14-changelog

[thirdparty/pdns.git] / pdns / validate-recursor.cc

diff --git a/pdns/validate-recursor.cc b/pdns/validate-recursor.cc
index 83e383328bdc150e7d7724007a514b4656b41724..6b62e1b8b2ad1a7d554ecdb8559b718cc2e34e89 100644 (file)
--- a/pdns/validate-recursor.cc
+++ b/pdns/validate-recursor.cc
@@ -2,6 +2,10 @@
 #include "validate-recursor.hh"
 #include "syncres.hh"
 #include "logger.hh"
+#include "rec-lua-conf.hh"
+#include "dnssecinfra.hh"
+#include "dnsseckeeper.hh"
+#include "zoneparser-tng.hh"
 
 DNSSECMode g_dnssecmode{DNSSECMode::ProcessNoValidate};
 bool g_dnssecLogBogus;
@@ -13,7 +17,7 @@ bool checkDNSSECDisabled() {
 bool warnIfDNSSECDisabled(const string& msg) {
   if(g_dnssecmode == DNSSECMode::Off) {
     if (!msg.empty())
-      L<<Logger::Warning<<msg<<endl;
+      g_log<<Logger::Warning<<msg<<endl;
     return true;
   }
   return false;
@@ -24,3 +28,44 @@ vState increaseDNSSECStateCounter(const vState& state)
   g_stats.dnssecResults[state]++;
   return state;
 }
+
+// Returns true if dsAnchors were modified
+bool updateTrustAnchorsFromFile(const std::string &fname, map<DNSName, dsmap_t> &dsAnchors) {
+  map<DNSName,dsmap_t> newDSAnchors;
+  try {
+    auto zp = ZoneParserTNG(fname);
+    DNSResourceRecord rr;
+    DNSRecord dr;
+    while(zp.get(rr)) {
+      dr = DNSRecord(rr);
+      if (rr.qtype == QType::DS) {
+        auto dsr = getRR<DSRecordContent>(dr);
+        if (dsr == nullptr) {
+          throw PDNSException("Unable to parse DS record '" + rr.qname.toString() + " " + rr.getZoneRepresentation() + "'");
+        }
+        newDSAnchors[rr.qname].insert(*dsr);
+      }
+      if (rr.qtype == QType::DNSKEY) {
+        auto dnskeyr = getRR<DNSKEYRecordContent>(dr);
+        if (dnskeyr == nullptr) {
+          throw PDNSException("Unable to parse DNSKEY record '" + rr.qname.toString() + " " + rr.getZoneRepresentation() +"'");
+        }
+        auto dsr = makeDSFromDNSKey(rr.qname, *dnskeyr, DNSSECKeeper::SHA256);
+        newDSAnchors[rr.qname].insert(dsr);
+      }
+    }
+    if (dsAnchors == newDSAnchors) {
+      g_log<<Logger::Debug<<"Read Trust Anchors from file, no changes detected"<<endl;
+      return false;
+    }
+    g_log<<Logger::Info<<"Read changed Trust Anchors from file, updating"<<endl;
+    dsAnchors = newDSAnchors;
+    return true;
+  }
+  catch (const std::exception &e) {
+    throw PDNSException("Error while reading Trust Anchors from file '" + fname + "': " + e.what());
+  }
+  catch (...) {
+    throw PDNSException("Error while reading Trust Anchors from file '" + fname + "'");
+  }
+}