From cf08d2fbb34fa6ca1433c26dd8b5c67fc1f51682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Gruszczy=C5=84ski?= Date: Fri, 5 Sep 2025 10:00:55 +0200 Subject: [PATCH] fixy --- app.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/app.py b/app.py index 61d078c..f582152 100644 --- a/app.py +++ b/app.py @@ -132,7 +132,6 @@ def commandCandidates(name: str): return cmds or [] - def reloadService(name: str): for cmd in commandCandidates(name): rc, out, err = runCmd(cmd) @@ -146,21 +145,23 @@ def reloadService(name: str): # jeśli nic się nie udało: return last if 'last' in locals() else {"service": name, "action": "no-cmd", "rc": 127, "stdout": "", "stderr": "no candidate"} -# -# WYCZYTUJEMY TOKEN -# ------------------------------------------------------ -file_token = readTokenFromFile(TOKEN_FILE_PATH) -if file_token: - API_TOKEN = file_token - logger.info(f"API_TOKEN wczytany z pliku: {TOKEN_FILE_PATH}") +# --- TOKEN / AUTH --- +def tokenSourceLabel(src): # do logów + return {"cfg": "config.ini", "env": "ENV"}[src] + +cfg_token = getCfg("API_TOKEN", None) # [daemon] API_TOKEN = xxxx +env_token = os.environ.get("HOSTS_DAEMON_API_TOKEN") # fallback + +if cfg_token: + API_TOKEN, _src = cfg_token, "cfg" +elif env_token: + API_TOKEN, _src = env_token, "env" else: - env_token = os.environ.get("HOSTS_DAEMON_API_TOKEN") - if env_token: - API_TOKEN = env_token - logger.info("API_TOKEN wczytany ze zmiennej środowiskowej HOSTS_DAEMON_API_TOKEN.") - else: - API_TOKEN = "superSecretTokenABC123" - logger.info("API_TOKEN ustawiony na wartość domyślną: superSecretTokenABC123") + logger.error("Brak API_TOKEN (config.ini ani ENV). Zakończono.") + raise SystemExit(1) + +logger.info(f"API_TOKEN wczytany ze źródła: {tokenSourceLabel(_src)}") + def requireAuth(): """Wymusza autoryzację przy pomocy nagłówka Authorization,