sascha/homelab-butler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'Hetzner-DNS-Token aus Secure Note normalisieren' (#32) from fix/hetzner-dns-note-parser-20260814 into main

Browse source
This commit is contained in:
sascha 2026-08-14 10:36:28 +02:00
commit a454ad4868
1 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app.py
View file

@ -980,13 +980,32 @@ print(backup)
return {"status": "reloaded", "backup": backup} return {"status": "reloaded", "backup": backup}
def _normalize_hetzner_dns_token(raw: str) -> str | None:
raw = (raw or "").strip()
if not raw:
return None
if raw.isascii() and not any(ch.isspace() for ch in raw) and re.fullmatch(r"[A-Za-z0-9._-]{24,}", raw):
return raw
candidates = []
labelled = re.findall(r"(?is)(?:token|api[ -]?key)[^\n:=]{0,80}(?::|=|\n)\s*([A-Za-z0-9._-]{24,})", raw)
candidates.extend(value for value in labelled if value.isascii())
for line in raw.splitlines():
if "token" not in line.lower() and "api key" not in line.lower() and "api-key" not in line.lower():
continue
value = re.split(r"[:=]", line, maxsplit=1)[-1].strip().strip("`'\"")
if value.isascii() and re.fullmatch(r"[A-Za-z0-9._-]{24,}", value):
candidates.append(value)
return candidates[0] if len(set(candidates)) == 1 else None
def _get_hetzner_dns_token() -> str: def _get_hetzner_dns_token() -> str:
token = _read("HETZNER_DNS_TOKEN") token = _normalize_hetzner_dns_token(_read("HETZNER_DNS_TOKEN") or "")
if token: if token:
return token return token
aliases = [value for key, value in _vault_cache.items() if "hetzner" in key.lower() and "dns" in key.lower() and value.strip()] aliases = [_normalize_hetzner_dns_token(value) for key, value in _vault_cache.items() if "hetzner" in key.lower() and "dns" in key.lower()]
if len(aliases) == 1: aliases = [value for value in aliases if value]
return aliases[0].strip() if len(set(aliases)) == 1:
return aliases[0]
rc, _out, err = _ssh( rc, _out, err = _ssh(
"sascha@10.4.1.116", "sascha@10.4.1.116",
"sudo bash /data/stacks/homelab-butler/vault-sync.sh", "sudo bash /data/stacks/homelab-butler/vault-sync.sh",