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

run cargo fmt

Browse source
This commit is contained in:
Johann150 2021-01-04 21:13:45 +01:00
parent 3d7a28a6bd
commit bb7e885143
1 changed files with 49 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/main.rs
View file

@ -1,6 +1,6 @@
use { use {
once_cell::sync::Lazy, once_cell::sync::Lazy,
percent_encoding::{AsciiSet, CONTROLS, percent_decode_str, percent_encode}, percent_encoding::{percent_decode_str, percent_encode, AsciiSet, CONTROLS},
rustls::{ rustls::{
internal::pemfile::{certs, pkcs8_private_keys}, internal::pemfile::{certs, pkcs8_private_keys},
NoClientAuth, ServerConfig, NoClientAuth, ServerConfig,
@ -20,7 +20,7 @@ use {
net::{TcpListener, TcpStream}, net::{TcpListener, TcpStream},
runtime::Runtime, runtime::Runtime,
}, },
tokio_rustls::{TlsAcceptor, server::TlsStream}, tokio_rustls::{server::TlsStream, TlsAcceptor},
url::{Host, Url}, url::{Host, Url},
}; };
@ -65,12 +65,42 @@ struct Args {
fn args() -> Result<Args> { fn args() -> Result<Args> {
let args: Vec<String> = std::env::args().collect(); let args: Vec<String> = std::env::args().collect();
let mut opts = getopts::Options::new(); let mut opts = getopts::Options::new();
opts.optopt("", "content", "Root of the content directory (default ./content)", "DIR"); opts.optopt(
opts.optopt("", "cert", "TLS certificate PEM file (default ./cert.pem)", "FILE"); "",
opts.optopt("", "key", "PKCS8 private key file (default ./key.rsa)", "FILE"); "content",
opts.optmulti("", "addr", "Address to listen on (multiple occurences possible, default 0.0.0.0:1965 and [::]:1965)", "IP:PORT"); "Root of the content directory (default ./content)",
opts.optopt("", "hostname", "Domain name of this Gemini server (optional)", "NAME"); "DIR",
opts.optopt("", "lang", "RFC 4646 Language code(s) for text/gemini documents", "LANG"); );
opts.optopt(
"",
"cert",
"TLS certificate PEM file (default ./cert.pem)",
"FILE",
);
opts.optopt(
"",
"key",
"PKCS8 private key file (default ./key.rsa)",
"FILE",
);
opts.optopt(
"",
"addr",
"Address to listen on (multiple occurences possible, default 0.0.0.0:1965 and [::]:1965)",
"IP:PORT",
);
opts.optopt(
"",
"hostname",
"Domain name of this Gemini server (optional)",
"NAME",
);
opts.optopt(
"",
"lang",
"RFC 4646 Language code(s) for text/gemini documents",
"LANG",
);
opts.optflag("s", "silent", "Disable logging output"); opts.optflag("s", "silent", "Disable logging output");
opts.optflag("h", "help", "Print this help menu"); opts.optflag("h", "help", "Print this help menu");
opts.optflag("", "serve-secret", "Enable serving secret files (files/directories starting with a dot)"); opts.optflag("", "serve-secret", "Enable serving secret files (files/directories starting with a dot)");
@ -142,7 +172,9 @@ fn acceptor() -> Result<TlsAcceptor> {
} }
/// Return the URL requested by the client. /// Return the URL requested by the client.
async fn parse_request(stream: &mut TlsStream<TcpStream>) -> std::result::Result<Url, (u8, &'static str)> { async fn parse_request(
stream: &mut TlsStream<TcpStream>,
) -> std::result::Result<Url, (u8, &'static str)> {
// Because requests are limited to 1024 bytes (plus 2 bytes for CRLF), we // Because requests are limited to 1024 bytes (plus 2 bytes for CRLF), we
// can use a fixed-sized buffer on the stack, avoiding allocations and // can use a fixed-sized buffer on the stack, avoiding allocations and
// copying, and stopping bad clients from making us use too much memory. // copying, and stopping bad clients from making us use too much memory.
@ -152,7 +184,10 @@ async fn parse_request(stream: &mut TlsStream<TcpStream>) -> std::result::Result
// Read until CRLF, end-of-stream, or there's no buffer space left. // Read until CRLF, end-of-stream, or there's no buffer space left.
loop { loop {
let bytes_read = stream.read(buf).await.or(Err((59, "Request ended unexpectedly")))?; let bytes_read = stream
.read(buf)
.await
.or(Err((59, "Request ended unexpectedly")))?;
len += bytes_read; len += bytes_read;
if request[..len].ends_with(b"\r\n") { if request[..len].ends_with(b"\r\n") {
break; break;
@ -251,7 +286,10 @@ async fn list_directory(stream: &mut TlsStream<TcpStream>, path: &Path) -> Resul
let mut entries = tokio::fs::read_dir(path).await?; let mut entries = tokio::fs::read_dir(path).await?;
let mut lines = vec![]; let mut lines = vec![];
while let Some(entry) = entries.next_entry().await? { while let Some(entry) = entries.next_entry().await? {
let mut name = entry.file_name().into_string().or(Err("Non-Unicode filename"))?; let mut name = entry
.file_name()
.into_string()
.or(Err("Non-Unicode filename"))?;
if name.starts_with('.') { if name.starts_with('.') {
continue; continue;
} }