mirror/Easytier
1
0
Fork 0
mirror of https://github.com/EasyTier/EasyTier.git synced 2026-09-02 09:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

add ttl to ZoneData

Browse Source
This commit is contained in:
Luna Yao
2026-04-06 11:54:50 +02:00
parent 09ba9a1203
commit 56f430bf10
6 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easytier/src/dns/config/dns.rs
+17 -12
View File
@@ -26,13 +26,13 @@ pub struct DnsConfig {
#[derivative(Default(value = "DNS_DEFAULT_TLD.clone()"))]
pub domain: LowerName,
#[derivative(Default(value = "vec![DNS_DEFAULT_ADDRESS].into()"))]
#[serde(deserialize_with = "DnsConfig::validate_addresses")]
#[serde(deserialize_with = "DnsConfig::deserialize_addresses")]
pub addresses: NameServerAddrGroup,
pub listeners: NameServerAddrGroup,
}
impl DnsConfig {
pub fn validate_addresses<'de, D>(deserializer: D) -> Result<NameServerAddrGroup, D::Error>
pub fn deserialize_addresses<'de, D>(deserializer: D) -> Result<NameServerAddrGroup, D::Error>
where
D: Deserializer<'de>,
{
@@ -82,32 +82,37 @@ impl DnsConfig {
pub type DnsExportConfig = GetExportConfigResponse;
pub trait DnsGlobalCtxExt {
fn dns_self_zone(&self) -> Option<ZoneConfig>;
fn dns_self_zone(&self) -> ZoneConfig;
fn dns_export_config(&self) -> DnsExportConfig;
fn dns_iter_zones(&self) -> impl Iterator<Item = ZoneConfig>;
}
impl DnsGlobalCtxExt for GlobalCtx {
fn dns_self_zone(&self) -> Option<ZoneConfig> {
fn dns_self_zone(&self) -> ZoneConfig {
let fqdn = self.config.get_dns().get_fqdn();
let ipv4 = self.get_ipv4().map(|ip| ip.address());
let ipv6 = self.get_ipv6().map(|ip| ip.address());
let ipv6 = ipv6.map(|a| vec![a]).unwrap_or_default();
ZoneConfig::dedicated(Some(self.get_id()), fqdn.clone(), ipv4, ipv6)
ZoneConfig::dedicated(Some(self.get_id()), fqdn.clone(), ipv4, ipv6).unwrap()
}
fn dns_export_config(&self) -> DnsExportConfig {
let config = self.config.get_dns();
let zone = self.dns_self_zone();
let zones = config.zones.iter().chain(zone.iter());
DnsExportConfig {
zones: zones
zones: self
.dns_iter_zones()
.filter(|z| z.policy.export.is_some()) // TODO: check policies of parent zones
.cloned()
.map_into()
.collect(),
fqdn: config.get_fqdn().to_string(),
fqdn: self.config.get_dns().get_fqdn().to_string(),
}
}
fn dns_iter_zones(&self) -> impl Iterator<Item = ZoneConfig> {
self.config
.get_dns()
.zones
.into_iter()
.chain(iter::once(self.dns_self_zone()))
}
}