diff --git a/src/main.rs b/src/main.rs index 1fa36b5..9e80ecb 100644 --- a/src/main.rs +++ b/src/main.rs @@ -51,7 +51,8 @@ fn main() -> Result<()> { fn handle(argument: Arc, peer: SocketAddr, stream: &mut TlsStream) { use titanite::*; println!("[{}] [info] [{peer}] New connection", now()); - + // validate totals + let mut total = 0; // read header bytes let mut input = vec![0; 1024]; match stream.read(&mut input) { @@ -92,48 +93,24 @@ fn handle(argument: Arc, peer: SocketAddr, stream: &mut TlsStream { - // init memory pool - let mut data: Vec = Vec::with_capacity(titan.size); - loop { - // read data bytes + Request::Titan(titan) => match storage::Item::create(&argument.directory) { + Ok(mut tmp) => loop { let mut input = vec![0; argument.chunk]; match stream.read(&mut input) { Ok(0) => println!( "[{}] [warning] [{peer}] Connection closed by peer", now() ), - Ok(l) => { - data.extend(&input[..l]); - // calculate once - let total = data.len(); - // validate server-side limits - if argument.size.is_some_and(|limit| total > limit) { - const MESSAGE: &str = - "Allowed max length limit reached"; - return send( - &response::failure::permanent::BadRequest { - message: Some(MESSAGE.to_string()), - } - .into_bytes(), - stream, - |result| match result { - Ok(()) => println!( - "[{}] [warning] [{peer}] {MESSAGE}", - now() - ), - Err(e) => { - println!("[{}] [error] [{peer}] {e}", now()) - } - }, - ); - } - // all expected data received - if titan.size >= total { - // validate client-side limits - if titan.size > total { + Ok(l) => match tmp.file.write(&input[..l]) { + Ok(s) => { + total += s; + if s != l { + todo!() + } + // validate server-side limits + if argument.size.is_some_and(|limit| total > limit) { const MESSAGE: &str = - "Data size mismatch header declaration"; + "Allowed max length limit reached"; return send( &response::failure::permanent::BadRequest { message: Some(MESSAGE.to_string()), @@ -141,117 +118,112 @@ fn handle(argument: Arc, peer: SocketAddr, stream: &mut TlsStream { + Ok(()) => println!( + "[{}] [warning] [{peer}] {MESSAGE}", + now() + ), + Err(e) => { println!( - "[{}] [warning] [{peer}] {MESSAGE}", + "[{}] [error] [{peer}] {e}", now() ) } - Err(e) => println!( - "[{}] [error] [{peer}] {e}", - now() - ), }, ); } - // @TODO detect/validate/cache mime based on data received - // success - match storage::Item::create(&argument.directory) { - Ok(mut tmp) => match tmp.file.write(&data) { - Ok(_) => match tmp.commit() { - Ok(pmt) => send( - &response::redirect::Permanent { - target: match argument.redirect { - Some(ref target) => format!( - "{}/{}", - target.trim_end_matches("/"), - pmt.to_uri(&argument.directory) - ), - None => format!( - "gemini://{}/{}", - argument.bind, - pmt.to_uri(&argument.directory) - ) - }, - } - .into_bytes(), - stream, - |result| match result { - Ok(()) => println!( - "[{}] [info] [{peer}] Data saved to {}", - now(), - pmt.path.to_string_lossy() - ), - Err(e) => println!( - "[{}] [warning] [{peer}] {e}", + // all expected data received + if titan.size >= total { + // validate client-side limits + if titan.size > total { + const MESSAGE: &str = + "Data size mismatch header declaration"; + return send( + &response::failure::permanent::BadRequest { + message: Some(MESSAGE.to_string()), + } + .into_bytes(), + stream, + |result| match result { + Ok(()) => { + println!( + "[{}] [warning] [{peer}] {MESSAGE}", now() - ), - }, - ), - Err((tmp, e)) => send( - &response::failure::temporary::General { - message: Some( - "Internal server error".to_string(), - ), + ) } - .into_bytes(), - stream, - |result| { - match result { - Ok(()) => println!( - "[{}] [error] [{peer}] {e}", - now() - ), - Err(e) => println!( - "[{}] [error] [{peer}] {e}", - now() - ), - }; - if let Err(e) = tmp.delete() { - println!( - "[{}] [error] [{peer}] {e}", - now() - ); - } + Err(e) => println!( + "[{}] [error] [{peer}] {e}", + now() + ), + }, + ); + } + // @TODO detect/validate/cache mime based on data received + // success + match tmp.commit() { + Ok(pmt) => send( + &response::redirect::Permanent { + target: match argument.redirect { + Some(ref target) => format!( + "{}/{}", + target.trim_end_matches("/"), + pmt.to_uri(&argument.directory) + ), + None => format!( + "gemini://{}/{}", + argument.bind, + pmt.to_uri(&argument.directory) + ), }, - ), - }, - Err(e) => send( - &response::failure::temporary::General { - message: Some("Internal server error".to_string()), } .into_bytes(), stream, |result| { match result { - Ok(()) => { - println!("[{}] [error] [{peer}] {e}", now()) - } - Err(e) => { - println!("[{}] [error] [{peer}] {e}", now()) - } + Ok(()) => println!( + "[{}] [info] [{peer}] Data saved to {}", + now(), + pmt.path.to_string_lossy() + ), + Err(e) => println!( + "[{}] [warning] [{peer}] {e}", + now() + ), + } + }, + ), + Err((tmp, e)) => send( + &response::failure::temporary::General { + message: Some( + "Internal server error".to_string(), + ), + } + .into_bytes(), + stream, + |result| { + match result { + Ok(()) => println!( + "[{}] [error] [{peer}] {e}", + now() + ), + Err(e) => println!( + "[{}] [error] [{peer}] {e}", + now() + ), }; if let Err(e) = tmp.delete() { - println!("[{}] [error] [{peer}] {e}", now()); + println!( + "[{}] [error] [{peer}] {e}", + now() + ); } }, ), - }, - Err(e) => send( - &response::failure::temporary::General { - message: Some("Internal server error".to_string()), - } - .into_bytes(), - stream, - |result| match result { - Ok(()) => println!("[{}] [error] [{peer}] {e}", now()), - Err(e) => println!("[{}] [error] [{peer}] {e}", now()), - }, - ), + } + break; } - break; } - } + Err(e) => todo!(), + }, Err(e) => send( &response::failure::temporary::General { message: Some("Internal server error".to_string()), @@ -259,13 +231,19 @@ fn handle(argument: Arc, peer: SocketAddr, stream: &mut TlsStream println!("[{}] [error] [{peer}] {e}", now()), - Err(e) => println!("[{}] [error] [{peer}] {e}", now()), + Ok(()) => { + println!("[{}] [error] [{peer}] {e}", now()) + } + Err(e) => { + println!("[{}] [error] [{peer}] {e}", now()) + } }, ), } - } - } + }, + + Err(e) => todo!(), + }, } } Err(e) => send(