gkaklas/labadoor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auth,main: Use exit status to indicate authentication failure

Browse source
This commit is contained in:
George Kaklamanos 2023-11-27 19:07:54 +02:00
parent 7a294ee146
commit e65e086b90
No known key found for this signature in database
GPG key ID: C0CAB8A6BDC9399D
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
labadoor-auth/src/lib.rs
View file

@ -14,8 +14,9 @@ macro_rules! add_cliargs {
}; };
} }
use std::collections::{HashMap, HashSet}; use config::{builder::DefaultState, ConfigBuilder};
pub fn auth(cli: &cli::Cli, config: config::ConfigBuilder<config::builder::DefaultState>) { pub fn auth(cli: &cli::Cli, config: ConfigBuilder<DefaultState>) -> Result<(), ()> {
let mut ret = Err(());
let config = add_cliargs!(config, "auth", cli); let config = add_cliargs!(config, "auth", cli);
let backends = config.get::<Vec<cli::Backend>>("auth.backends").unwrap(); let backends = config.get::<Vec<cli::Backend>>("auth.backends").unwrap();
for backend in backends { for backend in backends {
@ -30,7 +31,12 @@ pub fn auth(cli: &cli::Cli, config: config::ConfigBuilder<config::builder::Defau
cliargs.identifier.clone(), cliargs.identifier.clone(),
cliargs.resource.clone(), cliargs.resource.clone(),
); );
if let Some(one) = found {
println!("{},{}", one.username, one.resource);
ret = Ok(())
}
} }
}; };
} }
ret
} }

8
labadoor/src/main.rs
View file

@ -13,7 +13,8 @@ macro_rules! add_cliargs {
}; };
} }
fn main() { fn main() -> Result<(), ()> {
let mut ret = Ok(());
let cli = cli::parse(); let cli = cli::parse();
let config = config::Config::builder() let config = config::Config::builder()
.add_source(config::File::with_name(path).required(false)) .add_source(config::File::with_name(path).required(false))
@ -38,8 +39,7 @@ fn main() {
labadoor_gpio::gpio(gpio); labadoor_gpio::gpio(gpio);
} }
#[cfg(feature = "auth")] #[cfg(feature = "auth")]
cli::Command::Auth(cli) => { cli::Command::Auth(cli) => ret = labadoor_auth::auth(&cli, config),
labadoor_auth::auth(&cli, config);
}
} }
ret
} }