Merge pull request PowerDNS#15194 from omoerbeek/rec-zf-file-syntax

rec: document file extension of zone forward file and do not accept empty list of forwards
webfutureiorepo · Feb 21, 2025 · 1d19e1a · 1d19e1a
2 parents d085ca6 + b287e57
commit 1d19e1a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/pdns/recursordist/rec-rust-lib/table.py b/pdns/recursordist/rec-rust-lib/table.py
@@ -1140,6 +1140,7 @@
  ''',
     'doc-new' : '''
         Same as :ref:`setting-forward-zones`, parsed from a file as a sequence of `Forward Zone`_.
+        The filename MUST end in ``.yml`` for the content to be parsed as YAML.
 
 .. code-block:: yaml
 

diff --git a/pdns/recursordist/reczones.cc b/pdns/recursordist/reczones.cc
@@ -65,6 +65,9 @@ static void convertServersForAD(const std::string& zone, const std::string& inpu
 {
   vector<string> servers;
   stringtok(servers, input, sepa);
+  if (servers.empty()) {
+    throw PDNSException("empty list of forwarders for domain '" + zone + '"');
+  }
   authDomain.d_servers.clear();
 
   vector<string> addresses;
@@ -413,6 +416,9 @@ static void processForwardZonesFile(shared_ptr<SyncRes::domainmap_t>& newMap, sh
       try {
         convertServersForAD(domain, instructions, authDomain, ",; ", log, false);
       }
+      catch (const PDNSException& e) {
+        throw PDNSException(e.reason + "on line " + std::to_string(linenum) + " of " + filename);
+      }
       catch (...) {
         throw PDNSException("Conversion error parsing line " + std::to_string(linenum) + " of " + filename);
       }