From e65e086b90bef37271a261856e488f4c21d7b5c9 Mon Sep 17 00:00:00 2001 From: George Kaklamanos Date: Mon, 27 Nov 2023 19:07:54 +0200 Subject: [PATCH] auth,main: Use exit status to indicate authentication failure --- labadoor-auth/src/lib.rs | 10 ++++++++-- labadoor/src/main.rs | 8 ++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/labadoor-auth/src/lib.rs b/labadoor-auth/src/lib.rs index d9d6843..6a70e64 100644 --- a/labadoor-auth/src/lib.rs +++ b/labadoor-auth/src/lib.rs @@ -14,8 +14,9 @@ macro_rules! add_cliargs { }; } -use std::collections::{HashMap, HashSet}; -pub fn auth(cli: &cli::Cli, config: config::ConfigBuilder) { +use config::{builder::DefaultState, ConfigBuilder}; +pub fn auth(cli: &cli::Cli, config: ConfigBuilder) -> Result<(), ()> { + let mut ret = Err(()); let config = add_cliargs!(config, "auth", cli); let backends = config.get::>("auth.backends").unwrap(); for backend in backends { @@ -30,7 +31,12 @@ pub fn auth(cli: &cli::Cli, config: config::ConfigBuilder Result<(), ()> { + let mut ret = Ok(()); let cli = cli::parse(); let config = config::Config::builder() .add_source(config::File::with_name(path).required(false)) @@ -38,8 +39,7 @@ fn main() { labadoor_gpio::gpio(gpio); } #[cfg(feature = "auth")] - cli::Command::Auth(cli) => { - labadoor_auth::auth(&cli, config); - } + cli::Command::Auth(cli) => ret = labadoor_auth::auth(&cli, config), } + ret }