Fixed wrong usage of IpNetwork in api

myOmikron · Apr 2, 2024 · 57222d9 · 57222d9
1 parent b71fcb2
commit 57222d9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/kraken/src/api/handler/data_export/handler.rs b/kraken/src/api/handler/data_export/handler.rs
@@ -208,7 +208,7 @@ impl From<Host> for AggregatedHost {
 
         Self {
             uuid,
-            ip_addr,
+            ip_addr: ip_addr.ip(),
             os_type,
             response_time,
             certainty,

diff --git a/kraken/src/api/handler/data_export/schema.rs b/kraken/src/api/handler/data_export/schema.rs
@@ -3,7 +3,6 @@ use std::net::IpAddr;
 
 use chrono::DateTime;
 use chrono::Utc;
-use ipnetwork::IpNetwork;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
@@ -43,7 +42,7 @@ pub struct AggregatedHost {
     pub uuid: Uuid,
 
     /// The IP address of the host.
-    pub ip_addr: IpNetwork, // TODO: this is wrong, should be IpAddr
+    pub ip_addr: IpAddr,
 
     /// The type of OS of this host
     pub os_type: OsType,

diff --git a/kraken/src/api/handler/services/handler.rs b/kraken/src/api/handler/services/handler.rs
@@ -4,6 +4,7 @@ use actix_web::web::Json;
 use actix_web::web::Path;
 use actix_web::HttpResponse;
 use futures::TryStreamExt;
+use ipnetwork::IpNetwork;
 use rorm::and;
 use rorm::conditions::DynamicCollection;
 use rorm::db::sql::value::Value;
@@ -373,7 +374,7 @@ pub async fn create_service(
             workspace,
             user,
             name,
-            host,
+            IpNetwork::from(host),
             port.zip(protocols),
             certainty,
         )

diff --git a/kraken/src/api/handler/services/schema.rs b/kraken/src/api/handler/services/schema.rs
@@ -2,7 +2,6 @@ use std::net::IpAddr;
 
 use chrono::DateTime;
 use chrono::Utc;
-use ipnetwork::IpNetwork;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
@@ -28,7 +27,7 @@ pub struct CreateServiceRequest {
     pub certainty: ManualServiceCertainty,
 
     /// The ip address the service runs on
-    pub host: IpNetwork, // TODO: this is wrong, should be IpAddr
+    pub host: IpAddr,
 
     /// An optional port the service runs on
     ///