Skip to content
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

fix: ASPA JSON deserialization failing on ASNs #134

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: ASPA JSON deserialization failing on ASNs #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f1368b
fix: ASPA JSON deserialization failing on ASNs
ember-ana Feb 3, 2025
074ffb8
fix: ASPA customer field name incompatibility with routinator/krill
ember-ana Feb 3, 2025
d1eb5ee
chore: remove redundant closure
ember-ana Feb 5, 2025
7200f20
chore: update changelog
ember-ana Feb 5, 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
2 changes: 2 additions & 0 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Breaking changes
New

* Add ASPA support to JSON input and output. ([#132] by [@devsnek])
* ASPA JSON compatibility with krill & routinator ([#134] by [@ember-ana])

Bug fixes

Expand All @@ -16,6 +17,7 @@ Other changes

[#132]: https://github.com/NLnetLabs/rtrtr/pull/132
[#133]: https://github.com/NLnetLabs/rtrtr/pull/133
[#134]: https://github.com/NLnetLabs/rtrtr/pull/134
[@devsnek]: https://github.com/devsnek
[@ember-ana]: https://github.com/ember-ana

Expand Down
73 changes: 48 additions & 25 deletions src/formats/json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,19 @@ impl Vrp {
impl TryFrom<JsonVrp> for Vrp {
type Error = MaxLenError;

fn try_from(json: JsonVrp) -> Result<Self, Self::Error> {
MaxLenPrefix::new(json.prefix, Some(json.max_length)).map(|prefix| {
Vrp {
payload: RouteOrigin::new(prefix, json.asn),
}
fn try_from(
JsonVrp {
prefix,
max_length,
asn: JsonAsn(asn),
}: JsonVrp,
) -> Result<Self, Self::Error> {
MaxLenPrefix::new(prefix, Some(max_length)).map(|prefix| Vrp {
payload: RouteOrigin::new(prefix, asn),
})
}
}


//------------ Aspa ----------------------------------------------------------

#[derive(Clone, Debug, Deserialize, Serialize)]
Expand All @@ -104,20 +107,36 @@ impl Aspa {
impl TryFrom<JsonAspa> for Aspa {
type Error = ProviderAsnsError;

fn try_from(json: JsonAspa) -> Result<Self, Self::Error> {
let providers = ProviderAsns::try_from_iter(json.providers.into_iter())?;
fn try_from(
JsonAspa {
providers,
customer: JsonAsn(customer),
}: JsonAspa,
) -> Result<Self, Self::Error> {
let provider_asns =
ProviderAsns::try_from_iter(providers.into_iter().map(|JsonAsn(asn)| asn))?;
Ok(Self {
payload: AspaPayload {
customer: json.customer_asid,
providers,
customer,
providers: provider_asns,
},
})
}
}


//============ Serialization =================================================

//------------ JsonAsn -------------------------------------------------------

#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(transparent)]
struct JsonAsn(
#[serde(
serialize_with = "Asn::serialize_as_str",
deserialize_with = "Asn::deserialize_from_any"
)]
Asn,
);

//------------ JsonVrp -------------------------------------------------------

Expand All @@ -130,11 +149,7 @@ struct JsonVrp {
prefix: Prefix,

/// The ASN member.
#[serde(
serialize_with = "Asn::serialize_as_str",
deserialize_with = "Asn::deserialize_from_any",
)]
asn: Asn,
asn: JsonAsn,

/// The max-length member.
#[serde(rename = "maxLength")]
Expand All @@ -145,7 +160,7 @@ impl From<Vrp> for JsonVrp {
fn from(vrp: Vrp) -> Self {
JsonVrp {
prefix: vrp.payload.prefix.prefix(),
asn: vrp.payload.asn,
asn: JsonAsn(vrp.payload.asn),
max_length: vrp.payload.prefix.resolved_max_len(),
}
}
Expand All @@ -156,16 +171,24 @@ impl From<Vrp> for JsonVrp {
#[derive(Clone, Debug, Deserialize, Serialize)]
struct JsonAspa {
/// The customer ASN.
customer_asid: Asn,
///
/// For rpki-client compatibility, "customer_asid" is also supported
#[serde(alias = "customer_asid")]
customer: JsonAsn,
/// The provider ASNs.
providers: Vec<Asn>,
providers: Vec<JsonAsn>,
}

impl From<Aspa> for JsonAspa {
fn from(aspa: Aspa) -> Self {
Self {
customer_asid: aspa.payload.customer,
providers: aspa.payload.providers.iter().collect(),
customer: JsonAsn(aspa.payload.customer),
providers: aspa
.payload
.providers
.iter()
.map(JsonAsn)
.collect(),
}
}
}
Expand Down Expand Up @@ -236,7 +259,7 @@ fn format_origin(origin: RouteOrigin, last: bool) -> Vec<u8> {

fn format_aspa(aspa: AspaPayload, last: bool) -> Vec<u8> {
format!(
r#" {{ "customer_asid": {}, "providers": {:?} }}{}"#,
r#" {{ "customer": {}, "providers": {:?} }}{}"#,
aspa.customer.into_u32(),
aspa.providers.iter().map(|a| a.into_u32()).collect::<Vec<_>>(),
if last { "\n" } else { ",\n" },
Expand Down Expand Up @@ -408,14 +431,14 @@ mod test {
s(vec![
Payload::Aspa(AspaPayload { customer: 42u32.into(), providers: ProviderAsns::try_from_iter(vec![44u32.into(), 45u32.into()]).unwrap() }),
]),
"{\n \"aspas\": [\n { \"customer_asid\": 42, \"providers\": [44, 45] }\n ]\n}",
"{\n \"aspas\": [\n { \"customer\": 42, \"providers\": [44, 45] }\n ]\n}",
);
assert_eq!(
s(vec![
Payload::Aspa(AspaPayload { customer: 42u32.into(), providers: ProviderAsns::try_from_iter(vec![44u32.into(), 45u32.into()]).unwrap() }),
Payload::Aspa(AspaPayload { customer: 45u32.into(), providers: ProviderAsns::try_from_iter(vec![46u32.into(), 47u32.into()]).unwrap() }),
]),
"{\n \"aspas\": [\n { \"customer_asid\": 42, \"providers\": [44, 45] },\n { \"customer_asid\": 45, \"providers\": [46, 47] }\n ]\n}",
"{\n \"aspas\": [\n { \"customer\": 42, \"providers\": [44, 45] },\n { \"customer\": 45, \"providers\": [46, 47] }\n ]\n}",
);

assert_eq!(
Expand All @@ -425,7 +448,7 @@ mod test {
Payload::Aspa(AspaPayload { customer: 45u32.into(), providers: ProviderAsns::try_from_iter(vec![46u32.into(), 47u32.into()]).unwrap() }),
Payload::Origin(RouteOrigin::new(MaxLenPrefix::new("fd00:1235::/32".parse().unwrap(), Some(48)).unwrap(), 42u32.into())),
]),
"{\n \"roas\": [\n { \"asn\": \"AS42\", \"prefix\": \"fd00:1234::/32\", \"maxLength\": 48, \"ta\": \"N/A\" },\n { \"asn\": \"AS42\", \"prefix\": \"fd00:1235::/32\", \"maxLength\": 48, \"ta\": \"N/A\" }\n ],\n \"aspas\": [\n { \"customer_asid\": 42, \"providers\": [44, 45] },\n { \"customer_asid\": 45, \"providers\": [46, 47] }\n ]\n}",
"{\n \"roas\": [\n { \"asn\": \"AS42\", \"prefix\": \"fd00:1234::/32\", \"maxLength\": 48, \"ta\": \"N/A\" },\n { \"asn\": \"AS42\", \"prefix\": \"fd00:1235::/32\", \"maxLength\": 48, \"ta\": \"N/A\" }\n ],\n \"aspas\": [\n { \"customer\": 42, \"providers\": [44, 45] },\n { \"customer\": 45, \"providers\": [46, 47] }\n ]\n}",
);
}
}
Expand Down