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

👕 refactor: move handlebars out of RelayState 

This will make it simpler to separate logic and presentation.
main
_ 2020-12-13 04:03:30 +00:00
parent 32e48697d5
commit 0737edd8f8
5 changed files with 76 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/ptth_relay/src/lib.rs
View File

@ -317,17 +317,22 @@ async fn handle_server_list_internal (state: &Arc <RelayState>)
} }
async fn handle_server_list ( async fn handle_server_list (
state: Arc <RelayState> state: Arc <RelayState>,
handlebars: Arc <Handlebars <'static>>
) -> Result <Response <Body>, RequestError> ) -> Result <Response <Body>, RequestError>
{ {
let page = handle_server_list_internal (&state).await; let page = handle_server_list_internal (&state).await;
let s = state.handlebars.render ("relay_server_list", &page)?; let s = handlebars.render ("relay_server_list", &page)?;
Ok (ok_reply (s)?) Ok (ok_reply (s)?)
} }
#[instrument (level = "trace", skip (req, state))] #[instrument (level = "trace", skip (req, state))]
async fn handle_all (req: Request <Body>, state: Arc <RelayState>) async fn handle_all (
req: Request <Body>,
state: Arc <RelayState>,
handlebars: Arc <Handlebars <'static>>
)
-> Result <Response <Body>, RequestError> -> Result <Response <Body>, RequestError>
{ {
let path = req.uri ().path ().to_string (); let path = req.uri ().path ().to_string ();
@ -359,7 +364,7 @@ async fn handle_all (req: Request <Body>, state: Arc <RelayState>)
} }
else if let Some (rest) = prefix_match ("/frontend/servers/", &path) { else if let Some (rest) = prefix_match ("/frontend/servers/", &path) {
if rest == "" { if rest == "" {
Ok (handle_server_list (state).await?) Ok (handle_server_list (state, handlebars).await?)
} }
else if let Some (idx) = rest.find ('/') { else if let Some (idx) = rest.find ('/') {
let listen_code = String::from (&rest [0..idx]); let listen_code = String::from (&rest [0..idx]);
@ -373,7 +378,7 @@ async fn handle_all (req: Request <Body>, state: Arc <RelayState>)
} }
} }
else if path == "/" { else if path == "/" {
let s = state.handlebars.render ("relay_root", &())?; let s = handlebars.render ("relay_root", &())?;
Ok (ok_reply (s)?) Ok (ok_reply (s)?)
} }
else if path == "/frontend/relay_up_check" { else if path == "/frontend/relay_up_check" {
@ -429,6 +434,7 @@ async fn reload_config (
pub async fn run_relay ( pub async fn run_relay (
state: Arc <RelayState>, state: Arc <RelayState>,
handlebars: Arc <Handlebars <'static>>,
shutdown_oneshot: oneshot::Receiver <()>, shutdown_oneshot: oneshot::Receiver <()>,
config_reload_path: Option <PathBuf> config_reload_path: Option <PathBuf>
) )
@ -448,12 +454,14 @@ pub async fn run_relay (
let make_svc = make_service_fn (|_conn| { let make_svc = make_service_fn (|_conn| {
let state = state.clone (); let state = state.clone ();
let handlebars = handlebars.clone ();
async { async {
Ok::<_, RequestError> (service_fn (move |req| { Ok::<_, RequestError> (service_fn (move |req| {
let state = state.clone (); let state = state.clone ();
let handlebars = handlebars.clone ();
handle_all (req, state) handle_all (req, state, handlebars)
})) }))
} }
}); });

1
crates/ptth_relay/src/main.rs
View File

@ -42,6 +42,7 @@ async fn main () -> Result <(), Box <dyn Error>> {
forced_shutdown.wrap_server ( forced_shutdown.wrap_server (
run_relay ( run_relay (
Arc::new (RelayState::try_from (config)?), Arc::new (RelayState::try_from (config)?),
Arc::new (ptth_relay::load_templates (&PathBuf::new ())?),
shutdown_rx, shutdown_rx,
Some (config_path) Some (config_path)
) )

2
crates/ptth_relay/src/relay_state.rs
View File

@ -76,7 +76,6 @@ impl Default for ServerStatus {
pub struct RelayState { pub struct RelayState {
pub config: RwLock <Config>, pub config: RwLock <Config>,
pub handlebars: Arc <Handlebars <'static>>,
// Key: Server ID // Key: Server ID
pub request_rendezvous: Mutex <HashMap <String, RequestRendezvous>>, pub request_rendezvous: Mutex <HashMap <String, RequestRendezvous>>,
@ -97,7 +96,6 @@ impl TryFrom <Config> for RelayState {
Ok (Self { Ok (Self {
config: config.into (), config: config.into (),
handlebars: Arc::new (load_templates (&PathBuf::new ())?),
request_rendezvous: Default::default (), request_rendezvous: Default::default (),
server_status: Default::default (), server_status: Default::default (),
response_rendezvous: Default::default (), response_rendezvous: Default::default (),

46
crates/ptth_relay/src/scraper_api.rs
View File

@ -98,3 +98,49 @@ pub async fn handle_scraper_api (
Ok (error_reply (StatusCode::NOT_FOUND, "Unknown scraper API version")?) Ok (error_reply (StatusCode::NOT_FOUND, "Unknown scraper API version")?)
} }
} }
#[cfg (test)]
mod tests {
use std::{
convert::TryFrom,
};
use tokio::runtime::Runtime;
use crate::{
config,
key_validity,
};
use super::*;
#[test]
fn auth () {
let input = Request::builder ()
.method ("GET")
.uri ("http://127.0.0.1:4000/scraper/v1/test")
.header ("X-ApiKey", "bogus")
.body (Body::empty ())
.unwrap ();
let config_file = config::file::Config {
port: Some (4000),
servers: vec! [],
iso: config::file::Isomorphic {
enable_scraper_auth: true,
dev_mode: Some (config::file::DevMode {
scraper_key: Some (key_validity::ScraperKey::new (b"bogus")),
}),
},
};
let config = config::Config::try_from (config_file).expect ("Can't load config");
let relay_state = Arc::new (RelayState::try_from (config).expect ("Can't create relay state"));
let mut rt = Runtime::new ().expect ("Can't create runtime for testing");
rt.block_on (async move {
let actual = handle_scraper_api (input, relay_state, "").await;
let actual = actual.expect ("Relay didn't respond");
});
}
}

17
src/tests.rs
View File

@ -1,5 +1,6 @@
use std::{ use std::{
convert::{TryFrom, TryInto}, convert::{TryFrom, TryInto},
path::PathBuf,
sync::{ sync::{
Arc, Arc,
}, },
@ -16,6 +17,8 @@ use tokio::{
use reqwest::Client; use reqwest::Client;
use tracing::{debug, info}; use tracing::{debug, info};
use ptth_relay::load_templates;
#[test] #[test]
fn end_to_end () { fn end_to_end () {
use ptth_relay::key_validity::BlakeHashWrapper; use ptth_relay::key_validity::BlakeHashWrapper;
@ -51,7 +54,12 @@ fn end_to_end () {
let relay_state_2 = relay_state.clone (); let relay_state_2 = relay_state.clone ();
let (stop_relay_tx, stop_relay_rx) = oneshot::channel (); let (stop_relay_tx, stop_relay_rx) = oneshot::channel ();
let task_relay = spawn (async move { let task_relay = spawn (async move {
ptth_relay::run_relay (relay_state_2, stop_relay_rx, None).await ptth_relay::run_relay (
relay_state_2,
Arc::new (load_templates (&PathBuf::new ())?),
stop_relay_rx,
None
).await
}); });
assert! (relay_state.list_servers ().await.is_empty ()); assert! (relay_state.list_servers ().await.is_empty ());
@ -153,7 +161,12 @@ fn scraper_endpoints () {
let relay_state_2 = relay_state.clone (); let relay_state_2 = relay_state.clone ();
let (stop_relay_tx, stop_relay_rx) = oneshot::channel (); let (stop_relay_tx, stop_relay_rx) = oneshot::channel ();
let task_relay = spawn (async move { let task_relay = spawn (async move {
run_relay (relay_state_2, stop_relay_rx, None).await run_relay (
relay_state_2,
Arc::new (load_templates (&PathBuf::new ())?),
stop_relay_rx,
None
).await
}); });
let relay_url = "http://127.0.0.1:4001"; let relay_url = "http://127.0.0.1:4001";