From e1bea0bc3e9e6301312e6eb21dedceb8f3bd54e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=93=D0=BE=D0=BB=D0=B8=D0=BA=D0=BE=D0=B2=20Maximillian?= =?UTF-8?q?=20=D0=90=D0=BD=D1=82=D0=BE=D0=BD?= Date: Fri, 13 Nov 2026 13:15:15 +0300 Subject: [PATCH] chore(lab5): add secret maker --- .env.example | 25 +++++++++++++++++-------- setup_secrets.sh | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 setup_secrets.sh diff --git a/.env.example b/.env.example index 119384b5..5c21c595 100644 --- a/.env.example +++ b/.env.example @@ -1,25 +1,34 @@ # Copy to .env for your LOCAL synthetic test environment; never commit .env. -# These are logical interface suggestions; map actual framework names in REPORT.md. +# Run ./setup_secrets.sh before starting to generate required secrets. APP_HOST=0.0.0.0 APP_PORT=8080 APP_ENV=lab SESSION_TTL_SECONDS=3600 -# Choose credentials locally. File paths contain no secret values. DATABASE_URL_FILE=/run/secrets/database_url -# Optional on 3, required use on 4 in lab2; Redis OR Valkey: -SESSION_STORE=postgres +SESSION_STORE=redis CACHE_URL_FILE=/run/secrets/cache_url API_REPLICAS=2 IDEMPOTENCY_TTL_SECONDS=86400 -S3_ENDPOINT=http://s3:9000 + +# S3 / MinIO Settings +S3_ENDPOINT=http://minio:9000 S3_REGION=us-east-1 S3_BUCKET=messenger-attachments S3_ACCESS_KEY_ID_FILE=/run/secrets/s3_access_key_id S3_SECRET_ACCESS_KEY_FILE=/run/secrets/s3_secret_access_key +MINIO_ROOT_USER_FILE=/run/secrets/minio_root_user +MINIO_ROOT_PASSWORD_FILE=/run/secrets/minio_root_password + +# Upload Limits MAX_UPLOAD_BYTES=10485760 MAX_IMAGE_PIXELS=40000000 -BROKER_URL_FILE=/run/secrets/broker_url + +# RabbitMQ Settings +RABBITMQ_PASSWORD=secret_rabbit +RABBITMQ_URL=amqp://messenger:secret_rabbit@rabbitmq:5672/ + +# Outbox & Worker Settings +OUTBOX_INTERVAL_MS=1000 WORKER_CONCURRENCY=2 JOB_MAX_ATTEMPTS=5 -JOB_TIMEOUT_SECONDS=60 -STAGING_RETENTION_SECONDS=86400 +JOB_TIMEOUT_SECONDS=60 \ No newline at end of file diff --git a/setup_secrets.sh b/setup_secrets.sh new file mode 100644 index 00000000..84b0c2e6 --- /dev/null +++ b/setup_secrets.sh @@ -0,0 +1,38 @@ +#!/bin/bash +set -eu + +echo "Генерация локальных секретов в папке secrets/..." +mkdir -p secrets + +# Генерируем случайные пароли +PG_PW="$(openssl rand -hex 16)" +MINIO_PW="$(openssl rand -hex 16)" +RABBIT_PW="$(openssl rand -hex 16)" +S3_KEY="$(openssl rand -hex 10)" +S3_SECRET="$(openssl rand -hex 20)" + +# Записываем в файлы без переносов строк +printf "%s" "$PG_PW" > secrets/postgres_password +printf "%s" "postgres://messenger:$PG_PW@postgres:5432/messenger?sslmode=disable" > secrets/database_url +printf "%s" "redis://redis:6379/0" > secrets/cache_url + +printf "%s" "admin" > secrets/minio_root_user +printf "%s" "$MINIO_PW" > secrets/minio_root_password +printf "%s" "$S3_KEY" > secrets/s3_access_key_id +printf "%s" "$S3_SECRET" > secrets/s3_secret_access_key + +printf "%s" "$RABBIT_PW" > secrets/rabbitmq_password + +# Выставляем права только для владельца (в Linux/Mac, в Windows игнорируется) +chmod 600 secrets/* 2>/dev/null || true + +# Обновляем .env, чтобы подставить правильный пароль для RabbitMQ +if [ -f .env ]; then + # Заменяем пароль в .env на сгенерированный + sed -i "s/^RABBITMQ_PASSWORD=.*/RABBITMQ_PASSWORD=$RABBIT_PW/" .env + sed -i "s#^RABBITMQ_URL=.*#RABBITMQ_URL=amqp://messenger:$RABBIT_PW@rabbitmq:5672/#" .env +else + echo "ВНИМАНИЕ: файл .env не найден. Сначала выполните 'cp .env.example .env', затем запустите этот скрипт снова." +fi + +echo "Секреты успешно сгенерированы!" \ No newline at end of file