Skip to content

fix: [client] Post freetext import to events/freeTextImport not attributes/ #20

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: [client] Post freetext import to events/freeTextImport not attributes/ #20

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
36 changes: 35 additions & 1 deletion src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2778,7 +2778,7 @@ impl MispClient {
body.insert("sharing_group_id".into(), serde_json::json!(sg));
}
self.post(
&format!("attributes/freeTextImport/{event_id}"),
&format!("events/freeTextImport/{event_id}"),
&Value::Object(body),
)
.await
Expand Down Expand Up @@ -6390,4 +6390,38 @@ mod tests {
let r = client.delete_user_setting("dashboard", None).await.unwrap();
assert_eq!(r["message"], "Setting deleted.");
}

#[tokio::test]
async fn freetext_posts_to_events_endpoint() {
// MISP implements freeTextImport on EventsController, not
// AttributesController: app/Controller/EventsController.php
// `public function freeTextImport($id, ...)`, routed at
// 'events/freeTextImport/' . $id. PyMISP posts to the same path
// (pymisp/api.py: f'events/freeTextImport/{event_id}').
use wiremock::matchers::{body_json, method, path};
use wiremock::{Mock, MockServer, ResponseTemplate};

let server = MockServer::start().await;
let client = MispClient::new(server.uri(), "key", false).unwrap();

Mock::given(method("POST"))
.and(path("/events/freeTextImport/42"))
.and(body_json(serde_json::json!({
"value": "1.2.3.4",
"adhereToWarninglists": true,
"distribution": 1
})))
.respond_with(
ResponseTemplate::new(200)
.set_body_json(serde_json::json!([{"type": "ip-dst", "value": "1.2.3.4"}])),
)
.mount(&server)
.await;

let result = client
.freetext(42, "1.2.3.4", Some(true), Some(1), None)
.await
.unwrap();
assert_eq!(result[0]["value"], "1.2.3.4");
}
}
Loading