fix VPN client name in MFA events

Cargo.toml

@@ -11,7 +11,7 @@ resolver = "2"
 
 [workspace.dependencies]
 # internal crates
-defguard_core = { path = "./crates/defguard_core", version = "1.3.1" }
+defguard_core = { path = "./crates/defguard_core", version = "1.5.0" }
 defguard_event_logger = { path = "./crates/defguard_event_logger", version = "0.0.0" }
 defguard_event_router = { path = "./crates/defguard_event_router", version = "0.0.0" }
 defguard_web_ui = { path = "./crates/defguard_web_ui", version = "0.0.0" }

crates/defguard_core/src/enterprise/grpc/desktop_client_mfa.rs

@@ -65,8 +65,13 @@ impl ClientMfaServer {
             return Err(Status::invalid_argument("invalid MFA method"));
         }
 
-        let (ip, user_agent) = parse_client_info(&info).map_err(Status::internal)?;
-        let context = BidiRequestContext::new(user.id, user.username.clone(), ip, user_agent);
+        let (ip, _user_agent) = parse_client_info(&info).map_err(Status::internal)?;
+        let context = BidiRequestContext::new(
+            user.id,
+            user.username.clone(),
+            ip,
+            format!("{} (ID {})", device.name, device.id),
+        );
 
         let code = AuthorizationCode::new(request.code.clone());
         let url = match Url::parse(&request.callback_url).map_err(|err| {

crates/defguard_core/src/events.rs

@@ -331,18 +331,18 @@ pub struct BidiRequestContext {
     pub user_id: Id,
     pub username: String,
     pub ip: IpAddr,
-    pub user_agent: String,
+    pub device_name: String,
 }
 
 impl BidiRequestContext {
-    pub fn new(user_id: Id, username: String, ip: IpAddr, user_agent: String) -> Self {
+    pub fn new(user_id: Id, username: String, ip: IpAddr, device_name: String) -> Self {
         let timestamp = Utc::now().naive_utc();
         Self {
             timestamp,
             user_id,
             username,
             ip,
-            user_agent,
+            device_name,
         }
     }
 }

crates/defguard_core/src/grpc/desktop_client_mfa.rs

@@ -315,8 +315,13 @@ impl ClientMfaServer {
         } = session;
 
         // Prepare event context
-        let (ip, user_agent) = parse_client_info(&info).map_err(Status::internal)?;
-        let context = BidiRequestContext::new(user.id, user.username.clone(), ip, user_agent);
+        let (ip, _user_agent) = parse_client_info(&info).map_err(Status::internal)?;
+        let context = BidiRequestContext::new(
+            user.id,
+            user.username.clone(),
+            ip,
+            format!("{} (ID {})", device.name, device.id),
+        );
 
         // validate code
         match method {

crates/defguard_event_logger/src/message.rs

@@ -74,7 +74,7 @@ impl EventContext {
             username: val.username,
             location,
             ip: val.ip,
-            device: val.user_agent,
+            device: val.device_name,
         }
     }