Skip to content

fix: [event_delegation] Add serde renames for Org/RequesterOrg fields #11

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

Draft
elhoim wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: [event_delegation] Add serde renames for Org/RequesterOrg fields #11

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
34 changes: 32 additions & 2 deletions src/models/event_delegation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,15 @@ pub struct MispEventDelegation {
pub event_info: Option<String>,

/// Organisation details.
#[serde(default, skip_serializing_if = "Option::is_none")]
#[serde(default, rename = "Org", skip_serializing_if = "Option::is_none")]
pub org: Option<serde_json::Value>,

/// Requester organisation details.
#[serde(default, skip_serializing_if = "Option::is_none")]
#[serde(
default,
rename = "RequesterOrg",
skip_serializing_if = "Option::is_none"
)]
pub requester_org: Option<serde_json::Value>,
}

Expand Down Expand Up @@ -108,4 +112,30 @@ mod tests {
assert_eq!(d.event_id, Some(42));
assert_eq!(d.distribution, Some(1));
}

/// MISP's EventDelegation model (app/Model/EventDelegation.php) declares
/// `$belongsTo` with the aliases 'Org' and 'RequesterOrg', so the API
/// response nests the related organisations under the capitalized keys
/// "Org" / "RequesterOrg", not "org" / "requester_org".
#[test]
fn event_delegation_deserialize_org_fields() {
let json = r#"{
"id": "7",
"event_id": "42",
"org_id": "5",
"requester_org_id": "3",
"distribution": "1",
"Org": {"id": "5", "name": "Requesting Org"},
"RequesterOrg": {"id": "3", "name": "Target Org"}
}"#;
let d: MispEventDelegation = serde_json::from_str(json).unwrap();
assert_eq!(
d.org,
Some(serde_json::json!({"id": "5", "name": "Requesting Org"}))
);
assert_eq!(
d.requester_org,
Some(serde_json::json!({"id": "3", "name": "Target Org"}))
);
}
}
Loading