tuxmain/sslrelay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaning up some error handling that was not needed and removing clutter

Browse source
This commit is contained in:
PinkP4nther 2021-09-28 14:21:56 -07:00
commit 65e781971d
2 changed files with 25 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

161
src/data.rs
View file

@ -23,37 +23,13 @@ enum DataPipe {
Shutdown, Shutdown,
} }
/*
trait DataStream {}
impl<S: Read + Write> DataStream for S {}
*/
pub enum DataStreamType { pub enum DataStreamType {
RAW(TcpStream), RAW(TcpStream),
TLS(SslStream<TcpStream>), TLS(SslStream<TcpStream>),
} }
//impl Read for DataStreamType {}
//impl Write for DataStreamType {}
/*
impl DataStreamType {
fn shutdown(&self) {
match self {
&Self::RAW(r) => {
r.shutdown(Shutdown::Both);
return;
},
&Self::TLS(t) => {
t.shutdown();
return;
},
}
}
}
*/
struct DownStreamInner struct DownStreamInner
{ {
//ds_stream: Option<Arc<Mutex<SslStream<TcpStream>>>>,
//ds_stream: Arc<Mutex<DataStreamType>>,
ds_stream: DataStreamType, ds_stream: DataStreamType,
internal_data_buffer: Vec<u8>, internal_data_buffer: Vec<u8>,
} }
@ -62,7 +38,6 @@ impl DownStreamInner {
fn handle_error(error_description: &str) { fn handle_error(error_description: &str) {
println!("[SSLRelay DownStream Thread Error]: {}", error_description); println!("[SSLRelay DownStream Thread Error]: {}", error_description);
//self.ds_stream.as_ref().shutdown();
} }
pub fn ds_handler(self, data_out: Sender<FullDuplexTcpState>, data_in: Receiver<DataPipe>) { pub fn ds_handler(self, data_out: Sender<FullDuplexTcpState>, data_in: Receiver<DataPipe>) {
@ -89,26 +64,13 @@ impl DownStreamInner {
match data_received { match data_received {
DataPipe::DataWrite(data) => { DataPipe::DataWrite(data) => {
/*
let mut stream_lock = match self.ds_stream.as_ref().unwrap().lock() {
Ok(sl) => sl,
Err(_e) => {
self.handle_error("Failed to get stream lock!");
if let Err(e) = data_out.send(FullDuplexTcpState::DownStreamShutDown) {
self.handle_error(format!("Failed to send shutdown signal to main thread from DownStream thread: {}", e).as_str());
}
return;
}
};
*/
match raw_stream.write_all(&data) { match raw_stream.write_all(&data) {
Ok(()) => {}, Ok(()) => {},
Err(_e) => { Err(_e) => {
Self::handle_error("Failed to write data to DownStream tcp stream!"); Self::handle_error("Failed to write data to DownStream tcp stream!");
if let Err(e) = data_out.send(FullDuplexTcpState::DownStreamShutDown) { let _ = data_out.send(FullDuplexTcpState::DownStreamShutDown);
Self::handle_error(format!("Failed to send shutdown signal to main thread from DownStream thread: {}", e).as_str()); let _ = raw_stream.shutdown(Shutdown::Both);
let _ = raw_stream.shutdown(Shutdown::Both);
}
return; return;
} }
} }
@ -145,9 +107,8 @@ impl DownStreamInner {
} else if byte_count == 0 || byte_count == -2 { } else if byte_count == 0 || byte_count == -2 {
if let Err(e) = data_out.send(FullDuplexTcpState::DownStreamShutDown) { let _ = data_out.send(FullDuplexTcpState::DownStreamShutDown);
Self::handle_error(format!("Failed to send shutdown signal to main thread from DownStream thread: {}", e).as_str()); let _ = raw_stream.shutdown(Shutdown::Both);
}
return; return;
} else if byte_count == -1 { } else if byte_count == -1 {
@ -175,25 +136,13 @@ impl DownStreamInner {
match data_received { match data_received {
DataPipe::DataWrite(data) => { DataPipe::DataWrite(data) => {
/*
let mut stream_lock = match self.ds_stream.as_ref().unwrap().lock() {
Ok(sl) => sl,
Err(_e) => {
self.handle_error("Failed to get stream lock!");
if let Err(e) = data_out.send(FullDuplexTcpState::DownStreamShutDown) {
self.handle_error(format!("Failed to send shutdown signal to main thread from DownStream thread: {}", e).as_str());
}
return;
}
};
*/
match tls_stream.write_all(&data) { match tls_stream.write_all(&data) {
Ok(()) => {}, Ok(()) => {},
Err(_e) => { Err(_e) => {
Self::handle_error("Failed to write data to DownStream tcp stream!"); Self::handle_error("Failed to write data to DownStream tcp stream!");
if let Err(e) = data_out.send(FullDuplexTcpState::DownStreamShutDown) { let _ = data_out.send(FullDuplexTcpState::DownStreamShutDown);
Self::handle_error(format!("Failed to send shutdown signal to main thread from DownStream thread: {}", e).as_str()); let _ = tls_stream.shutdown();
}
return; return;
} }
} }
@ -222,6 +171,7 @@ impl DownStreamInner {
if let Err(e) = data_out.send(FullDuplexTcpState::UpStreamWrite(self.internal_data_buffer.clone())) { if let Err(e) = data_out.send(FullDuplexTcpState::UpStreamWrite(self.internal_data_buffer.clone())) {
Self::handle_error(format!("Failed to send UpStreamWrite to main thread: {}", e).as_str()); Self::handle_error(format!("Failed to send UpStreamWrite to main thread: {}", e).as_str());
let _ = tls_stream.shutdown();
return; return;
} }
@ -229,9 +179,8 @@ impl DownStreamInner {
} else if byte_count == 0 || byte_count == -2 { } else if byte_count == 0 || byte_count == -2 {
if let Err(e) = data_out.send(FullDuplexTcpState::DownStreamShutDown) { let _ = data_out.send(FullDuplexTcpState::DownStreamShutDown);
Self::handle_error(format!("Failed to send shutdown signal to main thread from DownStream thread: {}", e).as_str()); let _ = tls_stream.shutdown();
}
return; return;
} else if byte_count == -1 { } else if byte_count == -1 {
@ -247,8 +196,6 @@ impl DownStreamInner {
let mut data_length: i64 = 0; let mut data_length: i64 = 0;
//let mut stream_lock = self.ds_stream.as_mut().unwrap().lock().unwrap();
loop { loop {
let mut r_buf = [0; 1024]; let mut r_buf = [0; 1024];
@ -303,7 +250,6 @@ impl DownStreamInner {
struct UpStreamInner struct UpStreamInner
{ {
//us_stream: Option<Arc<Mutex<DataStreamType>>>,
us_stream: DataStreamType, us_stream: DataStreamType,
internal_data_buffer: Vec<u8> internal_data_buffer: Vec<u8>
} }
@ -312,7 +258,6 @@ impl UpStreamInner {
fn handle_error(error_description: &str) { fn handle_error(error_description: &str) {
println!("[SSLRelay UpStream Thread Error]: {}", error_description); println!("[SSLRelay UpStream Thread Error]: {}", error_description);
//let _ = self.us_stream.as_ref().unwrap().lock().unwrap().get_ref().shutdown(Shutdown::Both);
} }
pub fn us_handler(self, data_out: Sender<FullDuplexTcpState>, data_in: Receiver<DataPipe>) { pub fn us_handler(self, data_out: Sender<FullDuplexTcpState>, data_in: Receiver<DataPipe>) {
@ -339,27 +284,13 @@ impl UpStreamInner {
match data_received { match data_received {
DataPipe::DataWrite(data) => { DataPipe::DataWrite(data) => {
/*
let mut stream_lock = match self.us_stream.as_ref().unwrap().lock() {
Ok(sl) => sl,
Err(_e) => {
self.handle_error("Failed to get stream lock!");
if let Err(_e) = data_out.send(FullDuplexTcpState::UpStreamShutDown) {
//println!("[SSLRelay UpStream Thread Error]: Failed to send shutdown signal to main thread from UpStream thread: {}", e);
//return;
}
return;
}
};
*/
match raw_stream.write_all(&data) { match raw_stream.write_all(&data) {
Ok(()) => {}, Ok(()) => {},
Err(_e) => { Err(_e) => {
println!("Failed to write data to UpStream tcp stream!"); Self::handle_error("Failed to write data to UpStream tcp stream!");
if let Err(_e) = data_out.send(FullDuplexTcpState::UpStreamShutDown) { let _ = data_out.send(FullDuplexTcpState::UpStreamShutDown);
//println!("[SSLRelay UpStream Thread Error]: Failed to send shutdown signal to main thread from UpStream thread: {}", e); let _ = raw_stream.shutdown(Shutdown::Both);
//return;
}
return; return;
} }
} }
@ -394,9 +325,8 @@ impl UpStreamInner {
} else if byte_count == 0 || byte_count == -2 { } else if byte_count == 0 || byte_count == -2 {
if let Err(e) = data_out.send(FullDuplexTcpState::UpStreamShutDown) { let _ = data_out.send(FullDuplexTcpState::UpStreamShutDown);
Self::handle_error(format!("Failed to send shutdown signal to main thread from UpStream thread: {}", e).as_str()); let _ = raw_stream.shutdown(Shutdown::Both);
}
return; return;
} else if byte_count == -1 { } else if byte_count == -1 {
continue; continue;
@ -421,27 +351,13 @@ impl UpStreamInner {
match data_received { match data_received {
DataPipe::DataWrite(data) => { DataPipe::DataWrite(data) => {
/*
let mut stream_lock = match self.us_stream.as_ref().unwrap().lock() {
Ok(sl) => sl,
Err(_e) => {
self.handle_error("Failed to get stream lock!");
if let Err(_e) = data_out.send(FullDuplexTcpState::UpStreamShutDown) {
//println!("[SSLRelay UpStream Thread Error]: Failed to send shutdown signal to main thread from UpStream thread: {}", e);
//return;
}
return;
}
};
*/
match tls_stream.write_all(&data) { match tls_stream.write_all(&data) {
Ok(()) => {}, Ok(()) => {},
Err(_e) => { Err(_e) => {
println!("Failed to write data to UpStream tcp stream!"); Self::handle_error("Failed to write data to UpStream tcp stream!");
if let Err(_e) = data_out.send(FullDuplexTcpState::UpStreamShutDown) { let _ = data_out.send(FullDuplexTcpState::UpStreamShutDown);
//println!("[SSLRelay UpStream Thread Error]: Failed to send shutdown signal to main thread from UpStream thread: {}", e); let _ = tls_stream.shutdown();
//return;
}
return; return;
} }
} }
@ -476,9 +392,8 @@ impl UpStreamInner {
} else if byte_count == 0 || byte_count == -2 { } else if byte_count == 0 || byte_count == -2 {
if let Err(e) = data_out.send(FullDuplexTcpState::UpStreamShutDown) { let _ = data_out.send(FullDuplexTcpState::UpStreamShutDown);
Self::handle_error(format!("Failed to send shutdown signal to main thread from UpStream thread: {}", e).as_str()); let _ = tls_stream.shutdown();
}
return; return;
} else if byte_count == -1 { } else if byte_count == -1 {
continue; continue;
@ -492,8 +407,6 @@ impl UpStreamInner {
let mut data_length: i64 = 0; let mut data_length: i64 = 0;
//let mut stream_lock = self.us_stream.as_mut().unwrap().lock().unwrap();
loop { loop {
let mut r_buf = [0; 1024]; let mut r_buf = [0; 1024];
@ -550,15 +463,10 @@ pub struct FullDuplexTcp<H>
where where
H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'static, H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'static,
{ {
//ds_tcp_stream: Arc<Mutex<DataStreamType>>,
//us_tcp_stream: Option<Arc<Mutex<DataStreamType>>>,
//remote_endpoint: String,
remote_host: String, remote_host: String,
remote_port: String, remote_port: String,
ds_inner_m: Arc<Mutex<Option<DownStreamInner>>>, ds_inner_m: Arc<Mutex<Option<DownStreamInner>>>,
//ds_inner_m: DownStreamInner,
us_inner_m: Arc<Mutex<Option<UpStreamInner>>>, us_inner_m: Arc<Mutex<Option<UpStreamInner>>>,
//us_inner_m: UpStreamInner,
inner_handlers: InnerHandlers<H>, inner_handlers: InnerHandlers<H>,
} }
@ -566,13 +474,11 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
pub fn new(ds_tcp_stream: DataStreamType, us_tcp_stream_type: TCPDataType, remote_host: String, remote_port: String, handlers: InnerHandlers<H>) -> Result<Self, i8> { pub fn new(ds_tcp_stream: DataStreamType, us_tcp_stream_type: TCPDataType, remote_host: String, remote_port: String, handlers: InnerHandlers<H>) -> Result<Self, i8> {
//let _ = ds_tcp_stream.set_read_timeout(Some(Duration::from_millis(50)));
match ds_tcp_stream { match ds_tcp_stream {
DataStreamType::RAW(ref s) => { let _ = s.set_read_timeout(Some(Duration::from_millis(50))); }, DataStreamType::RAW(ref s) => { let _ = s.set_read_timeout(Some(Duration::from_millis(50))); },
DataStreamType::TLS(ref s) => { let _ = s.get_ref().set_read_timeout(Some(Duration::from_millis(50))); }, DataStreamType::TLS(ref s) => { let _ = s.get_ref().set_read_timeout(Some(Duration::from_millis(50))); },
} }
// Connect to remote here
let us_tcp_stream = match Self::connect_endpoint(us_tcp_stream_type, remote_host.clone(), remote_port.clone()) { let us_tcp_stream = match Self::connect_endpoint(us_tcp_stream_type, remote_host.clone(), remote_port.clone()) {
Ok(s) => s, Ok(s) => s,
Err(ec) => { Err(ec) => {
@ -586,34 +492,23 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
Ok( Ok(
FullDuplexTcp { FullDuplexTcp {
//ds_tcp_stream: Arc::new(Mutex::new(ds_tcp_stream)),
//us_tcp_stream: None,
remote_host, remote_host,
remote_port, remote_port,
ds_inner_m: Arc::new(Mutex::new(Some(DownStreamInner{ds_stream: ds_tcp_stream, internal_data_buffer: Vec::<u8>::new()}))), ds_inner_m: Arc::new(Mutex::new(Some(DownStreamInner{ds_stream: ds_tcp_stream, internal_data_buffer: Vec::<u8>::new()}))),
//ds_inner_m: DownStreamInner{ds_stream: ds_tcp_stream, internal_data_buffer: Vec::<u8>::new()},
us_inner_m: Arc::new(Mutex::new(Some(UpStreamInner{us_stream: us_tcp_stream, internal_data_buffer: Vec::<u8>::new()}))), us_inner_m: Arc::new(Mutex::new(Some(UpStreamInner{us_stream: us_tcp_stream, internal_data_buffer: Vec::<u8>::new()}))),
//us_inner_m: UpStreamInner{us_stream: us_tcp_stream, internal_data_buffer: Vec::<u8>::new()},
inner_handlers: handlers, inner_handlers: handlers,
}) })
} }
pub fn handle(&mut self) { pub fn handle(&mut self) {
/*
if self.connect_endpoint() < 0 {
let _ = self.ds_tcp_stream.lock().unwrap().get_ref().shutdown(Shutdown::Both);
return;
}
*/
let (state_sender, state_receiver): (Sender<FullDuplexTcpState>, Receiver<FullDuplexTcpState>) = mpsc::channel(); let (state_sender, state_receiver): (Sender<FullDuplexTcpState>, Receiver<FullDuplexTcpState>) = mpsc::channel();
let (ds_data_pipe_sender, ds_data_pipe_receiver): (Sender<DataPipe>, Receiver<DataPipe>) = mpsc::channel(); let (ds_data_pipe_sender, ds_data_pipe_receiver): (Sender<DataPipe>, Receiver<DataPipe>) = mpsc::channel();
let (us_data_pipe_sender, us_data_pipe_receiver): (Sender<DataPipe>, Receiver<DataPipe>) = mpsc::channel(); let (us_data_pipe_sender, us_data_pipe_receiver): (Sender<DataPipe>, Receiver<DataPipe>) = mpsc::channel();
//self.ds_inner_m.lock().unwrap().ds_stream = Some(self.ds_tcp_stream.clone());
let ds_method_pointer = self.ds_inner_m.clone(); let ds_method_pointer = self.ds_inner_m.clone();
let ds_state_bc = state_sender.clone(); let ds_state_bc = state_sender.clone();
//self.us_inner_m.lock().unwrap().us_stream = Some(self.us_tcp_stream.as_ref().unwrap().clone());
let us_method_pointer = self.us_inner_m.clone(); let us_method_pointer = self.us_inner_m.clone();
let us_state_bc = state_sender.clone(); let us_state_bc = state_sender.clone();
@ -776,7 +671,6 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
let _ = s.set_read_timeout(Some(Duration::from_millis(50))); let _ = s.set_read_timeout(Some(Duration::from_millis(50)));
return Ok(DataStreamType::RAW(s)); return Ok(DataStreamType::RAW(s));
}, },
TCPDataType::TLS => { TCPDataType::TLS => {
@ -800,12 +694,7 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
return Result::Err(-2); return Result::Err(-2);
} }
}; };
/*
self.us_tcp_stream = Some(
Arc::new(
Mutex::new(
s
)));*/
let _ = s.get_ref().set_read_timeout(Some(Duration::from_millis(50))); let _ = s.get_ref().set_read_timeout(Some(Duration::from_millis(50)));
return Ok(DataStreamType::TLS(s)); return Ok(DataStreamType::TLS(s));
} }

19
src/lib.rs
View file

@ -80,27 +80,8 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
pub fn start(&mut self) { pub fn start(&mut self) {
/* For UpStream and DownStream TCP data type separation. It should probably start here.
* start() will setup anything that needs to be setup before starting the listener.
* Once everything is initialized it will then call another handle function that is
* decided based upon the DS/US options.
* Basically this method is decided from down stream options
* If DS is set to RAW mode then it will call the RAW TCP data mode handler vice versa.
* The stream type will be wrapped in a mode type.
* DataStreamType::TLS(SslStream<TcpStream>) or DataStreamType::RAW(TcpStream)
* This will be passed into the Full Duplex TCP simulator object and those
* methods within will decide which handler is called for each specific stream.
* WILL ONLY DECIDE HANDLER IF CANT DO GENERIC DATA TYPING WITH TRAITS
* The remote / UpStream data type will be decided by another DataStreamType variant and passed separately
* into the Full Duplex TCP simulator.
* Maybe streams passed into FDTCP simulator object could be typed as Trait requirements instead of a strict type?
* Like Write/Read etc.
*/
let rhost = self.config.remote_host.clone(); let rhost = self.config.remote_host.clone();
let rport = self.config.remote_port.clone(); let rport = self.config.remote_port.clone();
//let remote_endpoint = format!("{}:{}", rhost, rport);
let listener = TcpListener::bind(format!("{}:{}", self.config.bind_host.clone(), self.config.bind_port.clone())).unwrap(); let listener = TcpListener::bind(format!("{}:{}", self.config.bind_host.clone(), self.config.bind_port.clone())).unwrap();
let upstream_data_stream_type = self.config.upstream_data_type; let upstream_data_stream_type = self.config.upstream_data_type;