tweak Graph::build
to support anydomain.com. as leaf zone
This commit is contained in:
parent
ab2aa39b06
commit
a0909f3c04
@ -19,7 +19,6 @@ pub enum Sign<'a> {
|
|||||||
No,
|
No,
|
||||||
Yes,
|
Yes,
|
||||||
/// Signs the zone files and then modifies the records produced by the signing process
|
/// Signs the zone files and then modifies the records produced by the signing process
|
||||||
// XXX if captures are needed use `&dyn Fn(..)` instead of a function pointer
|
|
||||||
AndAmend(&'a dyn Fn(&FQDN, &mut Vec<Record>)),
|
AndAmend(&'a dyn Fn(&FQDN, &mut Vec<Record>)),
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -36,46 +35,54 @@ impl Graph {
|
|||||||
///
|
///
|
||||||
/// a non-empty `TrustAnchor` is returned only when `Sign::Yes` or `Sign::AndAmend` is used
|
/// a non-empty `TrustAnchor` is returned only when `Sign::Yes` or `Sign::AndAmend` is used
|
||||||
pub fn build(leaf: NameServer<Stopped>, sign: Sign) -> Result<Self> {
|
pub fn build(leaf: NameServer<Stopped>, sign: Sign) -> Result<Self> {
|
||||||
// TODO if `leaf` is not authoritative over `nameservers.com.`, we would need two "lines" to
|
assert_eq!(2, leaf.zone().num_labels(), "not yet implemented");
|
||||||
// root. for example, if `leaf` is authoritative over `example.net.` we would need these two
|
assert_eq!(Some(FQDN::COM), leaf.zone().parent(), "not yet implemented");
|
||||||
// lines:
|
|
||||||
// - `nameservers.com.`, `com.`, `.` to cover the `primaryNNN.nameservers.com.` domains that
|
|
||||||
// `NameServer` implicitly uses
|
|
||||||
// - `example.net.`, `net.`, `.` to cover the requested `leaf` name server
|
|
||||||
assert_eq!(&FQDN::NAMESERVERS, leaf.zone(), "not yet implemented");
|
|
||||||
|
|
||||||
// first pass: create nameservers for parent zones
|
// first pass: create nameservers for parent zones
|
||||||
let mut zone = leaf.zone().clone();
|
let mut zone = leaf.zone().clone();
|
||||||
let mut nameservers = vec![leaf];
|
let network = leaf.container.network().clone();
|
||||||
while let Some(parent) = zone.parent() {
|
let implementation = leaf.implementation.clone();
|
||||||
let leaf = &mut nameservers[0];
|
|
||||||
let nameserver = NameServer::new(
|
|
||||||
&leaf.implementation,
|
|
||||||
parent.clone(),
|
|
||||||
leaf.container.network(),
|
|
||||||
)?;
|
|
||||||
|
|
||||||
leaf.add(nameserver.a());
|
let (mut nameservers_ns, leaf) = if leaf.zone() != &FQDN::NAMESERVERS {
|
||||||
|
let nameservers_ns = NameServer::new(&implementation, FQDN::NAMESERVERS, &network)?;
|
||||||
|
(nameservers_ns, Some(leaf))
|
||||||
|
} else {
|
||||||
|
(leaf, None)
|
||||||
|
};
|
||||||
|
|
||||||
|
// the nameserver covering `FQDN::NAMESERVERS` needs A records about all the nameservers in the graph
|
||||||
|
let mut nameservers = vec![];
|
||||||
|
while let Some(parent) = zone.parent() {
|
||||||
|
let nameserver = NameServer::new(&implementation, parent.clone(), &network)?;
|
||||||
|
|
||||||
|
nameservers_ns.add(nameserver.a());
|
||||||
nameservers.push(nameserver);
|
nameservers.push(nameserver);
|
||||||
|
|
||||||
zone = parent;
|
zone = parent;
|
||||||
}
|
}
|
||||||
|
drop((network, implementation));
|
||||||
|
|
||||||
// XXX will not hold when `leaf` is not authoritative over `nameservers.com.`
|
if let Some(leaf) = leaf {
|
||||||
assert_eq!(3, nameservers.len());
|
nameservers.insert(0, leaf);
|
||||||
|
}
|
||||||
|
nameservers.insert(0, nameservers_ns);
|
||||||
|
|
||||||
// second pass: add referrals from parent to child
|
// second pass: add referrals from parent to child
|
||||||
// `windows_mut` is not a thing in `core::iter` so use indexing as a workaround
|
// the nameservers are sorted leaf-most zone first but siblings may be next to each other
|
||||||
for index in 0..nameservers.len() - 1 {
|
// for each child (e.g. `nameservers.com.`), do a linear search for its parent (`com.`)
|
||||||
let [child, parent] = &mut nameservers[index..][..2] else {
|
for index in 1..nameservers.len() {
|
||||||
unreachable!()
|
let (left, right) = nameservers.split_at_mut(index);
|
||||||
};
|
let child = left.last_mut().unwrap();
|
||||||
|
for maybe_parent in right {
|
||||||
parent.referral_nameserver(child);
|
if Some(maybe_parent.zone()) == child.zone().parent().as_ref() {
|
||||||
|
let parent = maybe_parent;
|
||||||
|
parent.referral_nameserver(child);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let root = nameservers.last().unwrap();
|
let root = nameservers.last().unwrap().root_hint();
|
||||||
let root = Root::new(root.fqdn().clone(), root.ipv4_addr());
|
|
||||||
|
|
||||||
// start name servers
|
// start name servers
|
||||||
let (nameservers, trust_anchor) = match sign {
|
let (nameservers, trust_anchor) = match sign {
|
||||||
@ -96,15 +103,22 @@ impl Graph {
|
|||||||
};
|
};
|
||||||
|
|
||||||
let mut running = vec![];
|
let mut running = vec![];
|
||||||
let mut child_ds = None;
|
let mut children_ds = vec![];
|
||||||
|
let mut children_num_labels = 0;
|
||||||
let len = nameservers.len();
|
let len = nameservers.len();
|
||||||
for (index, mut nameserver) in nameservers.into_iter().enumerate() {
|
for (index, mut nameserver) in nameservers.into_iter().enumerate() {
|
||||||
if let Some(ds) = child_ds.take() {
|
if !children_ds.is_empty() {
|
||||||
nameserver.add(ds);
|
let is_parent = nameserver.zone().num_labels() + 1 == children_num_labels;
|
||||||
|
if is_parent {
|
||||||
|
for ds in children_ds.drain(..) {
|
||||||
|
nameserver.add(ds);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut nameserver = nameserver.sign()?;
|
let mut nameserver = nameserver.sign()?;
|
||||||
child_ds = Some(nameserver.ds().clone());
|
children_ds.push(nameserver.ds().clone());
|
||||||
|
children_num_labels = nameserver.zone().num_labels();
|
||||||
if let Some(mutate) = maybe_mutate {
|
if let Some(mutate) = maybe_mutate {
|
||||||
let zone = nameserver.zone().clone();
|
let zone = nameserver.zone().clone();
|
||||||
mutate(&zone, &mut nameserver.signed_zone_file_mut().records);
|
mutate(&zone, &mut nameserver.signed_zone_file_mut().records);
|
||||||
|
Loading…
Reference in New Issue
Block a user