LibreCloud/lib_defs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: add home_path to WebServer config and fix APP_HOME

Browse Source
This commit is contained in:
Jesús Pérez Lorenzo 2021-09-07 18:09:50 +01:00
parent b7733d50e4
commit 952a3fd661
5 changed files with 60 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app_auth/src/lib.rs
View File

@ -1,5 +1,6 @@
use std::collections::HashMap; use std::collections::HashMap;
use std::fs; use std::fs;
use std::path::Path;
use std::sync::Arc; use std::sync::Arc;
use thiserror::Error; use thiserror::Error;
use serde::{Deserialize,Serialize}; use serde::{Deserialize,Serialize};
@ -192,6 +193,12 @@ impl AuthStore {
// } // }
pub async fn create_enforcer(model_path: &'static str, policy_path: &'static str) -> SharedEnforcer { pub async fn create_enforcer(model_path: &'static str, policy_path: &'static str) -> SharedEnforcer {
if ! Path::new(&model_path).exists() {
panic!("model path: {} not exists",&model_path);
}
if ! Path::new(&policy_path).exists() {
panic!("policy path: {} not exists",&policy_path);
}
// Arc::new(Enforcer::new(super::super::MODEL_PATH, super::super::POLICY_PATH) // Arc::new(Enforcer::new(super::super::MODEL_PATH, super::super::POLICY_PATH)
Arc::new(Enforcer::new(model_path, policy_path) Arc::new(Enforcer::new(model_path, policy_path)
.await .await

52
app_env/src/appinfo.rs
View File

@ -1,12 +1,9 @@
// //
// Copyright 2021, Jesús Pérez Lorenzo // Copyright 2021, Jesús Pérez Lorenzo
// //
use std::collections::HashMap;
use crate::{ use crate::{
config::Config,
module::Module,
AppRunMode, AppRunMode,
appenv::AppEnv,
}; };
use AppRunMode::{Pro,Premium}; use AppRunMode::{Pro,Premium};
@ -22,21 +19,32 @@ pub struct AppInfo {
pub appmode: AppRunMode, pub appmode: AppRunMode,
} }
impl AppInfo { impl AppInfo {
pub async fn new(app_name: &str, webname: String, version: String, author: String) -> Self { pub fn new(app_name: &str, webname: String, version: String, author: String) -> Self {
let usedata = match std::fs::read_to_string(format!("{}.use",&envmnt::get_or("APP_HOME", ""))) {
Ok(res) => res,
// Err(e) => { println!("Error usedata: {}",e); String::from("")},
Err(_) => String::from(""),
};
Self { Self {
name: format!("{} Server",&app_name), name: format!("{} Server",&app_name),
webname, webname,
version, version,
author, author,
about: format!("{}: Boot app",&app_name), about: format!("{}: Boot app",&app_name),
usedata, usedata: String::from(""),
appmode: AppRunMode::default(), appmode: AppRunMode::default(),
} }
}
pub fn load_data(&self,app_env: &AppEnv) -> Self {
let usedata = match std::fs::read_to_string(format!("{}/{}/.use",&envmnt::get_or("APP_HOME", ""),app_env.get_curr_websrvr_config().home_path)) {
Ok(res) => res,
// Err(e) => { println!("Error usedata: {}",e); String::from("")},
Err(_) => String::from(""),
};
Self {
name: self.name.to_owned(),
webname: self.webname.to_owned(),
version: self.version.to_owned(),
author: self.author.to_owned(),
about: self.about.to_owned(),
usedata,
appmode: self.appmode.to_owned(),
}
} }
#[must_use] #[must_use]
pub fn can_do(&self, target: &str) -> bool { pub fn can_do(&self, target: &str) -> bool {
@ -58,14 +66,14 @@ impl AppInfo {
} }
} }
#[derive(Clone, Debug)] // #[derive(Clone, Debug)]
pub struct AppEnv { // pub struct AppEnv {
pub info: AppInfo, // pub info: AppInfo,
pub config: Config, // pub config: Config,
pub debug_level: String, // pub debug_level: String,
pub appkey: String, // pub appkey: String,
pub checked: bool, // pub checked: bool,
pub collections: HashMap<String, toml::Value>, // pub collections: HashMap<String, toml::Value>,
pub modules: HashMap<String, Module>, // pub modules: HashMap<String, Module>,
// pub modules: HashMap<String, toml::Value>, // // pub modules: HashMap<String, toml::Value>,
} // }

34
app_env/src/config.rs
View File

@ -68,6 +68,7 @@ impl StoreLocal {
#[derive(Clone, Debug, Deserialize, Default)] #[derive(Clone, Debug, Deserialize, Default)]
pub struct WebServer { pub struct WebServer {
pub name: String, pub name: String,
pub home_path: String,
pub resources_path: String, pub resources_path: String,
pub certs_store_path: String, pub certs_store_path: String,
@ -171,31 +172,32 @@ impl Config {
println!("Config Loaded successfully"); println!("Config Loaded successfully");
} }
let app_home=envmnt::get_or("APP_HOME", ""); let app_home=envmnt::get_or("APP_HOME", "");
if app_home.is_empty() { // if app_home.is_empty() {
cfg // cfg
} else { // } else {
let mut app_cfg = cfg; let mut app_cfg: Config = cfg;
let mut websrvrs: Vec<WebServer> = Vec::new(); let mut websrvrs: Vec<WebServer> = Vec::new();
app_cfg.websrvrs.iter().enumerate().for_each(|(pos,it)| { app_cfg.websrvrs.iter().enumerate().for_each(|(pos,it)| {
let app_home_path=format!("{}/{}/",&app_home,&it.home_path);
websrvrs.push(it.to_owned()); websrvrs.push(it.to_owned());
websrvrs[pos].certs_store_path=format!("{}{}",&app_home,&it.certs_store_path); websrvrs[pos].certs_store_path=format!("{}{}",&app_home_path,&it.certs_store_path);
websrvrs[pos].resources_path=format!("{}{}",&app_home,&it.resources_path); websrvrs[pos].resources_path=format!("{}{}",&app_home_path,&it.resources_path);
websrvrs[pos].templates_path=format!("{}{}",&app_home,&it.templates_path); websrvrs[pos].templates_path=format!("{}{}",&app_home_path,&it.templates_path);
websrvrs[pos].defaults_path=format!("{}{}",&app_home,&it.defaults_path); websrvrs[pos].defaults_path=format!("{}{}",&app_home_path,&it.defaults_path);
websrvrs[pos].html_path=format!("{}{}",&app_home,&it.html_path); websrvrs[pos].html_path=format!("{}{}",&app_home_path,&it.html_path);
websrvrs[pos].dist_path=format!("{}{}",&app_home,&it.dist_path); websrvrs[pos].dist_path=format!("{}{}",&app_home_path,&it.dist_path);
websrvrs[pos].upload_path=format!("{}{}",&app_home,&it.upload_path); websrvrs[pos].upload_path=format!("{}{}",&app_home_path,&it.upload_path);
websrvrs[pos].auth_model_path=format!("{}{}",&app_home,&it.auth_model_path); websrvrs[pos].auth_model_path=format!("{}{}",&app_home_path,&it.auth_model_path);
websrvrs[pos].auth_policy_path=format!("{}{}",&app_home,&it.auth_policy_path); websrvrs[pos].auth_policy_path=format!("{}{}",&app_home_path,&it.auth_policy_path);
websrvrs[pos].usrs_store_target=format!("{}{}",&app_home,&it.usrs_store_target); websrvrs[pos].usrs_store_target=format!("{}{}",&app_home_path,&it.usrs_store_target);
websrvrs[pos].usrs_shadow_target=format!("{}{}",&app_home,&it.usrs_shadow_target); websrvrs[pos].usrs_shadow_target=format!("{}{}",&app_home_path,&it.usrs_shadow_target);
}); });
app_cfg.websrvrs = websrvrs; app_cfg.websrvrs = websrvrs;
app_cfg.cache_path=format!("{}{}",&app_home,&app_cfg.cache_path); app_cfg.cache_path=format!("{}{}",&app_home,&app_cfg.cache_path);
app_cfg.cache_lock_path=format!("{}{}",&app_home,&app_cfg.cache_lock_path); app_cfg.cache_lock_path=format!("{}{}",&app_home,&app_cfg.cache_lock_path);
app_cfg.check_path=format!("{}{}",&app_home,&app_cfg.check_path); app_cfg.check_path=format!("{}{}",&app_home,&app_cfg.check_path);
app_cfg app_cfg
} // }
}, },
Err(e) => { Err(e) => {
println!("Config error: {}",e); println!("Config error: {}",e);

9
app_env/src/module.rs
View File

@ -53,14 +53,7 @@ impl Module {
match toml::from_str(&content) { match toml::from_str(&content) {
Ok(cfg) => { Ok(cfg) => {
println!("Module Loaded successfully"); println!("Module Loaded successfully");
let app_home=envmnt::get_or("APP_HOME", ""); cfg
if app_home.is_empty() {
cfg
} else {
let mut module_cfg = cfg;
module_cfg.store_root=format!("{}{}",&app_home,&module_cfg.store_root);
module_cfg
}
}, },
Err(e) => { Err(e) => {
println!("Module error: {}",e); println!("Module error: {}",e);

6
kloud/src/utils.rs
View File

@ -11,8 +11,10 @@ use app_env::appenv::AppEnv;
pub fn load_from_module(env: AppEnv, coll_key: &str) -> (String,String) { pub fn load_from_module(env: AppEnv, coll_key: &str) -> (String,String) {
if let Some(module) = env.modules.get(coll_key) { if let Some(module) = env.modules.get(coll_key) {
match module.stores.to_owned().as_str() { match module.stores.to_owned().as_str() {
"file" => "file" => {
(module.store_frmt.to_owned(), load_fs_content(&module.store_root, &module.store_path, &module.store_frmt)), let store_root =format!("{}/{}/{}",&envmnt::get_or("APP_HOME", ""),&env.get_curr_websrvr_config().home_path,&module.store_root);
(module.store_frmt.to_owned(), load_fs_content(&store_root, &module.store_path, &module.store_frmt))
},
_ => { _ => {
println!("Stores {} load not defined", &module.stores); println!("Stores {} load not defined", &module.stores);
(module.store_frmt.to_owned(), String::from("")) (module.store_frmt.to_owned(), String::from(""))