From 901448a3a2a2adcd9c2bf4250dbc756ce4e61561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=9F=D0=BE=D1=80=D1=8F=D0=B4=D0=B8=D0=BD?= Date: Thu, 14 May 2026 17:38:10 +0300 Subject: [PATCH 1/4] feat(secrets): add recovery inventory --- .gitignore | 1 + secrets/secret-mapping.yaml | 148 ++++++ secrets/secrets-inventory.yaml | 898 +++++++++++++++++++++++++++++++++ secrets/targets.env.example | 7 + 4 files changed, 1054 insertions(+) create mode 100644 secrets/secret-mapping.yaml create mode 100644 secrets/secrets-inventory.yaml create mode 100644 secrets/targets.env.example diff --git a/.gitignore b/.gitignore index f971439..dc22e3b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ .pytest_cache/ __pycache__/ *.pyc +.secrets-recovery/ diff --git a/secrets/secret-mapping.yaml b/secrets/secret-mapping.yaml new file mode 100644 index 0000000..b6f45d9 --- /dev/null +++ b/secrets/secret-mapping.yaml @@ -0,0 +1,148 @@ +# Logical secret groups. Values are intentionally omitted. +# ASSUMPTION comments mark groups that must be verified after secrets-pull.sh. + +- logical: staging-ssh-key + description: "SSH private key for staging deployments" + bw_item: "Staging SSH private key" + # ASSUMPTION: verify core, telegram-frontend, mobile-app PWA, and ops staging keys are the same key before deduplicating. + used_as: + - {repo: core, name: DEV_SSH_KEY} + - {repo: telegram-frontend, name: DEV_SSH_KEY} + - {repo: mobile-app, name: SSH_KEY} + - {repo: ops, name: OPS_SSH_KEY} + +- logical: ops-vds-ssh-key + description: "SSH private key for ops VDS" + bw_item: "Ops VDS SSH private key" + used_as: + - {repo: ops, name: OPS_VDS_SSH_KEY} + +- logical: web-ssh-key + description: "SSH private key for web deployment target" + bw_item: "Web SSH private key" + # ASSUMPTION: verify whether this is distinct from the staging SSH key. + used_as: + - {repo: web, name: SSH_KEY} + +- logical: ghcr-pull-token + description: "PAT for pull/push access to GHCR packages" + bw_item: "GHCR pull token" + # ASSUMPTION: verify all GHCR PAT variables use the same token before deduplicating. + used_as: + - {repo: core, name: DEV_GHCR_PAT} + - {repo: telegram-frontend, name: DEV_GHCR_PAT} + - {repo: web, name: GHCR_PAT} + - {repo: mobile-app, name: GHCR_PAT} + - {repo: ops, name: AGENT_GHCR_TOKEN} + +- logical: ghcr-username + description: "GHCR username used by deploy workflows" + bw_item: "GHCR username" + # ASSUMPTION: verify all GHCR username variables point to the same account. + used_as: + - {repo: core, name: DEV_GHCR_USER} + - {repo: telegram-frontend, name: DEV_GHCR_USER} + - {repo: web, name: GHCR_USER} + - {repo: mobile-app, name: GHCR_USER} + - {repo: ops, name: AGENT_GHCR_USER} + +- logical: dockerhub-token + description: "Docker Hub access token for pulls from Docker Hub" + bw_item: "Docker Hub token" + used_as: + - {repo: ops, name: DOCKERHUB_TOKEN} + +- logical: dockerhub-username + description: "Docker Hub username" + bw_item: "Docker Hub username" + used_as: + - {repo: ops, name: DOCKERHUB_USER} + +- logical: s3-staging-media + description: "S3 credentials for private staging tutor media" + bw_item: "S3 staging media credentials" + used_as: + - {repo: core, name: DEV_S3_ACCESS_KEY_ID} + - {repo: core, name: DEV_S3_SECRET_ACCESS_KEY} + - {repo: core, name: DEV_S3_BUCKET} + - {repo: core, name: DEV_S3_REGION} + - {repo: core, name: DEV_S3_ENDPOINT_URL} + +- logical: s3-apk-storage + description: "S3 credentials for Android APK distribution storage" + bw_item: "S3 APK storage credentials" + # ASSUMPTION: probably distinct from staging media and backup credentials. + used_as: + - {repo: mobile-app, name: APK_S3_ACCESS_KEY_ID} + - {repo: mobile-app, name: APK_S3_SECRET_ACCESS_KEY} + - {repo: mobile-app, name: APK_S3_BUCKET} + - {repo: mobile-app, name: APK_S3_REGION} + - {repo: mobile-app, name: APK_S3_ENDPOINT_URL} + +- logical: s3-db-backups + description: "S3 credentials for database backups" + bw_item: "S3 database backup credentials" + # ASSUMPTION: probably distinct from staging media and APK credentials. + used_as: + - {repo: ops, name: BACKUP_S3_KEY_ID} + - {repo: ops, name: BACKUP_S3_SECRET} + - {repo: ops, name: BACKUP_S3_BUCKET} + - {repo: ops, name: BACKUP_S3_REGION} + +- logical: telegram-main-bot + description: "Primary product Telegram bot token" + bw_item: "Telegram main bot token" + used_as: + - {repo: telegram-frontend, name: DEV_BOT_TOKEN} + +- logical: telegram-deploy-notify-bot + description: "Telegram bot token for deployment notifications" + bw_item: "Telegram deploy notifications bot token" + # ASSUMPTION: verify core and telegram-frontend use the same deploy notification bot. + used_as: + - {repo: core, name: DEV_NOTIFY_BOT_TOKEN} + - {repo: telegram-frontend, name: DEV_NOTIFY_BOT_TOKEN} + +- logical: telegram-ops-bot + description: "Telegram bot token for ops notifications" + bw_item: "Telegram ops bot token" + # ASSUMPTION: verify mobile-app and ops use the same ops notification bot. + used_as: + - {repo: mobile-app, name: OPS_TG_TOKEN} + - {repo: ops, name: OPS_TG_TOKEN} + +- logical: telegram-alert-agent-bot + description: "Telegram bot token for alert-agent" + bw_item: "Telegram alert-agent bot token" + used_as: + - {repo: ops, name: AGENT_BOT_TOKEN} + +- logical: sentry-glitchtip-staging + description: "Sentry/GlitchTip DSN for staging services" + bw_item: "Sentry staging DSN" + # ASSUMPTION: verify backend, mobile, and web staging DSNs are intended to share one project or split projects. + used_as: + - {repo: core, name: SENTRY_DSN_STAGING} + - {repo: mobile-app, name: SENTRY_DSN_STAGING} + - {repo: web, name: SENTRY_DSN_STAGING} + +- logical: sentry-glitchtip-production + description: "Sentry/GlitchTip DSN for production clients" + bw_item: "Sentry production DSN" + # ASSUMPTION: verify mobile and web production DSNs are intended to share one project or split projects. + used_as: + - {repo: mobile-app, name: SENTRY_DSN_PRODUCTION} + - {repo: web, name: SENTRY_DSN_PRODUCTION} + +- logical: glitchtip-server-secrets + description: "GlitchTip server runtime secrets" + bw_item: "GlitchTip server secrets" + used_as: + - {repo: ops, name: GLITCHTIP_SECRET_KEY} + - {repo: ops, name: GLITCHTIP_DB_PASSWORD} + +- logical: grafana-admin-password + description: "Grafana admin password" + bw_item: "Grafana admin password" + used_as: + - {repo: ops, name: GRAFANA_ADMIN_PASSWORD} diff --git a/secrets/secrets-inventory.yaml b/secrets/secrets-inventory.yaml new file mode 100644 index 0000000..7eabdb0 --- /dev/null +++ b/secrets/secrets-inventory.yaml @@ -0,0 +1,898 @@ +# GitHub Actions secrets/config inventory for AssRep. +# This file contains names and metadata only. Do not add secret values here. + +- name: DEV_DATABASE_URL + repo: core + workflows: [build-deploy.yml, migrate.yml] + category: secret + purpose: "PostgreSQL DSN for staging" + recovery: ssh + recovery_hint: "staging VDS: $DEPLOY_PATH/.env, key DATABASE_URL" + bw_folder: core +- name: DEV_GHCR_USER + repo: core + workflows: [build-deploy.yml] + category: config + purpose: "GHCR username" + recovery: config + recovery_hint: "GitHub Actions secret value, repo/account setting" + bw_folder: core +- name: DEV_GHCR_PAT + repo: core + workflows: [build-deploy.yml] + category: secret + purpose: "GHCR pull/push PAT" + recovery: regenerate + recovery_hint: "Regenerate a GitHub PAT with required package permissions" + bw_folder: core +- name: DEV_SSH_HOST + repo: core + workflows: [build-deploy.yml, migrate.yml] + category: config + purpose: "SSH host for staging VDS" + recovery: config + recovery_hint: "staging VDS connection settings" + bw_folder: core +- name: DEV_SSH_USER + repo: core + workflows: [build-deploy.yml, migrate.yml] + category: config + purpose: "SSH user for staging VDS" + recovery: config + recovery_hint: "staging VDS connection settings" + bw_folder: core +- name: DEV_SSH_KEY + repo: core + workflows: [build-deploy.yml, migrate.yml] + category: secret + purpose: "SSH private key for staging VDS" + recovery: ssh-key + recovery_hint: "local laptop ~/.ssh; rotate if unavailable" + bw_folder: core +- name: DEV_SSH_PORT + repo: core + workflows: [build-deploy.yml, migrate.yml] + category: config + purpose: "SSH port for staging VDS" + recovery: config + recovery_hint: "staging VDS connection settings" + bw_folder: core +- name: DEV_DEPLOY_PATH + repo: core + workflows: [build-deploy.yml] + category: config + purpose: "Deployment path on staging VDS" + recovery: config + recovery_hint: "staging VDS deployment path" + bw_folder: core +- name: DEV_S3_ENDPOINT_URL + repo: core + workflows: [build-deploy.yml] + category: config + purpose: "S3 endpoint for staging media" + recovery: config + recovery_hint: "S3 provider console or backend.env" + bw_folder: core +- name: DEV_S3_REGION + repo: core + workflows: [build-deploy.yml] + category: config + purpose: "S3 region for staging media" + recovery: config + recovery_hint: "S3 provider console or backend.env" + bw_folder: core +- name: DEV_S3_ACCESS_KEY_ID + repo: core + workflows: [build-deploy.yml] + category: secret + purpose: "S3 access key id for staging media" + recovery: ssh + recovery_hint: "staging VDS backend.env or S3 provider console" + bw_folder: core +- name: DEV_S3_SECRET_ACCESS_KEY + repo: core + workflows: [build-deploy.yml] + category: secret + purpose: "S3 secret access key for staging media" + recovery: ssh + recovery_hint: "staging VDS backend.env or S3 provider console" + bw_folder: core +- name: DEV_S3_BUCKET + repo: core + workflows: [build-deploy.yml] + category: config + purpose: "S3 bucket for staging media" + recovery: config + recovery_hint: "S3 provider console or backend.env" + bw_folder: core +- name: DEV_S3_PUBLIC_BASE_URL + repo: core + workflows: [build-deploy.yml] + category: config + purpose: "S3 public base URL" + recovery: config + recovery_hint: "S3 provider console or backend.env" + bw_folder: core +- name: DEV_S3_PUBLIC_URL + repo: core + workflows: [build-deploy.yml] + category: config + purpose: "S3 public URL override" + recovery: config + recovery_hint: "S3 provider console or backend.env" + bw_folder: core +- name: DEV_S3_PRESIGN_EXPIRES + repo: core + workflows: [build-deploy.yml] + category: config + purpose: "Presigned URL TTL in seconds" + recovery: config + recovery_hint: "backend.env or desired operational default" + bw_folder: core +- name: DEV_CADDY_EMAIL + repo: core + workflows: [build-deploy.yml] + category: config + purpose: "Let's Encrypt email for Caddy" + recovery: config + recovery_hint: "Caddy deployment settings" + bw_folder: core +- name: DEV_NOTIFY_BOT_TOKEN + repo: core + workflows: [build-deploy.yml] + category: secret + purpose: "Telegram bot token for deployment notifications" + recovery: provider + recovery_hint: "@BotFather" + bw_folder: core +- name: DEV_NOTIFY_CHAT_ID + repo: core + workflows: [build-deploy.yml] + category: config + purpose: "Telegram chat id for deployment notifications" + recovery: config + recovery_hint: "Telegram chat/admin records" + bw_folder: core +- name: DEV_BOT_NOTIFY_URL + repo: core + workflows: [build-deploy.yml] + category: config + purpose: "Bot webhook URL for backend notifications" + recovery: config + recovery_hint: "staging compose network URL" + bw_folder: core +- name: DEV_LOG_ALERT_REGEX + repo: core + workflows: [build-deploy.yml] + category: config + purpose: "Regex for log-alert filtering" + recovery: config + recovery_hint: "workflow secret or deployment settings" + bw_folder: core +- name: SENTRY_DSN_STAGING + repo: core + workflows: [build-deploy.yml] + category: secret + purpose: "Sentry/GlitchTip DSN for staging backend" + recovery: provider + recovery_hint: "GlitchTip/Sentry project settings; fallback variable DEV_SENTRY_DSN" + bw_folder: core +- name: OPS_PRIVATE_IP + repo: core + workflows: [build-deploy.yml] + category: config + purpose: "Private IP of ops VDS" + recovery: config + recovery_hint: "cloud provider private network" + bw_folder: core + +- name: DEV_BOT_TOKEN + repo: telegram-frontend + workflows: [build-deploy.yml] + category: secret + purpose: "Main Telegram bot token" + recovery: provider + recovery_hint: "@BotFather" + bw_folder: telegram-frontend +- name: DEV_GHCR_USER + repo: telegram-frontend + workflows: [build-deploy.yml] + category: config + purpose: "GHCR username, likely same as core" + recovery: config + recovery_hint: "GitHub Actions secret value, repo/account setting" + bw_folder: telegram-frontend +- name: DEV_GHCR_PAT + repo: telegram-frontend + workflows: [build-deploy.yml] + category: secret + purpose: "GHCR PAT, likely same as core" + recovery: regenerate + recovery_hint: "Regenerate a GitHub PAT with required package permissions" + bw_folder: telegram-frontend +- name: DEV_SSH_HOST + repo: telegram-frontend + workflows: [build-deploy.yml] + category: config + purpose: "SSH host, likely same as core" + recovery: config + recovery_hint: "staging VDS connection settings" + bw_folder: telegram-frontend +- name: DEV_SSH_USER + repo: telegram-frontend + workflows: [build-deploy.yml] + category: config + purpose: "SSH user, likely same as core" + recovery: config + recovery_hint: "staging VDS connection settings" + bw_folder: telegram-frontend +- name: DEV_SSH_KEY + repo: telegram-frontend + workflows: [build-deploy.yml] + category: secret + purpose: "SSH private key, likely same as core" + recovery: ssh-key + recovery_hint: "local laptop ~/.ssh; rotate if unavailable" + bw_folder: telegram-frontend +- name: DEV_SSH_PORT + repo: telegram-frontend + workflows: [build-deploy.yml] + category: config + purpose: "SSH port, likely same as core" + recovery: config + recovery_hint: "staging VDS connection settings" + bw_folder: telegram-frontend +- name: DEV_NOTIFY_BOT_TOKEN + repo: telegram-frontend + workflows: [build-deploy.yml] + category: secret + purpose: "Telegram notification bot token, likely same as core" + recovery: provider + recovery_hint: "@BotFather" + bw_folder: telegram-frontend +- name: DEV_NOTIFY_CHAT_ID + repo: telegram-frontend + workflows: [build-deploy.yml] + category: config + purpose: "Telegram notification chat id, likely same as core" + recovery: config + recovery_hint: "Telegram chat/admin records" + bw_folder: telegram-frontend + +- name: EAS_PROJECT_ID + repo: mobile-app + workflows: [build-android-apk.yml, pwa-deploy.yml, mobile-beta-distribution.yml] + category: config + purpose: "Expo EAS project id" + recovery: config + recovery_hint: "expo.dev project settings" + bw_folder: mobile-app +- name: EXPO_OWNER + repo: mobile-app + workflows: [build-android-apk.yml, pwa-deploy.yml, mobile-beta-distribution.yml] + category: config + purpose: "Expo account owner" + recovery: config + recovery_hint: "expo.dev account/project settings" + bw_folder: mobile-app +- name: EXPO_TOKEN + repo: mobile-app + workflows: [build-android-apk.yml, pwa-deploy.yml, mobile-beta-distribution.yml] + category: secret + purpose: "Expo CLI access token" + recovery: regenerate + recovery_hint: "Regenerate in expo.dev account settings" + bw_folder: mobile-app +- name: APK_S3_ACCESS_KEY_ID + repo: mobile-app + workflows: [build-android-apk.yml, mobile-beta-distribution.yml] + category: secret + purpose: "S3 access key id for APK storage" + recovery: ssh + recovery_hint: "server env files or S3 provider console" + bw_folder: mobile-app +- name: APK_S3_SECRET_ACCESS_KEY + repo: mobile-app + workflows: [build-android-apk.yml, mobile-beta-distribution.yml] + category: secret + purpose: "S3 secret access key for APK storage" + recovery: ssh + recovery_hint: "server env files or S3 provider console" + bw_folder: mobile-app +- name: APK_S3_BUCKET + repo: mobile-app + workflows: [build-android-apk.yml, mobile-beta-distribution.yml] + category: config + purpose: "S3 bucket for APK storage" + recovery: config + recovery_hint: "S3 provider console or workflow settings" + bw_folder: mobile-app +- name: APK_S3_REGION + repo: mobile-app + workflows: [build-android-apk.yml, mobile-beta-distribution.yml] + category: config + purpose: "S3 region for APK storage" + recovery: config + recovery_hint: "S3 provider console or workflow settings" + bw_folder: mobile-app +- name: APK_S3_ENDPOINT_URL + repo: mobile-app + workflows: [build-android-apk.yml, mobile-beta-distribution.yml] + category: config + purpose: "S3 endpoint for APK storage" + recovery: config + recovery_hint: "S3 provider console or workflow settings" + bw_folder: mobile-app +- name: OPS_TG_TOKEN + repo: mobile-app + workflows: [build-android-apk.yml, mobile-beta-distribution.yml] + category: secret + purpose: "Telegram bot token for ops notifications" + recovery: provider + recovery_hint: "@BotFather" + bw_folder: mobile-app +- name: OPS_TG_CHAT_ID + repo: mobile-app + workflows: [build-android-apk.yml, mobile-beta-distribution.yml] + category: config + purpose: "Telegram chat id for ops notifications" + recovery: config + recovery_hint: "Telegram chat/admin records" + bw_folder: mobile-app +- name: GHCR_USER + repo: mobile-app + workflows: [pwa-deploy.yml] + category: config + purpose: "GHCR username for PWA deploy" + recovery: config + recovery_hint: "GitHub Actions secret value, repo/account setting" + bw_folder: mobile-app +- name: GHCR_PAT + repo: mobile-app + workflows: [pwa-deploy.yml] + category: secret + purpose: "GHCR PAT for PWA deploy" + recovery: regenerate + recovery_hint: "Regenerate a GitHub PAT with required package permissions" + bw_folder: mobile-app +- name: SSH_HOST + repo: mobile-app + workflows: [pwa-deploy.yml] + category: config + purpose: "SSH host for PWA target" + recovery: config + recovery_hint: "PWA target connection settings" + bw_folder: mobile-app +- name: SSH_USER + repo: mobile-app + workflows: [pwa-deploy.yml] + category: config + purpose: "SSH user for PWA target" + recovery: config + recovery_hint: "PWA target connection settings" + bw_folder: mobile-app +- name: SSH_KEY + repo: mobile-app + workflows: [pwa-deploy.yml] + category: secret + purpose: "SSH private key for PWA target" + recovery: ssh-key + recovery_hint: "local laptop ~/.ssh; rotate if unavailable" + bw_folder: mobile-app +- name: SSH_PORT + repo: mobile-app + workflows: [pwa-deploy.yml] + category: config + purpose: "SSH port for PWA target" + recovery: config + recovery_hint: "PWA target connection settings" + bw_folder: mobile-app +- name: SENTRY_DSN_STAGING + repo: mobile-app + workflows: [build-android-apk.yml, mobile-beta-distribution.yml] + category: secret + purpose: "Sentry/GlitchTip DSN for staging mobile" + recovery: provider + recovery_hint: "GlitchTip/Sentry project settings" + bw_folder: mobile-app +- name: SENTRY_DSN_PRODUCTION + repo: mobile-app + workflows: [build-android-apk.yml, mobile-beta-distribution.yml] + category: secret + purpose: "Sentry/GlitchTip DSN for production mobile" + recovery: provider + recovery_hint: "GlitchTip/Sentry project settings" + bw_folder: mobile-app + +- name: GHCR_USER + repo: web + workflows: [deploy.yml] + category: config + purpose: "GHCR username" + recovery: config + recovery_hint: "GitHub Actions secret value, repo/account setting" + bw_folder: web +- name: GHCR_PAT + repo: web + workflows: [deploy.yml] + category: secret + purpose: "GHCR PAT" + recovery: regenerate + recovery_hint: "Regenerate a GitHub PAT with required package permissions" + bw_folder: web +- name: SSH_HOST + repo: web + workflows: [deploy.yml] + category: config + purpose: "SSH host for web target" + recovery: config + recovery_hint: "web target connection settings" + bw_folder: web +- name: SSH_USER + repo: web + workflows: [deploy.yml] + category: config + purpose: "SSH user for web target" + recovery: config + recovery_hint: "web target connection settings" + bw_folder: web +- name: SSH_KEY + repo: web + workflows: [deploy.yml] + category: secret + purpose: "SSH private key for web target" + recovery: ssh-key + recovery_hint: "local laptop ~/.ssh; rotate if unavailable" + bw_folder: web +- name: SSH_PORT + repo: web + workflows: [deploy.yml] + category: config + purpose: "SSH port for web target" + recovery: config + recovery_hint: "web target connection settings" + bw_folder: web +- name: NEXT_PUBLIC_API_BASE_URL + repo: web + workflows: [deploy.yml] + category: config + purpose: "Public backend API URL" + recovery: config + recovery_hint: "public deployment URL" + bw_folder: web +- name: NEXT_PUBLIC_SITE_URL + repo: web + workflows: [deploy.yml] + category: config + purpose: "Public landing site URL" + recovery: config + recovery_hint: "public deployment URL" + bw_folder: web +- name: SENTRY_DSN_STAGING + repo: web + workflows: [deploy.yml] + category: secret + purpose: "Sentry/GlitchTip DSN for staging web" + recovery: provider + recovery_hint: "GlitchTip/Sentry project settings" + bw_folder: web +- name: SENTRY_DSN_PRODUCTION + repo: web + workflows: [deploy.yml] + category: secret + purpose: "Sentry/GlitchTip DSN for production web" + recovery: provider + recovery_hint: "GlitchTip/Sentry project settings" + bw_folder: web +- name: GITHUB_TOKEN + repo: web + workflows: [deploy.yml] + category: config + purpose: "Built-in GitHub Actions token; do not create in Bitwarden" + recovery: config + recovery_hint: "Provided by GitHub Actions at runtime" + bw_folder: web + skip_bitwarden: true + +- name: OPS_VDS_SSH_HOST + repo: ops + workflows: [deploy-ops-vds.yml] + category: config + purpose: "SSH host for ops VDS" + recovery: config + recovery_hint: "ops VDS connection settings" + bw_folder: ops +- name: OPS_VDS_SSH_USER + repo: ops + workflows: [deploy-ops-vds.yml] + category: config + purpose: "SSH user for ops VDS" + recovery: config + recovery_hint: "ops VDS connection settings" + bw_folder: ops +- name: OPS_VDS_SSH_PORT + repo: ops + workflows: [deploy-ops-vds.yml] + category: config + purpose: "SSH port for ops VDS" + recovery: config + recovery_hint: "ops VDS connection settings" + bw_folder: ops +- name: OPS_VDS_SSH_KEY + repo: ops + workflows: [deploy-ops-vds.yml] + category: secret + purpose: "SSH private key for ops VDS" + recovery: ssh-key + recovery_hint: "local laptop ~/.ssh; rotate if unavailable" + bw_folder: ops +- name: OPS_SSH_HOST + repo: ops + workflows: [deploy-staging-agents.yml, deploy-staging-services.yml] + category: config + purpose: "SSH host for staging agents/services" + recovery: config + recovery_hint: "staging VDS connection settings" + bw_folder: ops +- name: OPS_SSH_USER + repo: ops + workflows: [deploy-staging-agents.yml, deploy-staging-services.yml] + category: config + purpose: "SSH user for staging agents/services" + recovery: config + recovery_hint: "staging VDS connection settings" + bw_folder: ops +- name: OPS_SSH_PORT + repo: ops + workflows: [deploy-staging-agents.yml, deploy-staging-services.yml] + category: config + purpose: "SSH port for staging agents/services" + recovery: config + recovery_hint: "staging VDS connection settings" + bw_folder: ops +- name: OPS_SSH_KEY + repo: ops + workflows: [deploy-staging-agents.yml, deploy-staging-services.yml] + category: secret + purpose: "SSH private key for staging agents/services" + recovery: ssh-key + recovery_hint: "local laptop ~/.ssh; rotate if unavailable" + bw_folder: ops +- name: GLITCHTIP_DOMAIN + repo: ops + workflows: [deploy-ops-vds.yml] + category: config + purpose: "GlitchTip domain" + recovery: config + recovery_hint: "ops VDS Caddy/Ansible settings" + bw_folder: ops +- name: GLITCHTIP_SECRET_KEY + repo: ops + workflows: [deploy-ops-vds.yml] + category: secret + purpose: "Django SECRET_KEY for GlitchTip" + recovery: ssh + recovery_hint: "ops VDS env files" + bw_folder: ops +- name: GLITCHTIP_DB_PASSWORD + repo: ops + workflows: [deploy-ops-vds.yml] + category: secret + purpose: "PostgreSQL password for GlitchTip" + recovery: ssh + recovery_hint: "ops VDS env files" + bw_folder: ops +- name: CADDY_EMAIL + repo: ops + workflows: [deploy-ops-vds.yml] + category: config + purpose: "Let's Encrypt email for ops Caddy" + recovery: config + recovery_hint: "ops VDS Caddy settings" + bw_folder: ops +- name: OPS_TG_TOKEN + repo: ops + workflows: [deploy-ops-vds.yml, deploy-staging-agents.yml, deploy-staging-services.yml] + category: secret + purpose: "Telegram bot token for ops notifications" + recovery: provider + recovery_hint: "@BotFather" + bw_folder: ops +- name: OPS_TG_CHAT_ID + repo: ops + workflows: [deploy-ops-vds.yml, deploy-staging-agents.yml, deploy-staging-services.yml] + category: config + purpose: "Telegram chat id for ops notifications" + recovery: config + recovery_hint: "Telegram chat/admin records" + bw_folder: ops +- name: GRAFANA_DOMAIN + repo: ops + workflows: [deploy-ops-vds.yml] + category: config + purpose: "Grafana domain" + recovery: config + recovery_hint: "ops VDS Caddy/Grafana settings" + bw_folder: ops +- name: GRAFANA_ADMIN_PASSWORD + repo: ops + workflows: [deploy-ops-vds.yml] + category: secret + purpose: "Grafana admin password" + recovery: ssh + recovery_hint: "ops VDS env files" + bw_folder: ops +- name: DOCKERHUB_USER + repo: ops + workflows: [deploy-ops-vds.yml, deploy-staging-services.yml] + category: config + purpose: "Docker Hub username" + recovery: config + recovery_hint: "Docker Hub account settings" + bw_folder: ops +- name: DOCKERHUB_TOKEN + repo: ops + workflows: [deploy-ops-vds.yml, deploy-staging-services.yml] + category: secret + purpose: "Docker Hub access token" + recovery: regenerate + recovery_hint: "Regenerate in Docker Hub security settings" + bw_folder: ops +- name: PORTAINER_DOMAIN + repo: ops + workflows: [deploy-ops-vds.yml] + category: config + purpose: "Portainer domain" + recovery: config + recovery_hint: "ops VDS Caddy/Portainer settings" + bw_folder: ops +- name: STAGING_PRIVATE_IP + repo: ops + workflows: [deploy-ops-vds.yml, deploy-staging-agents.yml, deploy-staging-services.yml] + category: config + purpose: "Private IP of staging VDS" + recovery: config + recovery_hint: "cloud provider private network" + bw_folder: ops +- name: OPS_PRIVATE_IP + repo: ops + workflows: [deploy-ops-vds.yml, deploy-staging-agents.yml, deploy-staging-services.yml] + category: config + purpose: "Private IP of ops VDS" + recovery: config + recovery_hint: "cloud provider private network" + bw_folder: ops +- name: ALERT_AGENT_IMAGE + repo: ops + workflows: [deploy-ops-vds.yml] + category: config + purpose: "alert-agent container image" + recovery: config + recovery_hint: "workflow secret or default image" + bw_folder: ops +- name: ALERT_AGENT_PORT + repo: ops + workflows: [deploy-ops-vds.yml] + category: config + purpose: "alert-agent port" + recovery: config + recovery_hint: "workflow secret or default port" + bw_folder: ops +- name: ALERT_AGENT_MODEL + repo: ops + workflows: [deploy-ops-vds.yml] + category: config + purpose: "alert-agent LLM model" + recovery: config + recovery_hint: "workflow secret or model configuration" + bw_folder: ops +- name: ALERT_AGENT_SMALL_MODEL + repo: ops + workflows: [deploy-ops-vds.yml] + category: config + purpose: "alert-agent small LLM model" + recovery: config + recovery_hint: "workflow secret or model configuration" + bw_folder: ops +- name: AGENT_BOT_TOKEN + repo: ops + workflows: [deploy-ops-vds.yml] + category: secret + purpose: "Telegram bot token for alert-agent" + recovery: provider + recovery_hint: "@BotFather" + bw_folder: ops +- name: AGENT_BOT_CHAT_ID + repo: ops + workflows: [deploy-ops-vds.yml] + category: config + purpose: "Telegram chat id for alert-agent" + recovery: config + recovery_hint: "Telegram chat/admin records" + bw_folder: ops +- name: AGENT_GITHUB_TOKEN + repo: ops + workflows: [deploy-ops-vds.yml] + category: secret + purpose: "GitHub fine-grained PAT for alert-agent" + recovery: regenerate + recovery_hint: "Regenerate in GitHub developer settings" + bw_folder: ops +- name: ALERT_AGENT_CONTROL_TOKEN + repo: ops + workflows: [deploy-ops-vds.yml] + category: secret + purpose: "Random API control token for alert-agent" + recovery: ssh + recovery_hint: "ops VDS env files" + bw_folder: ops +- name: ALERT_AGENT_AUTH_JSON_PATH + repo: ops + workflows: [deploy-ops-vds.yml] + category: config + purpose: "Path to opencode auth.json" + recovery: config + recovery_hint: "ops VDS filesystem path" + bw_folder: ops +- name: AGENT_GHCR_USER + repo: ops + workflows: [deploy-ops-vds.yml] + category: config + purpose: "GHCR username for alert-agent" + recovery: config + recovery_hint: "GitHub Actions secret value, repo/account setting" + bw_folder: ops +- name: AGENT_GHCR_TOKEN + repo: ops + workflows: [deploy-ops-vds.yml] + category: secret + purpose: "GHCR token for alert-agent" + recovery: regenerate + recovery_hint: "Regenerate a GitHub PAT with required package permissions" + bw_folder: ops +- name: BACKUP_S3_KEY_ID + repo: ops + workflows: [deploy-staging-services.yml] + category: secret + purpose: "S3 access key id for database backups" + recovery: ssh + recovery_hint: "staging VDS env files or S3 provider console" + bw_folder: ops +- name: BACKUP_S3_SECRET + repo: ops + workflows: [deploy-staging-services.yml] + category: secret + purpose: "S3 secret key for database backups" + recovery: ssh + recovery_hint: "staging VDS env files or S3 provider console" + bw_folder: ops +- name: BACKUP_S3_BUCKET + repo: ops + workflows: [deploy-staging-services.yml] + category: config + purpose: "S3 bucket for database backups" + recovery: config + recovery_hint: "S3 provider console or workflow settings" + bw_folder: ops +- name: BACKUP_S3_REGION + repo: ops + workflows: [deploy-staging-services.yml] + category: config + purpose: "S3 region for database backups" + recovery: config + recovery_hint: "S3 provider console or workflow settings" + bw_folder: ops +- name: DB_PASSWORD + repo: ops + workflows: [deploy-staging-services.yml] + category: secret + purpose: "PostgreSQL password for backup role" + recovery: ssh + recovery_hint: "staging VDS env files" + bw_folder: ops +- name: DB_HOST + repo: ops + workflows: [deploy-staging-services.yml] + category: config + purpose: "Database host for backups" + recovery: config + recovery_hint: "database connection settings" + bw_folder: ops +- name: DB_USER + repo: ops + workflows: [deploy-staging-services.yml] + category: config + purpose: "Database user for backups" + recovery: config + recovery_hint: "database connection settings" + bw_folder: ops +- name: DB_NAME + repo: ops + workflows: [deploy-staging-services.yml] + category: config + purpose: "Database name for backups" + recovery: config + recovery_hint: "database connection settings" + bw_folder: ops +- name: GRAFANA_URL + repo: ops + workflows: [deploy-staging-agents.yml, deploy-staging-services.yml] + category: config + purpose: "Grafana URL for alert deep links" + recovery: config + recovery_hint: "Grafana deployment URL" + bw_folder: ops +- name: OPS_LOG_ALERT_CONFIG + repo: ops + workflows: [deploy-staging-agents.yml, deploy-staging-services.yml] + category: config + purpose: "Grouped log-alert configuration" + recovery: config + recovery_hint: "Create one secure note named ops log-alert config" + bw_folder: ops + members: + - OPS_LOG_ALERT_REGEX + - OPS_LOG_ALERT_IMAGE + - OPS_LOG_ALERT_PROJECT + - OPS_LOG_ALERT_ENV + - OPS_LOG_ALERT_INCLUDE + - OPS_LOG_ALERT_EXCLUDE + - OPS_LOG_ALERT_WINDOW_SEC + - OPS_LOG_ALERT_FLUSH_SEC + - OPS_LOG_ALERT_TOP_N + - OPS_LOG_ALERT_SERVICE_TOP_N + - OPS_LOG_ALERT_SAMPLE_MAX_LEN +- name: OPS_MONITORING_CONFIG + repo: ops + workflows: [deploy-staging-agents.yml, deploy-staging-services.yml] + category: config + purpose: "Grouped host monitoring thresholds and behavior" + recovery: config + recovery_hint: "Create one secure note named ops monitoring config" + bw_folder: ops + members: + - OPS_CPU_LIMIT + - OPS_RAM_LIMIT + - OPS_DISK_LIMIT + - OPS_SEND_OK + - OPS_ALERT_REMINDER_SEC + - OPS_OK_REMINDER_SEC + - OPS_MONITOR_INTERVAL_SEC +- name: OPS_RUNTIME_CONFIG + repo: ops + workflows: [deploy-staging-agents.yml, deploy-staging-services.yml] + category: config + purpose: "Grouped ops service identity and feature flags" + recovery: config + recovery_hint: "Create one secure note named ops runtime config" + bw_folder: ops + members: + - OPS_HOST_LABEL + - OPS_ALLOWED_CHATS + - OPS_COMPOSE_PROJECT + - OPS_SERVICES + - OPS_API_HEALTH_URL + - OPS_ENABLE_HOST_MONITOR + - OPS_ENABLE_DOCKER_PRUNE + - OPS_ENABLE_LOG_ALERT + - OPS_ENABLE_OPS_BOT + - OPS_ENABLE_MONITORING_AGENTS + - OPS_ENABLE_PORTAINER_AGENT + - OPS_ENABLE_PROMTAIL + - OPS_ENABLE_DB_BACKUP +- name: ALERT_AGENT_CONFIG + repo: ops + workflows: [deploy-ops-vds.yml] + category: config + purpose: "Grouped alert-agent runtime configuration" + recovery: config + recovery_hint: "Create one secure note named alert-agent config" + bw_folder: ops + members: + - ALERT_AGENT_DAILY_BUDGET + - ALERT_AGENT_COOLDOWN_MINUTES + - ALERT_AGENT_MAX_SUMMARY_CHARS + - ALERT_AGENT_QUEUE_MAXSIZE + - ALERT_AGENT_ENABLE_BOT_POLLING + - ALERT_AGENT_APPROVAL_REQUIRED_FIXERS + - ALERT_AGENT_MANAGED_REPOS diff --git a/secrets/targets.env.example b/secrets/targets.env.example new file mode 100644 index 0000000..d26cc10 --- /dev/null +++ b/secrets/targets.env.example @@ -0,0 +1,7 @@ +# Copy to .secrets-recovery/targets.env and fill locally. +# Values must never be committed. + +STAGING_SSH= +OPS_SSH= +STAGING_DEPLOY_PATH= +OPS_CONFIG_PATH= From 7cae55f75356a97c0b3389817ee91f2ec98c0b37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=9F=D0=BE=D1=80=D1=8F=D0=B4=D0=B8=D0=BD?= Date: Thu, 14 May 2026 17:38:26 +0300 Subject: [PATCH 2/4] feat(secrets): add recovery scripts --- scripts/secrets-pull.sh | 172 ++++++++++++++++ scripts/secrets-to-bitwarden.sh | 339 ++++++++++++++++++++++++++++++++ secrets/README.md | 127 ++++++++++++ 3 files changed, 638 insertions(+) create mode 100755 scripts/secrets-pull.sh create mode 100755 scripts/secrets-to-bitwarden.sh create mode 100644 secrets/README.md diff --git a/scripts/secrets-pull.sh b/scripts/secrets-pull.sh new file mode 100755 index 0000000..d471063 --- /dev/null +++ b/scripts/secrets-pull.sh @@ -0,0 +1,172 @@ +#!/bin/bash +# Pull deployed env/credential files from AssRep servers into .secrets-recovery/. +# Values are written only to local gitignored files and are never printed. +set -euo pipefail + +ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" +RECOVERY_DIR="${ROOT_DIR}/.secrets-recovery" +TARGETS_FILE="${RECOVERY_DIR}/targets.env" +PULLED_DIR="${RECOVERY_DIR}/pulled" + +usage() { + cat </ files on each run. +USAGE +} + +if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then + usage + exit 0 +fi + +if [[ "$#" -eq 0 ]]; then + usage + echo + echo "Running pull with default settings..." +fi + +if [[ "$#" -gt 0 ]]; then + echo "Unexpected argument: $1" >&2 + usage >&2 + exit 2 +fi + +if [[ ! -f "${TARGETS_FILE}" ]]; then + cat >&2 <&2 + exit 1 + fi +done + +flatten_path() { + local remote_path="$1" + local flattened + flattened="${remote_path#/}" + flattened="${flattened//\//__}" + printf '%s' "${flattened}" +} + +split_ssh_args() { + local target="$1" + # targets.env intentionally stores SSH args as a single operator-edited string. + # shellcheck disable=SC2206 + SSH_ARGS=(${target}) +} + +remote_find_files() { + local target="$1" + shift + local roots=("$@") + + split_ssh_args "${target}" + ssh "${SSH_ARGS[@]}" bash -s -- "${roots[@]}" <<'REMOTE' +set -euo pipefail + +for root in "$@"; do + [[ -n "${root}" ]] || continue + [[ -e "${root}" ]] || continue + find "${root}" -maxdepth 3 -type f \( -name "*.env" -o -name ".env" \) 2>/dev/null || true +done + +if [[ -f /etc/assrep/opencode-auth.json ]]; then + printf '%s\n' /etc/assrep/opencode-auth.json +fi +REMOTE +} + +copy_remote_file() { + local target="$1" + local remote_file="$2" + local dest_file="$3" + local quoted_remote + + split_ssh_args "${target}" + printf -v quoted_remote '%q' "${remote_file}" + # shellcheck disable=SC2029 + ssh "${SSH_ARGS[@]}" "cat -- ${quoted_remote}" > "${dest_file}" + chmod 600 "${dest_file}" +} + +pull_server() { + local label="$1" + local target="$2" + shift 2 + local roots=("$@") + local dest_dir="${PULLED_DIR}/${label}" + local remote_files=() + local unique_files=() + local remote_file + local dest_file + + mkdir -p "${dest_dir}" + + echo "Scanning ${label} for env/credential files..." + while IFS= read -r remote_file; do + remote_files+=("${remote_file}") + done < <(remote_find_files "${target}" "${roots[@]}") + + while IFS= read -r remote_file; do + unique_files+=("${remote_file}") + done < <(printf '%s\n' "${remote_files[@]}" | sed '/^$/d' | sort -u) + + if [[ "${#unique_files[@]}" -eq 0 ]]; then + echo "No files found on ${label}." + return + fi + + echo "Pulled files from ${label}:" + for remote_file in "${unique_files[@]}"; do + dest_file="${dest_dir}/$(flatten_path "${remote_file}")" + copy_remote_file "${target}" "${remote_file}" "${dest_file}" + echo " ${dest_file}" + done +} + +mkdir -p "${PULLED_DIR}" + +pull_server "staging" "${STAGING_SSH}" "${STAGING_DEPLOY_PATH}" /etc/assrep /opt /srv +pull_server "ops" "${OPS_SSH}" "${OPS_CONFIG_PATH}" /etc/assrep /opt /srv + +cat <&2 + usage >&2 + exit 2 + ;; + esac + shift +done + +require_command() { + local command_name="$1" + if ! command -v "${command_name}" >/dev/null 2>&1; then + echo "Missing required command: ${command_name}" >&2 + exit 1 + fi +} + +require_command bw +require_command jq +require_command awk + +if [[ ! -f "${INVENTORY_FILE}" ]]; then + echo "Missing inventory: ${INVENTORY_FILE}" >&2 + exit 1 +fi + +if [[ ! -f "${CONSOLIDATED_FILE}" ]]; then + cat >&2 <&2 <&2 < ${folder_name} (value: ***hidden***)" + return + fi + + if [[ -n "${existing_id}" ]]; then + encoded="$( + bw get item "${existing_id}" \ + | jq --arg notes "${notes}" --arg folderId "${folder_id}" ' + .type = 2 + | .secureNote.type = 0 + | .notes = $notes + | .folderId = (if $folderId == "" then null else $folderId end) + ' \ + | bw encode + )" + bw edit item "${existing_id}" "${encoded}" >/dev/null + echo "updated: ${item_name}" + return + fi + + encoded="$( + bw get template item \ + | jq --arg name "${item_name}" --arg notes "${notes}" --arg folderId "${folder_id}" ' + .type = 2 + | .secureNote.type = 0 + | .name = $name + | .notes = $notes + | .folderId = (if $folderId == "" then null else $folderId end) + ' \ + | bw encode + )" + bw create item "${encoded}" >/dev/null + echo "created: ${item_name}" +} + +missing_count=0 +while IFS=$'\t' read -r name repo workflows purpose recovery folder skip members; do + [[ -n "${name}" ]] || continue + if [[ "${skip}" == "true" ]]; then + echo "skip Bitwarden builtin: ${repo}/${name}" + continue + fi + + item_name="${repo}/${name}" + folder_name="AssRep/${folder}" + + if [[ -n "${members}" ]]; then + value_body="values:" + missing_members=() + IFS=',' read -r -a member_names <<< "${members}" + for member_name in "${member_names[@]}"; do + member_value="$(lookup_scoped_value "${repo}" "${member_name}")" + if [[ -z "${member_value}" ]]; then + missing_members+=("${member_name}") + continue + fi + value_body+=$'\n'"${member_name}=${member_value}" + done + if [[ "${#missing_members[@]}" -gt 0 ]]; then + echo "missing values for ${item_name}: ${missing_members[*]}" >&2 + missing_count=$((missing_count + 1)) + continue + fi + else + value="$(lookup_scoped_value "${repo}" "${name}")" + if [[ -z "${value}" ]]; then + echo "missing value for ${item_name}" >&2 + missing_count=$((missing_count + 1)) + continue + fi + value_body="value:"$'\n'"${value}" + fi + + notes="$(build_notes "${repo}" "${workflows}" "${purpose}" "${recovery}" "${value_body}")" + create_or_update_item "${item_name}" "${folder_name}" "${notes}" +done < <(parse_inventory) + +if [[ "${missing_count}" -gt 0 ]]; then + echo "Completed with ${missing_count} missing inventory value(s)." >&2 + exit 1 +fi diff --git a/secrets/README.md b/secrets/README.md new file mode 100644 index 0000000..225dfba --- /dev/null +++ b/secrets/README.md @@ -0,0 +1,127 @@ +# Secrets Recovery Toolkit + +This toolkit restores the names and values of AssRep GitHub Actions secrets into Bitwarden without committing real values. + +Committed files contain only metadata: + +- `secrets-inventory.yaml`: GitHub secret/config names and recovery hints. +- `secret-mapping.yaml`: logical grouping hypotheses for deduplication. +- `targets.env.example`: empty local connection template. +- `scripts/secrets-pull.sh`: pulls deployed `.env`/credential files into `.secrets-recovery/`. +- `scripts/secrets-to-bitwarden.sh`: creates Bitwarden secure notes from a local consolidated env file. + +Never commit `.secrets-recovery/`. + +## Recovery Flow + +1. Create local targets config: + + ```bash + mkdir -p .secrets-recovery + cp secrets/targets.env.example .secrets-recovery/targets.env + ``` + +2. Fill `.secrets-recovery/targets.env` locally: + + ```bash + STAGING_SSH='user@staging-host -p 22' + OPS_SSH='user@ops-host -p 22' + STAGING_DEPLOY_PATH='/opt/assrep/core/deploy/staging' + OPS_CONFIG_PATH='/etc/assrep' + ``` + +3. Pull deployed env/credential files: + + ```bash + ./scripts/secrets-pull.sh + ``` + + The script writes files only under `.secrets-recovery/pulled//` and prints only local paths. + +4. Build `.secrets-recovery/consolidated.env` manually from: + + - `.secrets-recovery/pulled/**` + - `secrets/secrets-inventory.yaml` + - provider consoles for `recovery: provider` + - newly issued values for `recovery: regenerate` + - local SSH keys for `recovery: ssh-key` + + Format: + + ```bash + NAME=VALUE + OTHER_NAME=OTHER_VALUE + ``` + + If the same GitHub secret name has different values in different repos, use a scoped override: + + ```bash + CORE__SENTRY_DSN_STAGING=VALUE + MOBILE_APP__SENTRY_DSN_STAGING=VALUE + WEB__SENTRY_DSN_STAGING=VALUE + ``` + + `scripts/secrets-to-bitwarden.sh` checks `REPO__NAME` first and falls back to `NAME`. + + For grouped inventory entries, provide every member listed under `members`. + +5. Run Bitwarden dry-run: + + ```bash + bw login + export BW_SESSION="$(bw unlock --raw)" + ./scripts/secrets-to-bitwarden.sh + ``` + +6. Apply after reviewing the dry-run: + + ```bash + ./scripts/secrets-to-bitwarden.sh --apply + ``` + + Existing Bitwarden items are skipped. To update them: + + ```bash + ./scripts/secrets-to-bitwarden.sh --apply --update + ``` + +7. After verifying Bitwarden, delete local secret values: + + ```bash + rm -rf .secrets-recovery + ``` + + Use `shred` or an encrypted disk workflow if your local security policy requires stronger deletion semantics. + +## Provider Checklist + +Use provider/admin consoles for entries marked `recovery: provider`: + +| Area | Entries | Source | +|---|---|---| +| Telegram bots | `DEV_BOT_TOKEN`, `DEV_NOTIFY_BOT_TOKEN`, `OPS_TG_TOKEN`, `AGENT_BOT_TOKEN` | @BotFather | +| Telegram chats | `DEV_NOTIFY_CHAT_ID`, `OPS_TG_CHAT_ID`, `AGENT_BOT_CHAT_ID` | Telegram chat/admin records | +| Sentry/GlitchTip DSNs | `SENTRY_DSN_STAGING`, `SENTRY_DSN_PRODUCTION` | Sentry/GlitchTip project settings | +| S3 credentials | `DEV_S3_*`, `APK_S3_*`, `BACKUP_S3_*` | S3 provider console, if not present in pulled env files | + +## Regenerate Required + +These entries cannot be recovered from GitHub Actions and should be rotated/reissued: + +| Repo | Name | Purpose | Where to regenerate | +|---|---|---|---| +| core | `DEV_GHCR_PAT` | GHCR pull/push PAT | [GitHub PAT settings](https://github.com/settings/tokens) | +| telegram-frontend | `DEV_GHCR_PAT` | GHCR PAT | [GitHub PAT settings](https://github.com/settings/tokens) | +| mobile-app | `EXPO_TOKEN` | Expo CLI access token | [Expo access tokens](https://expo.dev/accounts/%5Baccount%5D/settings/access-tokens) | +| mobile-app | `GHCR_PAT` | GHCR PAT | [GitHub PAT settings](https://github.com/settings/tokens) | +| web | `GHCR_PAT` | GHCR PAT | [GitHub PAT settings](https://github.com/settings/tokens) | +| ops | `DOCKERHUB_TOKEN` | Docker Hub access token | [Docker Hub security](https://app.docker.com/settings/personal-access-tokens) | +| ops | `AGENT_GITHUB_TOKEN` | GitHub fine-grained PAT for alert-agent | [GitHub fine-grained tokens](https://github.com/settings/personal-access-tokens) | +| ops | `AGENT_GHCR_TOKEN` | GHCR token for alert-agent | [GitHub PAT settings](https://github.com/settings/tokens) | + +## Local File Policy + +- Real values live only under `.secrets-recovery/`. +- `.secrets-recovery/` is gitignored. +- Do not paste secret values into commits, PR descriptions, CI logs, or issue comments. +- Before committing toolkit changes, inspect `git diff --staged` and verify that it contains no token, password, key, DSN, or pulled env content. From 88d4346b2b5aeefdb056f520ea84caf647b6a8f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=9F=D0=BE=D1=80=D1=8F=D0=B4=D0=B8=D0=BD?= Date: Sun, 17 May 2026 13:36:33 +0300 Subject: [PATCH 3/4] feat(secrets): add collect pipeline --- .github/workflows/secrets-toolkit.yml | 30 +++ scripts/secrets-collect.sh | 367 ++++++++++++++++++++++++++ scripts/secrets-pull.sh | 64 ++++- scripts/tests/run-all.sh | 9 + scripts/tests/test_collect.sh | 120 +++++++++ secrets/collect-mapping.yaml | 282 ++++++++++++++++++++ 6 files changed, 869 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/secrets-toolkit.yml create mode 100755 scripts/secrets-collect.sh create mode 100755 scripts/tests/run-all.sh create mode 100755 scripts/tests/test_collect.sh create mode 100644 secrets/collect-mapping.yaml diff --git a/.github/workflows/secrets-toolkit.yml b/.github/workflows/secrets-toolkit.yml new file mode 100644 index 0000000..734c0a9 --- /dev/null +++ b/.github/workflows/secrets-toolkit.yml @@ -0,0 +1,30 @@ +name: Secrets Toolkit + +on: + pull_request: + paths: + - "scripts/secrets-*.sh" + - "scripts/tests/**" + - "secrets/**" + - ".github/workflows/secrets-toolkit.yml" + push: + branches: + - "feature/secrets-collect" + paths: + - "scripts/secrets-*.sh" + - "scripts/tests/**" + - "secrets/**" + - ".github/workflows/secrets-toolkit.yml" + +jobs: + verify: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install shellcheck + run: sudo apt-get update && sudo apt-get install -y shellcheck + + - name: Run toolkit checks + run: bash scripts/tests/run-all.sh diff --git a/scripts/secrets-collect.sh b/scripts/secrets-collect.sh new file mode 100755 index 0000000..227cc4e --- /dev/null +++ b/scripts/secrets-collect.sh @@ -0,0 +1,367 @@ +#!/bin/bash +# Collect pulled/local secrets into Bitwarden-ready value blocks. +# Values are written only to .secrets-recovery/bitwarden-blocks.txt. +set -euo pipefail + +umask 077 + +ROOT_DIR="${SECRETS_ROOT_DIR:-$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)}" +RECOVERY_DIR="${SECRETS_RECOVERY_DIR:-${ROOT_DIR}/.secrets-recovery}" +PULLED_DIR="${SECRETS_PULLED_DIR:-${RECOVERY_DIR}/pulled}" +MAPPING_FILE="${SECRETS_COLLECT_MAPPING_FILE:-${ROOT_DIR}/secrets/collect-mapping.yaml}" +OUTPUT_FILE="${SECRETS_OUTPUT_FILE:-${RECOVERY_DIR}/bitwarden-blocks.txt}" + +usage() { + cat <&2 + usage >&2 + exit 2 +fi + +if [[ ! -d "${PULLED_DIR}" ]]; then + cat >&2 <&2 + exit 1 +fi + +mkdir -p "${RECOVERY_DIR}" + +flatten_path() { + local raw_path="$1" + local flattened="${raw_path#/}" + flattened="${flattened//\//__}" + printf '%s' "${flattened}" +} + +expand_local_path() { + local raw_path="$1" + case "${raw_path}" in + "~") + printf '%s' "${HOME}" + ;; + ~/*) + printf '%s/%s' "${HOME}" "${raw_path#~/}" + ;; + *) + printf '%s' "${raw_path}" + ;; + esac +} + +pulled_file_path() { + local server="$1" + local remote_file="$2" + printf '%s/%s/%s' "${PULLED_DIR}" "${server}" "$(flatten_path "${remote_file}")" +} + +trim_string() { + local value="$1" + value="${value#"${value%%[![:space:]]*}"}" + value="${value%"${value##*[![:space:]]}"}" + printf '%s' "${value}" +} + +strip_matching_quotes() { + local value="$1" + if [[ "${value}" == \"*\" && "${value}" == *\" ]]; then + value="${value:1:${#value}-2}" + elif [[ "${value}" == \'*\' && "${value}" == *\' ]]; then + value="${value:1:${#value}-2}" + fi + printf '%s' "${value}" +} + +lookup_assignment_value() { + local file_path="$1" + local key="$2" + local line + local value + + if [[ ! -f "${file_path}" ]]; then + return 1 + fi + + line="$(awk -v key="${key}" ' + BEGIN { + pattern = "^[[:space:]]*" key "=" + } + $0 ~ pattern { + result = $0 + } + END { + if (result != "") { + print result + } else { + exit 1 + } + } + ' "${file_path}")" || return 1 + + value="${line#*=}" + value="$(trim_string "${value}")" + value="${value%\\}" + value="$(trim_string "${value}")" + value="$(strip_matching_quotes "${value}")" + printf '%s' "${value}" +} + +extract_postgres_password() { + local url_value="$1" + + python3 - "$url_value" <<'PY' +import sys +from urllib.parse import unquote, urlparse + +url = sys.argv[1] +parsed = urlparse(url) +password = parsed.password +if password is None: + sys.exit(1) +print(unquote(password), end="") +PY +} + +parse_mapping() { + awk ' + function trim(value) { + gsub(/^[[:space:]]+|[[:space:]]+$/, "", value) + gsub(/^"|"$/, "", value) + return value + } + function value_after_colon() { + sub(/^[^:]+:[[:space:]]*/, "") + return trim($0) + } + function reset_record() { + bw_item = tag = optional = source_type = server = file = path = var = extract = vars = lines = "" + in_vars = 0 + in_lines = 0 + } + function flush_record() { + if (bw_item != "") { + print bw_item "\037" tag "\037" optional "\037" source_type "\037" server "\037" file "\037" path "\037" var "\037" extract "\037" vars "\037" lines + } + } + /^- bw_item:/ { + flush_record() + reset_record() + bw_item = value_after_colon() + next + } + /^ tag:/ { tag = value_after_colon(); next } + /^ optional:/ { optional = value_after_colon(); next } + /^ source:/ { next } + /^ type:/ { source_type = value_after_colon(); in_vars = 0; in_lines = 0; next } + /^ server:/ { server = value_after_colon(); in_vars = 0; in_lines = 0; next } + /^ file:/ { file = value_after_colon(); in_vars = 0; in_lines = 0; next } + /^ path:/ { path = value_after_colon(); in_vars = 0; in_lines = 0; next } + /^ var:/ { var = value_after_colon(); in_vars = 0; in_lines = 0; next } + /^ extract:/ { extract = value_after_colon(); in_vars = 0; in_lines = 0; next } + /^ vars:/ { in_vars = 1; in_lines = 0; next } + /^ lines:/ { in_lines = 1; in_vars = 0; next } + in_vars && /^ - / { + value = $0 + sub(/^ -[[:space:]]*/, "", value) + value = trim(value) + vars = vars (vars == "" ? "" : ",") value + next + } + in_lines && /^ - / { + value = $0 + sub(/^ -[[:space:]]*/, "", value) + value = trim(value) + lines = lines (lines == "" ? "" : "\034") value + next + } + !/^ - / { + in_vars = 0 + in_lines = 0 + } + BEGIN { reset_record() } + END { flush_record() } + ' "${MAPPING_FILE}" +} + +write_block() { + local out_file="$1" + local item_name="$2" + local tag_name="$3" + local body="$4" + + { + printf '### %s [%s]\n' "${item_name}" "${tag_name}" + printf '%s\n' "${body}" + printf '\n' + } >> "${out_file}" +} + +emit_missing_notice() { + local out_file="$1" + shift + local missing_items=("$@") + local joined + + if [[ "${#missing_items[@]}" -eq 0 ]]; then + return + fi + + joined="$(printf '%s, ' "${missing_items[@]}")" + joined="${joined%, }" + + { + printf '# PARTIAL: %s\n' "${joined}" + printf '\n' + } >> "${out_file}" +} + +tmp_output="$(mktemp "${RECOVERY_DIR}/bitwarden-blocks.XXXXXX")" +trap 'rm -f "${tmp_output}"' EXIT +chmod 600 "${tmp_output}" + +written_count=0 +missing_items=() + +while IFS=$'\037' read -r bw_item tag optional source_type server file path var extract vars_csv lines_raw; do + [[ -n "${bw_item}" ]] || continue + + source_file="" + block_body="" + + case "${source_type}" in + env_file) + source_file="$(pulled_file_path "${server}" "${file}")" + if ! block_value="$(lookup_assignment_value "${source_file}" "${var}")"; then + if [[ "${optional}" == "true" ]]; then + missing_items+=("${bw_item}") + fi + echo "Missing ${bw_item}: ${source_file} -> ${var}" >&2 + continue + fi + block_body="${var}=${block_value}" + ;; + env_file_group) + source_file="$(pulled_file_path "${server}" "${file}")" + if [[ ! -f "${source_file}" ]]; then + if [[ "${optional}" == "true" ]]; then + missing_items+=("${bw_item}") + fi + echo "Missing ${bw_item}: ${source_file}" >&2 + continue + fi + + block_lines=() + IFS=',' read -r -a vars_list <<< "${vars_csv}" + for member_var in "${vars_list[@]}"; do + if ! member_value="$(lookup_assignment_value "${source_file}" "${member_var}")"; then + if [[ "${optional}" == "true" ]]; then + missing_items+=("${bw_item}") + fi + echo "Missing ${bw_item}: ${source_file} -> ${member_var}" >&2 + block_lines=() + break + fi + block_lines+=("${member_var}=${member_value}") + done + + if [[ "${#block_lines[@]}" -eq 0 ]]; then + continue + fi + + block_body="$(printf '%s\n' "${block_lines[@]}")" + block_body="${block_body%$'\n'}" + ;; + extract_from_url) + source_file="$(pulled_file_path "${server}" "${file}")" + if ! url_value="$(lookup_assignment_value "${source_file}" "${var}")"; then + if [[ "${optional}" == "true" ]]; then + missing_items+=("${bw_item}") + fi + echo "Missing ${bw_item}: ${source_file} -> ${var}" >&2 + continue + fi + if [[ "${extract}" != "postgres_password" ]]; then + echo "Unsupported extract kind '${extract}' for ${bw_item}" >&2 + exit 1 + fi + if ! extracted_value="$(extract_postgres_password "${url_value}")"; then + if [[ "${optional}" == "true" ]]; then + missing_items+=("${bw_item}") + fi + echo "Missing ${bw_item}: unable to extract password from ${var}" >&2 + continue + fi + block_body="${var}=${url_value}"$'\n'"# extracted password -> ${extracted_value}" + ;; + whole_file) + source_file="$(pulled_file_path "${server}" "${file}")" + if [[ ! -f "${source_file}" ]]; then + if [[ "${optional}" == "true" ]]; then + missing_items+=("${bw_item}") + fi + echo "Missing ${bw_item}: ${source_file}" >&2 + continue + fi + block_body="$(<"${source_file}")" + ;; + local_file) + source_file="$(expand_local_path "${path}")" + if [[ ! -f "${source_file}" ]]; then + if [[ "${optional}" == "true" ]]; then + missing_items+=("${bw_item}") + fi + echo "Missing ${bw_item}: ${source_file}" >&2 + continue + fi + block_body="$(<"${source_file}")" + ;; + literal_lines) + IFS=$'\034' read -r -a literal_lines <<< "${lines_raw}" + block_body="$(printf '%s\n' "${literal_lines[@]}")" + block_body="${block_body%$'\n'}" + ;; + *) + echo "Unsupported source type '${source_type}' for ${bw_item}" >&2 + exit 1 + ;; + esac + + write_block "${tmp_output}" "${bw_item}" "${tag}" "${block_body}" + written_count=$((written_count + 1)) +done < <(parse_mapping) + +if [[ "${#missing_items[@]}" -gt 0 ]]; then + emit_missing_notice "${tmp_output}" "${missing_items[@]}" +fi +mv "${tmp_output}" "${OUTPUT_FILE}" +trap - EXIT + +chmod 600 "${OUTPUT_FILE}" +echo "${written_count} items written to ${OUTPUT_FILE}" diff --git a/scripts/secrets-pull.sh b/scripts/secrets-pull.sh index d471063..4936b00 100755 --- a/scripts/secrets-pull.sh +++ b/scripts/secrets-pull.sh @@ -3,6 +3,8 @@ # Values are written only to local gitignored files and are never printed. set -euo pipefail +umask 077 + ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" RECOVERY_DIR="${ROOT_DIR}/.secrets-recovery" TARGETS_FILE="${RECOVERY_DIR}/targets.env" @@ -98,10 +100,28 @@ remote_find_files() { ssh "${SSH_ARGS[@]}" bash -s -- "${roots[@]}" <<'REMOTE' set -euo pipefail +find_root_files() { + local root="$1" + local depth=3 + + case "${root}" in + /opt/assrep/core/deploy|/opt/assrep/core/deploy/*) + depth=5 + ;; + /opt/assrep|/opt/assrep/*|/opt/alert-agent|/opt/alert-agent/*) + depth=4 + ;; + esac + + find "${root}" -maxdepth "${depth}" -type f \ + \( -name "*.env" -o -name ".env" -o -name "*.json" -o -name "docker-compose.yml" -o -name "compose.yml" -o -name "db-backup.sh" -o -name "db-backup-alert.sh" \) \ + 2>/dev/null || true +} + for root in "$@"; do [[ -n "${root}" ]] || continue [[ -e "${root}" ]] || continue - find "${root}" -maxdepth 3 -type f \( -name "*.env" -o -name ".env" \) 2>/dev/null || true + find_root_files "${root}" done if [[ -f /etc/assrep/opencode-auth.json ]]; then @@ -110,6 +130,23 @@ fi REMOTE } +capture_remote_output() { + local target="$1" + local output_file="$2" + local command="$3" + + split_ssh_args "${target}" + # shellcheck disable=SC2029 + ssh "${SSH_ARGS[@]}" "${command}" > "${output_file}" || true + + if [[ ! -s "${output_file}" ]]; then + rm -f "${output_file}" + return 1 + fi + + chmod 600 "${output_file}" +} + copy_remote_file() { local target="$1" local remote_file="$2" @@ -158,10 +195,31 @@ pull_server() { done } +capture_generated_file() { + local label="$1" + local target="$2" + local pseudo_path="$3" + local command="$4" + local dest_dir="${PULLED_DIR}/${label}" + local dest_file + + dest_file="${dest_dir}/$(flatten_path "${pseudo_path}")" + + mkdir -p "${dest_dir}" + if capture_remote_output "${target}" "${dest_file}" "${command}"; then + echo " ${dest_file}" + fi +} + mkdir -p "${PULLED_DIR}" -pull_server "staging" "${STAGING_SSH}" "${STAGING_DEPLOY_PATH}" /etc/assrep /opt /srv -pull_server "ops" "${OPS_SSH}" "${OPS_CONFIG_PATH}" /etc/assrep /opt /srv +pull_server "staging" "${STAGING_SSH}" "${STAGING_DEPLOY_PATH}" /etc/assrep /opt/assrep /usr/local/bin /srv +echo "Generated captures from staging:" +capture_generated_file "staging" "${STAGING_SSH}" "/__generated/root-crontab.txt" "crontab -l 2>/dev/null || true" + +pull_server "ops" "${OPS_SSH}" "${OPS_CONFIG_PATH}" /etc/assrep /opt/assrep /opt/alert-agent /usr/local/bin /srv +echo "Generated captures from ops:" +capture_generated_file "ops" "${OPS_SSH}" "/__generated/docker-inspect-grafana.env" "docker inspect grafana --format '{{range .Config.Env}}{{println .}}{{end}}' 2>/dev/null || true" cat <&2 + exit 1 +} + +assert_contains() { + local file_path="$1" + local expected="$2" + if ! grep -Fq "${expected}" "${file_path}"; then + fail "expected '${expected}' in ${file_path}" + fi +} + +make_fixture_tree() { + local tmp_dir="$1" + mkdir -p "${tmp_dir}/.secrets-recovery/pulled/ops" "${tmp_dir}/.secrets-recovery/pulled/staging" +} + +run_collect() { + local tmp_dir="$1" + local mapping_file="$2" + SECRETS_ROOT_DIR="${tmp_dir}" \ + SECRETS_RECOVERY_DIR="${tmp_dir}/.secrets-recovery" \ + SECRETS_PULLED_DIR="${tmp_dir}/.secrets-recovery/pulled" \ + SECRETS_COLLECT_MAPPING_FILE="${mapping_file}" \ + SECRETS_OUTPUT_FILE="${tmp_dir}/.secrets-recovery/bitwarden-blocks.txt" \ + "${SCRIPT_PATH}" >/dev/null +} + +test_simple_var() { + local tmp_dir + tmp_dir="$(mktemp -d)" + trap 'rm -rf "${tmp_dir}"' RETURN + + make_fixture_tree "${tmp_dir}" + printf 'AGENT_BOT_TOKEN=test123\n' > "${tmp_dir}/.secrets-recovery/pulled/ops/etc__assrep__alert-bridge.env" + cat > "${tmp_dir}/mapping.yaml" <<'EOF' +- bw_item: ops/AGENT_BOT_TOKEN + tag: secret + source: + type: env_file + server: ops + file: /etc/assrep/alert-bridge.env + var: AGENT_BOT_TOKEN +EOF + + run_collect "${tmp_dir}" "${tmp_dir}/mapping.yaml" + assert_contains "${tmp_dir}/.secrets-recovery/bitwarden-blocks.txt" "### ops/AGENT_BOT_TOKEN [secret]" + assert_contains "${tmp_dir}/.secrets-recovery/bitwarden-blocks.txt" "AGENT_BOT_TOKEN=test123" +} + +test_extract_from_url() { + local tmp_dir + tmp_dir="$(mktemp -d)" + trap 'rm -rf "${tmp_dir}"' RETURN + + make_fixture_tree "${tmp_dir}" + printf 'DATABASE_URL=postgresql://postgres:s3cr3t@postgres:5432/glitchtip\n' > "${tmp_dir}/.secrets-recovery/pulled/ops/etc__assrep__glitchtip.env" + cat > "${tmp_dir}/mapping.yaml" <<'EOF' +- bw_item: ops/GLITCHTIP_DB_PASSWORD + tag: secret + source: + type: extract_from_url + server: ops + file: /etc/assrep/glitchtip.env + var: DATABASE_URL + extract: postgres_password +EOF + + run_collect "${tmp_dir}" "${tmp_dir}/mapping.yaml" + assert_contains "${tmp_dir}/.secrets-recovery/bitwarden-blocks.txt" "DATABASE_URL=postgresql://postgres:s3cr3t@postgres:5432/glitchtip" + assert_contains "${tmp_dir}/.secrets-recovery/bitwarden-blocks.txt" "# extracted password -> s3cr3t" +} + +test_config_group() { + local tmp_dir + tmp_dir="$(mktemp -d)" + trap 'rm -rf "${tmp_dir}"' RETURN + + make_fixture_tree "${tmp_dir}" + cat > "${tmp_dir}/.secrets-recovery/pulled/staging/etc__assrep__monitor.env" <<'EOF' +CPU_LIMIT=85 +RAM_LIMIT=90 +SEND_OK=0 +EOF + cat > "${tmp_dir}/mapping.yaml" <<'EOF' +- bw_item: ops/OPS_MONITORING_CONFIG + tag: config group + source: + type: env_file_group + server: staging + file: /etc/assrep/monitor.env + vars: + - CPU_LIMIT + - RAM_LIMIT + - SEND_OK +EOF + + run_collect "${tmp_dir}" "${tmp_dir}/mapping.yaml" + assert_contains "${tmp_dir}/.secrets-recovery/bitwarden-blocks.txt" "### ops/OPS_MONITORING_CONFIG [config group]" + assert_contains "${tmp_dir}/.secrets-recovery/bitwarden-blocks.txt" "CPU_LIMIT=85" + assert_contains "${tmp_dir}/.secrets-recovery/bitwarden-blocks.txt" "RAM_LIMIT=90" + assert_contains "${tmp_dir}/.secrets-recovery/bitwarden-blocks.txt" "SEND_OK=0" +} + +if [[ "${1:-}" == "" ]]; then + test_simple_var + test_extract_from_url + test_config_group + echo "All collect tests passed." + exit 0 +fi + +"$1" diff --git a/secrets/collect-mapping.yaml b/secrets/collect-mapping.yaml new file mode 100644 index 0000000..664e439 --- /dev/null +++ b/secrets/collect-mapping.yaml @@ -0,0 +1,282 @@ +- bw_item: ops/AGENT_BOT_TOKEN + tag: secret + source: + type: env_file + server: ops + file: /etc/assrep/alert-bridge.env + var: AGENT_BOT_TOKEN + +- bw_item: ops/AGENT_BOT_CHAT_ID + tag: config + source: + type: env_file + server: ops + file: /etc/assrep/alert-bridge.env + var: AGENT_BOT_CHAT_ID + +- bw_item: ops/AGENT_GITHUB_TOKEN + tag: secret + source: + type: env_file + server: ops + file: /etc/assrep/alert-bridge.env + var: AGENT_GITHUB_TOKEN + +- bw_item: ops/ALERT_AGENT_CONTROL_TOKEN + tag: secret + source: + type: env_file + server: ops + file: /etc/assrep/alert-bridge.env + var: ALERT_AGENT_CONTROL_TOKEN + +- bw_item: ops/ALERT_AGENT_CONFIG + tag: config group + source: + type: env_file_group + server: ops + file: /etc/assrep/alert-bridge.env + vars: + - ALERT_AGENT_DB + - ALERT_AGENT_COMMANDS_DIR + - ALERT_AGENT_MODEL + - ALERT_AGENT_COOLDOWN_MINUTES + - ALERT_AGENT_DAILY_BUDGET + - ALERT_AGENT_MAX_SUMMARY_CHARS + - ALERT_AGENT_QUEUE_MAXSIZE + - ALERT_AGENT_ENABLE_BOT_POLLING + - ALERT_AGENT_APPROVAL_REQUIRED_FIXERS + +- bw_item: ops/GLITCHTIP_SECRET_KEY + tag: secret + source: + type: env_file + server: ops + file: /etc/assrep/glitchtip.env + var: SECRET_KEY + +- bw_item: ops/GLITCHTIP_DB_PASSWORD + tag: secret + source: + type: extract_from_url + server: ops + file: /etc/assrep/glitchtip.env + var: DATABASE_URL + extract: postgres_password + +- bw_item: ops/GLITCHTIP_EMAIL_URL + tag: secret + source: + type: env_file + server: ops + file: /etc/assrep/glitchtip.env + var: EMAIL_URL + +- bw_item: ops/GLITCHTIP_CONFIG + tag: config group + source: + type: env_file_group + server: ops + file: /etc/assrep/glitchtip.env + vars: + - PORT + - GLITCHTIP_DOMAIN + - DEFAULT_FROM_EMAIL + - CELERY_WORKER_AUTOSCALE + - CELERY_WORKER_MAX_TASKS_PER_CHILD + +- bw_item: ops/GLITCHTIP_TG_TOKEN + tag: secret + source: + type: env_file + server: ops + file: /etc/assrep/glitchtip-telegram.env + var: TG_TOKEN + +- bw_item: ops/GLITCHTIP_TG_CONFIG + tag: config group + source: + type: env_file_group + server: ops + file: /etc/assrep/glitchtip-telegram.env + vars: + - TG_CHAT_ID + - GLITCHTIP_DOMAIN + +- bw_item: ops/opencode-auth.json + tag: whole file + source: + type: whole_file + server: ops + file: /etc/assrep/opencode-auth.json + +- bw_item: ops/OPS_TG_TOKEN + tag: secret + source: + type: env_file + server: staging + file: /etc/assrep/monitor.env + var: TG_TOKEN + +- bw_item: ops/OPS_TG_CHAT_ID + tag: config + source: + type: env_file + server: staging + file: /etc/assrep/monitor.env + var: TG_CHAT_ID + +- bw_item: ops/OPS_MONITORING_CONFIG + tag: config group + source: + type: env_file_group + server: staging + file: /etc/assrep/monitor.env + vars: + - CPU_LIMIT + - RAM_LIMIT + - DISK_LIMIT + - SEND_OK + - ALERT_REMINDER_SEC + - OK_REMINDER_SEC + - MUTE_STATE_FILE + +- bw_item: ops/OPS_BOT_TOKEN + tag: secret + source: + type: env_file + server: staging + file: /etc/assrep/ops-bot.env + var: OPS_BOT_TOKEN + +- bw_item: ops/OPS_RUNTIME_CONFIG + tag: config group + source: + type: env_file_group + server: staging + file: /etc/assrep/ops-bot.env + vars: + - OPS_ALLOWED_CHATS + - OPS_COMPOSE_PROJECT + - OPS_SERVICES + - OPS_API_HEALTH_URL + - OPS_HOST_LABEL + - OPS_HOST_ROOT + - OPS_MUTE_STATE_FILE + +- bw_item: ops/OPS_VDS_SSH_KEY + tag: whole file + source: + type: local_file + path: ~/.ssh/id_ed25519 + +- bw_item: ops/_CONNECTION_INFO + tag: config + source: + type: literal_lines + lines: + - DEV_SSH_HOST=109.73.192.184 + - DEV_SSH_USER=root + - DEV_SSH_PORT=22 + - OPS_VDS_SSH_HOST=5.129.198.133 + - OPS_VDS_SSH_USER=root + - OPS_VDS_SSH_PORT=22 + +- bw_item: core/DEV_DATABASE_URL + tag: secret + optional: true + source: + type: env_file + server: staging + file: /opt/assrep/core/deploy/staging/.env + var: DATABASE_URL + +- bw_item: core/DEV_S3_ACCESS_KEY_ID + tag: secret + optional: true + source: + type: env_file + server: staging + file: /opt/assrep/core/deploy/staging/backend.env + var: S3_ACCESS_KEY_ID + +- bw_item: core/DEV_S3_SECRET_ACCESS_KEY + tag: secret + optional: true + source: + type: env_file + server: staging + file: /opt/assrep/core/deploy/staging/backend.env + var: S3_SECRET_ACCESS_KEY + +- bw_item: core/JWT_SECRET + tag: secret + optional: true + source: + type: env_file + server: staging + file: /opt/assrep/core/deploy/staging/backend.env + var: JWT_SECRET + +- bw_item: core/SENTRY_DSN_STAGING + tag: secret + optional: true + source: + type: env_file + server: staging + file: /opt/assrep/core/deploy/staging/backend.env + var: SENTRY_DSN + +- bw_item: telegram-frontend/DEV_BOT_TOKEN + tag: secret + optional: true + source: + type: env_file + server: staging + file: /opt/assrep/core/deploy/staging/bot.env + var: BOT_TOKEN + +- bw_item: telegram-frontend/INTERNAL_TOKEN + tag: secret + optional: true + source: + type: env_file + server: staging + file: /opt/assrep/core/deploy/staging/bot.env + var: INTERNAL_TOKEN + +- bw_item: ops/GRAFANA_ADMIN_PASSWORD + tag: secret + optional: true + source: + type: env_file + server: ops + file: /__generated/docker-inspect-grafana.env + var: GF_SECURITY_ADMIN_PASSWORD + +- bw_item: ops/BACKUP_S3_KEY_ID + tag: secret + optional: true + source: + type: env_file + server: staging + file: /usr/local/bin/db-backup.sh + var: AWS_ACCESS_KEY_ID + +- bw_item: ops/BACKUP_S3_SECRET + tag: secret + optional: true + source: + type: env_file + server: staging + file: /usr/local/bin/db-backup.sh + var: AWS_SECRET_ACCESS_KEY + +- bw_item: ops/DB_PASSWORD + tag: secret + optional: true + source: + type: env_file + server: staging + file: /usr/local/bin/db-backup.sh + var: PGPASSWORD From a52da2fdcefee9a71ba29e89b8db06f3ce8f1424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=9F=D0=BE=D1=80=D1=8F=D0=B4=D0=B8=D0=BD?= Date: Sun, 17 May 2026 13:36:42 +0300 Subject: [PATCH 4/4] docs(secrets): add manual recovery walkthrough --- secrets/README.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/secrets/README.md b/secrets/README.md index 225dfba..63b57c8 100644 --- a/secrets/README.md +++ b/secrets/README.md @@ -93,6 +93,42 @@ Never commit `.secrets-recovery/`. Use `shred` or an encrypted disk workflow if your local security policy requires stronger deletion semantics. +## Manual recovery walkthrough + +1. Pull and format the locally recoverable values: + + ```bash + ./scripts/secrets-pull.sh + ./scripts/secrets-collect.sh + open .secrets-recovery/bitwarden-blocks.txt + ``` + +2. Transfer each block into Bitwarden manually: + + - Folder: `AssRep/` + - Item type: secure note + - Item name: the `### ...` header without the `[tag]` suffix + - Field `value:`: the block body under that header + +3. Manual-source checklist that still requires operator work: + + - Telegram bots via @BotFather `/token`: `DEV_BOT_TOKEN`, `DEV_NOTIFY_BOT_TOKEN`, `OPS_TG_TOKEN`, `AGENT_BOT_TOKEN` + - Verify chat ids if needed: `DEV_NOTIFY_CHAT_ID`, `OPS_TG_CHAT_ID`, `AGENT_BOT_CHAT_ID` + - GlitchTip UI -> Project -> Client Keys: `SENTRY_DSN_STAGING` for backend/mobile/web and `SENTRY_DSN_PRODUCTION` for mobile/web + - Per HANDOVER, create the missing GlitchTip projects first before recording the DSNs + - Regenerate manually: `DEV_GHCR_PAT`, `GHCR_PAT`, `AGENT_GHCR_TOKEN`, `EXPO_TOKEN`, `DOCKERHUB_TOKEN`, `AGENT_GITHUB_TOKEN` + - Rotate lost staging CI private keys: `DEV_SSH_KEY`, `OPS_SSH_KEY`, `SSH_KEY` + - The old staging CI private key fingerprint `SHA256:A0/C3q…` is considered lost; generate a new keypair, update `authorized_keys` on staging, remove the old key, then update the GitHub secrets + +4. `./scripts/secrets-to-bitwarden.sh` is not needed for entries already copied manually from `bitwarden-blocks.txt`. Keep it only if you still want to maintain `.secrets-recovery/consolidated.env` as a separate source of truth. + +5. Cleanup after finishing: + + ```bash + shred -u .secrets-recovery/bitwarden-blocks.txt + rm -rf .secrets-recovery + ``` + ## Provider Checklist Use provider/admin consoles for entries marked `recovery: provider`: