feat(575): WIP hiding secrets in logging not working

Signed-off-by: gabrik <[email protected]>
eclipse-zenoh · Oct 31, 2023 · 2ca6bf1 · 2ca6bf1
1 parent 8a5f71e
commit 2ca6bf1
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/commons/zenoh-config/src/lib.rs b/commons/zenoh-config/src/lib.rs
@@ -288,18 +288,22 @@ validated_struct::validator! {
                 pub tls: #[derive(Default)]
                 TLSConf {
                     root_ca_certificate: Option<String>,
-                    root_ca_certificate_base64: Option<String>,
                     server_private_key: Option<String>,
-                    server_private_key_base64: Option<String>,
                     server_certificate: Option<String>,
-                    server_certificate_base64: Option<String>,
                     client_auth: Option<bool>,
                     client_private_key: Option<String>,
-                    client_private_key_base64 : Option<String>,
                     client_certificate: Option<String>,
-                    client_certificate_base64 : Option<String>,
-                    server_name_verification: Option<bool>
-                },
+                    server_name_verification: Option<bool>,
+                    pub private : #[derive(Default)]
+                    Base64Data {
+                        root_ca_certificate_base64: Option<String>,
+                        server_private_key_base64: Option<String>,
+                        server_certificate_base64: Option<String>,
+                        client_private_key_base64 : Option<String>,
+                        client_certificate_base64 : Option<String>,
+                    }
+                }
+                ,
                 pub unixpipe: #[derive(Default)]
                 UnixPipeConf {
                     file_access_mask: Option<u32>

diff --git a/io/zenoh-links/zenoh-link-quic/Cargo.toml b/io/zenoh-links/zenoh-link-quic/Cargo.toml
@@ -42,4 +42,4 @@ zenoh-protocol = { workspace = true }
 zenoh-result = { workspace = true }
 zenoh-sync = { workspace = true }
 zenoh-util = { workspace = true }
-base64 = { workspace = true }
+base64 = { workspace = true }
diff --git a/io/zenoh-links/zenoh-link-quic/src/lib.rs b/io/zenoh-links/zenoh-link-quic/src/lib.rs
@@ -74,7 +74,10 @@ impl ConfigurationInspector<Config> for QuicConfigurator {
 
         let c = config.transport().link().tls();
 
-        match (c.root_ca_certificate(), c.root_ca_certificate_base64()) {
+        match (
+            c.root_ca_certificate(),
+            c.private().root_ca_certificate_base64(),
+        ) {
             (Some(_), Some(_)) => {
                 bail!("Only one between 'root_ca_certificate' and 'root_ca_certificate_base64' can be present!")
             }
@@ -87,7 +90,10 @@ impl ConfigurationInspector<Config> for QuicConfigurator {
             _ => {}
         }
 
-        match (c.server_private_key(), c.server_private_key_base64()) {
+        match (
+            c.server_private_key(),
+            c.private().server_private_key_base64(),
+        ) {
             (Some(_), Some(_)) => {
                 bail!("Only one between 'server_private_key' and 'server_private_key_base64' can be present!")
             }
@@ -100,7 +106,10 @@ impl ConfigurationInspector<Config> for QuicConfigurator {
             _ => {}
         }
 
-        match (c.server_certificate(), c.server_certificate_base64()) {
+        match (
+            c.server_certificate(),
+            c.private().server_certificate_base64(),
+        ) {
             (Some(_), Some(_)) => {
                 bail!("Only one between 'server_certificate' and 'server_certificate_base64' can be present!")
             }

diff --git a/io/zenoh-links/zenoh-link-tls/Cargo.toml b/io/zenoh-links/zenoh-link-tls/Cargo.toml
@@ -41,4 +41,4 @@ zenoh-protocol = { workspace = true }
 zenoh-result = { workspace = true }
 zenoh-sync = { workspace = true }
 zenoh-util = { workspace = true }
-base64 = { workspace = true }
+base64 = { workspace = true }
diff --git a/io/zenoh-links/zenoh-link-tls/src/lib.rs b/io/zenoh-links/zenoh-link-tls/src/lib.rs
@@ -71,7 +71,10 @@ impl ConfigurationInspector<Config> for TlsConfigurator {
 
         let c = config.transport().link().tls();
 
-        match (c.root_ca_certificate(), c.root_ca_certificate_base64()) {
+        match (
+            c.root_ca_certificate(),
+            c.private().root_ca_certificate_base64(),
+        ) {
             (Some(_), Some(_)) => {
                 bail!("Only one between 'root_ca_certificate' and 'root_ca_certificate_base64' can be present!")
             }
@@ -84,7 +87,10 @@ impl ConfigurationInspector<Config> for TlsConfigurator {
             _ => {}
         }
 
-        match (c.server_private_key(), c.server_private_key_base64()) {
+        match (
+            c.server_private_key(),
+            c.private().server_private_key_base64(),
+        ) {
             (Some(_), Some(_)) => {
                 bail!("Only one between 'server_private_key' and 'server_private_key_base64' can be present!")
             }
@@ -97,7 +103,10 @@ impl ConfigurationInspector<Config> for TlsConfigurator {
             _ => {}
         }
 
-        match (c.server_certificate(), c.server_certificate_base64()) {
+        match (
+            c.server_certificate(),
+            c.private().server_certificate_base64(),
+        ) {
             (Some(_), Some(_)) => {
                 bail!("Only one between 'server_certificate' and 'server_certificate_base64' can be present!")
             }
@@ -117,7 +126,10 @@ impl ConfigurationInspector<Config> for TlsConfigurator {
             };
         }
 
-        match (c.client_private_key(), c.client_private_key_base64()) {
+        match (
+            c.client_private_key(),
+            c.private().client_private_key_base64(),
+        ) {
             (Some(_), Some(_)) => {
                 bail!("Only one between 'client_private_key' and 'client_private_key_base64' can be present!")
             }
@@ -130,7 +142,10 @@ impl ConfigurationInspector<Config> for TlsConfigurator {
             _ => {}
         }
 
-        match (c.client_certificate(), c.client_certificate_base64()) {
+        match (
+            c.client_certificate(),
+            c.private().client_certificate_base64(),
+        ) {
             (Some(_), Some(_)) => {
                 bail!("Only one between 'client_certificate' and 'client_certificate_base64' can be present!")
             }