PlexSheep
/
wooly-vault
generated from PlexSheep/rs-base
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: each challenge has their own vault in meta

This commit is contained in:
Christoph J. Scherr 2024-09-08 03:05:31 +02:00
parent 695edbb563
commit 7f1ec08976
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib.rs
View File

@ -73,6 +73,7 @@ pub async fn select_and_start_single(
Ok(()) Ok(())
} }
// TODO: actually use different vaults for the challenges #7
pub async fn start_all(config: Config, vault: VaultRef) -> anyhow::Result<()> { pub async fn start_all(config: Config, vault: VaultRef) -> anyhow::Result<()> {
let c1 = challenge::c1::C1::new(config.clone(), vault.clone()); let c1 = challenge::c1::C1::new(config.clone(), vault.clone());
let c2 = challenge::c2::C2::new(config.clone(), vault.clone()); let c2 = challenge::c2::C2::new(config.clone(), vault.clone());
@ -84,11 +85,10 @@ pub async fn start_all(config: Config, vault: VaultRef) -> anyhow::Result<()> {
meta::serve( meta::serve(
vec![ vec![
challenge::c1::C1::text(), (challenge::c1::C1::text(), vault.clone()),
challenge::c2::C2::text(), (challenge::c2::C2::text(), vault.clone()),
challenge::c3::C3::text(), (challenge::c3::C3::text(), vault.clone()),
], ],
vault.clone(),
config.clone(), config.clone(),
) )
.await?; .await?;

11
src/meta/mod.rs
View File

@ -1,3 +1,4 @@
use std::collections::HashMap;
use std::sync::Arc; use std::sync::Arc;
use anyhow::Result; use anyhow::Result;
@ -20,17 +21,15 @@ pub mod errors;
#[derive(Clone)] #[derive(Clone)]
pub struct Service<'tp> { pub struct Service<'tp> {
vault: VaultRef,
config: Config, config: Config,
env: Environment<'tp>, env: Environment<'tp>,
challenges: Vec<ChallengeDesc>, challenges: Vec<(ChallengeDesc, VaultRef)>,
} }
impl<'tp> Service<'tp> { impl<'tp> Service<'tp> {
fn build(vault: VaultRef, config: Config, challenges: Vec<ChallengeDesc>) -> Result<Arc<Self>> { fn build(config: Config, challenges: Vec<(ChallengeDesc, VaultRef)>) -> Result<Arc<Self>> {
let mut env = Environment::new(); let mut env = Environment::new();
env.add_template("index", include_str!("../../data/www/admin.html"))?; env.add_template("index", include_str!("../../data/www/admin.html"))?;
Ok(Self { Ok(Self {
vault,
config, config,
env, env,
challenges, challenges,
@ -39,8 +38,8 @@ impl<'tp> Service<'tp> {
} }
} }
pub async fn serve(challenges: Vec<ChallengeDesc>, vault: VaultRef, config: Config) -> Result<()> { pub async fn serve(challenges: Vec<(ChallengeDesc, VaultRef)>, config: Config) -> Result<()> {
let service = Service::build(vault, config, challenges)?; let service = Service::build(config, challenges)?;
let routes = Service::admin_routes(service.clone()) let routes = Service::admin_routes(service.clone())
.or(Service::ressources_routes()) .or(Service::ressources_routes())