X-Git-Url: https://git.r.bdr.sh/rbdr/olden-mail/blobdiff_plain/8ab8739c55711caa07b8d7540309cb48cc892369..HEAD:/src/proxy.rs?ds=sidebyside diff --git a/src/proxy.rs b/src/proxy.rs index 781ce2e..9c6bbad 100644 --- 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 crate::middleware::get_middleware; +use crate::middleware::get as get_middleware; /// 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) { } } - 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"); - 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() { @@ -299,11 +308,19 @@ fn handle_client(client_stream: TcpStream, configuration: &Arc) { } } - 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"); - 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() {