use type String for alias_id

Author: GyulyVGC

src/app_guard_impl.rs

@@ -40,7 +40,7 @@ pub struct AppGuardImpl {
     ip_info_handler: IpInfoHandler,
     tx_store: UnboundedSender<DbEntry>,
     ctx: AppContext,
-    quarantine_alias_id: u64,
+    quarantine_alias_id: String,
     // tx_ai: Sender<AiEntry>,
 }
 
@@ -204,7 +204,7 @@ impl AppGuardImpl {
             };
             self.tx_store
                 .send(DbEntry::DeniedIp((
-                    self.quarantine_alias_id,
+                    self.quarantine_alias_id.clone(),
                     denied_ip,
                     token.to_string(),
                 )))

src/db/datastore_wrapper.rs

@@ -1160,7 +1160,7 @@ impl DatastoreWrapper {
         Ok(ret_val)
     }
 
-    pub(crate) async fn upsert_quarantine_alias(&mut self, token: &str) -> Result<u64, Error> {
+    pub(crate) async fn upsert_quarantine_alias(&mut self, token: &str) -> Result<String, Error> {
         let record = json!(
             {
                 "type": "host",
@@ -1176,7 +1176,7 @@ impl DatastoreWrapper {
             params: Some(Params {
                 id: String::new(),
                 table: table.into(),
-                r#type: String::new(),
+                r#type: String::from("root"),
             }),
             query: Some(Query {
                 pluck: String::from("id"),
@@ -1196,7 +1196,7 @@ impl DatastoreWrapper {
         Ok(id)
     }
 
-    fn internal_upsert_quarantine_alias_parse_response_data(data: String) -> Result<u64, Error> {
+    fn internal_upsert_quarantine_alias_parse_response_data(data: String) -> Result<String, Error> {
         let array_val = serde_json::from_str::<serde_json::Value>(&data).handle_err(location!())?;
         let array = array_val
             .as_array()
@@ -1214,9 +1214,10 @@ impl DatastoreWrapper {
             .handle_err(location!())?;
         let id = map
             .get("id")
-            .and_then(serde_json::Value::as_u64)
+            .and_then(serde_json::Value::as_str)
             .ok_or("Invalid data")
-            .handle_err(location!())?;
+            .handle_err(location!())?
+            .to_string();
 
         Ok(id)
     }

src/db/entries.rs

@@ -21,7 +21,7 @@ pub enum DbEntry {
     TcpConnection((AppGuardTcpConnection, u64)),
     // Blacklist((Vec<String>, String)),
     Firewall((String, Firewall, String)),
-    DeniedIp((u64, DeniedIp, String)),
+    DeniedIp((String, DeniedIp, String)),
     Config((Config, String)),
 }
 
@@ -101,7 +101,7 @@ impl DbEntry {
             // }
             DbEntry::Firewall((app_id, f, _)) => f.to_json(app_id),
             DbEntry::DeniedIp((quarantine_alias_id, denied_ip, _)) => {
-                denied_ip.to_json(*quarantine_alias_id)
+                denied_ip.to_json(quarantine_alias_id)
             }
             DbEntry::Config((configs, _)) => serde_json::to_string(configs).handle_err(location!()),
         }

src/db/store/denied_ip.rs

@@ -3,7 +3,7 @@ use nullnet_liberror::Error;
 use serde_json::json;
 
 impl DeniedIp {
-    pub(crate) fn to_json(&self, quarantine_alias_id: u64) -> Result<String, Error> {
+    pub(crate) fn to_json(&self, quarantine_alias_id: &str) -> Result<String, Error> {
         // a denied IP is always a single IP and (not a subnet)
         let prefix = if self.ip.is_ipv4() { 32 } else { 128 };
         Ok(json!({