Basic client version reporting

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

@@ -11,7 +11,7 @@ use crate::{
     events::{BidiRequestContext, BidiStreamEvent, BidiStreamEventType, DesktopClientMfaEvent},
     grpc::{
         client_mfa::{ClientLoginSession, ClientMfaServer},
-        utils::parse_client_info,
+        utils::parse_client_ip_agent,
     },
 };
 
@@ -66,7 +66,7 @@ impl ClientMfaServer {
             return Err(Status::invalid_argument("invalid MFA method"));
         }
 
-        let (ip, _user_agent) = parse_client_info(&info).map_err(Status::internal)?;
+        let (ip, _user_agent) = parse_client_ip_agent(&info).map_err(Status::internal)?;
         let context = BidiRequestContext::new(
             user.id,
             user.username.clone(),

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

@@ -1,5 +1,5 @@
 use defguard_common::db::Id;
-use defguard_proto::proxy::{InstanceInfoRequest, InstanceInfoResponse};
+use defguard_proto::proxy::{DeviceInfo, InstanceInfoRequest, InstanceInfoResponse};
 use sqlx::PgPool;
 use tonic::Status;
 
@@ -47,7 +47,11 @@ impl PollingServer {
 
     /// Prepares instance info for polling requests. Enterprise only.
     #[instrument(skip_all)]
-    pub async fn info(&self, request: InstanceInfoRequest) -> Result<InstanceInfoResponse, Status> {
+    pub async fn info(
+        &self,
+        request: InstanceInfoRequest,
+        device_info: Option<DeviceInfo>,
+    ) -> Result<InstanceInfoResponse, Status> {
         trace!("Polling info start");
         let token = self.validate_session(&request.token).await?;
         let Some(device) = Device::find_by_id(&self.pool, token.device_id)
@@ -82,7 +86,8 @@ impl PollingServer {
         }
 
         // Build and return polling info.
-        let device_config = build_device_config_response(&self.pool, device, None).await?;
+        let device_config =
+            build_device_config_response(&self.pool, device, None, device_info).await?;
 
         Ok(InstanceInfoResponse {
             device_config: Some(device_config),

crates/defguard_core/src/grpc/client_mfa.rs

@@ -32,7 +32,7 @@ use crate::{
     },
     enterprise::{db::models::openid_provider::OpenIdProvider, is_enterprise_enabled},
     events::{BidiRequestContext, BidiStreamEvent, BidiStreamEventType, DesktopClientMfaEvent},
-    grpc::utils::parse_client_info,
+    grpc::utils::parse_client_ip_agent,
     handlers::mail::send_email_mfa_code_email,
 };
 
@@ -395,7 +395,7 @@ impl ClientMfaServer {
         } = session;
 
         // Prepare event context
-        let (ip, _user_agent) = parse_client_info(&info).map_err(Status::internal)?;
+        let (ip, _user_agent) = parse_client_ip_agent(&info).map_err(Status::internal)?;
         let context = BidiRequestContext::new(
             user.id,
             user.username.clone(),