fix(security): move dashboard auth and netbird secrets to Infisical lifecycle
ansible-core-net / deploy (push) Successful in 21s
ansible-core-net / deploy (push) Successful in 21s
This commit is contained in:
1 parent
309b6538d0
commit
4ab29058fe
7 files changed
+58
-61
No files matched your search
@@ -41,7 +41,13 @@ jobs:
|
|||||||
--client-secret="${INFISICAL_CLIENT_SECRET}" \
|
--client-secret="${INFISICAL_CLIENT_SECRET}" \
|
||||||
--plain)
|
--plain)
|
||||||
|
|
||||||
|
# Проверяем и при необходимости инициализируем TRAEFIK_DASHBOARD_AUTH в /ci-cd
|
||||||
|
if ! infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/ci-cd" --format=dotenv-export --silent | grep -q 'TRAEFIK_DASHBOARD_AUTH'; then
|
||||||
|
infisical secrets set --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/ci-cd" "TRAEFIK_DASHBOARD_AUTH=karpenok:\$apr1\$dYhfMHp0\$/xqbASu5jj55Ev058YImp." --silent
|
||||||
|
fi
|
||||||
|
|
||||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/ci-cd" --format=dotenv-export --silent)"
|
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/ci-cd" --format=dotenv-export --silent)"
|
||||||
|
export TRAEFIK_DASHBOARD_AUTH="${TRAEFIK_DASHBOARD_AUTH:-}"
|
||||||
|
|
||||||
if [ -z "${RUNNER_SSH_KEY:-}" ]; then
|
if [ -z "${RUNNER_SSH_KEY:-}" ]; then
|
||||||
echo "В Infisical (/ci-cd) отсутствует RUNNER_SSH_KEY" >&2
|
echo "В Infisical (/ci-cd) отсутствует RUNNER_SSH_KEY" >&2
|
||||||
|
|||||||
@@ -49,6 +49,29 @@ jobs:
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
install -d -m 700 "${HOME}/.ssh"
|
||||||
|
printf '%s\n' "${RUNNER_SSH_KEY}" > "${HOME}/.ssh/id_ed25519"
|
||||||
|
chmod 600 "${HOME}/.ssh/id_ed25519"
|
||||||
|
trap 'rm -f "${HOME}/.ssh/id_ed25519"' EXIT
|
||||||
|
|
||||||
|
# Проверяем наличие ключей NetBird в /services/netbird в Infisical.
|
||||||
|
# Если они еще не в Infisical, но есть на рабочем VPS — автоматически переносим их в Infisical.
|
||||||
|
if ! infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/netbird" --format=dotenv-export --silent 2>/dev/null | grep -q 'NETBIRD_AUTH_SECRET'; then
|
||||||
|
if ssh -i "${HOME}/.ssh/id_ed25519" -o StrictHostKeyChecking=no root@45.154.185.208 "test -f /opt/netbird/.env"; then
|
||||||
|
ssh -i "${HOME}/.ssh/id_ed25519" -o StrictHostKeyChecking=no root@45.154.185.208 "cat /opt/netbird/.env" > /tmp/netbird.env
|
||||||
|
infisical secrets set --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/netbird" --file=/tmp/netbird.env --silent
|
||||||
|
rm -f /tmp/netbird.env
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Подтягиваем боевые ключи NetBird из Infisical
|
||||||
|
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/netbird" --format=dotenv-export --silent)"
|
||||||
|
export NETBIRD_AUTH_SECRET="${NETBIRD_AUTH_SECRET:-}"
|
||||||
|
export NETBIRD_DATASTORE_KEY="${NETBIRD_DATASTORE_KEY:-}"
|
||||||
|
export NETBIRD_SESSION_KEY="${NETBIRD_SESSION_KEY:-}"
|
||||||
|
export NETBIRD_DOMAIN="${NETBIRD_DOMAIN:-}"
|
||||||
|
export NETBIRD_LETSENCRYPT_EMAIL="${NETBIRD_LETSENCRYPT_EMAIL:-}"
|
||||||
|
|
||||||
rm -rf "${HOME}/homelab-infra"
|
rm -rf "${HOME}/homelab-infra"
|
||||||
git clone http://192.168.1.217:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra"
|
git clone http://192.168.1.217:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra"
|
||||||
sha="${GITHUB_SHA:-${GITEA_SHA:-}}"
|
sha="${GITHUB_SHA:-${GITEA_SHA:-}}"
|
||||||
@@ -57,11 +80,6 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
chmod -R go-w "${HOME}/homelab-infra"
|
chmod -R go-w "${HOME}/homelab-infra"
|
||||||
|
|
||||||
install -d -m 700 "${HOME}/.ssh"
|
|
||||||
printf '%s\n' "${RUNNER_SSH_KEY}" > "${HOME}/.ssh/id_ed25519"
|
|
||||||
chmod 600 "${HOME}/.ssh/id_ed25519"
|
|
||||||
trap 'rm -f "${HOME}/.ssh/id_ed25519"' EXIT
|
|
||||||
|
|
||||||
export ANSIBLE_HOST_KEY_CHECKING=False
|
export ANSIBLE_HOST_KEY_CHECKING=False
|
||||||
cd "${HOME}/homelab-infra/ansible"
|
cd "${HOME}/homelab-infra/ansible"
|
||||||
|
|
||||||
|
|||||||
@@ -4,3 +4,4 @@ traefik_dir: "/opt/traefik"
|
|||||||
traefik_dynamic_dir: "/opt/traefik/dynamic"
|
traefik_dynamic_dir: "/opt/traefik/dynamic"
|
||||||
traefik_log_dir: "/var/log/traefik"
|
traefik_log_dir: "/var/log/traefik"
|
||||||
traefik_acme_email: "vvkarpenok@gmail.com"
|
traefik_acme_email: "vvkarpenok@gmail.com"
|
||||||
|
traefik_dashboard_auth: "{{ lookup('env', 'TRAEFIK_DASHBOARD_AUTH') }}"
|
||||||
@@ -60,6 +60,12 @@
|
|||||||
group: root
|
group: root
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
|
|
||||||
|
- name: Проверить наличие обязательных секретов Traefik
|
||||||
|
ansible.builtin.assert:
|
||||||
|
that:
|
||||||
|
- traefik_dashboard_auth is defined and traefik_dashboard_auth | length > 0
|
||||||
|
fail_msg: "Переменная TRAEFIK_DASHBOARD_AUTH не передана из Infisical!"
|
||||||
|
|
||||||
- name: Синхронизировать динамические конфигурации маршрутов
|
- name: Синхронизировать динамические конфигурации маршрутов
|
||||||
ansible.builtin.copy:
|
ansible.builtin.copy:
|
||||||
src: dynamic/
|
src: dynamic/
|
||||||
@@ -68,6 +74,14 @@
|
|||||||
group: root
|
group: root
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
|
|
||||||
|
- name: Установить конфигурацию Traefik dashboard
|
||||||
|
ansible.builtin.template:
|
||||||
|
src: dynamic/dashboard.yml.j2
|
||||||
|
dest: "{{ traefik_dynamic_dir }}/dashboard.yml"
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: "0644"
|
||||||
|
|
||||||
- name: Найти существующие файлы маршрутов на сервере
|
- name: Найти существующие файлы маршрутов на сервере
|
||||||
ansible.builtin.find:
|
ansible.builtin.find:
|
||||||
paths: "{{ traefik_dynamic_dir }}"
|
paths: "{{ traefik_dynamic_dir }}"
|
||||||
@@ -80,7 +94,7 @@
|
|||||||
state: absent
|
state: absent
|
||||||
loop: "{{ remote_dynamic_files.files }}"
|
loop: "{{ remote_dynamic_files.files }}"
|
||||||
vars:
|
vars:
|
||||||
repo_files: "{{ q('fileglob', role_path ~ '/files/dynamic/*.yml') | map('basename') | list }}"
|
repo_files: "{{ (q('fileglob', role_path ~ '/files/dynamic/*.yml') | map('basename') | list) + ['dashboard.yml'] }}"
|
||||||
when: item.path | basename not in repo_files
|
when: item.path | basename not in repo_files
|
||||||
|
|
||||||
- name: Запустить Traefik через Docker Compose
|
- name: Запустить Traefik через Docker Compose
|
||||||
|
|||||||
+1
-2
@@ -14,5 +14,4 @@ http:
|
|||||||
dashboard-auth:
|
dashboard-auth:
|
||||||
basicAuth:
|
basicAuth:
|
||||||
users:
|
users:
|
||||||
- "karpenok:$apr1$dYhfMHp0$/xqbASu5jj55Ev058YImp."
|
- "{{ traefik_dashboard_auth }}"
|
||||||
|
|
||||||
@@ -5,4 +5,9 @@ netbird_ports:
|
|||||||
- 443/tcp
|
- 443/tcp
|
||||||
- 3478/udp
|
- 3478/udp
|
||||||
|
|
||||||
netbird_letsencrypt_email: "{{ letsencrypt_email | default(admin_email) }}"
|
netbird_domain: "{{ lookup('env', 'NETBIRD_DOMAIN') | default('central.myguni.ru', true) }}"
|
||||||
|
netbird_letsencrypt_email: "{{ lookup('env', 'NETBIRD_LETSENCRYPT_EMAIL') | default(letsencrypt_email | default(admin_email | default('vvkarpenok@gmail.com')), true) }}"
|
||||||
|
|
||||||
|
netbird_auth_secret: "{{ lookup('env', 'NETBIRD_AUTH_SECRET') }}"
|
||||||
|
netbird_datastore_key: "{{ lookup('env', 'NETBIRD_DATASTORE_KEY') }}"
|
||||||
|
netbird_session_key: "{{ lookup('env', 'NETBIRD_SESSION_KEY') }}"
|
||||||
@@ -18,60 +18,14 @@
|
|||||||
group: root
|
group: root
|
||||||
mode: "0700"
|
mode: "0700"
|
||||||
|
|
||||||
- name: Проверить, созданы ли уже ключи
|
- name: Проверить наличие обязательных секретов NetBird
|
||||||
ansible.builtin.stat:
|
|
||||||
path: "{{ netbird_dir }}/.env"
|
|
||||||
register: netbird_env
|
|
||||||
tags:
|
|
||||||
- config
|
|
||||||
|
|
||||||
- name: Проверить почту Let's Encrypt
|
|
||||||
ansible.builtin.assert:
|
ansible.builtin.assert:
|
||||||
that:
|
that:
|
||||||
- netbird_letsencrypt_email is defined
|
- netbird_auth_secret is defined and netbird_auth_secret | length > 0
|
||||||
- netbird_letsencrypt_email | length > 3
|
- netbird_datastore_key is defined and netbird_datastore_key | length > 0
|
||||||
fail_msg: Укажите почту Let's Encrypt при запуске плейбука.
|
- netbird_session_key is defined and netbird_session_key | length > 0
|
||||||
when: not netbird_env.stat.exists
|
- netbird_letsencrypt_email is defined and netbird_letsencrypt_email | length > 3
|
||||||
|
fail_msg: "Один или несколько обязательных секретов NetBird (NETBIRD_AUTH_SECRET, NETBIRD_DATASTORE_KEY, NETBIRD_SESSION_KEY, NETBIRD_LETSENCRYPT_EMAIL) не переданы из Infisical!"
|
||||||
- name: Сгенерировать ключи панели
|
|
||||||
ansible.builtin.shell: openssl rand -base64 32 | tr -d '\n'
|
|
||||||
register: netbird_generated_keys
|
|
||||||
changed_when: false
|
|
||||||
no_log: true
|
|
||||||
loop:
|
|
||||||
- auth
|
|
||||||
- datastore
|
|
||||||
- session
|
|
||||||
when: not netbird_env.stat.exists and netbird_auth_secret is not defined
|
|
||||||
|
|
||||||
- name: Запомнить новые ключи
|
|
||||||
ansible.builtin.set_fact:
|
|
||||||
netbird_auth_secret: "{{ netbird_generated_keys.results[0].stdout }}"
|
|
||||||
netbird_datastore_key: "{{ netbird_generated_keys.results[1].stdout }}"
|
|
||||||
netbird_session_key: "{{ netbird_generated_keys.results[2].stdout }}"
|
|
||||||
no_log: true
|
|
||||||
when: not netbird_env.stat.exists and netbird_auth_secret is not defined
|
|
||||||
|
|
||||||
- name: Прочитать сохранённые ключи
|
|
||||||
ansible.builtin.slurp:
|
|
||||||
src: "{{ netbird_dir }}/.env"
|
|
||||||
register: netbird_env_raw
|
|
||||||
no_log: true
|
|
||||||
when: netbird_env.stat.exists and netbird_auth_secret is not defined
|
|
||||||
tags:
|
|
||||||
- config
|
|
||||||
|
|
||||||
- name: Разобрать сохранённые ключи
|
|
||||||
ansible.builtin.set_fact:
|
|
||||||
netbird_auth_secret: "{{ env_map['NETBIRD_AUTH_SECRET'] }}"
|
|
||||||
netbird_datastore_key: "{{ env_map['NETBIRD_DATASTORE_KEY'] }}"
|
|
||||||
netbird_session_key: "{{ env_map['NETBIRD_SESSION_KEY'] }}"
|
|
||||||
netbird_letsencrypt_email: "{{ env_map['NETBIRD_LETSENCRYPT_EMAIL'] }}"
|
|
||||||
vars:
|
|
||||||
env_lines: "{{ (netbird_env_raw.content | b64decode).splitlines() | reject('equalto', '') | list }}"
|
|
||||||
env_map: "{{ dict(env_lines | map('split', '=', 1)) }}"
|
|
||||||
no_log: true
|
|
||||||
when: netbird_env.stat.exists and netbird_auth_secret is not defined
|
|
||||||
tags:
|
tags:
|
||||||
- config
|
- config
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user