Docker-Gruppe server_<SERVER>_docker_compose (Default H1), Deploy-Verzeichnis 'deployment', Repo-Link in authentik notes
This commit is contained in:
1 parent
c294a8e2d3
commit
8a3a3cefaa
3 files changed
+36
-10
No files matched your search
Binary file not shown.
+16
-8
@@ -15,7 +15,7 @@ from authentik_client.rest import ApiException
|
|||||||
|
|
||||||
DEFAULT_AUTHENTIK_URL = "https://auth.systems.cogsys.wiai.uni-bamberg.de/api/v3"
|
DEFAULT_AUTHENTIK_URL = "https://auth.systems.cogsys.wiai.uni-bamberg.de/api/v3"
|
||||||
DEFAULT_GITEA_URL = "https://git.share-fix.de"
|
DEFAULT_GITEA_URL = "https://git.share-fix.de"
|
||||||
DEFAULT_DOCKER_GROUP = "server_APPS_docker_compose"
|
DEFAULT_SERVER = "H1"
|
||||||
HOME_DIR_BASE = "/home"
|
HOME_DIR_BASE = "/home"
|
||||||
USERNAME_RE = re.compile(r"^[a-z_][a-z0-9_-]{0,31}$")
|
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")
|
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}")
|
print(f"Creating user: {username}")
|
||||||
users = client.core_users_list(username=username)
|
users = client.core_users_list(username=username)
|
||||||
if users.results:
|
if users.results:
|
||||||
print(f"User {username} already exists")
|
print(f"User {username} already exists")
|
||||||
user = users.results[0]
|
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:
|
else:
|
||||||
user = client.core_users_create(
|
user = client.core_users_create(
|
||||||
user_request=authentik_client.UserRequest(
|
user_request=authentik_client.UserRequest(
|
||||||
@@ -87,6 +93,7 @@ def authentik_create_user(client: authentik_client.CoreApi, username: str, home_
|
|||||||
is_active=True,
|
is_active=True,
|
||||||
path="goauthentik.io/service-accounts",
|
path="goauthentik.io/service-accounts",
|
||||||
attributes={
|
attributes={
|
||||||
|
"notes": repo_url,
|
||||||
"homeDirectory": home_directory,
|
"homeDirectory": home_directory,
|
||||||
"goauthentik.io/user/token-expires": False,
|
"goauthentik.io/user/token-expires": False,
|
||||||
},
|
},
|
||||||
@@ -119,12 +126,12 @@ def authentik_create_user(client: authentik_client.CoreApi, username: str, home_
|
|||||||
# ── CLI ──────────────────────────────────────────────────────────────────────
|
# ── CLI ──────────────────────────────────────────────────────────────────────
|
||||||
def parse_args() -> argparse.Namespace:
|
def parse_args() -> argparse.Namespace:
|
||||||
p = argparse.ArgumentParser(description="Deploy-User für ein Gitea-Repository in authentik anlegen")
|
p = argparse.ArgumentParser(description="Deploy-User für ein Gitea-Repository in authentik anlegen")
|
||||||
p.add_argument("--server", required=True,
|
p.add_argument("--server", default=DEFAULT_SERVER,
|
||||||
help="Zielserver; bestimmt die Gruppe server_<SERVER>_ssh_access (z. B. APPS -> server_APPS_ssh_access)")
|
help=f"Zielserver; bestimmt server_<SERVER>_ssh_access und server_<SERVER>_docker_compose (Standard: {DEFAULT_SERVER})")
|
||||||
p.add_argument("--project-path", help="Gitea-Repository: 'owner/repo' oder URL")
|
p.add_argument("--project-path", help="Gitea-Repository: 'owner/repo' oder URL")
|
||||||
p.add_argument("--username", help="Username des Deploy-Users (Standard: deploy_<owner>_<repo>)")
|
p.add_argument("--username", help="Username des Deploy-Users (Standard: deploy_<owner>_<repo>)")
|
||||||
p.add_argument("--docker-group", default=DEFAULT_DOCKER_GROUP,
|
p.add_argument("--docker-group",
|
||||||
help=f"Zusätzliche Gruppe für Docker-Deploys (Standard: {DEFAULT_DOCKER_GROUP})")
|
help="Gruppe für Docker-Deploys (Standard: server_<SERVER>_docker_compose)")
|
||||||
p.add_argument("--no-docker-group", action="store_true", help="Docker-Deploy-Gruppe nicht zuweisen")
|
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-url", default=DEFAULT_AUTHENTIK_URL)
|
||||||
p.add_argument("--authentik-token", default=os.environ.get("AUTHENTIK_TOKEN"),
|
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"]
|
group_names = [f"server_{args.server}_ssh_access"]
|
||||||
if not args.no_docker_group:
|
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"\nRepository: {repo_path} (id {repo['id']})")
|
||||||
print(f"Deploy-User: {username}")
|
print(f"Deploy-User: {username}")
|
||||||
print(f"Home-Verz.: {home_dir}")
|
print(f"Home-Verz.: {home_dir}")
|
||||||
print(f"Gruppen: {', '.join(group_names)}")
|
print(f"Gruppen: {', '.join(group_names)}")
|
||||||
|
print(f"Notes: {repo['html_url']}")
|
||||||
print(f"Gitea-Secrets: deploy_user, deploy_pass")
|
print(f"Gitea-Secrets: deploy_user, deploy_pass")
|
||||||
if args.dry_run:
|
if args.dry_run:
|
||||||
print("\n[dry-run] Es wurde nichts angelegt.")
|
print("\n[dry-run] Es wurde nichts angelegt.")
|
||||||
@@ -186,7 +194,7 @@ def main() -> int:
|
|||||||
core_api = authentik_client.CoreApi(api_client)
|
core_api = authentik_client.CoreApi(api_client)
|
||||||
try:
|
try:
|
||||||
groups = [authentik_get_group_by_name(core_api, n) for n in group_names]
|
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:
|
except (ApiException, RuntimeError) as e:
|
||||||
sys.exit(f"Fehler in authentik: {e}")
|
sys.exit(f"Fehler in authentik: {e}")
|
||||||
|
|
||||||
|
|||||||
+20
-2
@@ -7,10 +7,28 @@ IFS=$'\n\t'
|
|||||||
export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
||||||
|
|
||||||
readonly SCRIPT_NAME="$(basename "$0")"
|
readonly SCRIPT_NAME="$(basename "$0")"
|
||||||
readonly DEPLOY_SUBDIR="its-deploy"
|
readonly DEPLOY_SUBDIR="deployment"
|
||||||
readonly DEPLOY_GROUP="server_APPS_docker_compose"
|
readonly CONFIG_FILE="/etc/docker-deploy.conf"
|
||||||
readonly ALLOWED_ACTIONS=(build up down restart logs pull deploy)
|
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 ──────────────────────────────────────────────────────────
|
# ── Hilfsfunktionen ──────────────────────────────────────────────────────────
|
||||||
log() { printf '[%(%Y-%m-%d %H:%M:%S)T] %s\n' -1 "$*"; }
|
log() { printf '[%(%Y-%m-%d %H:%M:%S)T] %s\n' -1 "$*"; }
|
||||||
die() { printf '❌ %s\n' "$*" >&2; exit 1; }
|
die() { printf '❌ %s\n' "$*" >&2; exit 1; }
|
||||||
|
|||||||
Reference in new issue
Block a user