From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 8 Oct 2024 07:39:00 +0000 (+0200)
Subject: Allow notify of catz; rename name field to zone for consistency
X-Git-Tag: rec-5.2.0-alpha1~7^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75bfbd2df0086c1fd57a20a46c4d1df8f0fe5eac;p=thirdparty%2Fpdns.git

Allow notify of catz; rename name field to zone for consistency
---

diff --git a/pdns/recursordist/rec-xfr.cc b/pdns/recursordist/rec-xfr.cc
index a7b07cff3d..265617cb4f 100644
--- a/pdns/recursordist/rec-xfr.cc
+++ b/pdns/recursordist/rec-xfr.cc
@@ -34,7 +34,6 @@ static const DNSName cZones("zones");
 static const DNSName cVersion("version");
 
 // TODO: cleanup files if not in catalogzones?
-// TODO: notify to catzone (works but for #14506)
 
 void CatalogZone::add(const DNSRecord& record, Logr::log_t logger)
 {
diff --git a/pdns/recursordist/settings/cxxsupport.cc b/pdns/recursordist/settings/cxxsupport.cc
index d465fd0bc1..3fe87af6da 100644
--- a/pdns/recursordist/settings/cxxsupport.cc
+++ b/pdns/recursordist/settings/cxxsupport.cc
@@ -310,7 +310,8 @@ void pdns::settings::rec::processAPIDir(const string& includeDirOnCommandLine, p
   possiblyConvertForwardsandAuths(includeDir, apiDir, log);
 }
 
-static void addToAllowNotifyFor(Recursorsettings& settings, const rust::Vec<::pdns::rust::settings::rec::ForwardZone>& vec)
+template<typename T>
+static void addToAllowNotifyFor(Recursorsettings& settings, const rust::Vec<T>& vec)
 {
   for (const auto& item : vec) {
     if (item.notify_allowed) {
@@ -342,6 +343,7 @@ pdns::settings::rec::YamlSettingsStatus pdns::settings::rec::readYamlSettings(co
     // run --config, while they aren't actually there in any config file.
     addToAllowNotifyFor(yamlstruct, yamlstruct.recursor.forward_zones);
     addToAllowNotifyFor(yamlstruct, yamlstruct.recursor.forward_zones_recurse);
+    addToAllowNotifyFor(yamlstruct, yamlstruct.recursor.forwarding_catalog_zones);
     yamlstruct.validate();
     settings = std::move(yamlstruct);
     return YamlSettingsStatus::OK;
@@ -1317,7 +1319,7 @@ void fromRustToLuaConfig(const rust::Vec<pdns::rust::settings::rec::ForwardingCa
       ComboAddress combo = ComboAddress(std::string(address), 53);
       fwcatz.d_params.primaries.emplace_back(combo.toStringWithPort());
     }
-    fwcatz.d_params.name = std::string(catz.name);
+    fwcatz.d_params.name = std::string(catz.zone);
     fwcatz.d_params.zoneSizeHint = catz.xfr.zoneSizeHint;
     assign(fwcatz.d_params.tsigtriplet, catz.xfr.tsig);
     fwcatz.d_params.refreshFromConf = catz.xfr.refresh;
diff --git a/pdns/recursordist/settings/rust-bridge-in.rs b/pdns/recursordist/settings/rust-bridge-in.rs
index 2fd4f74622..4b42ad6152 100644
--- a/pdns/recursordist/settings/rust-bridge-in.rs
+++ b/pdns/recursordist/settings/rust-bridge-in.rs
@@ -294,7 +294,7 @@ pub struct FCZDefault {
 #[serde(deny_unknown_fields)]
 pub struct ForwardingCatalogZone {
     #[serde(default, skip_serializing_if = "crate::is_default")]
-    name: String,
+    zone: String,
     #[serde(default, skip_serializing_if = "crate::is_default")]
     notify_allowed: bool,
     #[serde(default, skip_serializing_if = "crate::is_default")]
diff --git a/pdns/recursordist/settings/rust/src/bridge.rs b/pdns/recursordist/settings/rust/src/bridge.rs
index d39d787696..3a84643079 100644
--- a/pdns/recursordist/settings/rust/src/bridge.rs
+++ b/pdns/recursordist/settings/rust/src/bridge.rs
@@ -664,7 +664,7 @@ impl ForwardingCatalogZone {
         // XXX INCOMPLETE
         let seq = serde_yaml::Sequence::new();
         let mut map = serde_yaml::Mapping::new();
-        inserts(&mut map, "name", &self.name);
+        inserts(&mut map, "zone", &self.zone);
         insertb(&mut map, "notify_allowed", self.notify_allowed);
         insertseq(&mut map, "groups", &seq);
         serde_yaml::Value::Mapping(map)
diff --git a/pdns/recursordist/test-settings.cc b/pdns/recursordist/test-settings.cc
index ac103d977b..b617d90748 100644
--- a/pdns/recursordist/test-settings.cc
+++ b/pdns/recursordist/test-settings.cc
@@ -890,7 +890,7 @@ BOOST_AUTO_TEST_CASE(test_yaml_forwardingcatalogzones)
 {
   const std::string yaml = R"EOT(recursor:
   forwarding_catalog_zones:
-  - name: 'forward.invalid'
+  - zone: 'forward.invalid'
     xfr:
       addresses: [192.168.178.3:53]
     groups:
@@ -903,7 +903,7 @@ BOOST_AUTO_TEST_CASE(test_yaml_forwardingcatalogzones)
 
   auto settings = pdns::rust::settings::rec::parse_yaml_string(yaml);
   settings.validate();
-  BOOST_CHECK_EQUAL(std::string(settings.recursor.forwarding_catalog_zones[0].name), "forward.invalid");
+  BOOST_CHECK_EQUAL(std::string(settings.recursor.forwarding_catalog_zones[0].zone), "forward.invalid");
   BOOST_CHECK_EQUAL(std::string(settings.recursor.forwarding_catalog_zones[0].xfr.addresses[0]), "192.168.178.3:53");
   BOOST_CHECK_EQUAL(settings.recursor.forwarding_catalog_zones[0].groups[0].forwarders.size(), 1U);
   BOOST_CHECK_EQUAL(std::string(settings.recursor.forwarding_catalog_zones[0].groups[0].forwarders[0]), "1.2.3.4");