Centralize logging

diff --git a/src/middleware/find_mailboxes_compatibility.rs b/src/middleware/find_mailboxes_compatibility.rs
index 63ed688e17ef3d75331adc8834081ad5949e0df0..2b5df8e3d70f2fe9158537e372e28999f331c89c 100644 (file)
--- a/src/middleware/find_mailboxes_compatibility.rs
+++ b/src/middleware/find_mailboxes_compatibility.rs
@@ -1,5 +1,3 @@
-use log::debug;
-

 use super::Middleware;
 
 /// `MailDrop` can't find folders to sync because it implements `IMAPv3` and
 use super::Middleware;
 
 /// `MailDrop` can't find folders to sync because it implements `IMAPv3` and


@@ -24,11 +22,6 @@ impl Middleware for FindMailboxesCompatibility {
                 // We'll need to convert the LIST to a FIND
                 self.tags.push(tag.trim().to_string());
                 let replacement = format!("{} LIST \"\" \"*\"\r\n", tag.trim());
                 // We'll need to convert the LIST to a FIND
                 self.tags.push(tag.trim().to_string());
                 let replacement = format!("{} LIST \"\" \"*\"\r\n", tag.trim());

-                let debug_str = replacement
-                    .replace('\n', "\\n")
-                    .replace('\r', "\\r")
-                    .replace('\t', "\\t");
-                debug!("### {debug_str}");

                 return replacement.into_bytes();
             }
         }
                 return replacement.into_bytes();
             }
         }


@@ -67,13 +60,6 @@ impl Middleware for FindMailboxesCompatibility {
             })
             .collect();
 
             })
             .collect();
 

-        let replacement = lines.join("\n");
-        let debug_str = replacement
-            .replace('\n', "\\n")
-            .replace('\r', "\\r")
-            .replace('\t', "\\t");
-        debug!("### {debug_str}");
-
-        replacement.into_bytes()
+        lines.join("\n").into_bytes()

     }
 }
     }
 }

diff --git a/src/proxy.rs b/src/proxy.rs
index b8d95cd466efb263c3736002f07a67e40e53654a..5678db92455dc6b51d726cf89a03c17ddadd9749 100644 (file)
--- a/src/proxy.rs
+++ b/src/proxy.rs
@@ -238,11 +238,18 @@ fn handle_client(client_stream: TcpStream, configuration: &Arc<Proxy>) {
                 }
             }
 
                 }
             }
 

-            let debug_str = String::from_utf8_lossy(&buffer[..bytes_read])
+            let debug_original = String::from_utf8_lossy(&buffer[..bytes_read])

                 .replace('\n', "\\n")
                 .replace('\r', "\\r")
                 .replace('\t', "\\t");
                 .replace('\n', "\\n")
                 .replace('\r', "\\r")
                 .replace('\t', "\\t");

-            debug!(">>> {}", debug_str);
+
+            let debug_final = String::from_utf8_lossy(&command)
+                .replace('\n', "\\n")
+                .replace('\r', "\\r")
+                .replace('\t', "\\t");
+
+            debug!(">>> {debug_original}");
+            debug!("### {debug_final}");

 
             // Lock the TLS stream and write the data to server
             match tls_stream_clone.lock() {
 
             // Lock the TLS stream and write the data to server
             match tls_stream_clone.lock() {


@@ -299,11 +306,17 @@ fn handle_client(client_stream: TcpStream, configuration: &Arc<Proxy>) {
                 }
             }
 
                 }
             }
 

-            let debug_str = String::from_utf8_lossy(&buffer[..bytes_read])
+            let debug_original = String::from_utf8_lossy(&buffer[..bytes_read])
+                .replace('\n', "\\n")
+                .replace('\r', "\\r")
+                .replace('\t', "\\t");
+
+            let debug_final = String::from_utf8_lossy(&command)

                 .replace('\n', "\\n")
                 .replace('\r', "\\r")
                 .replace('\t', "\\t");
                 .replace('\n', "\\n")
                 .replace('\r', "\\r")
                 .replace('\t', "\\t");

-            debug!("<<< {}", debug_str);
+            debug!("<<< {debug_original}");
+            debug!("### {debug_final}");

 
             // Write decrypted data to client
             if client_writer.write_all(&command).is_err() {
 
             // Write decrypted data to client
             if client_writer.write_all(&command).is_err() {