mirror of
https://github.com/YGGverse/titanit.git
synced 2026-04-02 10:05:35 +00:00
separate handlers
This commit is contained in:
yggverse
parent
69b0186d01
commit
71d75bc22f
1 changed files with 208 additions and 207 deletions
201
src/main.rs
201
src/main.rs
|
|
@ -3,7 +3,7 @@ mod storage;
|
||||||
|
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
use argument::Argument;
|
use argument::Argument;
|
||||||
use clap::Parser;
|
|
||||||
use native_tls::{Identity, TlsAcceptor, TlsStream};
|
use native_tls::{Identity, TlsAcceptor, TlsStream};
|
||||||
use std::{
|
use std::{
|
||||||
fs::File,
|
fs::File,
|
||||||
|
|
@ -15,6 +15,8 @@ use std::{
|
||||||
};
|
};
|
||||||
|
|
||||||
fn main() -> Result<()> {
|
fn main() -> Result<()> {
|
||||||
|
use clap::Parser;
|
||||||
|
|
||||||
let argument = Arc::new(Argument::parse());
|
let argument = Arc::new(Argument::parse());
|
||||||
|
|
||||||
// https://geminiprotocol.net/docs/protocol-specification.gmi#the-use-of-tls
|
// https://geminiprotocol.net/docs/protocol-specification.gmi#the-use-of-tls
|
||||||
|
|
@ -42,7 +44,7 @@ fn main() -> Result<()> {
|
||||||
move || handle(argument, peer, &mut stream)
|
move || handle(argument, peer, &mut stream)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
Err(e) => println!("[{}] [error] Failed to accept connection: {e}", now()),
|
Err(e) => println!("[{}] [error] {e}", now()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|
@ -51,19 +53,48 @@ fn main() -> Result<()> {
|
||||||
fn handle(argument: Arc<Argument>, peer: SocketAddr, stream: &mut TlsStream<TcpStream>) {
|
fn handle(argument: Arc<Argument>, peer: SocketAddr, stream: &mut TlsStream<TcpStream>) {
|
||||||
use titanite::*;
|
use titanite::*;
|
||||||
println!("[{}] [info] [{peer}] New connection", now());
|
println!("[{}] [info] [{peer}] New connection", now());
|
||||||
// validate totals
|
let mut input = vec![0; titanite::HEADER_MAX_LEN];
|
||||||
let mut total = 0;
|
|
||||||
// read header bytes
|
|
||||||
let mut input = vec![0; 1024];
|
|
||||||
match stream.read(&mut input) {
|
match stream.read(&mut input) {
|
||||||
Ok(0) => println!("[{}] [warning] [{peer}] Connection closed by peer", now()),
|
Ok(0) => println!("[{}] [warning] [{peer}] Connection closed by peer", now()),
|
||||||
Ok(l) => {
|
Ok(s) => match Request::from_bytes(&input[..s]) {
|
||||||
match Request::from_bytes(&input[..l]) {
|
Ok(request) => match request {
|
||||||
Ok(request) => {
|
Request::Gemini(this) => handle_gemini(this, argument, peer, stream),
|
||||||
match request {
|
Request::Titan(this) => handle_titan(this, argument, peer, stream),
|
||||||
Request::Gemini(gemini) => {
|
},
|
||||||
match storage::Item::from_url(&gemini.url.as_str(), &argument.directory)
|
Err(e) => send(
|
||||||
{
|
&response::failure::temporary::General {
|
||||||
|
message: Some("Internal server error".to_string()),
|
||||||
|
}
|
||||||
|
.into_bytes(),
|
||||||
|
stream,
|
||||||
|
|result| match result {
|
||||||
|
Ok(()) => println!("[{}] [warning] [{peer}] {e}", now()),
|
||||||
|
Err(e) => 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!("[{}] [warning] [{peer}] {e}", now()),
|
||||||
|
Err(e) => println!("[{}] [error] [{peer}] {e}", now()),
|
||||||
|
},
|
||||||
|
),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn handle_gemini(
|
||||||
|
gemini: titanite::request::Gemini,
|
||||||
|
argument: Arc<Argument>,
|
||||||
|
peer: SocketAddr,
|
||||||
|
stream: &mut TlsStream<TcpStream>,
|
||||||
|
) {
|
||||||
|
use titanite::*;
|
||||||
|
match storage::Item::from_url(&gemini.url.as_str(), &argument.directory) {
|
||||||
Ok(item) => send(
|
Ok(item) => send(
|
||||||
&response::success::Default {
|
&response::success::Default {
|
||||||
mime: "text/gemini".to_string(),
|
mime: "text/gemini".to_string(),
|
||||||
|
|
@ -72,11 +103,7 @@ fn handle(argument: Arc<Argument>, peer: SocketAddr, stream: &mut TlsStream<TcpS
|
||||||
.into_bytes(),
|
.into_bytes(),
|
||||||
stream,
|
stream,
|
||||||
|result| match result {
|
|result| match result {
|
||||||
Ok(()) => println!(
|
Ok(()) => println!("[{}] [info] [{peer}] Request: {}", now(), gemini.url),
|
||||||
"[{}] [info] [{peer}] Request: {}",
|
|
||||||
now(),
|
|
||||||
gemini.url
|
|
||||||
),
|
|
||||||
Err(e) => println!("[{}] [error] [{peer}] {e}", now()),
|
Err(e) => println!("[{}] [error] [{peer}] {e}", now()),
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
|
@ -93,24 +120,54 @@ fn handle(argument: Arc<Argument>, peer: SocketAddr, stream: &mut TlsStream<TcpS
|
||||||
),
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Request::Titan(titan) => match storage::Item::create(&argument.directory) {
|
|
||||||
|
fn handle_titan(
|
||||||
|
titan: titanite::request::Titan,
|
||||||
|
argument: Arc<Argument>,
|
||||||
|
peer: SocketAddr,
|
||||||
|
stream: &mut TlsStream<TcpStream>,
|
||||||
|
) {
|
||||||
|
use titanite::*;
|
||||||
|
let mut total = 0;
|
||||||
|
match storage::Item::create(&argument.directory) {
|
||||||
Ok(mut tmp) => loop {
|
Ok(mut tmp) => loop {
|
||||||
let mut input = vec![0; argument.chunk];
|
let mut input = vec![0; argument.chunk];
|
||||||
match stream.read(&mut input) {
|
match stream.read(&mut input) {
|
||||||
Ok(0) => println!(
|
Ok(0) => {
|
||||||
"[{}] [warning] [{peer}] Connection closed by peer",
|
println!("[{}] [warning] [{peer}] Connection closed by peer", now());
|
||||||
now()
|
if let Err(e) = tmp.delete() {
|
||||||
),
|
println!("[{}] [error] [{peer}] {e}", now());
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
Ok(l) => match tmp.file.write(&input[..l]) {
|
Ok(l) => match tmp.file.write(&input[..l]) {
|
||||||
Ok(s) => {
|
Ok(s) => {
|
||||||
total += s;
|
total += s;
|
||||||
if s != l {
|
if s != l {
|
||||||
todo!()
|
if let Err(e) = tmp.delete() {
|
||||||
|
println!("[{}] [error] [{peer}] {e}", now());
|
||||||
|
}
|
||||||
|
const MESSAGE: &str = "File sizes mismatch";
|
||||||
|
return send(
|
||||||
|
&response::failure::temporary::General {
|
||||||
|
message: Some(MESSAGE.to_string()),
|
||||||
|
}
|
||||||
|
.into_bytes(),
|
||||||
|
stream,
|
||||||
|
|result| match result {
|
||||||
|
Ok(()) => println!("[{}] [error] [{peer}] {MESSAGE}", now()),
|
||||||
|
Err(e) => {
|
||||||
|
println!("[{}] [error] [{peer}] {e}", now())
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
// validate server-side limits
|
// validate server-side limits
|
||||||
if argument.size.is_some_and(|limit| total > limit) {
|
if argument.size.is_some_and(|limit| total > limit) {
|
||||||
const MESSAGE: &str =
|
if let Err(e) = tmp.delete() {
|
||||||
"Allowed max length limit reached";
|
println!("[{}] [error] [{peer}] {e}", now());
|
||||||
|
}
|
||||||
|
const MESSAGE: &str = "Allowed max length limit reached";
|
||||||
return send(
|
return send(
|
||||||
&response::failure::permanent::BadRequest {
|
&response::failure::permanent::BadRequest {
|
||||||
message: Some(MESSAGE.to_string()),
|
message: Some(MESSAGE.to_string()),
|
||||||
|
|
@ -118,15 +175,9 @@ fn handle(argument: Arc<Argument>, peer: SocketAddr, stream: &mut TlsStream<TcpS
|
||||||
.into_bytes(),
|
.into_bytes(),
|
||||||
stream,
|
stream,
|
||||||
|result| match result {
|
|result| match result {
|
||||||
Ok(()) => println!(
|
Ok(()) => println!("[{}] [warning] [{peer}] {MESSAGE}", now()),
|
||||||
"[{}] [warning] [{peer}] {MESSAGE}",
|
|
||||||
now()
|
|
||||||
),
|
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
println!(
|
println!("[{}] [error] [{peer}] {e}", now())
|
||||||
"[{}] [error] [{peer}] {e}",
|
|
||||||
now()
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
@ -135,8 +186,10 @@ fn handle(argument: Arc<Argument>, peer: SocketAddr, stream: &mut TlsStream<TcpS
|
||||||
if titan.size >= total {
|
if titan.size >= total {
|
||||||
// validate client-side limits
|
// validate client-side limits
|
||||||
if titan.size > total {
|
if titan.size > total {
|
||||||
const MESSAGE: &str =
|
if let Err(e) = tmp.delete() {
|
||||||
"Data size mismatch header declaration";
|
println!("[{}] [error] [{peer}] {e}", now());
|
||||||
|
}
|
||||||
|
const MESSAGE: &str = "Data size mismatch header declaration";
|
||||||
return send(
|
return send(
|
||||||
&response::failure::permanent::BadRequest {
|
&response::failure::permanent::BadRequest {
|
||||||
message: Some(MESSAGE.to_string()),
|
message: Some(MESSAGE.to_string()),
|
||||||
|
|
@ -145,15 +198,9 @@ fn handle(argument: Arc<Argument>, peer: SocketAddr, stream: &mut TlsStream<TcpS
|
||||||
stream,
|
stream,
|
||||||
|result| match result {
|
|result| match result {
|
||||||
Ok(()) => {
|
Ok(()) => {
|
||||||
println!(
|
println!("[{}] [warning] [{peer}] {MESSAGE}", now())
|
||||||
"[{}] [warning] [{peer}] {MESSAGE}",
|
|
||||||
now()
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
Err(e) => println!(
|
Err(e) => println!("[{}] [error] [{peer}] {e}", now()),
|
||||||
"[{}] [error] [{peer}] {e}",
|
|
||||||
now()
|
|
||||||
),
|
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
@ -177,44 +224,30 @@ fn handle(argument: Arc<Argument>, peer: SocketAddr, stream: &mut TlsStream<TcpS
|
||||||
}
|
}
|
||||||
.into_bytes(),
|
.into_bytes(),
|
||||||
stream,
|
stream,
|
||||||
|result| {
|
|result| match result {
|
||||||
match result {
|
|
||||||
Ok(()) => println!(
|
Ok(()) => println!(
|
||||||
"[{}] [info] [{peer}] Data saved to {}",
|
"[{}] [info] [{peer}] Data saved to {}",
|
||||||
now(),
|
now(),
|
||||||
pmt.path.to_string_lossy()
|
pmt.path.to_string_lossy()
|
||||||
),
|
),
|
||||||
Err(e) => println!(
|
Err(e) => println!("[{}] [warning] [{peer}] {e}", now()),
|
||||||
"[{}] [warning] [{peer}] {e}",
|
|
||||||
now()
|
|
||||||
),
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
Err((tmp, e)) => send(
|
Err((tmp, e)) => send(
|
||||||
&response::failure::temporary::General {
|
&response::failure::temporary::General {
|
||||||
message: Some(
|
message: Some("Internal server error".to_string()),
|
||||||
"Internal server error".to_string(),
|
|
||||||
),
|
|
||||||
}
|
}
|
||||||
.into_bytes(),
|
.into_bytes(),
|
||||||
stream,
|
stream,
|
||||||
|result| {
|
|result| {
|
||||||
match result {
|
match result {
|
||||||
Ok(()) => println!(
|
Ok(()) => {
|
||||||
"[{}] [error] [{peer}] {e}",
|
println!("[{}] [warning] [{peer}] {e}", now())
|
||||||
now()
|
}
|
||||||
),
|
Err(e) => println!("[{}] [error] [{peer}] {e}", now()),
|
||||||
Err(e) => println!(
|
|
||||||
"[{}] [error] [{peer}] {e}",
|
|
||||||
now()
|
|
||||||
),
|
|
||||||
};
|
};
|
||||||
if let Err(e) = tmp.delete() {
|
if let Err(e) = tmp.delete() {
|
||||||
println!(
|
println!("[{}] [error] [{peer}] {e}", now());
|
||||||
"[{}] [error] [{peer}] {e}",
|
|
||||||
now()
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
|
@ -231,45 +264,13 @@ fn handle(argument: Arc<Argument>, peer: SocketAddr, stream: &mut TlsStream<TcpS
|
||||||
.into_bytes(),
|
.into_bytes(),
|
||||||
stream,
|
stream,
|
||||||
|result| match result {
|
|result| match result {
|
||||||
Ok(()) => {
|
Ok(()) => println!("[{}] [warning] [{peer}] {e}", now()),
|
||||||
println!("[{}] [error] [{peer}] {e}", now())
|
Err(e) => println!("[{}] [error] [{peer}] {e}", now()),
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
println!("[{}] [error] [{peer}] {e}", now())
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
Err(e) => todo!(),
|
Err(e) => todo!(),
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
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()),
|
|
||||||
},
|
|
||||||
),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
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()),
|
|
||||||
},
|
|
||||||
),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue