ecoppens/colmena
1
0
Fork 0
forked from DGNum/colmena
Code Pull requests Activity

Allow specifying alternative commands for privilege escalation

Browse source 
Fixes #16.
This commit is contained in:
Zhaofeng Li 2021-03-10 08:41:22 -08:00
parent 082a033443
commit fb5ff6f9c9
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/command/apply_local.rs
View file

@ -27,6 +27,12 @@ pub fn subcommand() -> App<'static, 'static> {
.arg(Arg::with_name("sudo") .arg(Arg::with_name("sudo")
.long("sudo") .long("sudo")
.help("Attempt to escalate privileges if not run as root")) .help("Attempt to escalate privileges if not run as root"))
.arg(Arg::with_name("sudo-command")
.long("sudo-command")
.value_name("COMMAND")
.help("Command to use to escalate privileges")
.default_value("sudo")
.takes_value(true))
.arg(Arg::with_name("verbose") .arg(Arg::with_name("verbose")
.short("v") .short("v")
.long("verbose") .long("verbose")
@ -73,7 +79,9 @@ pub async fn run(_global_args: &ArgMatches<'_>, local_args: &ArgMatches<'_>) {
} }
if local_args.is_present("sudo") { if local_args.is_present("sudo") {
escalate().await; let sudo = local_args.value_of("sudo-command").unwrap();
escalate(sudo).await;
} else { } else {
log::warn!("Colmena was not started by root. This is probably not going to work."); log::warn!("Colmena was not started by root. This is probably not going to work.");
log::warn!("Hint: Add the --sudo flag."); log::warn!("Hint: Add the --sudo flag.");
@ -123,11 +131,11 @@ pub async fn run(_global_args: &ArgMatches<'_>, local_args: &ArgMatches<'_>) {
deployment.execute().await; deployment.execute().await;
} }
async fn escalate() -> ! { async fn escalate(sudo: &str) -> ! {
// Restart ourselves with sudo // Restart ourselves with sudo
let argv: Vec<String> = env::args().collect(); let argv: Vec<String> = env::args().collect();
let exit = Command::new("sudo") let exit = Command::new(sudo)
.arg("--") .arg("--")
.args(argv) .args(argv)
.arg("--we-are-launched-by-sudo") .arg("--we-are-launched-by-sudo")