reactor
/
ptth
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

🚧 Working on handlebars for prettier directories

main
_ 2020-10-30 21:31:03 -05:00
parent ba17f11297
commit 55b3e9f520
7 changed files with 74 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -12,6 +12,7 @@ edition = "2018"
base64 = "0.12.3" base64 = "0.12.3"
blake3 = "0.3.7" blake3 = "0.3.7"
futures = "0.3.7" futures = "0.3.7"
handlebars = "3.5.1"
http = "0.2.1" http = "0.2.1"
hyper = "0.13.8" hyper = "0.13.8"
lazy_static = "1.4.0" lazy_static = "1.4.0"

9
ptth_handlebars/file_server_dir.html Normal file
View File

@ -0,0 +1,9 @@
<ul>
{{#each entries}}
<li>
<a href="{{this.encoded_file_name}}{{this.trailing_slash}}">
{{this.file_name}}{{this.trailing_slash}}
</a>
</li>
{{/each}}
</ul>

5
ptth_handlebars/file_server_dir_entry.html Normal file
View File

@ -0,0 +1,5 @@
<li>
<a href="{{encoded_file_name}}{{trailing_slash}}">
{{file_name}}{{trailing_slash}}
</a>
</li>

19
src/bin/file_server.rs
View File

@ -18,9 +18,8 @@ use hyper::{
StatusCode, StatusCode,
}; };
#[derive (Default)] struct ServerState <'a> {
struct ServerState { handlebars: Arc <handlebars::Handlebars <'a>>,
// Pass
} }
fn status_reply <B: Into <Body>> (status: StatusCode, b: B) fn status_reply <B: Into <Body>> (status: StatusCode, b: B)
@ -39,7 +38,7 @@ fn prefix_match <'a> (hay: &'a str, needle: &str) -> Option <&'a str>
} }
} }
async fn handle_all (req: Request <Body>, _state: Arc <ServerState>) async fn handle_all (req: Request <Body>, state: Arc <ServerState <'static>>)
-> Result <Response <Body>, Infallible> -> Result <Response <Body>, Infallible>
{ {
use ptth::{ use ptth::{
@ -62,7 +61,7 @@ async fn handle_all (req: Request <Body>, _state: Arc <ServerState>)
_ => return Ok (status_reply (StatusCode::BAD_REQUEST, "Bad request")), _ => return Ok (status_reply (StatusCode::BAD_REQUEST, "Bad request")),
}; };
let ptth_resp = file_server::serve_all (&root, ptth_req).await; let ptth_resp = file_server::serve_all (state.handlebars.clone (), &root, ptth_req).await;
let mut resp = Response::builder () let mut resp = Response::builder ()
.status (StatusCode::from (ptth_resp.parts.status_code)); .status (StatusCode::from (ptth_resp.parts.status_code));
@ -91,7 +90,15 @@ async fn handle_all (req: Request <Body>, _state: Arc <ServerState>)
async fn main () -> Result <(), Box <dyn Error>> { async fn main () -> Result <(), Box <dyn Error>> {
let addr = SocketAddr::from(([0, 0, 0, 0], 4000)); let addr = SocketAddr::from(([0, 0, 0, 0], 4000));
let state = Arc::new (ServerState::default ()); let mut handlebars = handlebars::Handlebars::new ();
handlebars.register_template_file ("file_server_dir_entry", "ptth_handlebars/file_server_dir_entry.html")?;
let handlebars = Arc::new (handlebars);
let state = Arc::new (ServerState {
handlebars,
});
let make_svc = make_service_fn (|_conn| { let make_svc = make_service_fn (|_conn| {
let state = state.clone (); let state = state.clone ();

31
src/server/file_server.rs
View File

@ -5,8 +5,10 @@ use std::{
convert::{Infallible, TryInto}, convert::{Infallible, TryInto},
io::SeekFrom, io::SeekFrom,
path::{Path, PathBuf}, path::{Path, PathBuf},
sync::Arc,
}; };
use handlebars::Handlebars;
use tokio::{ use tokio::{
fs::{ fs::{
File, File,
@ -45,15 +47,21 @@ fn parse_range_header (range_str: &str) -> (Option <u64>, Option <u64>) {
(start, end) (start, end)
} }
async fn serve_dir (mut dir: ReadDir) -> http_serde::Response { async fn serve_dir (
handlebars: Arc <Handlebars <'static>>,
mut dir: ReadDir
) -> http_serde::Response {
let (tx, rx) = channel (2); let (tx, rx) = channel (2);
let handlebars = handlebars.clone ();
tokio::spawn (async move { tokio::spawn (async move {
let mut tx = tx; let mut tx = tx;
tx.send (Ok::<_, Infallible> (String::from ("<style>body {font-family:sans;}</style><ul>").into_bytes ())).await.unwrap (); tx.send (Ok::<_, Infallible> (String::from ("<style>body {font-family:sans;}</style><ul>").into_bytes ())).await.unwrap ();
let handlebars = handlebars.clone ();
while let Ok (entry) = dir.next_entry ().await { while let Ok (entry) = dir.next_entry ().await {
let handlebars = handlebars.clone ();
let entry: tokio::fs::DirEntry = match entry { let entry: tokio::fs::DirEntry = match entry {
Some (x) => x, Some (x) => x,
None => break, None => break,
@ -84,9 +92,23 @@ async fn serve_dir (mut dir: ReadDir) -> http_serde::Response {
use std::borrow::Cow; use std::borrow::Cow;
use percent_encoding::*; use percent_encoding::*;
let percent_file_name: Cow <str> = utf8_percent_encode (&file_name, CONTROLS).into (); let encoded_file_name: Cow <str> = utf8_percent_encode (&file_name, CONTROLS).into ();
#[derive (serde::Serialize)]
struct TemplateDirEntry <'a> {
trailing_slash: &'a str,
file_name: &'a str,
encoded_file_name: Cow <'a, str>,
}
let s = handlebars.render (
"file_server_dir_entry",
&TemplateDirEntry {
trailing_slash: &trailing_slash,
file_name: &file_name,
encoded_file_name,
}).unwrap ();
let s = format! ("<li><a href=\"{}{}\">{}{}</a></li>\n", percent_file_name, trailing_slash, file_name, trailing_slash);
if tx.send (Ok::<_, Infallible> (s.into_bytes ())).await.is_err () if tx.send (Ok::<_, Infallible> (s.into_bytes ())).await.is_err ()
{ {
break; break;
@ -201,6 +223,7 @@ async fn serve_error (
} }
pub async fn serve_all ( pub async fn serve_all (
handlebars: Arc <Handlebars <'static>>,
root: &Path, root: &Path,
parts: http_serde::RequestParts parts: http_serde::RequestParts
) )
@ -238,7 +261,7 @@ pub async fn serve_all (
full_path.push (&*path); full_path.push (&*path);
if let Ok (dir) = read_dir (&full_path).await { if let Ok (dir) = read_dir (&full_path).await {
serve_dir (dir).await serve_dir (handlebars, dir).await
} }
else if let Ok (file) = File::open (&full_path).await { else if let Ok (file) = File::open (&full_path).await {
serve_file ( serve_file (

29
src/server/mod.rs
View File

@ -5,6 +5,7 @@ use std::{
time::Duration, time::Duration,
}; };
use handlebars::Handlebars;
use hyper::{ use hyper::{
StatusCode, StatusCode,
}; };
@ -19,28 +20,29 @@ pub mod file_server;
const SERVER_NAME: &str = "alien_wildlands"; const SERVER_NAME: &str = "alien_wildlands";
async fn handle_req_resp ( async fn handle_req_resp <'a> (
opt: &Opt, opt: &'a Opt,
client: &Client, handlebars: Arc <Handlebars <'static>>,
client: &'a Client,
req_resp: reqwest::Response req_resp: reqwest::Response
) -> Result <(), Box <dyn Error>> { ) {
//println! ("Step 1"); //println! ("Step 1");
if req_resp.status () != StatusCode::OK { if req_resp.status () != StatusCode::OK {
// TODO: Error handling // TODO: Error handling
return Ok (()); return;
} }
let body = req_resp.bytes ().await?; let body = req_resp.bytes ().await.unwrap ();
let wrapped_req: http_serde::WrappedRequest = match rmp_serde::from_read_ref (&body) let wrapped_req: http_serde::WrappedRequest = match rmp_serde::from_read_ref (&body)
{ {
Ok (x) => x, Ok (x) => x,
_ => return Ok (()), _ => return,
}; };
let (req_id, parts) = (wrapped_req.id, wrapped_req.req); let (req_id, parts) = (wrapped_req.id, wrapped_req.req);
let response = file_server::serve_all (&opt.file_server_root, parts).await; let response = file_server::serve_all (handlebars, &opt.file_server_root, parts).await;
let mut resp_req = client let mut resp_req = client
.post (&format! ("{}/http_response/{}", opt.relay_url, req_id)) .post (&format! ("{}/http_response/{}", opt.relay_url, req_id))
@ -54,8 +56,6 @@ async fn handle_req_resp (
if let Err (e) = resp_req.send ().await { if let Err (e) = resp_req.send ().await {
println! ("Err: {:?}", e); println! ("Err: {:?}", e);
} }
Ok (())
} }
pub struct Opt { pub struct Opt {
@ -67,6 +67,12 @@ pub async fn main (opt: Opt) -> Result <(), Box <dyn Error>> {
let client = Arc::new (Client::new ()); let client = Arc::new (Client::new ());
let opt = Arc::new (opt); let opt = Arc::new (opt);
let mut handlebars = handlebars::Handlebars::new ();
handlebars.register_template_file ("file_server_dir_entry", "ptth_handlebars/file_server_dir_entry.html")?;
let handlebars = Arc::new (handlebars);
let mut backoff_delay = 0; let mut backoff_delay = 0;
loop { loop {
@ -94,8 +100,9 @@ pub async fn main (opt: Opt) -> Result <(), Box <dyn Error>> {
let client = client.clone (); let client = client.clone ();
let opt = opt.clone (); let opt = opt.clone ();
let handlebars = handlebars.clone ();
tokio::spawn (async move { tokio::spawn (async move {
match handle_req_resp (&opt, &client, req_resp).await { match handle_req_resp (&opt, handlebars, &client, req_resp).await {
_ => (), _ => (),
} }
}); });

1
todo.md
View File

@ -1,4 +1,5 @@
- Add ".." for parent directory - Add ".." for parent directory
- Prevent directory traversal attacks
- Set up tokens or something so clients can't trivially - Set up tokens or something so clients can't trivially
impersonate servers impersonate servers
- Offer list of clients at server root - Offer list of clients at server root