Merge pull request #16 from NullNet-ai/switch-transmissions

Add fields to allow switching packets & resources transmissions on/off at the client

Author: GyulyVGC

libwallguard/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nullnet-libwallguard"
-version = "0.1.6"
+version = "0.1.7"
 edition = "2024"
 authors = ["Giuliano Bellini <[email protected]>", "Anton Liashkevich <[email protected]>"]
 description = "A centralized management system for network firewalls"

libwallguard/src/lib.rs

@@ -94,7 +94,10 @@ impl WallGuardGrpcInterface {
     }
 
     #[allow(clippy::missing_errors_doc)]
-    pub async fn handle_system_resources(&mut self, message: SystemResources) -> Result<CommonResponse, String> {
+    pub async fn handle_system_resources(
+        &mut self,
+        message: SystemResources,
+    ) -> Result<CommonResponse, String> {
         self.client
             .handle_system_resources(Request::new(message))
             .await

libwallguard/src/proto/wallguard.rs

@@ -22,8 +22,13 @@ pub struct HeartbeatResponse {
     pub remote_ui_enabled: bool,
     #[prost(bool, tag = "5")]
     pub remote_ssh_enabled: bool,
+    /// rename this to is_config_monitoring_enabled ???
     #[prost(bool, tag = "6")]
     pub is_monitoring_enabled: bool,
+    #[prost(bool, tag = "7")]
+    pub is_packet_capture_enabled: bool,
+    #[prost(bool, tag = "8")]
+    pub is_resource_monitoring_enabled: bool,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CommonResponse {

proto/wallguard.proto

@@ -32,7 +32,10 @@ message HeartbeatResponse {
   bool remote_shell_enabled = 3;
   bool remote_ui_enabled = 4;
   bool remote_ssh_enabled = 5;
+  // rename this to is_config_monitoring_enabled ???
   bool is_monitoring_enabled = 6;
+  bool is_packet_capture_enabled = 7;
+  bool is_resource_monitoring_enabled = 8;
 }
 
 message CommonResponse {

src/client_stream/auth_stream.rs

@@ -77,6 +77,8 @@ async fn stream_impl(
                         remote_ui_enabled,
                         remote_ssh_enabled,
                         is_monitoring_enabled: response.is_monitoring_enabled,
+                        is_packet_capture_enabled: response.is_packet_capture_enabled,
+                        is_resource_monitoring_enabled: response.is_resource_monitoring_enabled,
                     };
 
                     if tx.send(Ok(response)).await.is_err() {

src/datastore/features/heartbeat/latest_device_info.rs

@@ -5,6 +5,8 @@ use nullnet_liberror::{Error, ErrorHandler, Location, location};
 pub struct LatestDeviceInfo {
     pub status: DeviceStatus,
     pub is_monitoring_enabled: bool,
+    pub is_packet_capture_enabled: bool,
+    pub is_resource_monitoring_enabled: bool,
 }
 
 impl LatestDeviceInfo {
@@ -28,6 +30,18 @@ impl LatestDeviceInfo {
             .ok_or("Could not parse 'is_monitoring_enabled'")
             .handle_err(location!())?;
 
+        let is_packet_capture_enabled = object
+            .get("is_packet_capture_enabled")
+            .and_then(serde_json::Value::as_bool)
+            .ok_or("Could not parse 'is_packet_capture_enabled'")
+            .handle_err(location!())?;
+
+        let is_resource_monitoring_enabled = object
+            .get("is_resource_monitoring_enabled")
+            .and_then(serde_json::Value::as_bool)
+            .ok_or("Could not parse 'is_resource_monitoring_enabled'")
+            .handle_err(location!())?;
+
         let status = object
             .get("status")
             .and_then(|v| v.as_str())
@@ -38,6 +52,8 @@ impl LatestDeviceInfo {
         Ok(Self {
             status: map_status_value_to_enum(&status),
             is_monitoring_enabled,
+            is_packet_capture_enabled,
+            is_resource_monitoring_enabled,
         })
     }
 }

src/datastore/features/heartbeat/mod.rs

@@ -65,7 +65,7 @@ impl DatastoreWrapper {
                 table: String::from("devices"),
             }),
             query: Some(Query {
-                pluck: String::from("status,is_monitoring_enabled,is_remote_access_enabled"),
+                pluck: String::from("status,is_monitoring_enabled,is_remote_access_enabled,is_packet_capture_enabled,is_resource_monitoring_enabled"),
                 durability: String::from("soft"),
             }),
         };

src/proto/wallguard.rs

@@ -22,8 +22,13 @@ pub struct HeartbeatResponse {
     pub remote_ui_enabled: bool,
     #[prost(bool, tag = "5")]
     pub remote_ssh_enabled: bool,
+    /// rename this to is_config_monitoring_enabled ???
     #[prost(bool, tag = "6")]
     pub is_monitoring_enabled: bool,
+    #[prost(bool, tag = "7")]
+    pub is_packet_capture_enabled: bool,
+    #[prost(bool, tag = "8")]
+    pub is_resource_monitoring_enabled: bool,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CommonResponse {