Skip to content

fix(authority): skip members with incomplete data instead of panicking #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eejd wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(authority): skip members with incomplete data instead of panicking #251

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions zeronsd/src/authority.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,19 @@ impl ZTAuthority {
}

for member in members {
let record = ZTRecord::new(
let record = match ZTRecord::new(
&member,
sixplane,
rfc4193,
self.forward_authority.domain_name.clone().into(),
self.wildcard,
)?;
) {
Ok(record) => record,
Err(e) => {
tracing::warn!("Skipping member with incomplete data: {}", e);
continue;
}
};

self.forward_authority
.insert_member(&mut forward_records, record.clone())
Expand Down Expand Up @@ -602,7 +608,7 @@ impl ZTRecord {
member
.clone()
.node_id
.expect("Node ID for member does not exist")
.ok_or_else(|| anyhow::anyhow!("member has no node ID"))?
);

let fqdn = member_name.to_fqdn(domain_name.clone())?;
Expand All @@ -620,11 +626,10 @@ impl ZTRecord {
let mut ips = member
.clone()
.config
.expect("Member config does not exist")
.ip_assignments
.and_then(|c| c.ip_assignments)
.map_or(Vec::new(), |v| {
v.iter()
.map(|s| IpAddr::from_str(s).expect("Could not parse IP address"))
.filter_map(|s| IpAddr::from_str(s).ok())
.collect()
});

Expand Down