Split LINE and not COMMAND

[rbdr/olden-mail] / src / proxy.rs

diff --git a/src/proxy.rs b/src/proxy.rs
index 781ce2e1b0dbc9297357cada9b6c4a76bfb4c30e..9c6bbad314d475c8727e72d440fea50720c18e60 100644 (file)
--- a/src/proxy.rs
+++ b/src/proxy.rs
@@ -42,7 +42,7 @@ use std::thread::{sleep, spawn, JoinHandle};
 use std::time::Duration;
 
 use crate::configuration::Proxy;
 use std::time::Duration;
 
 use crate::configuration::Proxy;

-use crate::middleware::get_middleware;
+use crate::middleware::get as get_middleware;

 
 /// A proxy server that listens for plaintext connections and forwards them
 /// via TLS.
 
 /// A proxy server that listens for plaintext connections and forwards them
 /// via TLS.


@@ -238,11 +238,20 @@ 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}");
+            if debug_original != debug_final {
+                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 +308,19 @@ 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}");
+            if debug_original != debug_final {
+                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() {