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

Use concrete types for TlsStreams

Browse source
This commit is contained in:
Matt Brubeck 2020-12-31 17:02:45 -08:00
parent edf2ebffdc
commit ec50a315a3
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main.rs
View file

@ -4,7 +4,7 @@ use async_std::{
stream::StreamExt, stream::StreamExt,
task, task,
}; };
use async_tls::TlsAcceptor; use async_tls::{TlsAcceptor, server::TlsStream};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use percent_encoding::{AsciiSet, CONTROLS, percent_decode_str, percent_encode}; use percent_encoding::{AsciiSet, CONTROLS, percent_decode_str, percent_encode};
use rustls::{ use rustls::{
@ -17,7 +17,6 @@ use std::{
ffi::OsStr, ffi::OsStr,
fs::File, fs::File,
io::BufReader, io::BufReader,
marker::Unpin,
path::Path, path::Path,
sync::Arc, sync::Arc,
}; };
@ -127,9 +126,7 @@ fn acceptor() -> Result<TlsAcceptor> {
} }
/// Return the URL requested by the client. /// Return the URL requested by the client.
async fn parse_request<R: Read + Unpin>( async fn parse_request(stream: &mut TlsStream<TcpStream>) -> std::result::Result<Url, (u8, &'static str)> {
stream: &mut R,
) -> 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.
@ -177,7 +174,7 @@ async fn parse_request<R: Read + Unpin>(
} }
/// Send the client the file located at the requested URL. /// Send the client the file located at the requested URL.
async fn send_response<W: Write + Unpin>(url: Url, stream: &mut W) -> Result { async fn send_response(url: Url, stream: &mut TlsStream<TcpStream>) -> Result {
let mut path = std::path::PathBuf::from(&ARGS.content_dir); let mut path = std::path::PathBuf::from(&ARGS.content_dir);
if let Some(segments) = url.path_segments() { if let Some(segments) = url.path_segments() {
for segment in segments { for segment in segments {
@ -223,7 +220,7 @@ async fn send_response<W: Write + Unpin>(url: Url, stream: &mut W) -> Result {
Ok(()) Ok(())
} }
async fn list_directory<W: Write + Unpin>(stream: &mut W, path: &Path) -> Result { async fn list_directory(stream: &mut TlsStream<TcpStream>, path: &Path) -> Result {
// https://url.spec.whatwg.org/#path-percent-encode-set // https://url.spec.whatwg.org/#path-percent-encode-set
const ENCODE_SET: AsciiSet = CONTROLS.add(b' ') const ENCODE_SET: AsciiSet = CONTROLS.add(b' ')
.add(b'"').add(b'#').add(b'<').add(b'>') .add(b'"').add(b'#').add(b'<').add(b'>')
@ -255,7 +252,7 @@ async fn list_directory<W: Write + Unpin>(stream: &mut W, path: &Path) -> Result
Ok(()) Ok(())
} }
async fn send_header<W: Write + Unpin>(stream: &mut W, status: u8, meta: &[&str]) -> Result { async fn send_header(stream: &mut TlsStream<TcpStream>, status: u8, meta: &[&str]) -> Result {
use std::fmt::Write; use std::fmt::Write;
let mut response = String::with_capacity(64); let mut response = String::with_capacity(64);
write!(response, "{} ", status)?; write!(response, "{} ", status)?;
@ -266,7 +263,7 @@ async fn send_header<W: Write + Unpin>(stream: &mut W, status: u8, meta: &[&str]
Ok(()) Ok(())
} }
async fn send_text_gemini_header<W: Write + Unpin>(stream: &mut W) -> Result { async fn send_text_gemini_header(stream: &mut TlsStream<TcpStream>) -> Result {
if let Some(lang) = ARGS.language.as_deref() { if let Some(lang) = ARGS.language.as_deref() {
send_header(stream, 20, &["text/gemini;lang=", lang]).await send_header(stream, 20, &["text/gemini;lang=", lang]).await
} else { } else {