From 28ef3a76ebb5f38b495cd833c9f8bbaa7362c270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20K=C5=82ak?= <tomasz.klak@nordsec.com>
Date: Fri, 18 Oct 2024 11:27:00 +0200
Subject: [PATCH] Rename hide_ips to hide_user_data

---
 crates/telio-model/src/features.rs | 19 +++++++++++--------
 nat-lab/tests/utils/bindings.py    |  2 +-
 src/device.rs                      |  2 +-
 src/device/wg_controller.rs        |  2 +-
 src/ffi/defaults_builder.rs        |  2 +-
 src/libtelio.udl                   |  4 ++--
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/crates/telio-model/src/features.rs b/crates/telio-model/src/features.rs
index 779e31628..2164ebbc6 100644
--- a/crates/telio-model/src/features.rs
+++ b/crates/telio-model/src/features.rs
@@ -31,9 +31,10 @@ pub struct Features {
     /// Test environment (natlab) requires binding feature disabled
     /// TODO: Remove it once mac integration tests support the binding mechanism
     pub is_test_env: Option<bool>,
-    /// Controll if IP addresses should be hidden in logs
+    /// Controll if IP addresses and domains should be hidden in logs
+    #[serde(alias = "hide_ips")] // Old name
     #[default(true)]
-    pub hide_ips: bool,
+    pub hide_user_data: bool,
     /// Derp server specific configuration
     pub derp: Option<FeatureDerp>,
     /// Flag to specify if keys should be validated
@@ -500,7 +501,7 @@ mod tests {
                 }
             },
             "is_test_env": true,
-            "hide_ips": false,
+            "hide_user_data": false,
             "derp": {
                 "tcp_keepalive": 13,
                 "derp_keepalive": 14,
@@ -583,7 +584,7 @@ mod tests {
                         ),
                     }),
                     is_test_env: Some(true),
-                    hide_ips: false,
+                    hide_user_data: false,
                     derp: Some(FeatureDerp {
                         tcp_keepalive: Some(13),
                         derp_keepalive: Some(14),
@@ -772,10 +773,12 @@ mod tests {
         }
 
         #[test]
-        fn test_hide_ips() {
-            assert_json!(r#"{}"#, true, hide_ips);
-            assert_json!(r#"{"hide_ips": false}"#, false, hide_ips);
-            assert_json!(r#"{"hide_ips": true}"#, true, hide_ips);
+        fn test_hide_user_data() {
+            assert_json!(r#"{}"#, true, hide_user_data);
+            assert_json!(r#"{"hide_ips": false}"#, false, hide_user_data);
+            assert_json!(r#"{"hide_ips": true}"#, true, hide_user_data);
+            assert_json!(r#"{"hide_user_data": false}"#, false, hide_user_data);
+            assert_json!(r#"{"hide_user_data": true}"#, true, hide_user_data);
         }
     }
 
diff --git a/nat-lab/tests/utils/bindings.py b/nat-lab/tests/utils/bindings.py
index 83c81d542..d7520c019 100644
--- a/nat-lab/tests/utils/bindings.py
+++ b/nat-lab/tests/utils/bindings.py
@@ -47,7 +47,7 @@ def default_features(
 
     features = features_builder.build()
     features.is_test_env = True
-    features.hide_ips = False
+    features.hide_user_data = False
     features.dns.exit_dns = FeatureExitDns(auto_switch_dns_ips=True)
     return features
 
diff --git a/src/device.rs b/src/device.rs
index c2ec82aed..7c028f3eb 100644
--- a/src/device.rs
+++ b/src/device.rs
@@ -460,7 +460,7 @@ impl Device {
         event_cb: F,
         protect: Option<Arc<dyn Protector>>,
     ) -> Result<Self> {
-        LOG_CENSOR.set_enabled(features.hide_ips);
+        LOG_CENSOR.set_enabled(features.hide_user_data);
 
         let version_tag = version_tag();
         let commit_sha = commit_sha();
diff --git a/src/device/wg_controller.rs b/src/device/wg_controller.rs
index b4e87f4d0..935085542 100644
--- a/src/device/wg_controller.rs
+++ b/src/device/wg_controller.rs
@@ -1599,7 +1599,7 @@ mod tests {
                     } else {
                         None
                     },
-                    hide_ips: false,
+                    hide_user_data: false,
                     derp: None,
                     validate_keys: Default::default(),
                     ipv6: true,
diff --git a/src/ffi/defaults_builder.rs b/src/ffi/defaults_builder.rs
index 331d59c1f..a69b86818 100644
--- a/src/ffi/defaults_builder.rs
+++ b/src/ffi/defaults_builder.rs
@@ -23,7 +23,7 @@ impl FeaturesDefaultsBuilder {
             paths: None,
             direct: None,
             is_test_env: None,
-            hide_ips: true,
+            hide_user_data: true,
             // All inner values of derp are None's or false's
             // and as it does not actualy control derp
             // builder part is not added
diff --git a/src/libtelio.udl b/src/libtelio.udl
index 8a9414afa..6c06056db 100644
--- a/src/libtelio.udl
+++ b/src/libtelio.udl
@@ -527,8 +527,8 @@ dictionary Features {
     FeatureDirect? direct;
     /// Should only be set for macos sideload
     boolean? is_test_env;
-    /// Controll if IP addresses should be hidden in logs
-    boolean hide_ips;
+    /// Controll if IP addresses and domains should be hidden in logs
+    boolean hide_user_data;
     /// Derp server specific configuration
     FeatureDerp? derp;
     /// Flag to specify if keys should be validated