Merge pull request #344 from NordSecurity/FILE-615_update_moose_track…

…er_to_v_13

FILE-615: update moose tracker to v13.1.0

MOOSE_RELEASE_TAG

@@ -1 +1 @@
-v7.0.0-libDropApp
+v13.1.0-libDropApp

changelog.md

@@ -2,6 +2,8 @@
 ### **UNRELEASED**
 ---
 * Add `base_dir` field to the `FilePending` event
+* Update moose tracker to v13.1.0
+    * Adds the `transfer_intent_received` event
 
 ---
 <br>

drop-analytics/src/file_impl.rs

@@ -10,6 +10,8 @@ enum MooseEventType {
     Init(InitEvent),
     #[serde(rename = "transfer_intent")]
     TransferIntent(crate::TransferIntentEventData),
+    #[serde(rename = "transfer_intent_received")]
+    TransferIntentReceived(crate::TransferIntentReceivedEventData),
     #[serde(rename = "transfer_state")]
     TransferState(crate::TransferStateEventData),
     #[serde(rename = "file")]
@@ -97,6 +99,18 @@ impl super::Moose for FileImpl {
         };
     }
 
+    fn event_transfer_intent_received(&self, data: crate::TransferIntentReceivedEventData) {
+        let event = self.write_event(MooseEventType::TransferIntentReceived(data));
+
+        if event.is_err() {
+            slog::error!(
+                self.logger,
+                "[Moose] Failed to write transfer intent received event: {:?}",
+                event.err()
+            );
+        };
+    }
+
     fn event_transfer_state(&self, data: crate::TransferStateEventData) {
         let event = self.write_event(MooseEventType::TransferState(data));
 

drop-analytics/src/lib.rs

@@ -50,6 +50,11 @@ pub struct TransferIntentEventData {
     pub mime_types: String,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct TransferIntentReceivedEventData {
+    pub transfer_id: String,
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct TransferStateEventData {
     pub protocol_version: i32,
@@ -88,6 +93,7 @@ pub struct DeveloperExceptionWithValueEventData {
 pub trait Moose: Send + Sync {
     fn event_init(&self, data: InitEventData);
     fn event_transfer_intent(&self, data: TransferIntentEventData);
+    fn event_transfer_intent_received(&self, data: TransferIntentReceivedEventData);
     fn event_transfer_state(&self, data: TransferStateEventData);
     fn event_transfer_file(&self, data: TransferFileEventData);
 

drop-analytics/src/mock_impl.rs

@@ -3,6 +3,7 @@ pub struct MockImpl;
 impl super::Moose for MockImpl {
     fn event_init(&self, _: crate::InitEventData) {}
     fn event_transfer_intent(&self, _: crate::TransferIntentEventData) {}
+    fn event_transfer_intent_received(&self, _: crate::TransferIntentReceivedEventData) {}
     fn event_transfer_state(&self, _: crate::TransferStateEventData) {}
     fn event_transfer_file(&self, _: crate::TransferFileEventData) {}
     fn developer_exception(&self, _: crate::DeveloperExceptionEventData) {}

drop-analytics/src/moose_impl.rs

@@ -127,7 +127,8 @@ impl super::Moose for MooseImpl {
             self.logger,
             send_serviceQuality_initialization_init,
             data.result,
-            data.init_duration
+            data.init_duration,
+            None
         );
     }
 
@@ -141,7 +142,17 @@ impl super::Moose for MooseImpl {
             data.file_sizes,
             data.extensions,
             data.mime_types,
-            data.path_ids
+            data.path_ids,
+            None
+        );
+    }
+
+    fn event_transfer_intent_received(&self, data: crate::TransferIntentReceivedEventData) {
+        moose!(
+            self.logger,
+            send_serviceQuality_transfer_intentReceived,
+            data.transfer_id,
+            None
         );
     }
 
@@ -151,7 +162,8 @@ impl super::Moose for MooseImpl {
             send_serviceQuality_transfer_state,
             data.transfer_id,
             data.result,
-            data.protocol_version
+            data.protocol_version,
+            None
         );
     }
 
@@ -165,7 +177,8 @@ impl super::Moose for MooseImpl {
             data.direction.into(),
             data.path_id,
             data.phase.into(),
-            data.transferred
+            data.transferred,
+            None
         );
     }
 
@@ -177,7 +190,8 @@ impl super::Moose for MooseImpl {
             data.code,
             data.name,
             data.message,
-            data.note
+            data.note,
+            None
         );
     }
 
@@ -189,7 +203,8 @@ impl super::Moose for MooseImpl {
             data.code,
             data.name,
             data.message,
-            data.note
+            data.note,
+            None
         );
     }
 }

drop-transfer/src/ws/events.rs

@@ -564,6 +564,14 @@ impl TransferEventTx<OutgoingTransfer> {
 
 impl TransferEventTx<IncomingTransfer> {
     pub async fn received(&self) {
+        self.inner
+            .lock()
+            .await
+            .moose
+            .event_transfer_intent_received(drop_analytics::TransferIntentReceivedEventData {
+                transfer_id: self.xfer.id().to_string(),
+            });
+
         self.emit_ongoing(Event::RequestReceived(self.xfer.clone()))
             .await;
     }

test/drop_test/action.py

@@ -12,6 +12,7 @@
 import socket
 import requests
 import shutil
+import re
 
 from . import event, ffi
 from .logger import logger
@@ -33,7 +34,7 @@ def to_num(s: str):
         return s
 
 
-compare_funcs = [
+compare_ops = [
     ("*", lambda input, value: value is not None),
     ("<=", lambda input, value: value <= to_num(input)),
     (">=", lambda input, value: value >= to_num(input)),
@@ -48,6 +49,18 @@ def to_num(s: str):
 ]
 
 
+def substitute_transfer_id(input: str):
+    split = input.split(":")
+    if len(split) != 2:
+        raise Exception("Malformed transfer_id substitution expression")
+
+    return get_uuid(to_num(split[1]))
+
+
+substitute_pattern = r"(\?\/)(.*)(\/)"
+substitute_ops = [("transfer_id", lambda input: substitute_transfer_id(input))]
+
+
 def compare_json_struct(expected: dict, actual: dict):
     for key in expected:
         if key is not int:
@@ -64,7 +77,15 @@ def compare_json_struct(expected: dict, actual: dict):
                 compare_json_struct(expected_value[i], actual_value[i])
         else:
             valid = False
-            for func in compare_funcs:
+            substitution = re.search(substitute_pattern, str(expected_value))
+            if substitution is not None:
+                inner = substitution.group(2)
+                for sub_entry in substitute_ops:
+                    if inner.startswith(sub_entry[0]):
+                        expected_value = sub_entry[1](inner)
+                        break
+
+            for func in compare_ops:
                 signature = func[0]
                 op = func[1]
                 if str(expected_value).startswith(signature):