Skip to content

Fix panic on invalid OSPF area-type configuration #1

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix panic on invalid OSPF area-type configuration #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea3a431
Initial plan
Copilot Dec 17, 2025
e223f57
Fix panic when invalid area-type is provided in OSPF configuration
Copilot Dec 17, 2025
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
10 changes: 8 additions & 2 deletions holo-ospf/src/northbound/configuration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,9 @@ where
let area = &mut instance.arenas.areas[area_idx];

let area_type = args.dnode.get_string();
let area_type = AreaType::try_from_yang(&area_type).unwrap();
// This should not fail as validation has already checked this
let area_type = AreaType::try_from_yang(&area_type)
.expect("area_type should be valid after validation");
area.config.area_type = area_type;
area.config.summary = ospf::areas::area::summary::DFLT;
area.config.default_cost = ospf::areas::area::default_cost::DFLT;
Expand Down Expand Up @@ -1665,7 +1667,11 @@ fn load_validation_callbacks() -> ValidationCallbacks {
.path(ospf::areas::area::area_type::PATH)
.validate(|args| {
let area_type = args.dnode.get_string();
let area_type = AreaType::try_from_yang(&area_type).unwrap();
let area_type = AreaType::try_from_yang(&area_type)
.ok_or_else(|| format!(
"invalid area type '{}'. Valid options are: 'ietf-ospf:normal-area', 'ietf-ospf:stub-area', 'ietf-ospf:nssa-area'",
area_type
))?;
if area_type == AreaType::Nssa {
return Err("unsupported area type".to_string());
}
Expand Down