Github/aralez
1
0
Fork 0
mirror of https://github.com/sadoyan/aralez.git synced 2026-04-30 14:58:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed config file parser at startup, to keep initially dead nodes in list.

Browse Source
This commit is contained in:
Ara Sadoyan
2025-09-25 18:32:46 +02:00
parent 5d4915d6b9
commit b916b152ea
4 changed files with 61 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/web/start.rs
View File

@@ -105,14 +105,17 @@ pub fn run() {
server.add_service(bg_srvc);
thread::spawn(move || server.run_forever());
drop_priv(cfg.rungroup.clone(), cfg.runuser.clone(), cfg.proxy_address_http.clone(), cfg.proxy_address_tls.clone());
if let (Some(user), Some(group)) = (cfg.rungroup.clone(), cfg.runuser.clone()) {
drop_priv(user, group, cfg.proxy_address_http.clone(), cfg.proxy_address_tls.clone());
}
let (tx, rx) = channel();
ctrlc::set_handler(move || tx.send(()).expect("Could not send signal on channel.")).expect("Error setting Ctrl-C handler");
rx.recv().expect("Could not receive from channel.");
println!("\nSignal received ! Exiting...");
info!("Signal received ! Exiting...");
}
fn drop_priv(user: Option<String>, group: Option<String>, http_addr: String, tls_addr: Option<String>) {
fn drop_priv(user: String, group: String, http_addr: String, tls_addr: Option<String>) {
thread::sleep(time::Duration::from_millis(10));
loop {
thread::sleep(time::Duration::from_millis(10));
@@ -129,12 +132,19 @@ fn drop_priv(user: Option<String>, group: Option<String>, http_addr: String, tls
}
}
if let (Some(u), Some(g)) = (user, group) {
if std::fs::metadata("/proc/self").map(|m| m.uid()).unwrap_or(1) == 0 {
info!("Dropping ROOT privileges to: {}:{}", u, g);
if let Err(e) = PrivDrop::default().user(u).group(g).apply() {
panic!("Failed to drop privileges: {}", e);
}
if std::fs::metadata("/proc/self").map(|m| m.uid()).unwrap_or(1) == 0 {
info!("Dropping ROOT privileges to: {}:{}", user, group);
if let Err(e) = PrivDrop::default().user(user).group(group).apply() {
panic!("Failed to drop privileges: {}", e);
}
}
// if let (Some(u), Some(g)) = (user, group) {
// if std::fs::metadata("/proc/self").map(|m| m.uid()).unwrap_or(1) == 0 {
// info!("Dropping ROOT privileges to: {}:{}", u, g);
// if let Err(e) = PrivDrop::default().user(u).group(g).apply() {
// panic!("Failed to drop privileges: {}", e);
// }
// }
// }
}