From 8a3a3cefaa347971212a09ee3d10bddc7f532466 Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Sat, 24 Oct 2026 10:05:52 +0200 Subject: [PATCH] Docker-Gruppe server__docker_compose (Default H1), Deploy-Verzeichnis 'deployment', Repo-Link in authentik notes --- .../create-deploy-user.cpython-313.pyc | Bin 0 -> 14452 bytes create-deploy-user.py | 24 ++++++++++++------ docker-deploy.sh | 22 ++++++++++++++-- 3 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 __pycache__/create-deploy-user.cpython-313.pyc diff --git a/__pycache__/create-deploy-user.cpython-313.pyc b/__pycache__/create-deploy-user.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..5c666096307749c7f826e6b545b7b03ae303fed2 GIT binary patch literal 14452 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 literal 0 HcmV?d00001 diff --git a/create-deploy-user.py b/create-deploy-user.py index 64c4bbc..f1ed78b 100755 --- a/create-deploy-user.py +++ b/create-deploy-user.py @@ -15,7 +15,7 @@ from authentik_client.rest import ApiException DEFAULT_AUTHENTIK_URL = "https://auth.systems.cogsys.wiai.uni-bamberg.de/api/v3" DEFAULT_GITEA_URL = "https://git.share-fix.de" -DEFAULT_DOCKER_GROUP = "server_APPS_docker_compose" +DEFAULT_SERVER = "H1" HOME_DIR_BASE = "/home" USERNAME_RE = re.compile(r"^[a-z_][a-z0-9_-]{0,31}$") @@ -72,12 +72,18 @@ def authentik_get_group_by_name(client: authentik_client.CoreApi, name: str): raise RuntimeError(f"Gruppe '{name}' nicht gefunden") -def authentik_create_user(client: authentik_client.CoreApi, username: str, home_directory: str, groups) -> str: +def authentik_create_user(client: authentik_client.CoreApi, username: str, home_directory: str, groups, repo_url: str) -> str: print(f"Creating user: {username}") users = client.core_users_list(username=username) if users.results: print(f"User {username} already exists") user = users.results[0] + client.core_users_partial_update( + id=user.pk, + patched_user_request=authentik_client.PatchedUserRequest( + attributes={**(user.attributes or {}), "notes": repo_url, "homeDirectory": home_directory} + ), + ) else: user = client.core_users_create( user_request=authentik_client.UserRequest( @@ -87,6 +93,7 @@ def authentik_create_user(client: authentik_client.CoreApi, username: str, home_ is_active=True, path="goauthentik.io/service-accounts", attributes={ + "notes": repo_url, "homeDirectory": home_directory, "goauthentik.io/user/token-expires": False, }, @@ -119,12 +126,12 @@ def authentik_create_user(client: authentik_client.CoreApi, username: str, home_ # ── CLI ────────────────────────────────────────────────────────────────────── def parse_args() -> argparse.Namespace: p = argparse.ArgumentParser(description="Deploy-User für ein Gitea-Repository in authentik anlegen") - p.add_argument("--server", required=True, - help="Zielserver; bestimmt die Gruppe server__ssh_access (z. B. APPS -> server_APPS_ssh_access)") + p.add_argument("--server", default=DEFAULT_SERVER, + help=f"Zielserver; bestimmt server__ssh_access und server__docker_compose (Standard: {DEFAULT_SERVER})") p.add_argument("--project-path", help="Gitea-Repository: 'owner/repo' oder URL") p.add_argument("--username", help="Username des Deploy-Users (Standard: deploy__)") - p.add_argument("--docker-group", default=DEFAULT_DOCKER_GROUP, - help=f"Zusätzliche Gruppe für Docker-Deploys (Standard: {DEFAULT_DOCKER_GROUP})") + p.add_argument("--docker-group", + help="Gruppe für Docker-Deploys (Standard: server__docker_compose)") p.add_argument("--no-docker-group", action="store_true", help="Docker-Deploy-Gruppe nicht zuweisen") p.add_argument("--authentik-url", default=DEFAULT_AUTHENTIK_URL) p.add_argument("--authentik-token", default=os.environ.get("AUTHENTIK_TOKEN"), @@ -168,12 +175,13 @@ def main() -> int: group_names = [f"server_{args.server}_ssh_access"] if not args.no_docker_group: - group_names.append(args.docker_group) + group_names.append(args.docker_group or f"server_{args.server}_docker_compose") print(f"\nRepository: {repo_path} (id {repo['id']})") print(f"Deploy-User: {username}") print(f"Home-Verz.: {home_dir}") print(f"Gruppen: {', '.join(group_names)}") + print(f"Notes: {repo['html_url']}") print(f"Gitea-Secrets: deploy_user, deploy_pass") if args.dry_run: print("\n[dry-run] Es wurde nichts angelegt.") @@ -186,7 +194,7 @@ def main() -> int: core_api = authentik_client.CoreApi(api_client) try: groups = [authentik_get_group_by_name(core_api, n) for n in group_names] - key = authentik_create_user(core_api, username, home_dir, groups) + key = authentik_create_user(core_api, username, home_dir, groups, repo["html_url"]) except (ApiException, RuntimeError) as e: sys.exit(f"Fehler in authentik: {e}") diff --git a/docker-deploy.sh b/docker-deploy.sh index b07c3a8..c679be5 100644 --- a/docker-deploy.sh +++ b/docker-deploy.sh @@ -7,10 +7,28 @@ IFS=$'\n\t' export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" readonly SCRIPT_NAME="$(basename "$0")" -readonly DEPLOY_SUBDIR="its-deploy" -readonly DEPLOY_GROUP="server_APPS_docker_compose" +readonly DEPLOY_SUBDIR="deployment" +readonly CONFIG_FILE="/etc/docker-deploy.conf" readonly ALLOWED_ACTIONS=(build up down restart logs pull deploy) +# ── Konfiguration ──────────────────────────────────────────────────────────── +# Optional: /etc/docker-deploy.conf (root-owned, nicht group/world-writable) mit +# DEPLOY_SERVER=H1 +# Berechtigte Gruppe: server_${DEPLOY_SERVER}_docker_compose. +# Bewusst keine Umgebungsvariable/kein Parameter: sudo-Aufrufer sollen die +# Berechtigungsprüfung nicht selbst umstellen können. +DEPLOY_SERVER="H1" +if [[ -e "$CONFIG_FILE" ]]; then + IFS=' ' read -r cfg_owner cfg_mode < <(stat -c '%u %a' "$CONFIG_FILE") + if [[ "$cfg_owner" != 0 ]] || (( 8#$cfg_mode & 8#022 )); then + echo "❌ $CONFIG_FILE muss root gehören und darf nicht group/world-writable sein" >&2 + exit 1 + fi + DEPLOY_SERVER="$(sed -n 's/^DEPLOY_SERVER=//p' "$CONFIG_FILE" | tail -n1 | tr -d "\"' ")" +fi +[[ "$DEPLOY_SERVER" =~ ^[A-Za-z0-9_-]+$ ]] || { echo "❌ Ungültiger DEPLOY_SERVER: '$DEPLOY_SERVER'" >&2; exit 1; } +readonly DEPLOY_GROUP="server_${DEPLOY_SERVER}_docker_compose" + # ── Hilfsfunktionen ────────────────────────────────────────────────────────── log() { printf '[%(%Y-%m-%d %H:%M:%S)T] %s\n' -1 "$*"; } die() { printf '❌ %s\n' "$*" >&2; exit 1; }