Provide more context in GeoIP YAML parsing failures.

Fixes: #13064
Signed-off-by: Miod Vallat <miod.vallat@powerdns.com>

diff --git a/modules/geoipbackend/geoipbackend.cc b/modules/geoipbackend/geoipbackend.cc
index 9a6d9cbbdc724035ef73e3084f816b2798532877..b34c4c0623dd750c5c39f0795e6e174c4141520e 100644 (file)
--- a/modules/geoipbackend/geoipbackend.cc
+++ b/modules/geoipbackend/geoipbackend.cc
@@ -232,12 +232,22 @@ void GeoIPBackend::setupNetmasks(const YAML::Node& domain, GeoIPDomain& dom)
   }
 }
 
-bool GeoIPBackend::loadDomain(const YAML::Node& domain, domainid_t domainID, GeoIPDomain& dom)
+bool GeoIPBackend::loadDomain(const std::string& origin, const YAML::Node& domain, domainid_t domainID, GeoIPDomain& dom)
 {
   try {
     dom.id = domainID;
-    dom.domain = ZoneName(domain["domain"].as<string>());
-    dom.ttl = domain["ttl"].as<int>();
+    if (auto node = domain["domain"]) {
+      dom.domain = ZoneName(node.as<string>());
+    }
+    else {
+      throw PDNSException("missing 'domain' node");
+    }
+    if (auto node = domain["ttl"]) {
+      dom.ttl = node.as<int>();
+    }
+    else {
+      throw PDNSException("missing 'ttl' node");
+    }
 
     for (auto recs = domain["records"].begin(); recs != domain["records"].end(); recs++) {
       ZoneName qname = ZoneName(recs->first.as<string>());
@@ -355,11 +365,11 @@ bool GeoIPBackend::loadDomain(const YAML::Node& domain, domainid_t domainID, Geo
     }
   }
   catch (std::exception& ex) {
-    g_log << Logger::Error << ex.what() << endl;
+    g_log << Logger::Error << "Could not load zone from " << origin << ": " << ex.what() << endl;
     return false;
   }
   catch (PDNSException& ex) {
-    g_log << Logger::Error << ex.reason << endl;
+    g_log << Logger::Error << "Could not load zone from " << origin << ": " << ex.reason << endl;
     return false;
   }
   return true;
@@ -375,17 +385,18 @@ void GeoIPBackend::loadDomainsFromDirectory(const std::string& dir, vector<GeoIP
   }
   std::sort(paths.begin(), paths.end());
   for (const auto& p : paths) {
+    std::string path = p.string();
     try {
       GeoIPDomain dom;
-      const auto& zoneRoot = YAML::LoadFile(p.string());
+      const auto& zoneRoot = YAML::LoadFile(path);
       // expect zone key
       const auto& zone = zoneRoot["zone"];
-      if (loadDomain(zone, domains.size(), dom)) {
+      if (loadDomain(path, zone, static_cast<domainid_t>(domains.size()), dom)) {
         domains.push_back(dom);
       }
     }
     catch (std::exception& ex) {
-      g_log << Logger::Warning << "Cannot load zone from " << p << ": " << ex.what() << endl;
+      g_log << Logger::Warning << "Cannot load zone from " << path << ": " << ex.what() << endl;
     }
   }
 }
@@ -438,9 +449,13 @@ void GeoIPBackend::initialize()
     d_global_custom_mapping = mapping.as<map<std::string, std::string>>();
   }
 
+  std::string origin;
   for (YAML::const_iterator _domain = config["domains"].begin(); _domain != config["domains"].end(); _domain++) {
     GeoIPDomain dom;
-    if (loadDomain(*_domain, tmp_domains.size(), dom)) {
+    if (origin.empty()) {
+      origin = "'domains' section in " + zonesFile;
+    }
+    if (loadDomain(origin, *_domain, static_cast<domainid_t>(tmp_domains.size()), dom)) {
       tmp_domains.push_back(std::move(dom));
     }
   }

diff --git a/modules/geoipbackend/geoipbackend.hh b/modules/geoipbackend/geoipbackend.hh
index 57f29a808d16e94b143b67b95e21cdce003df241..b597c7dc2729ae05430267bd3b74830e848f482f 100644 (file)
--- a/modules/geoipbackend/geoipbackend.hh
+++ b/modules/geoipbackend/geoipbackend.hh
@@ -93,7 +93,7 @@ private:
   bool hasDNSSECkey(const ZoneName& name);
   bool lookup_static(const GeoIPDomain& dom, const DNSName& search, const QType& qtype, const DNSName& qdomain, const Netmask& addr, GeoIPNetmask& gl);
   void setupNetmasks(const YAML::Node& domain, GeoIPDomain& dom);
-  bool loadDomain(const YAML::Node& domain, domainid_t domainID, GeoIPDomain& dom);
+  bool loadDomain(const std::string& origin, const YAML::Node& domain, domainid_t domainID, GeoIPDomain& dom);
   void loadDomainsFromDirectory(const std::string& dir, vector<GeoIPDomain>& domains);
   vector<DNSResourceRecord> d_result;
   vector<GeoIPInterface> d_files;