YGGverse/agate
1
0
Fork 0
mirror of https://github.com/YGGverse/agate.git synced 2026-04-08 20:45:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Redirect on URLs without trailing slash

Browse source
This commit is contained in:
Matt Brubeck 2020-05-21 10:11:49 -07:00
parent ca85842369
commit 3a41f40775
1 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/main.rs
View file

@ -75,21 +75,11 @@ async fn connection(stream: TcpStream) -> Result {
use async_std::io::prelude::*; use async_std::io::prelude::*;
let mut stream = ACCEPTOR.accept(stream).await?; let mut stream = ACCEPTOR.accept(stream).await?;
match parse_request(&mut stream).await { match parse_request(&mut stream).await {
Ok(url) => get(&url, &mut stream).await,
Err(e) => { Err(e) => {
stream.write_all(b"59 Invalid request.\r\n").await?; stream.write_all(b"59 Invalid request.\r\n").await?;
Err(e) Err(e)
} }
Ok(url) => match get(&url).await {
Err(e) => {
stream.write_all(b"51 Not found, sorry.\r\n").await?;
Err(e)
}
Ok(response) => {
stream.write_all(b"20 text/gemini\r\n").await?;
stream.write_all(&response).await?;
Ok(())
}
}
} }
} }
@ -102,12 +92,36 @@ async fn parse_request(stream: &mut TlsStream<TcpStream>) -> Result<Url> {
Ok(url) Ok(url)
} }
async fn get(url: &Url) -> Result<Vec<u8>> { async fn get(url: &Url, stream: &mut TlsStream<TcpStream>) -> Result {
let mut path = PathBuf::from(&ARGS.content_dir); let mut path = PathBuf::from(&ARGS.content_dir);
path.extend(url.path_segments().ok_or("invalid url")?); if let Some(segments) = url.path_segments() {
if path.is_dir().await { path.extend(segments);
path.push("index.gemini"); } else {
return redirect_slash(url, stream).await;
} }
let response = async_std::fs::read(&path).await?; if path.is_dir().await {
Ok(response) if url.as_str().ends_with('/') {
path.push("index.gemini");
} else {
return redirect_slash(url, stream).await;
}
}
match async_std::fs::read(&path).await {
Ok(body) => {
stream.write_all(b"20 text/gemini\r\n").await?;
stream.write_all(&body).await?;
}
Err(e) => {
stream.write_all(b"51 Not found, sorry.\r\n").await?;
Err(e)?
}
}
Ok(())
}
async fn redirect_slash(url: &Url, stream: &mut TlsStream<TcpStream>) -> Result {
stream.write_all(b"31 ").await?;
stream.write_all(url.as_str().as_bytes()).await?;
stream.write_all(b"/\r\n").await?;
return Ok(())
} }