From 811d65526b9dd9cc2ef81745c00741ee9064c814 Mon Sep 17 00:00:00 2001 From: karpenok Date: Wed, 11 Nov 2026 16:52:38 +0700 Subject: [PATCH] feat(auth): integrate Grafana and Ntfy with Authentik SSO --- ansible/ci/deploy-machine.sh | 21 +++++++ .../core-mon/monitoring/defaults/main.yml | 1 + .../roles/core-mon/monitoring/tasks/main.yml | 6 ++ .../monitoring/templates/compose.yaml.j2 | 11 ++++ .../core-net/authentik/defaults/main.yml | 1 + .../files/blueprints/traefik-dashboard.yaml | 44 +++++++++++++- .../roles/core-net/authentik/tasks/main.yml | 25 +++++++- .../templates/blueprints/grafana.yaml.j2 | 59 +++++++++++++++++++ .../core-net/traefik/files/dynamic/ntfy.yml | 12 +++- 9 files changed, 174 insertions(+), 6 deletions(-) create mode 100644 ansible/roles/core-net/authentik/templates/blueprints/grafana.yaml.j2 diff --git a/ansible/ci/deploy-machine.sh b/ansible/ci/deploy-machine.sh index 67f4e58..7cdd2ac 100755 --- a/ansible/ci/deploy-machine.sh +++ b/ansible/ci/deploy-machine.sh @@ -58,9 +58,19 @@ case "$machine" in --silent unset GEN_SECRET_KEY GEN_PG_PASS fi + if ! infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" --format=dotenv-export --silent 2>/dev/null | grep -q 'GRAFANA_OAUTH_CLIENT_SECRET'; then + infisical secrets-manager folders create authentik --path /services --env prod --projectId "${INFISICAL_PROJECT_ID}" --domain "${INFISICAL_DOMAIN}" --token "${TOKEN}" --silent 2>/dev/null || true + GEN_OAUTH_SECRET=$(openssl rand -base64 48 | tr -dc 'a-zA-Z0-9' | head -c 48) + infisical secrets set --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" \ + "GRAFANA_OAUTH_CLIENT_SECRET=${GEN_OAUTH_SECRET}" \ + --silent + unset GEN_OAUTH_SECRET + fi eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" --format=dotenv-export --silent)" export AUTHENTIK_SECRET_KEY="${AUTHENTIK_SECRET_KEY:-}" export AUTHENTIK_POSTGRES_PASSWORD="${AUTHENTIK_POSTGRES_PASSWORD:-}" + export GRAFANA_OAUTH_CLIENT_SECRET="${GRAFANA_OAUTH_CLIENT_SECRET:-}" + extra+=(-e "grafana_oauth_client_secret=${GRAFANA_OAUTH_CLIENT_SECRET:-}") ;; core-secrets) eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/infisical" --format=dotenv-export --silent)" @@ -78,9 +88,20 @@ case "$machine" in --silent unset GEN_GRAFANA_PASS fi + if ! infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" --format=dotenv-export --silent 2>/dev/null | grep -q 'GRAFANA_OAUTH_CLIENT_SECRET'; then + infisical secrets-manager folders create authentik --path /services --env prod --projectId "${INFISICAL_PROJECT_ID}" --domain "${INFISICAL_DOMAIN}" --token "${TOKEN}" --silent 2>/dev/null || true + GEN_OAUTH_SECRET=$(openssl rand -base64 48 | tr -dc 'a-zA-Z0-9' | head -c 48) + infisical secrets set --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" \ + "GRAFANA_OAUTH_CLIENT_SECRET=${GEN_OAUTH_SECRET}" \ + --silent + unset GEN_OAUTH_SECRET + fi eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/monitoring" --format=dotenv-export --silent)" + eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" --format=dotenv-export --silent)" export GRAFANA_ADMIN_USER="${GRAFANA_ADMIN_USER:-admin}" export GRAFANA_ADMIN_PASSWORD="${GRAFANA_ADMIN_PASSWORD:-}" + export GRAFANA_OAUTH_CLIENT_SECRET="${GRAFANA_OAUTH_CLIENT_SECRET:-}" + extra+=(-e "grafana_oauth_client_secret=${GRAFANA_OAUTH_CLIENT_SECRET:-}") ;; rus-central) input_email="${INPUT_LETSENCRYPT_EMAIL:-}" diff --git a/ansible/roles/core-mon/monitoring/defaults/main.yml b/ansible/roles/core-mon/monitoring/defaults/main.yml index 1b5cfbf..1c3cb3e 100644 --- a/ansible/roles/core-mon/monitoring/defaults/main.yml +++ b/ansible/roles/core-mon/monitoring/defaults/main.yml @@ -5,6 +5,7 @@ prometheus_retention: "30d" grafana_admin_user: "{{ lookup('ansible.builtin.env', 'GRAFANA_ADMIN_USER', default='admin') }}" grafana_admin_password: "{{ lookup('ansible.builtin.env', 'GRAFANA_ADMIN_PASSWORD', default='') }}" grafana_root_url: "https://graf.gunihome.ru" +grafana_oauth_client_secret: "{{ lookup('ansible.builtin.env', 'GRAFANA_OAUTH_CLIENT_SECRET', default='') }}" ntfy_base_url: "https://ntfy.gunihome.ru" ntfy_default_topic: "homelab-alerts" diff --git a/ansible/roles/core-mon/monitoring/tasks/main.yml b/ansible/roles/core-mon/monitoring/tasks/main.yml index de8bc24..fd67af8 100644 --- a/ansible/roles/core-mon/monitoring/tasks/main.yml +++ b/ansible/roles/core-mon/monitoring/tasks/main.yml @@ -1,4 +1,10 @@ --- +- name: Проверить наличие секрета Grafana OAuth + ansible.builtin.assert: + that: + - grafana_oauth_client_secret is defined and grafana_oauth_client_secret | length > 0 + fail_msg: "Секрет GRAFANA_OAUTH_CLIENT_SECRET не передан!" + - name: Создать базовые каталоги мониторинга ansible.builtin.file: path: "{{ item.path }}" diff --git a/ansible/roles/core-mon/monitoring/templates/compose.yaml.j2 b/ansible/roles/core-mon/monitoring/templates/compose.yaml.j2 index 4ad37b7..ca1d55d 100644 --- a/ansible/roles/core-mon/monitoring/templates/compose.yaml.j2 +++ b/ansible/roles/core-mon/monitoring/templates/compose.yaml.j2 @@ -57,6 +57,17 @@ services: - GF_SECURITY_ADMIN_PASSWORD={{ grafana_admin_password }} - GF_USERS_ALLOW_SIGN_UP=false - GF_SERVER_ROOT_URL={{ grafana_root_url }} + - GF_AUTH_GENERIC_OAUTH_ENABLED=true + - GF_AUTH_GENERIC_OAUTH_NAME=Authentik + - GF_AUTH_GENERIC_OAUTH_CLIENT_ID=grafana + - GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET={{ grafana_oauth_client_secret }} + - GF_AUTH_GENERIC_OAUTH_SCOPES=openid email profile + - GF_AUTH_GENERIC_OAUTH_AUTH_URL=https://auth.gunihome.ru/application/o/authorize/ + - GF_AUTH_GENERIC_OAUTH_TOKEN_URL=https://auth.gunihome.ru/application/o/token/ + - GF_AUTH_GENERIC_OAUTH_API_URL=https://auth.gunihome.ru/application/o/userinfo/ + - GF_AUTH_GENERIC_OAUTH_ALLOW_SIGN_UP=true + - "GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_PATH=contains(groups[*], 'admins') && 'Admin' || 'Viewer'" + - GF_AUTH_GENERIC_OAUTH_ALLOW_ASSIGN_GRAFANA_ADMIN=true volumes: - ./grafana_data:/var/lib/grafana - ./grafana/provisioning:/etc/grafana/provisioning:ro diff --git a/ansible/roles/core-net/authentik/defaults/main.yml b/ansible/roles/core-net/authentik/defaults/main.yml index e8f1f10..c322c9f 100644 --- a/ansible/roles/core-net/authentik/defaults/main.yml +++ b/ansible/roles/core-net/authentik/defaults/main.yml @@ -4,4 +4,5 @@ authentik_dir: "/opt/authentik" authentik_http_port: 9000 authentik_secret_key: "{{ lookup('env', 'AUTHENTIK_SECRET_KEY') }}" authentik_postgres_password: "{{ lookup('env', 'AUTHENTIK_POSTGRES_PASSWORD') }}" +grafana_oauth_client_secret: "{{ lookup('env', 'GRAFANA_OAUTH_CLIENT_SECRET') }}" diff --git a/ansible/roles/core-net/authentik/files/blueprints/traefik-dashboard.yaml b/ansible/roles/core-net/authentik/files/blueprints/traefik-dashboard.yaml index a0a8c8e..8a91e07 100644 --- a/ansible/roles/core-net/authentik/files/blueprints/traefik-dashboard.yaml +++ b/ansible/roles/core-net/authentik/files/blueprints/traefik-dashboard.yaml @@ -3,13 +3,18 @@ version: 1 metadata: name: traefik-dashboard labels: - blueprints.goauthentik.io/description: "Панель Traefik только для группы admins" + blueprints.goauthentik.io/description: "Панель Traefik и Ntfy Forward-auth" entries: - model: authentik_core.group id: group-admins identifiers: name: admins + - model: authentik_core.group + id: group-family + identifiers: + name: family + - model: authentik_providers_proxy.proxyprovider id: provider-traefik-dashboard identifiers: @@ -37,6 +42,41 @@ entries: attrs: group: !KeyOf group-admins + - model: authentik_providers_proxy.proxyprovider + id: provider-ntfy + identifiers: + name: ntfy + attrs: + mode: forward_single + external_host: https://ntfy.gunihome.ru + intercept_header_auth: true + authorization_flow: !Find [authentik_flows.flow, [slug, default-provider-authorization-implicit-consent]] + invalidation_flow: !Find [authentik_flows.flow, [slug, default-provider-invalidation-flow]] + + - model: authentik_core.application + id: app-ntfy + identifiers: + slug: ntfy + attrs: + name: Ntfy + meta_launch_url: https://ntfy.gunihome.ru + policy_engine_mode: any + provider: !KeyOf provider-ntfy + + - model: authentik_policies.policybinding + identifiers: + order: 0 + target: !KeyOf app-ntfy + attrs: + group: !KeyOf group-admins + + - model: authentik_policies.policybinding + identifiers: + order: 1 + target: !KeyOf app-ntfy + attrs: + group: !KeyOf group-family + # providers ниже — полный список embedded outpost. # Новый proxy-провайдер добавляется в этот файл, а не только в интерфейсе. - model: authentik_outposts.outpost @@ -49,4 +89,4 @@ entries: authentik_host: https://auth.gunihome.ru providers: - !KeyOf provider-traefik-dashboard - + - !KeyOf provider-ntfy diff --git a/ansible/roles/core-net/authentik/tasks/main.yml b/ansible/roles/core-net/authentik/tasks/main.yml index fe34931..407fe12 100644 --- a/ansible/roles/core-net/authentik/tasks/main.yml +++ b/ansible/roles/core-net/authentik/tasks/main.yml @@ -19,7 +19,8 @@ that: - authentik_secret_key is defined and authentik_secret_key | length > 0 - authentik_postgres_password is defined and authentik_postgres_password | length > 0 - fail_msg: "Один или оба секрета Authentik (AUTHENTIK_SECRET_KEY, AUTHENTIK_POSTGRES_PASSWORD) не переданы через переменные окружения!" + - grafana_oauth_client_secret is defined and grafana_oauth_client_secret | length > 0 + fail_msg: "Один или несколько секретов Authentik (AUTHENTIK_SECRET_KEY, AUTHENTIK_POSTGRES_PASSWORD, GRAFANA_OAUTH_CLIENT_SECRET) не переданы!" - name: Установить compose.yaml для Authentik ansible.builtin.template: @@ -30,7 +31,7 @@ mode: "0600" no_log: true -- name: Синхронизировать blueprints Authentik +- name: Синхронизировать статические blueprints Authentik ansible.builtin.copy: src: blueprints/ dest: "{{ authentik_dir }}/blueprints/" @@ -39,6 +40,16 @@ mode: "0644" register: authentik_blueprint +- name: Установить шаблонные blueprints Authentik + ansible.builtin.template: + src: blueprints/grafana.yaml.j2 + dest: "{{ authentik_dir }}/blueprints/grafana.yaml" + owner: root + group: root + mode: "0644" + register: authentik_blueprint_grafana + no_log: true + - name: Запустить сервисы Authentik через Docker Compose ansible.builtin.command: docker compose -f {{ authentik_dir }}/compose.yaml up -d --remove-orphans register: compose_up @@ -46,7 +57,15 @@ - name: Перезапустить воркер Authentik при обновлении blueprints ansible.builtin.command: docker compose -f {{ authentik_dir }}/compose.yaml restart authentik-worker - when: authentik_blueprint.changed and not compose_up.changed + when: (authentik_blueprint.changed or authentik_blueprint_grafana.changed) and not compose_up.changed + +- name: Применить blueprints Authentik в authentik-server + ansible.builtin.command: > + docker compose -f {{ authentik_dir }}/compose.yaml exec -T authentik-server + ak apply_blueprint /blueprints/custom/traefik-dashboard.yaml /blueprints/custom/grafana.yaml + when: authentik_blueprint.changed or authentik_blueprint_grafana.changed or compose_up.changed + register: apply_blueprints_cmd + changed_when: true diff --git a/ansible/roles/core-net/authentik/templates/blueprints/grafana.yaml.j2 b/ansible/roles/core-net/authentik/templates/blueprints/grafana.yaml.j2 new file mode 100644 index 0000000..a97ade7 --- /dev/null +++ b/ansible/roles/core-net/authentik/templates/blueprints/grafana.yaml.j2 @@ -0,0 +1,59 @@ +# yaml-language-server: $schema=https://goauthentik.io/blueprints/schema.json +version: 1 +metadata: + name: grafana-sso + labels: + blueprints.goauthentik.io/description: "Grafana OAuth2 Provider" +entries: + - model: authentik_core.group + id: group-admins + identifiers: + name: admins + + - model: authentik_core.group + id: group-family + identifiers: + name: family + + - model: authentik_providers_oauth2.oauth2provider + id: provider-grafana + identifiers: + name: grafana + attrs: + client_type: confidential + client_id: grafana + client_secret: {{ grafana_oauth_client_secret | to_json }} + redirect_uris: + - matching_mode: strict + url: https://graf.gunihome.ru/login/generic_oauth + authorization_flow: !Find [authentik_flows.flow, [slug, default-provider-authorization-implicit-consent]] + invalidation_flow: !Find [authentik_flows.flow, [slug, default-provider-invalidation-flow]] + signing_key: !Find [authentik_crypto.certificatekeypair, [name, "authentik Self-signed Certificate"]] + property_mappings: + - !Find [authentik_providers_oauth2.scopemapping, [scope_name, openid]] + - !Find [authentik_providers_oauth2.scopemapping, [scope_name, email]] + - !Find [authentik_providers_oauth2.scopemapping, [scope_name, profile]] + + - model: authentik_core.application + id: app-grafana + identifiers: + slug: grafana + attrs: + name: Grafana + meta_launch_url: https://graf.gunihome.ru + policy_engine_mode: any + provider: !KeyOf provider-grafana + + - model: authentik_policies.policybinding + identifiers: + order: 0 + target: !KeyOf app-grafana + attrs: + group: !KeyOf group-admins + + - model: authentik_policies.policybinding + identifiers: + order: 1 + target: !KeyOf app-grafana + attrs: + group: !KeyOf group-family diff --git a/ansible/roles/core-net/traefik/files/dynamic/ntfy.yml b/ansible/roles/core-net/traefik/files/dynamic/ntfy.yml index f1bbf05..7a76643 100644 --- a/ansible/roles/core-net/traefik/files/dynamic/ntfy.yml +++ b/ansible/roles/core-net/traefik/files/dynamic/ntfy.yml @@ -5,6 +5,17 @@ http: entryPoints: - websecure service: ntfy + middlewares: + - authentik@file + tls: + certResolver: letsencrypt + + ntfy-outpost: + rule: "Host(`ntfy.gunihome.ru`) && PathPrefix(`/outpost.goauthentik.io/`)" + entryPoints: + - websecure + service: authentik@file + priority: 100 tls: certResolver: letsencrypt @@ -13,4 +24,3 @@ http: loadBalancer: servers: - url: "http://192.168.1.108:80" -