diff --git a/.dockerignore b/.dockerignore index ddd2c73..59cb48d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,6 +3,7 @@ .env .env.* !.env.example +.runtime secrets certs volumes diff --git a/.gitignore b/.gitignore index 7913498..d7b71d6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .env .env.* !.env.example +.runtime/ secrets/ certs/private/ *.key @@ -32,3 +33,4 @@ coverage/ # Inspect git diff --cached: ignore rules are not a secret scanner. evidence/runtime/ +.runtime/ diff --git a/Dockerfile b/Dockerfile index ab37655..324c2f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,23 @@ -FROM golang:1.26.5-alpine3.24 AS build +FROM alpine:3.24.2 AS security-test + +RUN apk add --no-cache curl openssl +WORKDIR /src +COPY scripts/test-tls-matrix.sh /src/scripts/test-tls-matrix.sh +CMD ["/bin/sh", "/src/scripts/test-tls-matrix.sh"] + +FROM golang:1.26.10-alpine3.24 AS build + +ARG GOPROXY=https://proxy.golang.org WORKDIR /src ENV GOMAXPROCS=2 GOMEMLIMIT=1GiB +RUN apk add --no-cache git COPY go.mod go.sum ./ -RUN go mod download +RUN GOPROXY="$GOPROXY" go mod download COPY . . RUN go build -p=1 -o /out/messenger ./cmd/messenger RUN go build -p=1 -o /out/lab5experiment ./cmd/lab5experiment +RUN go build -p=1 -o /out/mtlsproxy ./cmd/mtlsproxy FROM build AS test @@ -27,19 +38,22 @@ FROM grafana/grafana:13.2.4 AS grafana COPY monitoring/grafana/provisioning /etc/grafana/provisioning COPY monitoring/grafana/dashboards /etc/grafana/dashboards -FROM nginx:1.30.5-alpine AS loadbalancer +FROM nginx:1.30.6-alpine AS loadbalancer + +RUN apk upgrade --no-cache COPY nginx/nginx.conf /etc/nginx/nginx.conf COPY nginx/upstream.conf /etc/nginx/conf.d/upstream.conf FROM alpine:3.24.2 -RUN addgroup -S app && adduser -S -G app -u 10001 app +RUN apk upgrade --no-cache && addgroup -S app && adduser -S -G app -u 10001 app COPY --from=build --chown=app:app /out/messenger /app/messenger COPY --from=build --chown=app:app /out/lab5experiment /app/lab5experiment +COPY --from=build --chown=app:app /out/mtlsproxy /app/mtlsproxy USER app WORKDIR /app HEALTHCHECK --interval=10s --timeout=2s --start-period=5s --retries=3 \ - CMD wget -q -O /dev/null "http://127.0.0.1:${APP_PORT}/health/ready" || exit 1 + CMD wget -q -O /dev/null "http://127.0.0.1:8082/health/ready" || exit 1 CMD ["/app/messenger"] diff --git a/compose.yaml b/compose.yaml index d21c2eb..fa8ba0c 100644 --- a/compose.yaml +++ b/compose.yaml @@ -7,17 +7,98 @@ x-messenger-config-volume: &messenger-config-volume x-telemetry-environment: &telemetry-environment OTEL_EXPORTER_OTLP_ENDPOINT: ${OTEL_EXPORTER_OTLP_ENDPOINT} OTEL_EXPORTER_OTLP_PROTOCOL: ${OTEL_EXPORTER_OTLP_PROTOCOL} + OTEL_EXPORTER_OTLP_INSECURE: "false" + OTEL_EXPORTER_OTLP_CERTIFICATE: /run/security/internal-ca/ca.crt + OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE: /run/security/client/tls.crt + OTEL_EXPORTER_OTLP_CLIENT_KEY: /run/security/client/tls.key + OTEL_EXPORTER_OTLP_SERVER_NAME: otel-gateway OTEL_RESOURCE_ATTRIBUTES: deployment.environment.name=${DEPLOYMENT_ENVIRONMENT},service.version=${SERVICE_VERSION} +x-app-hardening: &app-hardening + read_only: true + security_opt: + - no-new-privileges:true + cap_drop: + - ALL + tmpfs: + - /tmp:rw,noexec,nosuid,size=64m + services: + security-bootstrap: + image: alpine:3.24.2 + entrypoint: ["/bin/sh", "/install.sh"] + volumes: + - ./.runtime/security:/source:ro + - ./infra/pki/install.sh:/install.sh:ro + - api_security:/target/api + - nginx_security:/target/nginx + - prometheus_security:/target/prometheus + - client_security:/target/client + - postgres_security:/target/postgres + - valkey_security:/target/valkey + - redis_broker_security:/target/redis-broker + - redis_gateway_security:/target/redis-gateway + - minio_security:/target/minio + - otel_gateway_security:/target/otel-gateway + - dispatcher_security:/target/dispatcher + - worker_security:/target/worker + - migrate_security:/target/migrate + - reconciler_security:/target/reconciler + - postgres_bootstrap_security:/target/postgres-bootstrap + - postgres_exporter_security:/target/postgres-exporter + - valkey_exporter_security:/target/valkey-exporter + - redis_exporter_security:/target/redis-exporter + - s3_bootstrap_security:/target/s3-bootstrap + - openbao_security:/target/openbao + - openbao_agent_security:/target/openbao-agent + - telemetry_gateway_security:/target/telemetry-gateway + - collector_security:/target/collector + - grafana_security:/target/grafana + healthcheck: + disable: true + restart: "no" + network_mode: none + + acl-bootstrap: + image: alpine:3.24.2 + entrypoint: ["/bin/sh", "-c"] + command: + - | + /bootstrap-acl.sh valkey /target/valkey/valkey/users.acl + /bootstrap-acl.sh broker /target/redis/redis-broker/users.acl + chown 999:999 /target/valkey/valkey/users.acl /target/redis/redis-broker/users.acl + environment: + VALKEY_API_PASSWORD: ${VALKEY_API_PASSWORD} + VALKEY_EXPORTER_PASSWORD: ${VALKEY_EXPORTER_PASSWORD} + VALKEY_HEALTH_PASSWORD: ${VALKEY_HEALTH_PASSWORD} + REDIS_DISPATCHER_PASSWORD: ${REDIS_DISPATCHER_PASSWORD} + REDIS_WORKER_PASSWORD: ${REDIS_WORKER_PASSWORD} + REDIS_EXPORTER_PASSWORD: ${REDIS_EXPORTER_PASSWORD} + REDIS_HEALTH_PASSWORD: ${REDIS_HEALTH_PASSWORD} + volumes: + - ./infra/redis/bootstrap-acl.sh:/bootstrap-acl.sh:ro + - valkey_security:/target/valkey + - redis_broker_security:/target/redis + depends_on: + security-bootstrap: + condition: service_completed_successfully + healthcheck: + disable: true + restart: "no" + network_mode: none + postgres: image: postgres:17.6-alpine3.22 environment: POSTGRES_USER: ${POSTGRES_USER} POSTGRES_DB: ${POSTGRES_DB} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + command: ["postgres", "-c", "config_file=/etc/postgresql/postgresql.conf"] volumes: - postgres_data:/var/lib/postgresql/data + - postgres_security:/run/security:ro + - ./infra/postgres/postgresql.conf:/etc/postgresql/postgresql.conf:ro + - ./infra/postgres/pg_hba.conf:/etc/postgresql/pg_hba.conf:ro healthcheck: test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"] interval: 5s @@ -26,50 +107,73 @@ services: cpus: ${POSTGRES_CPUS} mem_limit: ${POSTGRES_MEMORY} restart: unless-stopped + depends_on: + security-bootstrap: + condition: service_completed_successfully networks: [data] valkey: image: valkey/valkey:8.1.4-alpine - command: ["valkey-server", "--appendonly", "yes", "--appendfsync", "everysec", "--requirepass", "${VALKEY_PASSWORD}"] + command: ["valkey-server", "/etc/valkey/valkey.conf"] environment: - VALKEY_PASSWORD: ${VALKEY_PASSWORD} + VALKEY_HEALTH_PASSWORD: ${VALKEY_HEALTH_PASSWORD} volumes: - valkey_data:/data + - valkey_security:/run/security:ro + - ./infra/redis/valkey.conf:/etc/valkey/valkey.conf:ro healthcheck: - test: ["CMD-SHELL", "valkey-cli --no-auth-warning -a \"$$VALKEY_PASSWORD\" ping | grep -q PONG"] + test: ["CMD-SHELL", "valkey-cli --no-auth-warning -s /tmp/valkey.sock --user valkey_health -a \"$$VALKEY_HEALTH_PASSWORD\" ping | grep -q PONG"] interval: 5s timeout: 3s retries: 20 cpus: ${VALKEY_CPUS} mem_limit: ${VALKEY_MEMORY} restart: unless-stopped - networks: [data] + depends_on: + acl-bootstrap: + condition: service_completed_successfully + networks: [data_backend] redis-broker: image: redis:8.2.2-alpine - command: - - redis-server - - --appendonly - - "yes" - - --appendfsync - - always - - --maxmemory-policy - - noeviction - - --requirepass - - ${REDIS_BROKER_PASSWORD} + command: ["redis-server", "/etc/redis/redis.conf"] environment: - REDIS_BROKER_PASSWORD: ${REDIS_BROKER_PASSWORD} + REDIS_HEALTH_PASSWORD: ${REDIS_HEALTH_PASSWORD} volumes: - redis_broker_data:/data + - redis_broker_security:/run/security:ro + - ./infra/redis/redis-broker.conf:/etc/redis/redis.conf:ro healthcheck: - test: ["CMD-SHELL", "redis-cli --no-auth-warning -a \"$$REDIS_BROKER_PASSWORD\" ping | grep -q PONG"] + test: ["CMD-SHELL", "redis-cli --no-auth-warning -s /tmp/redis.sock --user redis_health -a \"$$REDIS_HEALTH_PASSWORD\" ping | grep -q PONG"] interval: 5s timeout: 3s retries: 20 cpus: ${REDIS_BROKER_CPUS} mem_limit: ${REDIS_BROKER_MEMORY} restart: unless-stopped - networks: [data] + depends_on: + acl-bootstrap: + condition: service_completed_successfully + networks: [data_backend] + + redis-gateway: + image: envoyproxy/envoy:v1.35.2 + command: ["-c", "/etc/envoy/gateway.yaml", "--log-level", "warning"] + volumes: + - ./infra/redis/gateway.yaml:/etc/envoy/gateway.yaml:ro + - redis_gateway_security:/run/security:ro + expose: ["16379", "26379", "36379"] + depends_on: + valkey: + condition: service_healthy + redis-broker: + condition: service_healthy + healthcheck: + disable: true + cpus: ${REDIS_GATEWAY_CPUS} + mem_limit: ${REDIS_GATEWAY_MEMORY} + restart: unless-stopped + networks: [data, data_backend, secure_clients] s3: build: @@ -78,24 +182,29 @@ services: args: MINIO_VERSION: RELEASE.2025-10-15T17-29-55Z image: mtusi-minio:RELEASE.2025-10-15T17-29-55Z - command: ["server", "/data", "--address", ":9000"] + command: ["server", "/data", "--address", ":9000", "--certs-dir", "/run/security/minio"] environment: MINIO_ROOT_USER: ${MINIO_ROOT_USER} MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD} MINIO_BROWSER: "off" MINIO_PROMETHEUS_AUTH_TYPE: public + SSL_CERT_FILE: /run/security/internal-ca/ca.crt volumes: - s3_data:/data + - minio_security:/run/security:ro expose: - "9000" healthcheck: - test: ["CMD", "wget", "-q", "-O", "/dev/null", "http://127.0.0.1:9000/minio/health/ready"] + test: ["CMD", "wget", "-q", "-O", "/dev/null", "https://s3:9000/minio/health/ready"] interval: 5s timeout: 3s retries: 20 cpus: ${S3_CPUS} mem_limit: ${S3_MEMORY} restart: unless-stopped + depends_on: + security-bootstrap: + condition: service_completed_successfully networks: [data] s3-bootstrap: @@ -110,8 +219,17 @@ services: MINIO_ROOT_USER: ${MINIO_ROOT_USER} MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD} S3_BUCKET: ${S3_BUCKET} - S3_ACCESS_KEY: ${S3_ACCESS_KEY} - S3_SECRET_KEY: ${S3_SECRET_KEY} + S3_API_ACCESS_KEY: ${S3_API_ACCESS_KEY} + S3_API_SECRET_KEY: ${S3_API_SECRET_KEY} + S3_WORKER_ACCESS_KEY: ${S3_WORKER_ACCESS_KEY} + S3_WORKER_SECRET_KEY: ${S3_WORKER_SECRET_KEY} + S3_RECONCILER_ACCESS_KEY: ${S3_RECONCILER_ACCESS_KEY} + S3_RECONCILER_SECRET_KEY: ${S3_RECONCILER_SECRET_KEY} + SSL_CERT_FILE: /run/security/internal-ca/ca.crt + MC_CONFIG_DIR: /tmp/mc-bootstrap + volumes: + - s3_bootstrap_security:/run/security:ro + - ./infra/minio/bootstrap.sh:/usr/local/bin/bootstrap.sh:ro depends_on: s3: condition: service_healthy @@ -122,54 +240,229 @@ services: restart: "no" networks: [data] - migrate: - image: ${API_IMAGE:-mtusi-messenger:lab6} - command: ["/app/messenger", "migrate"] - environment: - MESSENGER_CONFIG_PATH: /etc/messenger/messenger.yaml - DATABASE_URL: ${DATABASE_URL} + postgres-roles: + image: postgres:17.6-alpine3.22 + command: ["/bootstrap/bootstrap-roles.sh", "create"] + environment: &postgres-role-environment + POSTGRES_DB: ${POSTGRES_DB} + POSTGRES_USER: ${POSTGRES_USER} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + POSTGRES_API_PASSWORD: ${POSTGRES_API_PASSWORD} + POSTGRES_DISPATCHER_PASSWORD: ${POSTGRES_DISPATCHER_PASSWORD} + POSTGRES_WORKER_PASSWORD: ${POSTGRES_WORKER_PASSWORD} + POSTGRES_RECONCILER_PASSWORD: ${POSTGRES_RECONCILER_PASSWORD} + POSTGRES_EXPORTER_PASSWORD: ${POSTGRES_EXPORTER_PASSWORD} + POSTGRES_MIGRATE_PASSWORD: ${POSTGRES_MIGRATE_PASSWORD} volumes: - - *messenger-config-volume + - ./infra/postgres:/bootstrap:ro + - postgres_bootstrap_security:/run/security:ro depends_on: postgres: condition: service_healthy healthcheck: disable: true + restart: "no" + networks: [data] + + migrate: + image: ${API_IMAGE:-mtusi-messenger:lab7} + command: ["/app/messenger", "migrate"] + environment: + MESSENGER_CONFIG_PATH: /etc/messenger/messenger.yaml + DATABASE_URL: ${DATABASE_MIGRATE_URL} + volumes: + - *messenger-config-volume + - migrate_security:/run/security:ro + depends_on: + postgres-roles: + condition: service_completed_successfully + healthcheck: + disable: true cpus: ${MIGRATE_CPUS} mem_limit: ${MIGRATE_MEMORY} restart: "no" networks: [data] + postgres-grants: + image: postgres:17.6-alpine3.22 + command: ["/bootstrap/bootstrap-roles.sh", "grant"] + environment: *postgres-role-environment + volumes: + - ./infra/postgres:/bootstrap:ro + - postgres_bootstrap_security:/run/security:ro + depends_on: + migrate: + condition: service_completed_successfully + healthcheck: + disable: true + restart: "no" + networks: [data] + + openbao-permissions: + image: alpine:3.24.2 + command: ["/bin/sh", "-c", "chown -R 100:100 /openbao/data && chown -R 10001:10001 /secrets/api /secrets/worker"] + volumes: + - openbao_data:/openbao/data + - openbao_api_secrets:/secrets/api + - openbao_worker_secrets:/secrets/worker + depends_on: + security-bootstrap: + condition: service_completed_successfully + healthcheck: + disable: true + restart: "no" + network_mode: none + + openbao: + image: openbao/openbao:2.7.1 + command: ["server", "-config=/etc/openbao/config.hcl"] + environment: + BAO_ENABLE_FILE_PERMISSIONS_CHECK: "false" + volumes: + - ./infra/openbao/config.hcl:/etc/openbao/config.hcl:ro + - openbao_data:/openbao/data + - openbao_security:/run/security:ro + ports: + - "${OPENBAO_BIND_ADDRESS}:8200" + depends_on: + openbao-permissions: + condition: service_completed_successfully + read_only: true + security_opt: + - no-new-privileges:true + cap_drop: + - ALL + tmpfs: + - /tmp:rw,noexec,nosuid,size=16m + - /run/openbao:rw,noexec,nosuid,size=8m + cpus: ${OPENBAO_CPUS} + mem_limit: ${OPENBAO_MEMORY} + restart: unless-stopped + networks: [secrets, edge] + + openbao-cli: + profiles: ["tools"] + image: openbao/openbao:2.7.1 + environment: + BAO_ADDR: https://openbao:8200 + BAO_CACERT: /run/security/openbao/ca.crt + BAO_TOKEN: ${BAO_TOKEN:-} + volumes: + - openbao_agent_security:/run/security:ro + depends_on: + - openbao + networks: [secrets] + + openbao-identity-install: + profiles: ["tools"] + image: alpine:3.24.2 + entrypoint: ["/bin/sh", "/install-identity.sh"] + volumes: + - ./infra/openbao/install-identity.sh:/install-identity.sh:ro + - ./.runtime/openbao/approle:/source:ro + - openbao_api_identity:/identities/api + - openbao_worker_identity:/identities/worker + network_mode: none + restart: "no" + + openbao-agent-api: + image: openbao/openbao:2.7.1 + user: "10001:10001" + command: ["agent", "-config=/etc/openbao-agent/agent.hcl"] + volumes: + - ./infra/openbao/agent/api.hcl:/etc/openbao-agent/agent.hcl:ro + - ./infra/openbao/agent/api-secrets.ctmpl:/etc/openbao-agent/api-secrets.ctmpl:ro + - openbao_api_identity:/run/openbao-identity:ro + - openbao_api_secrets:/run/openbao-secrets + - openbao_agent_security:/run/security:ro + depends_on: + openbao-permissions: + condition: service_completed_successfully + openbao: + condition: service_started + healthcheck: + test: ["CMD-SHELL", "test -s /run/openbao-secrets/secrets.json && BAO_ADDR=https://openbao:8200 BAO_CACERT=/run/security/openbao/ca.crt BAO_TOKEN=$$(cat /run/openbao-agent/token) bao token lookup >/dev/null 2>&1"] + interval: 2s + timeout: 1s + retries: 60 + read_only: true + security_opt: + - no-new-privileges:true + cap_drop: ["ALL"] + tmpfs: + - /tmp:rw,noexec,nosuid,size=8m + - /run/openbao-agent:rw,noexec,nosuid,size=8m,uid=10001,gid=10001,mode=0700 + restart: unless-stopped + networks: [secrets] + + openbao-agent-worker: + image: openbao/openbao:2.7.1 + user: "10001:10001" + command: ["agent", "-config=/etc/openbao-agent/agent.hcl"] + volumes: + - ./infra/openbao/agent/worker.hcl:/etc/openbao-agent/agent.hcl:ro + - ./infra/openbao/agent/worker-secrets.ctmpl:/etc/openbao-agent/worker-secrets.ctmpl:ro + - openbao_worker_identity:/run/openbao-identity:ro + - openbao_worker_secrets:/run/openbao-secrets + - openbao_agent_security:/run/security:ro + depends_on: + openbao-permissions: + condition: service_completed_successfully + openbao: + condition: service_started + healthcheck: + test: ["CMD-SHELL", "test -s /run/openbao-secrets/secrets.json && BAO_ADDR=https://openbao:8200 BAO_CACERT=/run/security/openbao/ca.crt BAO_TOKEN=$$(cat /run/openbao-agent/token) bao token lookup >/dev/null 2>&1"] + interval: 2s + timeout: 1s + retries: 60 + read_only: true + security_opt: + - no-new-privileges:true + cap_drop: ["ALL"] + tmpfs: + - /tmp:rw,noexec,nosuid,size=8m + - /run/openbao-agent:rw,noexec,nosuid,size=8m,uid=10001,gid=10001,mode=0700 + restart: unless-stopped + networks: [secrets] + api: + <<: *app-hardening build: . - image: ${API_IMAGE:-mtusi-messenger:lab6} + image: ${API_IMAGE:-mtusi-messenger:lab7} environment: <<: *telemetry-environment OTEL_SERVICE_NAME: messenger-api MESSENGER_CONFIG_PATH: /etc/messenger/messenger.yaml APP_HOST: ${APP_HOST} APP_PORT: ${APP_PORT} - DATABASE_URL: ${DATABASE_URL} - CACHE_URL: ${CACHE_URL} + APP_HEALTH_ADDRESS: ${APP_HEALTH_ADDRESS} + MESSENGER_SECRETS_FILE: /run/openbao-secrets/secrets.json SWAGGER_PORT: ${SWAGGER_PORT} - S3_ENDPOINT: ${S3_ENDPOINT} + S3_ENDPOINT: https://${S3_ENDPOINT} S3_REGION: ${S3_REGION} S3_BUCKET: ${S3_BUCKET} - S3_ACCESS_KEY: ${S3_ACCESS_KEY} - S3_SECRET_KEY: ${S3_SECRET_KEY} volumes: - *messenger-config-volume + - api_security:/run/security:ro + - openbao_api_secrets:/run/openbao-secrets:ro expose: - - "8080" + - "8443" + - "9091" depends_on: + security-bootstrap: + condition: service_completed_successfully migrate: condition: service_completed_successfully - valkey: - condition: service_healthy + postgres-grants: + condition: service_completed_successfully + redis-gateway: + condition: service_started s3-bootstrap: condition: service_completed_successfully + openbao-agent-api: + condition: service_healthy healthcheck: - test: ["CMD-SHELL", "wget -q -O /dev/null http://127.0.0.1:${APP_PORT}/health/ready || exit 1"] + test: ["CMD-SHELL", "wget -q -O /dev/null http://127.0.0.1:8082/health/ready || exit 1"] interval: 2s timeout: 1s start_period: 5s @@ -180,28 +473,32 @@ services: mem_limit: ${API_MEMORY} stop_grace_period: 8s restart: unless-stopped - networks: [application, data] + networks: [application, data, monitoring] dispatcher: - image: ${API_IMAGE:-mtusi-messenger:lab6} + <<: *app-hardening + image: ${API_IMAGE:-mtusi-messenger:lab7} command: ["/app/messenger", "dispatch"] environment: <<: *telemetry-environment OTEL_SERVICE_NAME: messenger-dispatcher MESSENGER_CONFIG_PATH: /etc/messenger/messenger.yaml - DATABASE_URL: ${DATABASE_URL} - BROKER_URL: ${BROKER_URL} + DATABASE_URL: ${DATABASE_DISPATCHER_URL} + BROKER_URL: ${BROKER_DISPATCHER_URL} volumes: - *messenger-config-volume + - dispatcher_security:/run/security:ro expose: - "9091" depends_on: migrate: condition: service_completed_successfully - redis-broker: - condition: service_healthy + postgres-grants: + condition: service_completed_successfully + redis-gateway: + condition: service_started healthcheck: - test: ["CMD-SHELL", "wget -q -O /dev/null http://127.0.0.1:9091/health/live || exit 1"] + test: ["CMD-SHELL", "wget -q -O /dev/null http://127.0.0.1:9092/health/live || exit 1"] interval: 5s timeout: 2s retries: 20 @@ -211,32 +508,36 @@ services: networks: [data, monitoring] worker: - image: ${API_IMAGE:-mtusi-messenger:lab6} + <<: *app-hardening + image: ${API_IMAGE:-mtusi-messenger:lab7} command: ["/app/messenger", "worker"] environment: <<: *telemetry-environment OTEL_SERVICE_NAME: messenger-worker MESSENGER_CONFIG_PATH: /etc/messenger/messenger.yaml - DATABASE_URL: ${DATABASE_URL} - S3_ENDPOINT: ${S3_ENDPOINT} + MESSENGER_SECRETS_FILE: /run/openbao-secrets/secrets.json + S3_ENDPOINT: https://${S3_ENDPOINT} S3_REGION: ${S3_REGION} S3_BUCKET: ${S3_BUCKET} - S3_ACCESS_KEY: ${S3_ACCESS_KEY} - S3_SECRET_KEY: ${S3_SECRET_KEY} - BROKER_URL: ${BROKER_URL} volumes: - *messenger-config-volume + - worker_security:/run/security:ro + - openbao_worker_secrets:/run/openbao-secrets:ro expose: - "9091" depends_on: migrate: condition: service_completed_successfully - redis-broker: - condition: service_healthy + postgres-grants: + condition: service_completed_successfully + redis-gateway: + condition: service_started s3-bootstrap: condition: service_completed_successfully + openbao-agent-worker: + condition: service_healthy healthcheck: - test: ["CMD-SHELL", "wget -q -O /dev/null http://127.0.0.1:9091/health/live || exit 1"] + test: ["CMD-SHELL", "wget -q -O /dev/null http://127.0.0.1:9092/health/live || exit 1"] interval: 5s timeout: 2s retries: 20 @@ -246,14 +547,43 @@ services: restart: unless-stopped networks: [data, monitoring] + reconciler: + profiles: ["maintenance"] + <<: *app-hardening + image: ${API_IMAGE:-mtusi-messenger:lab7} + command: ["/app/messenger", "reconcile-attachments", "--grace-period=1h", "--page-size=100"] + environment: + MESSENGER_CONFIG_PATH: /etc/messenger/messenger.yaml + DATABASE_URL: ${DATABASE_RECONCILER_URL} + S3_ENDPOINT: https://${S3_ENDPOINT} + S3_REGION: ${S3_REGION} + S3_BUCKET: ${S3_BUCKET} + S3_ACCESS_KEY: ${S3_RECONCILER_ACCESS_KEY} + S3_SECRET_KEY: ${S3_RECONCILER_SECRET_KEY} + volumes: + - *messenger-config-volume + - reconciler_security:/run/security:ro + depends_on: + postgres-grants: + condition: service_completed_successfully + s3-bootstrap: + condition: service_completed_successfully + healthcheck: + disable: true + networks: [data] + nginx: build: context: . target: loadbalancer - image: ${NGINX_IMAGE:-mtusi-nginx:lab6} + image: ${NGINX_IMAGE:-mtusi-nginx:lab7} ports: - - "${API_BIND_ADDRESS}:8080" + - "${API_BIND_ADDRESS}:8443" + volumes: + - nginx_security:/run/security:ro depends_on: + security-bootstrap: + condition: service_completed_successfully api: condition: service_healthy healthcheck: @@ -266,11 +596,62 @@ services: restart: unless-stopped networks: [edge, application, monitoring] + security-tests: + profiles: ["security"] + build: + context: . + target: security-test + environment: + PUBLIC_TLS_HOST: nginx + PUBLIC_TLS_PORT: "8443" + API_TLS_ADDRESS: api:8443 + METRICS_TLS_ADDRESS: api:9091 + SECURITY_DIR: /src/.runtime/security + volumes: + - ./.runtime/security:/src/.runtime/security:ro + depends_on: + nginx: + condition: service_healthy + networks: [edge, application] + + dependency-tests: + profiles: ["security"] + image: mtusi-mc:RELEASE.2025-08-13T08-35-41Z + user: "0:0" + entrypoint: ["/bin/sh", "/test-dependency-matrix.sh"] + environment: + SECURITY_DIR: /run/security-source + POSTGRES_DB: ${POSTGRES_DB} + POSTGRES_API_PASSWORD: ${POSTGRES_API_PASSWORD} + POSTGRES_WORKER_PASSWORD: ${POSTGRES_WORKER_PASSWORD} + POSTGRES_DISPATCHER_PASSWORD: ${POSTGRES_DISPATCHER_PASSWORD} + VALKEY_API_PASSWORD: ${VALKEY_API_PASSWORD} + REDIS_DISPATCHER_PASSWORD: ${REDIS_DISPATCHER_PASSWORD} + REDIS_WORKER_PASSWORD: ${REDIS_WORKER_PASSWORD} + S3_BUCKET: ${S3_BUCKET} + S3_API_ACCESS_KEY: ${S3_API_ACCESS_KEY} + S3_API_SECRET_KEY: ${S3_API_SECRET_KEY} + S3_WORKER_ACCESS_KEY: ${S3_WORKER_ACCESS_KEY} + S3_WORKER_SECRET_KEY: ${S3_WORKER_SECRET_KEY} + volumes: + - ./infra/security/test-dependency-matrix.sh:/test-dependency-matrix.sh:ro + - ./.runtime/security:/run/security-source:ro + depends_on: + api: + condition: service_healthy + dispatcher: + condition: service_healthy + worker: + condition: service_healthy + otel-gateway: + condition: service_started + networks: [data, data_backend, secure_clients] + swagger: build: context: . target: swagger - image: ${SWAGGER_IMAGE:-mtusi-swagger:lab6} + image: ${SWAGGER_IMAGE:-mtusi-swagger:lab7} ports: - "${SWAGGER_BIND_ADDRESS}:8080" depends_on: @@ -287,32 +668,40 @@ services: context: . target: test environment: - TEST_DATABASE_URL: ${DATABASE_URL} + TEST_DATABASE_URL: postgres://messenger_migrate:${POSTGRES_MIGRATE_PASSWORD}@postgres:5432/${POSTGRES_DB}?sslmode=verify-full&sslrootcert=/run/database-security/internal-ca/ca.crt&sslcert=/run/database-security/client/tls.crt&sslkey=/run/database-security/client/tls.key TEST_CACHE_URL: ${CACHE_URL} + TEST_CACHE_TLS_CA_PATH: /run/cache-security/internal-ca/ca.crt + TEST_CACHE_TLS_CERTIFICATE_PATH: /run/cache-security/client/tls.crt + TEST_CACHE_TLS_PRIVATE_KEY_PATH: /run/cache-security/client/tls.key + TEST_CACHE_TLS_SERVER_NAME: redis-gateway + volumes: + - migrate_security:/run/database-security:ro + - api_security:/run/cache-security:ro depends_on: - migrate: + postgres-grants: condition: service_completed_successfully - valkey: - condition: service_healthy + redis-gateway: + condition: service_started cpus: ${TEST_CPUS} mem_limit: ${TEST_MEMORY} networks: [data] lab5-experiment: profiles: ["experiments"] - image: ${API_IMAGE:-mtusi-messenger:lab6} + image: ${API_IMAGE:-mtusi-messenger:lab7} command: ["/app/lab5experiment"] environment: MESSENGER_CONFIG_PATH: /etc/messenger/messenger.yaml - DATABASE_URL: ${DATABASE_URL} - S3_ENDPOINT: ${S3_ENDPOINT} + DATABASE_URL: ${DATABASE_WORKER_URL} + S3_ENDPOINT: https://${S3_ENDPOINT} S3_REGION: ${S3_REGION} S3_BUCKET: ${S3_BUCKET} - S3_ACCESS_KEY: ${S3_ACCESS_KEY} - S3_SECRET_KEY: ${S3_SECRET_KEY} - BROKER_URL: ${BROKER_URL} + S3_ACCESS_KEY: ${S3_WORKER_ACCESS_KEY} + S3_SECRET_KEY: ${S3_WORKER_SECRET_KEY} + BROKER_URL: ${BROKER_WORKER_URL} volumes: - *messenger-config-volume + - worker_security:/run/security:ro depends_on: migrate: condition: service_completed_successfully @@ -327,16 +716,15 @@ services: postgres-exporter: image: quay.io/prometheuscommunity/postgres-exporter:v0.20.1 environment: - DATA_SOURCE_URI: postgres:5432/${POSTGRES_DB}?sslmode=disable - DATA_SOURCE_USER: ${POSTGRES_USER} - DATA_SOURCE_PASS: ${POSTGRES_PASSWORD} + DATA_SOURCE_NAME: postgres://messenger_exporter:${POSTGRES_EXPORTER_PASSWORD}@postgres:5432/${POSTGRES_DB}?sslmode=verify-full&sslrootcert=/run/security/internal-ca/ca.crt&sslcert=/run/security/client/tls.crt&sslkey=/run/security/client/tls.key PG_EXPORTER_COLLECTION_TIMEOUT: 5s PG_EXPORTER_EXTEND_QUERY_PATH: /etc/postgres_exporter/queries.yml volumes: - ./monitoring/postgres-queries.yml:/etc/postgres_exporter/queries.yml:ro + - postgres_exporter_security:/run/security:ro depends_on: - postgres: - condition: service_healthy + postgres-grants: + condition: service_completed_successfully cpus: ${EXPORTER_CPUS} mem_limit: ${EXPORTER_MEMORY} restart: unless-stopped @@ -345,31 +733,43 @@ services: valkey-exporter: image: oliver006/redis_exporter:v1.89.0-alpine environment: - REDIS_ADDR: redis://valkey:6379 - REDIS_USER: default - REDIS_PASSWORD: ${VALKEY_PASSWORD} + REDIS_ADDR: rediss://valkey:6379 + REDIS_USER: valkey_exporter + REDIS_PASSWORD: ${VALKEY_EXPORTER_PASSWORD} + REDIS_EXPORTER_TLS_CLIENT_KEY_FILE: /run/security/client/tls.key + REDIS_EXPORTER_TLS_CLIENT_CERT_FILE: /run/security/client/tls.crt + REDIS_EXPORTER_TLS_CA_CERT_FILE: /run/security/internal-ca/ca.crt + REDIS_EXPORTER_TLS_SERVER_NAME: valkey + volumes: + - valkey_exporter_security:/run/security:ro depends_on: valkey: condition: service_healthy cpus: ${EXPORTER_CPUS} mem_limit: ${EXPORTER_MEMORY} restart: unless-stopped - networks: [data, monitoring] + networks: [data_backend, monitoring] redis-broker-exporter: image: oliver006/redis_exporter:v1.89.0-alpine environment: - REDIS_ADDR: redis://redis-broker:6379 - REDIS_USER: default - REDIS_PASSWORD: ${REDIS_BROKER_PASSWORD} + REDIS_ADDR: rediss://redis-broker:6379 + REDIS_USER: redis_exporter + REDIS_PASSWORD: ${REDIS_EXPORTER_PASSWORD} + REDIS_EXPORTER_TLS_CLIENT_KEY_FILE: /run/security/client/tls.key + REDIS_EXPORTER_TLS_CLIENT_CERT_FILE: /run/security/client/tls.crt + REDIS_EXPORTER_TLS_CA_CERT_FILE: /run/security/internal-ca/ca.crt + REDIS_EXPORTER_TLS_SERVER_NAME: redis-broker REDIS_EXPORTER_CHECK_SINGLE_STREAMS: attachment-jobs,attachment-jobs-failed + volumes: + - redis_exporter_security:/run/security:ro depends_on: redis-broker: condition: service_healthy cpus: ${EXPORTER_CPUS} mem_limit: ${EXPORTER_MEMORY} restart: unless-stopped - networks: [data, monitoring] + networks: [data_backend, monitoring] nginx-exporter: image: nginx/nginx-prometheus-exporter:1.5.1 @@ -386,7 +786,7 @@ services: build: context: . target: prometheus - image: ${PROMETHEUS_IMAGE:-mtusi-prometheus:lab6} + image: ${PROMETHEUS_IMAGE:-mtusi-prometheus:lab7} command: - --config.file=/etc/prometheus/prometheus.yml - --storage.tsdb.path=/prometheus @@ -394,6 +794,7 @@ services: - --web.enable-remote-write-receiver volumes: - prometheus_data:/prometheus + - prometheus_security:/run/security:ro ports: - "${PROMETHEUS_BIND_ADDRESS}:9090" healthcheck: @@ -402,49 +803,71 @@ services: timeout: 3s retries: 20 depends_on: - - api - - nginx-exporter - - postgres-exporter - - valkey-exporter - - redis-broker-exporter - - dispatcher - - worker - - s3 - - otel-collector - - loki - - tempo + security-bootstrap: + condition: service_completed_successfully + api: + condition: service_healthy + nginx-exporter: + condition: service_started + postgres-exporter: + condition: service_started + valkey-exporter: + condition: service_started + redis-broker-exporter: + condition: service_started + dispatcher: + condition: service_healthy + worker: + condition: service_healthy + s3: + condition: service_healthy + otel-collector: + condition: service_healthy + loki: + condition: service_healthy + tempo: + condition: service_healthy cpus: ${PROMETHEUS_CPUS} mem_limit: ${PROMETHEUS_MEMORY} restart: unless-stopped - networks: [edge, application, data, monitoring] + networks: [application, data, monitoring, telemetry_storage] grafana: build: context: . target: grafana - image: ${GRAFANA_IMAGE:-mtusi-grafana:lab6} + image: ${GRAFANA_IMAGE:-mtusi-grafana:lab7} environment: GF_SECURITY_ADMIN_USER: admin GF_SECURITY_ADMIN_PASSWORD: ${GRAFANA_ADMIN_PASSWORD} GF_USERS_ALLOW_SIGN_UP: "false" GF_EXPLORE_ENABLED: "true" + GF_SERVER_PROTOCOL: https + GF_SERVER_CERT_FILE: /run/security/grafana-server.crt + GF_SERVER_CERT_KEY: /run/security/grafana-server.key + GF_SERVER_DOMAIN: localhost + SSL_CERT_FILE: /run/security/internal-ca/ca.crt volumes: - grafana_data:/var/lib/grafana + - grafana_security:/run/security:ro ports: - "${GRAFANA_BIND_ADDRESS}:3000" depends_on: - - prometheus - - loki - - tempo + prometheus-grafana-gateway: + condition: service_started + loki-grafana-gateway: + condition: service_started + tempo-grafana-gateway: + condition: service_started healthcheck: - test: ["CMD-SHELL", "wget -q -O /dev/null http://127.0.0.1:3000/api/health || exit 1"] + test: ["CMD-SHELL", "wget -q -O /dev/null https://localhost:3000/api/health || exit 1"] interval: 5s timeout: 3s retries: 20 cpus: ${GRAFANA_CPUS} mem_limit: ${GRAFANA_MEMORY} restart: unless-stopped - networks: [edge, monitoring] + networks: [edge, secure_clients] loki: image: grafana/loki:3.7.9 @@ -452,8 +875,6 @@ services: volumes: - ./infra/loki/loki.yaml:/etc/loki/loki.yaml:ro - loki_data:/loki - ports: - - "${LOKI_BIND_ADDRESS}:3100" healthcheck: test: ["CMD", "/usr/bin/loki", "-version"] interval: 10s @@ -462,7 +883,7 @@ services: cpus: ${LOKI_CPUS} mem_limit: ${LOKI_MEMORY} restart: unless-stopped - networks: [edge, monitoring] + networks: [telemetry_storage] tempo: image: grafana/tempo:2.10.10 @@ -470,8 +891,6 @@ services: volumes: - ./infra/tempo/tempo.yaml:/etc/tempo/tempo.yaml:ro - tempo_data:/var/tempo - ports: - - "${TEMPO_BIND_ADDRESS}:3200" healthcheck: test: ["CMD", "/tempo", "-version"] interval: 10s @@ -480,13 +899,145 @@ services: cpus: ${TEMPO_CPUS} mem_limit: ${TEMPO_MEMORY} restart: unless-stopped - networks: [edge, monitoring] + networks: [telemetry_storage] + + otel-gateway: + image: envoyproxy/envoy:v1.35.2 + command: ["-c", "/etc/envoy/gateway.yaml", "--log-level", "warning"] + volumes: + - ./infra/otel/gateway.yaml:/etc/envoy/gateway.yaml:ro + - otel_gateway_security:/run/security:ro + expose: ["4317", "4318"] + depends_on: + security-bootstrap: + condition: service_completed_successfully + otel-collector: + condition: service_healthy + cpus: ${OTEL_GATEWAY_CPUS} + mem_limit: ${OTEL_GATEWAY_MEMORY} + restart: unless-stopped + networks: [data, telemetry_backend] + + tempo-collector-gateway: + <<: *app-hardening + image: ${API_IMAGE:-mtusi-messenger:lab7} + command: ["/app/mtlsproxy"] + environment: + PROXY_LISTEN_ADDRESS: 0.0.0.0:8443 + PROXY_TARGET_ADDRESS: tempo:4317 + PROXY_TLS_CA_PATH: /run/security/internal-ca/ca.crt + PROXY_TLS_CERTIFICATE_PATH: /run/security/telemetry-gateway/tls.crt + PROXY_TLS_PRIVATE_KEY_PATH: /run/security/telemetry-gateway/tls.key + PROXY_ALLOWED_CLIENT_URI: spiffe://mtusi/lab7/collector + PROXY_ALPN_PROTOCOLS: h2 + volumes: + - telemetry_gateway_security:/run/security:ro + depends_on: + security-bootstrap: + condition: service_completed_successfully + tempo: + condition: service_healthy + healthcheck: + disable: true + restart: unless-stopped + networks: [secure_clients, telemetry_storage] + + loki-collector-gateway: + <<: *app-hardening + image: ${API_IMAGE:-mtusi-messenger:lab7} + command: ["/app/mtlsproxy"] + environment: + PROXY_LISTEN_ADDRESS: 0.0.0.0:8443 + PROXY_TARGET_ADDRESS: loki:3100 + PROXY_TLS_CA_PATH: /run/security/internal-ca/ca.crt + PROXY_TLS_CERTIFICATE_PATH: /run/security/telemetry-gateway/tls.crt + PROXY_TLS_PRIVATE_KEY_PATH: /run/security/telemetry-gateway/tls.key + PROXY_ALLOWED_CLIENT_URI: spiffe://mtusi/lab7/collector + PROXY_ALPN_PROTOCOLS: http/1.1 + volumes: + - telemetry_gateway_security:/run/security:ro + depends_on: + security-bootstrap: + condition: service_completed_successfully + loki: + condition: service_healthy + healthcheck: + disable: true + restart: unless-stopped + networks: [secure_clients, telemetry_storage] + + prometheus-grafana-gateway: + <<: *app-hardening + image: ${API_IMAGE:-mtusi-messenger:lab7} + command: ["/app/mtlsproxy"] + environment: + PROXY_LISTEN_ADDRESS: 0.0.0.0:8443 + PROXY_TARGET_ADDRESS: prometheus:9090 + PROXY_TLS_CA_PATH: /run/security/internal-ca/ca.crt + PROXY_TLS_CERTIFICATE_PATH: /run/security/telemetry-gateway/tls.crt + PROXY_TLS_PRIVATE_KEY_PATH: /run/security/telemetry-gateway/tls.key + PROXY_ALLOWED_CLIENT_URI: spiffe://mtusi/lab7/grafana + PROXY_ALPN_PROTOCOLS: http/1.1 + volumes: + - telemetry_gateway_security:/run/security:ro + depends_on: + prometheus: + condition: service_healthy + healthcheck: + disable: true + restart: unless-stopped + networks: [secure_clients, telemetry_storage] + + loki-grafana-gateway: + <<: *app-hardening + image: ${API_IMAGE:-mtusi-messenger:lab7} + command: ["/app/mtlsproxy"] + environment: + PROXY_LISTEN_ADDRESS: 0.0.0.0:8443 + PROXY_TARGET_ADDRESS: loki:3100 + PROXY_TLS_CA_PATH: /run/security/internal-ca/ca.crt + PROXY_TLS_CERTIFICATE_PATH: /run/security/telemetry-gateway/tls.crt + PROXY_TLS_PRIVATE_KEY_PATH: /run/security/telemetry-gateway/tls.key + PROXY_ALLOWED_CLIENT_URI: spiffe://mtusi/lab7/grafana + PROXY_ALPN_PROTOCOLS: http/1.1 + volumes: + - telemetry_gateway_security:/run/security:ro + depends_on: + loki: + condition: service_healthy + healthcheck: + disable: true + restart: unless-stopped + networks: [secure_clients, telemetry_storage] + + tempo-grafana-gateway: + <<: *app-hardening + image: ${API_IMAGE:-mtusi-messenger:lab7} + command: ["/app/mtlsproxy"] + environment: + PROXY_LISTEN_ADDRESS: 0.0.0.0:8443 + PROXY_TARGET_ADDRESS: tempo:3200 + PROXY_TLS_CA_PATH: /run/security/internal-ca/ca.crt + PROXY_TLS_CERTIFICATE_PATH: /run/security/telemetry-gateway/tls.crt + PROXY_TLS_PRIVATE_KEY_PATH: /run/security/telemetry-gateway/tls.key + PROXY_ALLOWED_CLIENT_URI: spiffe://mtusi/lab7/grafana + PROXY_ALPN_PROTOCOLS: http/1.1 + volumes: + - telemetry_gateway_security:/run/security:ro + depends_on: + tempo: + condition: service_healthy + healthcheck: + disable: true + restart: unless-stopped + networks: [secure_clients, telemetry_storage] otel-collector: image: otel/opentelemetry-collector-contrib:0.160.0 command: ["--config=/etc/otelcol-contrib/collector.yaml"] volumes: - ./infra/otel/collector.yaml:/etc/otelcol-contrib/collector.yaml:ro + - collector_security:/run/security:ro expose: - "4317" - "4318" @@ -504,9 +1055,38 @@ services: cpus: ${OTEL_COLLECTOR_CPUS} mem_limit: ${OTEL_COLLECTOR_MEMORY} restart: unless-stopped - networks: [application, data, monitoring] + networks: [telemetry_backend, secure_clients, monitoring] volumes: + api_security: + nginx_security: + prometheus_security: + client_security: + postgres_security: + valkey_security: + redis_broker_security: + redis_gateway_security: + minio_security: + otel_gateway_security: + dispatcher_security: + worker_security: + migrate_security: + reconciler_security: + postgres_bootstrap_security: + postgres_exporter_security: + valkey_exporter_security: + redis_exporter_security: + s3_bootstrap_security: + openbao_security: + openbao_agent_security: + telemetry_gateway_security: + collector_security: + grafana_security: + openbao_api_secrets: + openbao_worker_secrets: + openbao_api_identity: + openbao_worker_identity: + openbao_data: postgres_data: valkey_data: redis_broker_data: @@ -522,5 +1102,15 @@ networks: internal: true data: internal: true + data_backend: + internal: true monitoring: internal: true + telemetry_backend: + internal: true + telemetry_storage: + internal: true + secure_clients: + internal: true + secrets: + internal: true diff --git a/infra/minio/bootstrap.sh b/infra/minio/bootstrap.sh old mode 100644 new mode 100755 index 68a2888..2df3ceb --- a/infra/minio/bootstrap.sh +++ b/infra/minio/bootstrap.sh @@ -2,35 +2,124 @@ set -eu -alias_name=bootstrap -policy_name=messenger-attachments -policy_file=/tmp/messenger-attachments-policy.json +: "${MINIO_ROOT_USER:?MINIO_ROOT_USER is required}" +: "${MINIO_ROOT_PASSWORD:?MINIO_ROOT_PASSWORD is required}" +: "${S3_BUCKET:?S3_BUCKET is required}" +: "${S3_API_ACCESS_KEY:?S3_API_ACCESS_KEY is required}" +: "${S3_API_SECRET_KEY:?S3_API_SECRET_KEY is required}" +: "${S3_WORKER_ACCESS_KEY:?S3_WORKER_ACCESS_KEY is required}" +: "${S3_WORKER_SECRET_KEY:?S3_WORKER_SECRET_KEY is required}" +: "${S3_RECONCILER_ACCESS_KEY:?S3_RECONCILER_ACCESS_KEY is required}" +: "${S3_RECONCILER_SECRET_KEY:?S3_RECONCILER_SECRET_KEY is required}" -mc alias set "$alias_name" http://s3:9000 "$MINIO_ROOT_USER" "$MINIO_ROOT_PASSWORD" +export SSL_CERT_FILE=${SSL_CERT_FILE:-/run/security/internal-ca/ca.crt} + +alias_name=bootstrap +policy_dir=/tmp/minio-policies +mkdir -p "$policy_dir" + +mc alias set "$alias_name" https://s3:9000 "$MINIO_ROOT_USER" "$MINIO_ROOT_PASSWORD" mc mb --ignore-existing "$alias_name/$S3_BUCKET" mc anonymous set none "$alias_name/$S3_BUCKET" -cat >"$policy_file" <"$policy_dir/messenger-api.json" <"$policy_dir/messenger-worker.json" </dev/null +cat >"$policy_dir/messenger-reconciler.json" </dev/null diff --git a/infra/minio/client.Dockerfile b/infra/minio/client.Dockerfile index fe8ee0a..1be182f 100644 --- a/infra/minio/client.Dockerfile +++ b/infra/minio/client.Dockerfile @@ -10,7 +10,11 @@ RUN LDFLAGS="$(MC_RELEASE=RELEASE go run buildscripts/gen-ldflags.go)" && \ FROM alpine:3.22.2 +RUN apk add --no-cache curl openssl postgresql17-client redis && \ + addgroup -g 10001 messenger && \ + adduser -D -H -u 10001 -G messenger messenger COPY --from=build /out/mc /usr/local/bin/mc COPY infra/minio/bootstrap.sh /usr/local/bin/bootstrap.sh +USER 10001:10001 ENTRYPOINT ["mc"] diff --git a/infra/openbao/README.md b/infra/openbao/README.md index 0850e23..2b75368 100644 --- a/infra/openbao/README.md +++ b/infra/openbao/README.md @@ -1,7 +1,45 @@ -# OpenBao — реализовать конфигурацию и политики +# OpenBao -Добавьте non-dev конфигурацию listener/storage/TLS, API/worker policies, bootstrap и rotation scripts. Credentials и unseal material создаются локально; здесь нет готового root token или private key. +OpenBao работает вне dev-mode с single-node integrated Raft. Данные сохраняются в `/openbao/data`, API принимает только TLS 1.3 на `8200`, cluster transport использует `8201`. Сертификат и ключ передаются в `/run/security/openbao`, а не входят в образ. -Решение должно показать реальную сервисную аутентификацию и получение нужного secret по ограниченной policy; просто работающий контейнер OpenBao не засчитывается. На 3 статический KV secret допустим. На 4 покажите expiry/renewal/rotation и allow/deny. Путь KV v2 data/metadata и ACL должен соответствовать фактическому mount; не копируйте широкое `path "*"` для приложения. +## Идентичности -Документируйте шаги оператора init/unseal и восстановление после restart. Скрипт не должен печатать tokens/shares или хранить их в Git. См. contracts/trust-matrix.md и REPORT.md. +`messenger-api` и `messenger-worker` — разные AppRole. Каждая роль: + +- читает только свой `secret/data/messenger/` в KV v2; +- получает renewable token на 15 минут с максимальным TTL 1 час; +- использует короткоживущий `SecretID` с TTL один час; +- не получает policy `default`, доступ к чужому secret или управление policies. + +OpenBao Agent читает `RoleID` и короткоживущий `SecretID`, renew-ит token и повторно аутентифицируется после его истечения или рестарта. SecretID действует один час и хранится в operator-controlled каталоге с правами `0600`; после истечения оператор выдаёт новый через `openbao-issue-approle.sh`. KV v2 secret рендерится в защищённый Docker volume `/run/openbao-secrets/secrets.json` с правами `0600`; токен Agent хранится отдельно в tmpfs `/run/openbao-agent`. Старый rendered secret не считается признаком здоровья: healthcheck также проверяет token и процесс Agent. + +## Bootstrap оператора + +Все команды выполняются с проверкой CA и hostname. `BAO_ADDR` по умолчанию равен `https://localhost:8200`, `BAO_CACERT` — `.runtime/security/openbao/ca.crt`. + +```sh +scripts/openbao-init.sh +scripts/openbao-unseal.sh +chmod 0600 .runtime/openbao/seed/api.json .runtime/openbao/seed/worker.json +scripts/openbao-bootstrap.sh \ + .runtime/openbao/seed/api.json \ + .runtime/openbao/seed/worker.json +scripts/openbao-test-policy.sh +``` + +Seed-файлы — непустые JSON-объекты с фактическими credentials сервиса. Скрипт не выводит значения в консоль. `operator init` создаёт три unseal share с threshold 2 и сохраняет единственную локальную копию в `.runtime/openbao/operator/init.json` с правами `0600`. Этот каталог игнорируется Git. + +Для учебного локального стенда оператор хранит init-файл вне контейнера. В реальном окружении shares нужно разделить между операторами либо защитить KMS/HSM, а root token отозвать после настройки recovery-доступа. API, worker и Agent не получают root token или unseal shares. + +После обычного перезапуска данные остаются в Raft volume, но процесс остаётся sealed до ручного `scripts/openbao-unseal.sh`. Перезапуск API и worker не требует unseal. + +## Ротация + +```sh +chmod 0600 .runtime/openbao/seed/api-next.json +scripts/openbao-rotate.sh api .runtime/openbao/seed/api-next.json +``` + +Ротация создаёт новую версию KV v2 и новый короткоживущий `SecretID`; предыдущий accessor отзывается. Agent перечитывает статический secret не позднее пяти минут. Уже выданный token может жить до своего TTL, поэтому при компрометации дополнительно отзывают его accessor или отключают роль и перезапускают Agent с новой идентичностью. + +`scripts/openbao-test-policy.sh` выдаёт временные AppRole credentials, проверяет разрешённое чтение собственного пути, запрет чужого пути, записи и управления policies, а также renewal. Временные tokens отзываются при завершении. diff --git a/infra/openbao/agent/api-secrets.ctmpl b/infra/openbao/agent/api-secrets.ctmpl new file mode 100644 index 0000000..3e8892b --- /dev/null +++ b/infra/openbao/agent/api-secrets.ctmpl @@ -0,0 +1,4 @@ +{{- with secret "secret/data/messenger/api" -}} +{{ .Data.data | toJSON }} +{{- end -}} + diff --git a/infra/openbao/agent/api.hcl b/infra/openbao/agent/api.hcl new file mode 100644 index 0000000..964d993 --- /dev/null +++ b/infra/openbao/agent/api.hcl @@ -0,0 +1,44 @@ +pid_file = "/run/openbao-agent/agent.pid" + +vault { + address = "https://openbao:8200" + ca_cert = "/run/security/openbao/ca.crt" + tls_server_name = "openbao" +} + +auto_auth { + method { + type = "approle" + mount_path = "auth/approle" + + config = { + role_id_file_path = "/run/openbao-identity/role-id" + secret_id_file_path = "/run/openbao-identity/secret-id" + remove_secret_id_file_after_reading = false + } + } + + sink { + type = "file" + + config = { + path = "/run/openbao-agent/token" + mode = 384 + } + } +} + +template_config { + exit_on_retry_failure = true + static_secret_render_interval = "5m" +} + +template { + source = "/etc/openbao-agent/api-secrets.ctmpl" + destination = "/run/openbao-secrets/secrets.json" + create_dest_dirs = true + error_on_missing_key = true + perms = "0600" + backup = false +} + diff --git a/infra/openbao/agent/worker-secrets.ctmpl b/infra/openbao/agent/worker-secrets.ctmpl new file mode 100644 index 0000000..9e2f36e --- /dev/null +++ b/infra/openbao/agent/worker-secrets.ctmpl @@ -0,0 +1,4 @@ +{{- with secret "secret/data/messenger/worker" -}} +{{ .Data.data | toJSON }} +{{- end -}} + diff --git a/infra/openbao/agent/worker.hcl b/infra/openbao/agent/worker.hcl new file mode 100644 index 0000000..66567de --- /dev/null +++ b/infra/openbao/agent/worker.hcl @@ -0,0 +1,44 @@ +pid_file = "/run/openbao-agent/agent.pid" + +vault { + address = "https://openbao:8200" + ca_cert = "/run/security/openbao/ca.crt" + tls_server_name = "openbao" +} + +auto_auth { + method { + type = "approle" + mount_path = "auth/approle" + + config = { + role_id_file_path = "/run/openbao-identity/role-id" + secret_id_file_path = "/run/openbao-identity/secret-id" + remove_secret_id_file_after_reading = false + } + } + + sink { + type = "file" + + config = { + path = "/run/openbao-agent/token" + mode = 384 + } + } +} + +template_config { + exit_on_retry_failure = true + static_secret_render_interval = "5m" +} + +template { + source = "/etc/openbao-agent/worker-secrets.ctmpl" + destination = "/run/openbao-secrets/secrets.json" + create_dest_dirs = true + error_on_missing_key = true + perms = "0600" + backup = false +} + diff --git a/infra/openbao/config.hcl b/infra/openbao/config.hcl new file mode 100644 index 0000000..939484f --- /dev/null +++ b/infra/openbao/config.hcl @@ -0,0 +1,20 @@ +ui = false + +api_addr = "https://openbao:8200" +cluster_addr = "https://openbao:8201" + +storage "raft" { + path = "/openbao/data" + node_id = "messenger-openbao-1" +} + +listener "tcp" { + address = "0.0.0.0:8200" + cluster_address = "0.0.0.0:8201" + tls_cert_file = "/run/security/openbao/tls.crt" + tls_key_file = "/run/security/openbao/tls.key" + tls_min_version = "tls13" +} + +log_level = "info" + diff --git a/infra/openbao/install-identity.sh b/infra/openbao/install-identity.sh new file mode 100644 index 0000000..6c61ff2 --- /dev/null +++ b/infra/openbao/install-identity.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +set -eu +umask 077 + +case "${SERVICE:-}" in + api|worker) ;; + *) echo "SERVICE must be api or worker" >&2; exit 2 ;; +esac + +source_dir="/source/$SERVICE" +target_dir="/identities/$SERVICE" +mkdir -p "$target_dir" +for file in role-id secret-id secret-id-accessor; do + cp "$source_dir/$file" "$target_dir/$file.next" + chown 10001:10001 "$target_dir/$file.next" + chmod 0600 "$target_dir/$file.next" + mv "$target_dir/$file.next" "$target_dir/$file" +done +chown 10001:10001 "$target_dir" +chmod 0700 "$target_dir" diff --git a/infra/openbao/policies/messenger-api.hcl b/infra/openbao/policies/messenger-api.hcl new file mode 100644 index 0000000..aaebd73 --- /dev/null +++ b/infra/openbao/policies/messenger-api.hcl @@ -0,0 +1,32 @@ +path "secret/data/messenger/api" { + capabilities = ["read"] +} + +path "secret/metadata/messenger/api" { + capabilities = ["read"] +} + +path "secret/data/messenger/worker" { + capabilities = ["deny"] +} + +path "secret/metadata/messenger/worker" { + capabilities = ["deny"] +} + +path "auth/token/lookup-self" { + capabilities = ["read"] +} + +path "auth/token/renew-self" { + capabilities = ["update"] +} + +path "auth/token/revoke-self" { + capabilities = ["update"] +} + +path "sys/policies/*" { + capabilities = ["deny"] +} + diff --git a/infra/openbao/policies/messenger-worker.hcl b/infra/openbao/policies/messenger-worker.hcl new file mode 100644 index 0000000..8357e16 --- /dev/null +++ b/infra/openbao/policies/messenger-worker.hcl @@ -0,0 +1,32 @@ +path "secret/data/messenger/worker" { + capabilities = ["read"] +} + +path "secret/metadata/messenger/worker" { + capabilities = ["read"] +} + +path "secret/data/messenger/api" { + capabilities = ["deny"] +} + +path "secret/metadata/messenger/api" { + capabilities = ["deny"] +} + +path "auth/token/lookup-self" { + capabilities = ["read"] +} + +path "auth/token/renew-self" { + capabilities = ["update"] +} + +path "auth/token/revoke-self" { + capabilities = ["update"] +} + +path "sys/policies/*" { + capabilities = ["deny"] +} + diff --git a/infra/otel/collector.yaml b/infra/otel/collector.yaml index e912195..6f7c90f 100644 --- a/infra/otel/collector.yaml +++ b/infra/otel/collector.yaml @@ -6,9 +6,9 @@ receivers: otlp: protocols: grpc: - endpoint: 0.0.0.0:4317 + endpoint: 0.0.0.0:14317 http: - endpoint: 0.0.0.0:4318 + endpoint: 0.0.0.0:14318 processors: memory_limiter: @@ -29,9 +29,12 @@ exporters: - service.version - deployment.environment.name otlp_grpc/tempo: - endpoint: tempo:4317 + endpoint: tempo-collector-gateway:8443 tls: - insecure: true + ca_file: /run/security/internal-ca/ca.crt + cert_file: /run/security/client/tls.crt + key_file: /run/security/client/tls.key + server_name_override: telemetry-gateway sending_queue: enabled: true num_consumers: 2 @@ -42,7 +45,12 @@ exporters: max_interval: 5s max_elapsed_time: 30s otlp_http/loki: - endpoint: http://loki:3100/otlp + endpoint: https://loki-collector-gateway:8443/otlp + tls: + ca_file: /run/security/internal-ca/ca.crt + cert_file: /run/security/client/tls.crt + key_file: /run/security/client/tls.key + server_name_override: telemetry-gateway sending_queue: enabled: true num_consumers: 2 @@ -58,6 +66,13 @@ service: telemetry: logs: level: info + metrics: + readers: + - pull: + exporter: + prometheus: + host: 0.0.0.0 + port: 8888 pipelines: metrics: receivers: [otlp] diff --git a/infra/otel/gateway.yaml b/infra/otel/gateway.yaml new file mode 100644 index 0000000..7871fa4 --- /dev/null +++ b/infra/otel/gateway.yaml @@ -0,0 +1,133 @@ +static_resources: + listeners: + - name: otlp_grpc_mtls + address: + socket_address: + address: 0.0.0.0 + port_value: 4317 + filter_chains: + - filters: + - name: envoy.filters.network.http_connection_manager + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + stat_prefix: otlp_grpc + codec_type: HTTP2 + route_config: + name: otlp_grpc + virtual_hosts: + - name: collector + domains: ["*"] + routes: + - match: {prefix: "/"} + route: + cluster: collector_grpc + timeout: 0s + http_filters: + - name: envoy.filters.http.router + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router + transport_socket: + name: envoy.transport_sockets.tls + typed_config: + "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext + require_client_certificate: true + common_tls_context: + tls_params: + tls_minimum_protocol_version: TLSv1_3 + tls_maximum_protocol_version: TLSv1_3 + alpn_protocols: [h2] + tls_certificates: + - certificate_chain: {filename: /run/security/otel-gateway/tls.crt} + private_key: {filename: /run/security/otel-gateway/tls.key} + validation_context: + trusted_ca: {filename: /run/security/internal-ca/ca.crt} + match_typed_subject_alt_names: + - san_type: URI + matcher: + safe_regex: + regex: "^spiffe://mtusi/lab7/(api|dispatcher|worker)$" + + - name: otlp_http_mtls + address: + socket_address: + address: 0.0.0.0 + port_value: 4318 + filter_chains: + - filters: + - name: envoy.filters.network.http_connection_manager + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + stat_prefix: otlp_http + codec_type: AUTO + route_config: + name: otlp_http + virtual_hosts: + - name: collector + domains: ["*"] + routes: + - match: {prefix: "/"} + route: + cluster: collector_http + timeout: 30s + http_filters: + - name: envoy.filters.http.router + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router + transport_socket: + name: envoy.transport_sockets.tls + typed_config: + "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext + require_client_certificate: true + common_tls_context: + tls_params: + tls_minimum_protocol_version: TLSv1_3 + tls_maximum_protocol_version: TLSv1_3 + alpn_protocols: [h2, http/1.1] + tls_certificates: + - certificate_chain: {filename: /run/security/otel-gateway/tls.crt} + private_key: {filename: /run/security/otel-gateway/tls.key} + validation_context: + trusted_ca: {filename: /run/security/internal-ca/ca.crt} + match_typed_subject_alt_names: + - san_type: URI + matcher: + safe_regex: + regex: "^spiffe://mtusi/lab7/(api|dispatcher|worker)$" + + clusters: + - name: collector_grpc + connect_timeout: 2s + type: STRICT_DNS + load_assignment: + cluster_name: collector_grpc + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: otel-collector + port_value: 14317 + typed_extension_protocol_options: + envoy.extensions.upstreams.http.v3.HttpProtocolOptions: + "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions + explicit_http_config: + http2_protocol_options: {} + + - name: collector_http + connect_timeout: 2s + type: STRICT_DNS + load_assignment: + cluster_name: collector_http + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: otel-collector + port_value: 14318 + +admin: + address: + socket_address: + address: 127.0.0.1 + port_value: 9901 diff --git a/infra/pki/bootstrap.sh b/infra/pki/bootstrap.sh new file mode 100755 index 0000000..297809a --- /dev/null +++ b/infra/pki/bootstrap.sh @@ -0,0 +1,158 @@ +#!/bin/sh + +set -eu + +umask 077 + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +repo_dir=$(CDPATH= cd -- "$script_dir/../.." && pwd) +security_dir="$repo_dir/.runtime/security" +staging_dir="$security_dir/.bootstrap.$$" + +cleanup() { + rm -rf "$staging_dir" +} + +trap cleanup EXIT HUP INT TERM + +if [ "${1:-}" = "--force" ]; then + force=1 +elif [ "$#" -eq 0 ]; then + force=0 +else + echo "usage: $0 [--force]" >&2 + exit 2 +fi + +if [ -d "$security_dir/public-ca" ] || [ -d "$security_dir/internal-ca" ]; then + if [ "$force" -ne 1 ]; then + echo "security material already exists; use --force to replace it" >&2 + exit 1 + fi +fi + +mkdir -p "$security_dir" "$staging_dir" +chmod 0700 "$security_dir" "$staging_dir" + +create_ca() { + name=$1 + common_name=$2 + directory="$staging_dir/$name" + + mkdir -p "$directory" + openssl genpkey -quiet -algorithm RSA -pkeyopt rsa_keygen_bits:2048 -out "$directory/ca.key" + openssl req -new -x509 -sha256 -days 3650 \ + -key "$directory/ca.key" \ + -out "$directory/ca.crt" \ + -subj "/CN=$common_name" \ + -config "$script_dir/templates/ca.cnf" \ + -extensions v3_ca +} + +create_leaf() { + name=$1 + common_name=$2 + issuer=$3 + template=$4 + directory="$staging_dir/$name" + issuer_directory="$staging_dir/$issuer" + + mkdir -p "$directory" + openssl genpkey -quiet -algorithm RSA -pkeyopt rsa_keygen_bits:2048 -out "$directory/tls.key" + openssl req -new -sha256 \ + -key "$directory/tls.key" \ + -out "$directory/tls.csr" \ + -subj "/CN=$common_name" + openssl x509 -req -sha256 -days 30 \ + -in "$directory/tls.csr" \ + -CA "$issuer_directory/ca.crt" \ + -CAkey "$issuer_directory/ca.key" \ + -CAcreateserial \ + -out "$directory/tls.crt" \ + -extfile "$script_dir/templates/$template" + rm "$directory/tls.csr" +} + +create_ca public-ca "MTUSI Lab 7 Public CA" +create_ca internal-ca "MTUSI Lab 7 Internal CA" +create_ca foreign-ca "MTUSI Lab 7 Foreign CA" + +create_leaf ingress localhost public-ca ingress.cnf +create_leaf api api internal-ca api.cnf +create_leaf load-balancer load-balancer internal-ca load-balancer.cnf +create_leaf prometheus prometheus internal-ca prometheus.cnf +create_leaf postgres postgres internal-ca postgres.cnf +create_leaf valkey valkey internal-ca valkey.cnf +create_leaf redis-broker redis-broker internal-ca redis-broker.cnf +create_leaf redis-gateway redis-gateway internal-ca redis-gateway.cnf +create_leaf redis-gateway-client redis-gateway internal-ca redis-gateway-client.cnf +create_leaf minio s3 internal-ca minio.cnf +create_leaf otel-gateway otel-gateway internal-ca otel-gateway.cnf +create_leaf openbao openbao internal-ca openbao.cnf +cp "$staging_dir/internal-ca/ca.crt" "$staging_dir/openbao/ca.crt" +create_leaf telemetry-gateway telemetry-gateway internal-ca telemetry-gateway.cnf +create_leaf collector-client collector internal-ca collector-client.cnf +create_leaf grafana-client grafana internal-ca grafana-client.cnf +create_leaf grafana-server grafana internal-ca grafana-server.cnf +create_leaf pipeline-metrics pipeline-metrics internal-ca pipeline-metrics.cnf +create_leaf api-client messenger_api internal-ca api-client.cnf +create_leaf dispatcher-client messenger_dispatcher internal-ca dispatcher-client.cnf +create_leaf worker-client messenger_worker internal-ca worker-client.cnf +create_leaf migrate-client messenger_migrate internal-ca migrate-client.cnf +create_leaf reconciler-client messenger_reconciler internal-ca reconciler-client.cnf +create_leaf postgres-exporter messenger_exporter internal-ca postgres-exporter.cnf +create_leaf postgres-admin-client messenger internal-ca postgres-admin-client.cnf +create_leaf valkey-exporter valkey_exporter internal-ca valkey-exporter.cnf +create_leaf redis-exporter redis_exporter internal-ca redis-exporter.cnf +create_leaf forbidden-client worker internal-ca forbidden-client.cnf +create_leaf foreign-client load-balancer foreign-ca load-balancer.cnf + +openssl verify -purpose sslserver -verify_hostname localhost \ + -CAfile "$staging_dir/public-ca/ca.crt" "$staging_dir/ingress/tls.crt" >/dev/null +openssl verify -purpose sslserver -verify_hostname api \ + -CAfile "$staging_dir/internal-ca/ca.crt" "$staging_dir/api/tls.crt" >/dev/null +for server in postgres valkey redis-broker redis-gateway minio otel-gateway openbao telemetry-gateway grafana-server pipeline-metrics; do + case "$server" in + minio) hostname=s3 ;; + grafana-server) hostname=grafana ;; + *) hostname=$server ;; + esac + openssl verify -purpose sslserver -verify_hostname "$hostname" \ + -CAfile "$staging_dir/internal-ca/ca.crt" "$staging_dir/$server/tls.crt" >/dev/null +done +openssl verify -purpose sslclient \ + -CAfile "$staging_dir/internal-ca/ca.crt" \ + "$staging_dir/load-balancer/tls.crt" \ + "$staging_dir/prometheus/tls.crt" \ + "$staging_dir/api-client/tls.crt" \ + "$staging_dir/dispatcher-client/tls.crt" \ + "$staging_dir/worker-client/tls.crt" \ + "$staging_dir/migrate-client/tls.crt" \ + "$staging_dir/reconciler-client/tls.crt" \ + "$staging_dir/postgres-exporter/tls.crt" \ + "$staging_dir/postgres-admin-client/tls.crt" \ + "$staging_dir/valkey-exporter/tls.crt" \ + "$staging_dir/redis-exporter/tls.crt" \ + "$staging_dir/redis-gateway-client/tls.crt" \ + "$staging_dir/collector-client/tls.crt" \ + "$staging_dir/grafana-client/tls.crt" \ + "$staging_dir/forbidden-client/tls.crt" >/dev/null +openssl verify -purpose sslclient \ + -CAfile "$staging_dir/foreign-ca/ca.crt" "$staging_dir/foreign-client/tls.crt" >/dev/null + +find "$staging_dir" -type d -exec chmod 0700 {} \; +find "$staging_dir" -type f -exec chmod 0600 {} \; + +for directory in \ + public-ca internal-ca foreign-ca ingress api load-balancer prometheus \ + postgres valkey redis-broker redis-gateway redis-gateway-client minio otel-gateway openbao \ + telemetry-gateway collector-client grafana-client grafana-server \ + pipeline-metrics \ + api-client dispatcher-client worker-client migrate-client reconciler-client \ + postgres-exporter postgres-admin-client valkey-exporter redis-exporter \ + forbidden-client foreign-client; do + rm -rf "$security_dir/$directory" + mv "$staging_dir/$directory" "$security_dir/$directory" +done + +echo "local PKI created in .runtime/security" diff --git a/infra/pki/install.sh b/infra/pki/install.sh new file mode 100644 index 0000000..0a96544 --- /dev/null +++ b/infra/pki/install.sh @@ -0,0 +1,141 @@ +#!/bin/sh + +set -eu + +umask 077 + +rm -rf /target/api/internal-ca /target/api/api /target/api/client +mkdir -p /target/api/internal-ca /target/api/api /target/api/client +cp /source/internal-ca/ca.crt /target/api/internal-ca/ca.crt +cp /source/api/tls.crt /target/api/api/tls.crt +cp /source/api/tls.key /target/api/api/tls.key +cp /source/api-client/tls.crt /target/api/client/tls.crt +cp /source/api-client/tls.key /target/api/client/tls.key +chown -R 10001:10001 /target/api +find /target/api -type d -exec chmod 0700 {} \; +find /target/api -type f -exec chmod 0600 {} \; + +rm -rf /target/nginx/ingress /target/nginx/public-ca /target/nginx/internal-ca /target/nginx/load-balancer +mkdir -p /target/nginx/ingress /target/nginx/public-ca /target/nginx/internal-ca /target/nginx/load-balancer +cp /source/ingress/tls.crt /target/nginx/ingress/tls.crt +cp /source/ingress/tls.key /target/nginx/ingress/tls.key +cp /source/public-ca/ca.crt /target/nginx/public-ca/ca.crt +cp /source/internal-ca/ca.crt /target/nginx/internal-ca/ca.crt +cp /source/load-balancer/tls.crt /target/nginx/load-balancer/tls.crt +cp /source/load-balancer/tls.key /target/nginx/load-balancer/tls.key +chown -R 0:0 /target/nginx +find /target/nginx -type d -exec chmod 0700 {} \; +find /target/nginx -type f -exec chmod 0600 {} \; + +rm -rf /target/prometheus/internal-ca /target/prometheus/prometheus +mkdir -p /target/prometheus/internal-ca /target/prometheus/prometheus +cp /source/internal-ca/ca.crt /target/prometheus/internal-ca/ca.crt +cp /source/prometheus/tls.crt /target/prometheus/prometheus/tls.crt +cp /source/prometheus/tls.key /target/prometheus/prometheus/tls.key +chown -R 65534:65534 /target/prometheus +find /target/prometheus -type d -exec chmod 0700 {} \; +find /target/prometheus -type f -exec chmod 0600 {} \; + +rm -rf /target/client/public-ca +mkdir -p /target/client/public-ca +cp /source/public-ca/ca.crt /target/client/public-ca/ca.crt +chown -R 10001:10001 /target/client +find /target/client -type d -exec chmod 0700 {} \; +find /target/client -type f -exec chmod 0600 {} \; + +install_server() { + target=$1 + identity=$2 + owner=$3 + + rm -rf "/target/$target/internal-ca" "/target/$target/$identity" + mkdir -p "/target/$target/internal-ca" "/target/$target/$identity" + cp /source/internal-ca/ca.crt "/target/$target/internal-ca/ca.crt" + cp "/source/$identity/tls.crt" "/target/$target/$identity/tls.crt" + cp "/source/$identity/tls.key" "/target/$target/$identity/tls.key" + chown -R "$owner" "/target/$target" + find "/target/$target" -type d -exec chmod 0700 {} \; + find "/target/$target" -type f -exec chmod 0600 {} \; +} + +install_client() { + target=$1 + identity=$2 + owner=$3 + + rm -rf "/target/$target/internal-ca" "/target/$target/public-ca" "/target/$target/client" + mkdir -p "/target/$target/internal-ca" "/target/$target/public-ca" "/target/$target/client" + cp /source/internal-ca/ca.crt "/target/$target/internal-ca/ca.crt" + cp /source/public-ca/ca.crt "/target/$target/public-ca/ca.crt" + cp "/source/$identity/tls.crt" "/target/$target/client/tls.crt" + cp "/source/$identity/tls.key" "/target/$target/client/tls.key" + chown -R "$owner" "/target/$target" + find "/target/$target" -type d -exec chmod 0700 {} \; + find "/target/$target" -type f -exec chmod 0600 {} \; +} + +install_server postgres postgres 70:70 +install_server valkey valkey 999:999 +install_server redis-broker redis-broker 999:999 +install_server minio minio 100:101 +cp /source/minio/tls.crt /target/minio/minio/public.crt +cp /source/minio/tls.key /target/minio/minio/private.key +chown 100:101 /target/minio/minio/public.crt /target/minio/minio/private.key +chmod 0600 /target/minio/minio/public.crt /target/minio/minio/private.key +install_server otel-gateway otel-gateway 101:101 +install_server openbao openbao 100:100 +cp /source/internal-ca/ca.crt /target/openbao/openbao/ca.crt +chown 100:100 /target/openbao/openbao/ca.crt +chmod 0600 /target/openbao/openbao/ca.crt + +rm -rf /target/openbao-agent/openbao +mkdir -p /target/openbao-agent/openbao +cp /source/internal-ca/ca.crt /target/openbao-agent/openbao/ca.crt +chown -R 10001:10001 /target/openbao-agent +find /target/openbao-agent -type d -exec chmod 0700 {} \; +find /target/openbao-agent -type f -exec chmod 0600 {} \; +chmod 0644 /target/openbao-agent/openbao/ca.crt +chmod 0755 /target/openbao-agent /target/openbao-agent/openbao + +install_server telemetry-gateway telemetry-gateway 10001:10001 +install_client collector collector-client 10001:10001 +install_client grafana grafana-client 472:472 +cp /source/grafana-server/tls.crt /target/grafana/grafana-server.crt +cp /source/grafana-server/tls.key /target/grafana/grafana-server.key +chown 472:472 /target/grafana/grafana-server.crt /target/grafana/grafana-server.key +chmod 0600 /target/grafana/grafana-server.crt /target/grafana/grafana-server.key + +rm -rf /target/redis-gateway/internal-ca /target/redis-gateway/redis-gateway /target/redis-gateway/client +mkdir -p /target/redis-gateway/internal-ca /target/redis-gateway/redis-gateway /target/redis-gateway/client +cp /source/internal-ca/ca.crt /target/redis-gateway/internal-ca/ca.crt +cp /source/redis-gateway/tls.crt /target/redis-gateway/redis-gateway/tls.crt +cp /source/redis-gateway/tls.key /target/redis-gateway/redis-gateway/tls.key +cp /source/redis-gateway-client/tls.crt /target/redis-gateway/client/tls.crt +cp /source/redis-gateway-client/tls.key /target/redis-gateway/client/tls.key +chown -R 101:101 /target/redis-gateway +find /target/redis-gateway -type d -exec chmod 0700 {} \; +find /target/redis-gateway -type f -exec chmod 0600 {} \; + +install_client dispatcher dispatcher-client 10001:10001 +install_client worker worker-client 10001:10001 +for target in dispatcher worker; do + mkdir -p "/target/$target/metrics" + cp /source/pipeline-metrics/tls.crt "/target/$target/metrics/tls.crt" + cp /source/pipeline-metrics/tls.key "/target/$target/metrics/tls.key" + chown -R 10001:10001 "/target/$target/metrics" + find "/target/$target/metrics" -type d -exec chmod 0700 {} \; + find "/target/$target/metrics" -type f -exec chmod 0600 {} \; +done +install_client migrate migrate-client 10001:10001 +install_client reconciler reconciler-client 10001:10001 +install_client postgres-exporter postgres-exporter 65534:65534 +install_client postgres-bootstrap postgres-admin-client 0:0 +install_client valkey-exporter valkey-exporter 59000:59000 +install_client redis-exporter redis-exporter 59000:59000 + +rm -rf /target/s3-bootstrap/internal-ca +mkdir -p /target/s3-bootstrap/internal-ca +cp /source/internal-ca/ca.crt /target/s3-bootstrap/internal-ca/ca.crt +chown -R 10001:10001 /target/s3-bootstrap +find /target/s3-bootstrap -type d -exec chmod 0700 {} \; +find /target/s3-bootstrap -type f -exec chmod 0600 {} \; diff --git a/infra/pki/templates/api-client.cnf b/infra/pki/templates/api-client.cnf new file mode 100644 index 0000000..0184b3e --- /dev/null +++ b/infra/pki/templates/api-client.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature +extendedKeyUsage = clientAuth +subjectAltName = URI:spiffe://mtusi/lab7/api +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/api.cnf b/infra/pki/templates/api.cnf new file mode 100644 index 0000000..db5c7c5 --- /dev/null +++ b/infra/pki/templates/api.cnf @@ -0,0 +1,10 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature,keyEncipherment +extendedKeyUsage = serverAuth +subjectAltName = @subject_alt_names +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer + +[subject_alt_names] +DNS.1 = api +URI.1 = spiffe://mtusi/lab7/api diff --git a/infra/pki/templates/ca.cnf b/infra/pki/templates/ca.cnf new file mode 100644 index 0000000..eafaf88 --- /dev/null +++ b/infra/pki/templates/ca.cnf @@ -0,0 +1,12 @@ +[req] +distinguished_name = distinguished_name +prompt = no + +[distinguished_name] +CN = local-ca + +[v3_ca] +basicConstraints = critical,CA:TRUE,pathlen:0 +keyUsage = critical,keyCertSign,cRLSign +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid:always diff --git a/infra/pki/templates/collector-client.cnf b/infra/pki/templates/collector-client.cnf new file mode 100644 index 0000000..98344b7 --- /dev/null +++ b/infra/pki/templates/collector-client.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature +extendedKeyUsage = clientAuth +subjectAltName = URI:spiffe://mtusi/lab7/collector +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/dispatcher-client.cnf b/infra/pki/templates/dispatcher-client.cnf new file mode 100644 index 0000000..5b0bbfc --- /dev/null +++ b/infra/pki/templates/dispatcher-client.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature +extendedKeyUsage = clientAuth +subjectAltName = URI:spiffe://mtusi/lab7/dispatcher +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/forbidden-client.cnf b/infra/pki/templates/forbidden-client.cnf new file mode 100644 index 0000000..2c0a192 --- /dev/null +++ b/infra/pki/templates/forbidden-client.cnf @@ -0,0 +1,9 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature +extendedKeyUsage = clientAuth +subjectAltName = @subject_alt_names +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer + +[subject_alt_names] +URI.1 = spiffe://mtusi/lab7/worker diff --git a/infra/pki/templates/grafana-client.cnf b/infra/pki/templates/grafana-client.cnf new file mode 100644 index 0000000..b65e4e0 --- /dev/null +++ b/infra/pki/templates/grafana-client.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature +extendedKeyUsage = clientAuth +subjectAltName = URI:spiffe://mtusi/lab7/grafana +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/grafana-server.cnf b/infra/pki/templates/grafana-server.cnf new file mode 100644 index 0000000..4d5646d --- /dev/null +++ b/infra/pki/templates/grafana-server.cnf @@ -0,0 +1,11 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature,keyEncipherment +extendedKeyUsage = serverAuth +subjectAltName = @subject_alt_names +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer + +[subject_alt_names] +DNS.1 = grafana +DNS.2 = localhost +IP.1 = 127.0.0.1 diff --git a/infra/pki/templates/ingress.cnf b/infra/pki/templates/ingress.cnf new file mode 100644 index 0000000..0f50b42 --- /dev/null +++ b/infra/pki/templates/ingress.cnf @@ -0,0 +1,11 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature,keyEncipherment +extendedKeyUsage = serverAuth +subjectAltName = @subject_alt_names +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer + +[subject_alt_names] +DNS.1 = localhost +DNS.2 = nginx +IP.1 = 127.0.0.1 diff --git a/infra/pki/templates/load-balancer.cnf b/infra/pki/templates/load-balancer.cnf new file mode 100644 index 0000000..6b7565b --- /dev/null +++ b/infra/pki/templates/load-balancer.cnf @@ -0,0 +1,9 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature +extendedKeyUsage = clientAuth +subjectAltName = @subject_alt_names +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer + +[subject_alt_names] +URI.1 = spiffe://mtusi/lab7/load-balancer diff --git a/infra/pki/templates/migrate-client.cnf b/infra/pki/templates/migrate-client.cnf new file mode 100644 index 0000000..548c604 --- /dev/null +++ b/infra/pki/templates/migrate-client.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature +extendedKeyUsage = clientAuth +subjectAltName = URI:spiffe://mtusi/lab7/migrate +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/minio.cnf b/infra/pki/templates/minio.cnf new file mode 100644 index 0000000..8d8eb9d --- /dev/null +++ b/infra/pki/templates/minio.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature,keyEncipherment +extendedKeyUsage = serverAuth +subjectAltName = DNS:s3 +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/openbao.cnf b/infra/pki/templates/openbao.cnf new file mode 100644 index 0000000..16eef4e --- /dev/null +++ b/infra/pki/templates/openbao.cnf @@ -0,0 +1,11 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature,keyEncipherment +extendedKeyUsage = serverAuth +subjectAltName = @subject_alt_names +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer + +[subject_alt_names] +DNS.1 = openbao +DNS.2 = localhost +IP.1 = 127.0.0.1 diff --git a/infra/pki/templates/otel-gateway.cnf b/infra/pki/templates/otel-gateway.cnf new file mode 100644 index 0000000..96d68d6 --- /dev/null +++ b/infra/pki/templates/otel-gateway.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature,keyEncipherment +extendedKeyUsage = serverAuth +subjectAltName = DNS:otel-gateway +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/pipeline-metrics.cnf b/infra/pki/templates/pipeline-metrics.cnf new file mode 100644 index 0000000..e31124f --- /dev/null +++ b/infra/pki/templates/pipeline-metrics.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature,keyEncipherment +extendedKeyUsage = serverAuth +subjectAltName = DNS:pipeline-metrics +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/postgres-admin-client.cnf b/infra/pki/templates/postgres-admin-client.cnf new file mode 100644 index 0000000..35c28f0 --- /dev/null +++ b/infra/pki/templates/postgres-admin-client.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature +extendedKeyUsage = clientAuth +subjectAltName = URI:spiffe://mtusi/lab7/postgres-bootstrap +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/postgres-exporter.cnf b/infra/pki/templates/postgres-exporter.cnf new file mode 100644 index 0000000..ac68c22 --- /dev/null +++ b/infra/pki/templates/postgres-exporter.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature +extendedKeyUsage = clientAuth +subjectAltName = URI:spiffe://mtusi/lab7/postgres-exporter +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/postgres.cnf b/infra/pki/templates/postgres.cnf new file mode 100644 index 0000000..2c52161 --- /dev/null +++ b/infra/pki/templates/postgres.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature,keyEncipherment +extendedKeyUsage = serverAuth +subjectAltName = DNS:postgres +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/prometheus.cnf b/infra/pki/templates/prometheus.cnf new file mode 100644 index 0000000..8d924dc --- /dev/null +++ b/infra/pki/templates/prometheus.cnf @@ -0,0 +1,4 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature +extendedKeyUsage = clientAuth +subjectAltName = URI:spiffe://mtusi/lab7/prometheus diff --git a/infra/pki/templates/reconciler-client.cnf b/infra/pki/templates/reconciler-client.cnf new file mode 100644 index 0000000..d43a4e4 --- /dev/null +++ b/infra/pki/templates/reconciler-client.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature +extendedKeyUsage = clientAuth +subjectAltName = URI:spiffe://mtusi/lab7/reconciler +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/redis-broker.cnf b/infra/pki/templates/redis-broker.cnf new file mode 100644 index 0000000..1fd32ab --- /dev/null +++ b/infra/pki/templates/redis-broker.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature,keyEncipherment +extendedKeyUsage = serverAuth +subjectAltName = DNS:redis-broker +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/redis-exporter.cnf b/infra/pki/templates/redis-exporter.cnf new file mode 100644 index 0000000..583a914 --- /dev/null +++ b/infra/pki/templates/redis-exporter.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature +extendedKeyUsage = clientAuth +subjectAltName = URI:spiffe://mtusi/lab7/redis-exporter +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/redis-gateway-client.cnf b/infra/pki/templates/redis-gateway-client.cnf new file mode 100644 index 0000000..8312453 --- /dev/null +++ b/infra/pki/templates/redis-gateway-client.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature +extendedKeyUsage = clientAuth +subjectAltName = URI:spiffe://mtusi/lab7/redis-gateway +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/redis-gateway.cnf b/infra/pki/templates/redis-gateway.cnf new file mode 100644 index 0000000..f63842f --- /dev/null +++ b/infra/pki/templates/redis-gateway.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature,keyEncipherment +extendedKeyUsage = serverAuth +subjectAltName = DNS:redis-gateway +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/telemetry-gateway.cnf b/infra/pki/templates/telemetry-gateway.cnf new file mode 100644 index 0000000..970e9a7 --- /dev/null +++ b/infra/pki/templates/telemetry-gateway.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature,keyEncipherment +extendedKeyUsage = serverAuth +subjectAltName = DNS:telemetry-gateway +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/valkey-exporter.cnf b/infra/pki/templates/valkey-exporter.cnf new file mode 100644 index 0000000..faf5ecd --- /dev/null +++ b/infra/pki/templates/valkey-exporter.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature +extendedKeyUsage = clientAuth +subjectAltName = URI:spiffe://mtusi/lab7/valkey-exporter +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/valkey.cnf b/infra/pki/templates/valkey.cnf new file mode 100644 index 0000000..d6d5aa8 --- /dev/null +++ b/infra/pki/templates/valkey.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature,keyEncipherment +extendedKeyUsage = serverAuth +subjectAltName = DNS:valkey +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/pki/templates/worker-client.cnf b/infra/pki/templates/worker-client.cnf new file mode 100644 index 0000000..25af4e6 --- /dev/null +++ b/infra/pki/templates/worker-client.cnf @@ -0,0 +1,6 @@ +basicConstraints = critical,CA:FALSE +keyUsage = critical,digitalSignature +extendedKeyUsage = clientAuth +subjectAltName = URI:spiffe://mtusi/lab7/worker +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer diff --git a/infra/postgres/bootstrap-roles.sh b/infra/postgres/bootstrap-roles.sh new file mode 100755 index 0000000..d4c5ddc --- /dev/null +++ b/infra/postgres/bootstrap-roles.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +set -eu + +case "${1:-}" in + create) sql_file=/bootstrap/roles.sql ;; + grant) sql_file=/bootstrap/grants.sql ;; + *) echo "usage: $0 create|grant" >&2; exit 2 ;; +esac + +: "${POSTGRES_DB:?POSTGRES_DB is required}" +: "${POSTGRES_USER:?POSTGRES_USER is required}" +: "${POSTGRES_PASSWORD:?POSTGRES_PASSWORD is required}" +: "${POSTGRES_API_PASSWORD:?POSTGRES_API_PASSWORD is required}" +: "${POSTGRES_DISPATCHER_PASSWORD:?POSTGRES_DISPATCHER_PASSWORD is required}" +: "${POSTGRES_WORKER_PASSWORD:?POSTGRES_WORKER_PASSWORD is required}" +: "${POSTGRES_RECONCILER_PASSWORD:?POSTGRES_RECONCILER_PASSWORD is required}" +: "${POSTGRES_EXPORTER_PASSWORD:?POSTGRES_EXPORTER_PASSWORD is required}" +: "${POSTGRES_MIGRATE_PASSWORD:?POSTGRES_MIGRATE_PASSWORD is required}" + +export PGPASSWORD=$POSTGRES_PASSWORD +export PGSSLROOTCERT=${PGSSLROOTCERT:-/run/security/internal-ca/ca.crt} +export PGSSLCERT=${PGSSLCERT:-/run/security/client/tls.crt} +export PGSSLKEY=${PGSSLKEY:-/run/security/client/tls.key} +export PGSSLMODE=verify-full + +psql \ + --host=postgres \ + --username="$POSTGRES_USER" \ + --dbname="$POSTGRES_DB" \ + --set=ON_ERROR_STOP=1 \ + --set=api_password="$POSTGRES_API_PASSWORD" \ + --set=dispatcher_password="$POSTGRES_DISPATCHER_PASSWORD" \ + --set=worker_password="$POSTGRES_WORKER_PASSWORD" \ + --set=reconciler_password="$POSTGRES_RECONCILER_PASSWORD" \ + --set=exporter_password="$POSTGRES_EXPORTER_PASSWORD" \ + --set=migrate_password="$POSTGRES_MIGRATE_PASSWORD" \ + --file="$sql_file" diff --git a/infra/postgres/grants.sql b/infra/postgres/grants.sql new file mode 100644 index 0000000..02fca4d --- /dev/null +++ b/infra/postgres/grants.sql @@ -0,0 +1,25 @@ +REVOKE ALL ON ALL TABLES IN SCHEMA public FROM PUBLIC; + +GRANT SELECT, INSERT, UPDATE, DELETE ON + users, + chats, + chat_members, + messages, + message_idempotency, + attachments, + message_attachments, + attachment_jobs, + outbox_events +TO messenger_api; +GRANT SELECT ON attachment_variants TO messenger_api; + +GRANT SELECT, UPDATE, DELETE ON outbox_events TO messenger_dispatcher; + +GRANT SELECT, UPDATE ON attachments, attachment_jobs TO messenger_worker; +GRANT SELECT, INSERT, UPDATE, DELETE ON attachment_variants TO messenger_worker; +GRANT INSERT ON attachment_replay_audit TO messenger_worker; +GRANT INSERT ON outbox_events TO messenger_worker; + +GRANT SELECT, UPDATE, DELETE ON attachments TO messenger_reconciler; +GRANT SELECT ON attachment_variants, message_attachments TO messenger_reconciler; +GRANT pg_monitor TO messenger_exporter; diff --git a/infra/postgres/pg_hba.conf b/infra/postgres/pg_hba.conf new file mode 100644 index 0000000..33d20f3 --- /dev/null +++ b/infra/postgres/pg_hba.conf @@ -0,0 +1,15 @@ +# Local bootstrap and health checks stay inside the PostgreSQL container. +local all all trust + +# TLS verifies the server. clientcert=verify-full additionally binds the +# certificate CN to the database role; SCRAM remains a second factor. +hostssl messenger messenger_api all scram-sha-256 clientcert=verify-full +hostssl messenger messenger_dispatcher all scram-sha-256 clientcert=verify-full +hostssl messenger messenger_worker all scram-sha-256 clientcert=verify-full +hostssl messenger messenger_reconciler all scram-sha-256 clientcert=verify-full +hostssl messenger messenger_exporter all scram-sha-256 clientcert=verify-full +hostssl messenger messenger_migrate all scram-sha-256 clientcert=verify-full +hostssl messenger messenger all scram-sha-256 clientcert=verify-full + +hostnossl all all all reject +hostssl all all all reject diff --git a/infra/postgres/postgresql.conf b/infra/postgres/postgresql.conf new file mode 100644 index 0000000..e27a93c --- /dev/null +++ b/infra/postgres/postgresql.conf @@ -0,0 +1,11 @@ +listen_addresses = '*' +port = 5432 + +ssl = on +ssl_cert_file = '/run/security/postgres/tls.crt' +ssl_key_file = '/run/security/postgres/tls.key' +ssl_ca_file = '/run/security/internal-ca/ca.crt' +ssl_min_protocol_version = 'TLSv1.3' + +hba_file = '/etc/postgresql/pg_hba.conf' +password_encryption = 'scram-sha-256' diff --git a/infra/postgres/roles.sql b/infra/postgres/roles.sql new file mode 100644 index 0000000..2d6ba99 --- /dev/null +++ b/infra/postgres/roles.sql @@ -0,0 +1,38 @@ +SELECT format('CREATE ROLE %I LOGIN', role_name) +FROM unnest(ARRAY[ + 'messenger_api', + 'messenger_dispatcher', + 'messenger_worker', + 'messenger_reconciler', + 'messenger_exporter', + 'messenger_migrate' +]) AS roles(role_name) +WHERE NOT EXISTS (SELECT FROM pg_roles WHERE rolname = role_name) +\gexec + +ALTER ROLE messenger_api PASSWORD :'api_password'; +ALTER ROLE messenger_dispatcher PASSWORD :'dispatcher_password'; +ALTER ROLE messenger_worker PASSWORD :'worker_password'; +ALTER ROLE messenger_reconciler PASSWORD :'reconciler_password'; +ALTER ROLE messenger_exporter PASSWORD :'exporter_password'; +ALTER ROLE messenger_migrate PASSWORD :'migrate_password'; + +REVOKE CREATE ON SCHEMA public FROM PUBLIC; + +GRANT CONNECT ON DATABASE messenger TO + messenger_api, + messenger_dispatcher, + messenger_worker, + messenger_reconciler, + messenger_exporter, + messenger_migrate; +GRANT USAGE ON SCHEMA public TO + messenger_api, + messenger_dispatcher, + messenger_worker, + messenger_reconciler, + messenger_exporter; +GRANT USAGE, CREATE ON SCHEMA public TO messenger_migrate; + +ALTER DEFAULT PRIVILEGES FOR ROLE messenger_migrate IN SCHEMA public + GRANT SELECT, INSERT, UPDATE, DELETE ON TABLES TO messenger_api; diff --git a/infra/redis/bootstrap-acl.sh b/infra/redis/bootstrap-acl.sh new file mode 100755 index 0000000..b5133c2 --- /dev/null +++ b/infra/redis/bootstrap-acl.sh @@ -0,0 +1,66 @@ +#!/bin/sh + +set -eu + +usage() { + echo "usage: $0 valkey|broker OUTPUT" >&2 + exit 2 +} + +valid_secret() { + value=$1 + case "$value" in + ""|*[!A-Za-z0-9_@%+=:,./-]*) return 1 ;; + *) return 0 ;; + esac +} + +write_valkey_acl() { + : "${VALKEY_API_PASSWORD:?VALKEY_API_PASSWORD is required}" + : "${VALKEY_EXPORTER_PASSWORD:?VALKEY_EXPORTER_PASSWORD is required}" + : "${VALKEY_HEALTH_PASSWORD:?VALKEY_HEALTH_PASSWORD is required}" + valid_secret "$VALKEY_API_PASSWORD" || exit 1 + valid_secret "$VALKEY_EXPORTER_PASSWORD" || exit 1 + valid_secret "$VALKEY_HEALTH_PASSWORD" || exit 1 + + cat >"$output" <$VALKEY_API_PASSWORD ~session:* ~login-rate:* +ping +get +set +del +unlink +expire +pexpire +ttl +pttl +incr +eval +evalsha +script|load +user valkey_exporter reset on >$VALKEY_EXPORTER_PASSWORD ~* +ping +info +client +config|get +scan +dbsize +slowlog +user valkey_health reset on >$VALKEY_HEALTH_PASSWORD +ping +EOF +} + +write_broker_acl() { + : "${REDIS_DISPATCHER_PASSWORD:?REDIS_DISPATCHER_PASSWORD is required}" + : "${REDIS_WORKER_PASSWORD:?REDIS_WORKER_PASSWORD is required}" + : "${REDIS_EXPORTER_PASSWORD:?REDIS_EXPORTER_PASSWORD is required}" + : "${REDIS_HEALTH_PASSWORD:?REDIS_HEALTH_PASSWORD is required}" + valid_secret "$REDIS_DISPATCHER_PASSWORD" || exit 1 + valid_secret "$REDIS_WORKER_PASSWORD" || exit 1 + valid_secret "$REDIS_EXPORTER_PASSWORD" || exit 1 + valid_secret "$REDIS_HEALTH_PASSWORD" || exit 1 + + cat >"$output" <$REDIS_DISPATCHER_PASSWORD ~attachment-jobs +ping +xadd +user messenger_worker reset on >$REDIS_WORKER_PASSWORD ~attachment-jobs ~attachment-jobs-failed +ping +xgroup +xreadgroup +xautoclaim +xpending +xack +xdel +xadd +eval +evalsha +script|load +user redis_exporter reset on >$REDIS_EXPORTER_PASSWORD ~* +ping +info +client +config|get +scan +dbsize +slowlog +xinfo +user redis_health reset on >$REDIS_HEALTH_PASSWORD +ping +EOF +} + +[ "$#" -eq 2 ] || usage +mode=$1 +output=$2 + +umask 077 +mkdir -p "$(dirname -- "$output")" + +case "$mode" in + valkey) write_valkey_acl ;; + broker) write_broker_acl ;; + *) usage ;; +esac + +chmod 0600 "$output" diff --git a/infra/redis/gateway.yaml b/infra/redis/gateway.yaml new file mode 100644 index 0000000..93ef23e --- /dev/null +++ b/infra/redis/gateway.yaml @@ -0,0 +1,136 @@ +static_resources: + listeners: + - name: valkey_api + address: + socket_address: {address: 0.0.0.0, port_value: 16379} + filter_chains: + - filters: + - name: envoy.filters.network.tcp_proxy + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + stat_prefix: valkey_api + cluster: valkey + transport_socket: + name: envoy.transport_sockets.tls + typed_config: + "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext + require_client_certificate: true + common_tls_context: + tls_params: {tls_minimum_protocol_version: TLSv1_3, tls_maximum_protocol_version: TLSv1_3} + tls_certificates: + - certificate_chain: {filename: /run/security/redis-gateway/tls.crt} + private_key: {filename: /run/security/redis-gateway/tls.key} + validation_context: + trusted_ca: {filename: /run/security/internal-ca/ca.crt} + match_typed_subject_alt_names: + - san_type: URI + matcher: {exact: "spiffe://mtusi/lab7/api"} + + - name: broker_dispatcher + address: + socket_address: {address: 0.0.0.0, port_value: 26379} + filter_chains: + - filters: + - name: envoy.filters.network.tcp_proxy + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + stat_prefix: broker_dispatcher + cluster: redis_broker + transport_socket: + name: envoy.transport_sockets.tls + typed_config: + "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext + require_client_certificate: true + common_tls_context: + tls_params: {tls_minimum_protocol_version: TLSv1_3, tls_maximum_protocol_version: TLSv1_3} + tls_certificates: + - certificate_chain: {filename: /run/security/redis-gateway/tls.crt} + private_key: {filename: /run/security/redis-gateway/tls.key} + validation_context: + trusted_ca: {filename: /run/security/internal-ca/ca.crt} + match_typed_subject_alt_names: + - san_type: URI + matcher: {exact: "spiffe://mtusi/lab7/dispatcher"} + + - name: broker_worker + address: + socket_address: {address: 0.0.0.0, port_value: 36379} + filter_chains: + - filters: + - name: envoy.filters.network.tcp_proxy + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + stat_prefix: broker_worker + cluster: redis_broker + transport_socket: + name: envoy.transport_sockets.tls + typed_config: + "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext + require_client_certificate: true + common_tls_context: + tls_params: {tls_minimum_protocol_version: TLSv1_3, tls_maximum_protocol_version: TLSv1_3} + tls_certificates: + - certificate_chain: {filename: /run/security/redis-gateway/tls.crt} + private_key: {filename: /run/security/redis-gateway/tls.key} + validation_context: + trusted_ca: {filename: /run/security/internal-ca/ca.crt} + match_typed_subject_alt_names: + - san_type: URI + matcher: {exact: "spiffe://mtusi/lab7/worker"} + + clusters: + - name: valkey + connect_timeout: 2s + type: STRICT_DNS + load_assignment: + cluster_name: valkey + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: {address: valkey, port_value: 6379} + transport_socket: + name: envoy.transport_sockets.tls + typed_config: + "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext + sni: valkey + common_tls_context: + tls_params: {tls_minimum_protocol_version: TLSv1_3, tls_maximum_protocol_version: TLSv1_3} + tls_certificates: + - certificate_chain: {filename: /run/security/client/tls.crt} + private_key: {filename: /run/security/client/tls.key} + validation_context: + trusted_ca: {filename: /run/security/internal-ca/ca.crt} + match_typed_subject_alt_names: + - san_type: DNS + matcher: {exact: valkey} + + - name: redis_broker + connect_timeout: 2s + type: STRICT_DNS + load_assignment: + cluster_name: redis_broker + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: {address: redis-broker, port_value: 6379} + transport_socket: + name: envoy.transport_sockets.tls + typed_config: + "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext + sni: redis-broker + common_tls_context: + tls_params: {tls_minimum_protocol_version: TLSv1_3, tls_maximum_protocol_version: TLSv1_3} + tls_certificates: + - certificate_chain: {filename: /run/security/client/tls.crt} + private_key: {filename: /run/security/client/tls.key} + validation_context: + trusted_ca: {filename: /run/security/internal-ca/ca.crt} + match_typed_subject_alt_names: + - san_type: DNS + matcher: {exact: redis-broker} + +admin: + address: + socket_address: {address: 127.0.0.1, port_value: 9901} diff --git a/infra/redis/redis-broker.conf b/infra/redis/redis-broker.conf new file mode 100644 index 0000000..4124875 --- /dev/null +++ b/infra/redis/redis-broker.conf @@ -0,0 +1,17 @@ +bind 0.0.0.0 +protected-mode yes +port 0 +tls-port 6379 +tls-cert-file /run/security/redis-broker/tls.crt +tls-key-file /run/security/redis-broker/tls.key +tls-ca-cert-file /run/security/internal-ca/ca.crt +tls-auth-clients yes +tls-protocols "TLSv1.3" +unixsocket /tmp/redis.sock +unixsocketperm 700 + +aclfile /run/security/redis-broker/users.acl +appendonly yes +appendfsync always +maxmemory-policy noeviction +dir /data diff --git a/infra/redis/valkey.conf b/infra/redis/valkey.conf new file mode 100644 index 0000000..14b2aa5 --- /dev/null +++ b/infra/redis/valkey.conf @@ -0,0 +1,16 @@ +bind 0.0.0.0 +protected-mode yes +port 0 +tls-port 6379 +tls-cert-file /run/security/valkey/tls.crt +tls-key-file /run/security/valkey/tls.key +tls-ca-cert-file /run/security/internal-ca/ca.crt +tls-auth-clients yes +tls-protocols "TLSv1.3" +unixsocket /tmp/valkey.sock +unixsocketperm 700 + +aclfile /run/security/valkey/users.acl +appendonly yes +appendfsync everysec +dir /data diff --git a/infra/security/test-dependency-matrix.sh b/infra/security/test-dependency-matrix.sh new file mode 100755 index 0000000..06c96c5 --- /dev/null +++ b/infra/security/test-dependency-matrix.sh @@ -0,0 +1,199 @@ +#!/bin/sh + +set -eu + +: "${SECURITY_DIR:=/run/security-source}" +: "${POSTGRES_HOST:=postgres}" +: "${VALKEY_HOST:=redis-gateway}" +: "${VALKEY_PORT:=16379}" +: "${REDIS_HOST:=redis-gateway}" +: "${REDIS_DISPATCHER_PORT:=26379}" +: "${REDIS_WORKER_PORT:=36379}" +: "${S3_HOST:=s3}" +: "${OTEL_HOST:=otel-gateway}" +: "${POSTGRES_DB:=messenger}" +: "${S3_BUCKET:=messenger-attachments}" + +required_commands="curl mc openssl psql redis-cli" +for command in $required_commands; do + command -v "$command" >/dev/null 2>&1 || { + echo "$command is required" >&2 + exit 1 + } +done + +ca=$SECURITY_DIR/internal-ca/ca.crt + +expect_failure() { + description=$1 + shift + if "$@" >/dev/null 2>&1; then + echo "expected failure: $description" >&2 + exit 1 + fi +} + +expect_redis_denied() { + description=$1 + shift + output=$("$@" 2>&1 || true) + case "$output" in + *NOPERM*|*DENIED*) ;; + *) echo "expected Redis ACL denial: $description" >&2; exit 1 ;; + esac +} + +expect_redis_allowed() { + description=$1 + shift + output=$("$@" 2>&1) || { + echo "expected Redis ACL allow: $description: $output" >&2 + exit 1 + } + case "$output" in + *NOPERM*|*DENIED*) echo "expected Redis ACL allow: $description: $output" >&2; exit 1 ;; + esac +} + +check_server() { + host=$1 + port=$2 + identity=${3:-} + client_options= + if [ -n "$identity" ]; then + client_options="-cert $SECURITY_DIR/$identity/tls.crt -key $SECURITY_DIR/$identity/tls.key" + fi + # client_options contains only paths assembled by this script. + # shellcheck disable=SC2086 + printf '' | openssl s_client $client_options \ + -connect "$host:$port" \ + -servername "$host" \ + -verify_hostname "$host" \ + -verify_return_error \ + -CAfile "$ca" >/dev/null 2>&1 +} + +check_server "$POSTGRES_HOST" 5432 api-client +check_server "$VALKEY_HOST" "$VALKEY_PORT" api-client +check_server "$REDIS_HOST" "$REDIS_WORKER_PORT" worker-client +check_server "$S3_HOST" 9000 + +: "${POSTGRES_API_PASSWORD:?POSTGRES_API_PASSWORD is required}" +: "${POSTGRES_WORKER_PASSWORD:?POSTGRES_WORKER_PASSWORD is required}" +: "${POSTGRES_DISPATCHER_PASSWORD:?POSTGRES_DISPATCHER_PASSWORD is required}" + +pg_url() { + role=$1 + cert=$2 + password=$3 + printf 'postgresql://%s:%s@%s:5432/%s?sslmode=verify-full&sslrootcert=%s&sslcert=%s&sslkey=%s' \ + "$role" "$password" "$POSTGRES_HOST" "$POSTGRES_DB" "$ca" \ + "$SECURITY_DIR/$cert/tls.crt" "$SECURITY_DIR/$cert/tls.key" +} + +api_db=$(pg_url messenger_api api-client "$POSTGRES_API_PASSWORD") +worker_db=$(pg_url messenger_worker worker-client "$POSTGRES_WORKER_PASSWORD") +dispatcher_db=$(pg_url messenger_dispatcher dispatcher-client "$POSTGRES_DISPATCHER_PASSWORD") +api_with_worker_cert=$(pg_url messenger_api worker-client "$POSTGRES_API_PASSWORD") + +psql "$api_db" --set=ON_ERROR_STOP=1 --command='SELECT count(*) FROM users' >/dev/null +psql "$worker_db" --set=ON_ERROR_STOP=1 --command='SELECT count(*) FROM attachment_jobs' >/dev/null +psql "$worker_db" --set=ON_ERROR_STOP=1 --command='UPDATE attachment_jobs SET updated_at = updated_at WHERE false' >/dev/null +psql "$dispatcher_db" --set=ON_ERROR_STOP=1 --command='SELECT count(*) FROM outbox_events' >/dev/null +expect_failure "worker reads users" psql "$worker_db" --set=ON_ERROR_STOP=1 --command='SELECT count(*) FROM users' +expect_failure "dispatcher reads attachments" psql "$dispatcher_db" --set=ON_ERROR_STOP=1 --command='SELECT count(*) FROM attachments' +expect_failure "API role uses worker certificate" psql "$api_with_worker_cert" --set=ON_ERROR_STOP=1 --command='SELECT 1' + +: "${VALKEY_API_PASSWORD:?VALKEY_API_PASSWORD is required}" +: "${REDIS_DISPATCHER_PASSWORD:?REDIS_DISPATCHER_PASSWORD is required}" +: "${REDIS_WORKER_PASSWORD:?REDIS_WORKER_PASSWORD is required}" + +expect_failure "broker without client certificate" env REDISCLI_AUTH="$REDIS_WORKER_PASSWORD" \ + redis-cli --tls --cacert "$ca" --user messenger_worker -h "$REDIS_HOST" -p "$REDIS_WORKER_PORT" PING +for identity in foreign-client api-client; do + expect_failure "broker rejects $identity" env REDISCLI_AUTH="$REDIS_WORKER_PASSWORD" \ + redis-cli --tls --cacert "$ca" --cert "$SECURITY_DIR/$identity/tls.crt" \ + --key "$SECURITY_DIR/$identity/tls.key" --user messenger_worker \ + -h "$REDIS_HOST" -p "$REDIS_WORKER_PORT" PING +done + +redis_tls() { + identity=$1 + shift + redis-cli --tls --cacert "$ca" \ + --cert "$SECURITY_DIR/$identity/tls.crt" \ + --key "$SECURITY_DIR/$identity/tls.key" "$@" +} + +REDISCLI_AUTH=$VALKEY_API_PASSWORD redis_tls api-client \ + --user messenger_api -h "$VALKEY_HOST" -p "$VALKEY_PORT" SET session:acl-test value EX 30 >/dev/null +expect_redis_denied "session identity writes an arbitrary key" env REDISCLI_AUTH="$VALKEY_API_PASSWORD" \ + redis-cli --tls --cacert "$ca" --cert "$SECURITY_DIR/api-client/tls.crt" \ + --key "$SECURITY_DIR/api-client/tls.key" --user messenger_api -h "$VALKEY_HOST" -p "$VALKEY_PORT" SET forbidden value + +REDISCLI_AUTH=$REDIS_DISPATCHER_PASSWORD redis_tls dispatcher-client \ + --user messenger_dispatcher -h "$REDIS_HOST" -p "$REDIS_DISPATCHER_PORT" XADD attachment-jobs '*' payload acl-test >/dev/null +expect_redis_denied "dispatcher consumes jobs" env REDISCLI_AUTH="$REDIS_DISPATCHER_PASSWORD" \ + redis-cli --tls --cacert "$ca" --cert "$SECURITY_DIR/dispatcher-client/tls.crt" \ + --key "$SECURITY_DIR/dispatcher-client/tls.key" --user messenger_dispatcher -h "$REDIS_HOST" -p "$REDIS_DISPATCHER_PORT" \ + XREAD COUNT 1 STREAMS attachment-jobs 0 +REDISCLI_AUTH=$REDIS_WORKER_PASSWORD redis_tls worker-client \ + --user messenger_worker -h "$REDIS_HOST" -p "$REDIS_WORKER_PORT" XGROUP DESTROY attachment-jobs acl-worker-check >/dev/null 2>&1 || true +expect_redis_allowed "worker creates its consumer group" env REDISCLI_AUTH="$REDIS_WORKER_PASSWORD" \ + redis-cli --tls --cacert "$ca" --cert "$SECURITY_DIR/worker-client/tls.crt" \ + --key "$SECURITY_DIR/worker-client/tls.key" --user messenger_worker -h "$REDIS_HOST" -p "$REDIS_WORKER_PORT" \ + XGROUP CREATE attachment-jobs acl-worker-check '$' MKSTREAM +expect_redis_allowed "worker consumes its stream" env REDISCLI_AUTH="$REDIS_WORKER_PASSWORD" \ + redis-cli --tls --cacert "$ca" --cert "$SECURITY_DIR/worker-client/tls.crt" \ + --key "$SECURITY_DIR/worker-client/tls.key" --user messenger_worker -h "$REDIS_HOST" -p "$REDIS_WORKER_PORT" \ + XREADGROUP GROUP acl-worker-check acl-worker-consumer COUNT 1 STREAMS attachment-jobs '>' +expect_redis_allowed "worker acknowledges its stream" env REDISCLI_AUTH="$REDIS_WORKER_PASSWORD" \ + redis-cli --tls --cacert "$ca" --cert "$SECURITY_DIR/worker-client/tls.crt" \ + --key "$SECURITY_DIR/worker-client/tls.key" --user messenger_worker -h "$REDIS_HOST" -p "$REDIS_WORKER_PORT" \ + XACK attachment-jobs acl-worker-check 0-1 +REDISCLI_AUTH=$REDIS_WORKER_PASSWORD redis_tls worker-client \ + --user messenger_worker -h "$REDIS_HOST" -p "$REDIS_WORKER_PORT" XGROUP DESTROY attachment-jobs acl-worker-check >/dev/null +expect_redis_denied "worker accesses an unrelated stream" env REDISCLI_AUTH="$REDIS_WORKER_PASSWORD" \ + redis-cli --tls --cacert "$ca" --cert "$SECURITY_DIR/worker-client/tls.crt" \ + --key "$SECURITY_DIR/worker-client/tls.key" --user messenger_worker -h "$REDIS_HOST" -p "$REDIS_WORKER_PORT" XADD unrelated '*' payload denied + +: "${S3_API_ACCESS_KEY:?S3_API_ACCESS_KEY is required}" +: "${S3_API_SECRET_KEY:?S3_API_SECRET_KEY is required}" +: "${S3_WORKER_ACCESS_KEY:?S3_WORKER_ACCESS_KEY is required}" +: "${S3_WORKER_SECRET_KEY:?S3_WORKER_SECRET_KEY is required}" + +export SSL_CERT_FILE=$ca +export MC_CONFIG_DIR=/tmp/mc-acl-test +test_file=/tmp/acl-test-object +printf 'acl-test' >"$test_file" +mc alias set api "https://$S3_HOST:9000" "$S3_API_ACCESS_KEY" "$S3_API_SECRET_KEY" >/dev/null +mc alias set worker "https://$S3_HOST:9000" "$S3_WORKER_ACCESS_KEY" "$S3_WORKER_SECRET_KEY" >/dev/null +mc cp "$test_file" "api/$S3_BUCKET/staging/acl-test" >/dev/null +expect_failure "API writes processed objects" mc cp "$test_file" "api/$S3_BUCKET/attachments/acl-test" +mc cp "$test_file" "worker/$S3_BUCKET/attachments/acl-test" >/dev/null +expect_failure "worker writes outside attachment prefixes" mc cp "$test_file" "worker/$S3_BUCKET/private/acl-test" +mc rm "api/$S3_BUCKET/staging/acl-test" >/dev/null +mc rm "worker/$S3_BUCKET/attachments/acl-test" >/dev/null + +expect_failure "OTel without client certificate" curl --silent --show-error \ + --cacert "$ca" "https://$OTEL_HOST:4318/" +expect_failure "OTel with foreign CA client certificate" curl --silent --show-error \ + --cacert "$ca" --cert "$SECURITY_DIR/foreign-client/tls.crt" \ + --key "$SECURITY_DIR/foreign-client/tls.key" "https://$OTEL_HOST:4318/" + +curl --silent --show-error --fail-with-body \ + --cacert "$ca" \ + --cert "$SECURITY_DIR/api-client/tls.crt" \ + --key "$SECURITY_DIR/api-client/tls.key" \ + "https://$OTEL_HOST:4318/" >/dev/null 2>&1 || status=$? +case "${status:-0}" in + 0|22) ;; + *) echo "allowed OTel identity failed TLS" >&2; exit 1 ;; +esac +expect_failure "Prometheus same-CA identity reaches OTel" curl --silent --show-error \ + --cacert "$ca" \ + --cert "$SECURITY_DIR/prometheus/tls.crt" \ + --key "$SECURITY_DIR/prometheus/tls.key" \ + "https://$OTEL_HOST:4318/" + +echo "dependency TLS and least-privilege matrix passed" diff --git a/lab6.env.example b/lab6.env.example deleted file mode 100644 index ca34a40..0000000 --- a/lab6.env.example +++ /dev/null @@ -1,93 +0,0 @@ -# Изолированное имя Compose-проекта и его volumes/networks. -COMPOSE_PROJECT_NAME=mtusi2026lab6 - -# Адрес и внутренний порт HTTP-сервера. -APP_HOST=0.0.0.0 -APP_PORT=8080 -MESSENGER_CONFIG_PATH=config/messenger.yaml - -# Адреса публикации сервисов на локальной машине. -API_BIND_ADDRESS=127.0.0.1:8080 -SWAGGER_BIND_ADDRESS=127.0.0.1:8081 -PROMETHEUS_BIND_ADDRESS=127.0.0.1:9090 -GRAFANA_BIND_ADDRESS=127.0.0.1:3000 -LOKI_BIND_ADDRESS=127.0.0.1:3100 -TEMPO_BIND_ADDRESS=127.0.0.1:3200 - -# Ресурсные атрибуты и внутренний OTLP endpoint приложений. -DEPLOYMENT_ENVIRONMENT=lab -SERVICE_VERSION=lab6 -OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317 -OTEL_EXPORTER_OTLP_PROTOCOL=grpc - -# Число API-реплик за Nginx. -API_REPLICAS=2 - -# Учётные данные локального PostgreSQL и строка подключения API. -POSTGRES_USER=messenger -POSTGRES_DB=messenger -POSTGRES_PASSWORD=local-postgres-password -DATABASE_URL=postgres://messenger:local-postgres-password@postgres:5432/messenger?sslmode=disable - -# Пароль локального Valkey и строка подключения API. -VALKEY_PASSWORD=local-valkey-password -CACHE_URL=redis://default:local-valkey-password@valkey:6379/0 - -# Redis Streams используется только как устойчивый брокер заданий. -REDIS_BROKER_PASSWORD=local-redis-broker-password -BROKER_URL=redis://default:local-redis-broker-password@redis-broker:6379/0 - -# Административные данные MinIO используются только при bootstrap. -MINIO_ROOT_USER=local-minio-admin -MINIO_ROOT_PASSWORD=local-minio-admin-password - -# API использует отдельного пользователя с доступом только к bucket вложений. -S3_ENDPOINT=s3:9000 -S3_REGION=us-east-1 -S3_BUCKET=messenger-attachments -S3_ACCESS_KEY=messenger-app -S3_SECRET_KEY=local-messenger-s3-password - -# Порт Swagger внутри конфигурации CORS API. -SWAGGER_PORT=8081 - -# Ограничения ресурсов контейнеров. -API_CPUS=1 -API_MEMORY=512m -MIGRATE_CPUS=0.5 -MIGRATE_MEMORY=128m -NGINX_CPUS=0.5 -NGINX_MEMORY=128m -SWAGGER_CPUS=0.25 -SWAGGER_MEMORY=128m -TEST_CPUS=2 -TEST_MEMORY=512m -EXPORTER_CPUS=0.25 -EXPORTER_MEMORY=128m -PROMETHEUS_CPUS=1 -PROMETHEUS_MEMORY=512m -GRAFANA_CPUS=1 -GRAFANA_MEMORY=512m -OTEL_COLLECTOR_CPUS=0.5 -OTEL_COLLECTOR_MEMORY=256m -LOKI_CPUS=1 -LOKI_MEMORY=512m -TEMPO_CPUS=1 -TEMPO_MEMORY=512m -POSTGRES_CPUS=2 -POSTGRES_MEMORY=1g -VALKEY_CPUS=1 -VALKEY_MEMORY=256m -REDIS_BROKER_CPUS=1 -REDIS_BROKER_MEMORY=256m -DISPATCHER_CPUS=0.5 -DISPATCHER_MEMORY=128m -WORKER_CPUS=2 -WORKER_MEMORY=1g -S3_CPUS=1 -S3_MEMORY=512m -S3_BOOTSTRAP_CPUS=0.25 -S3_BOOTSTRAP_MEMORY=256m - -# Пароль локального администратора Grafana. -GRAFANA_ADMIN_PASSWORD=local-grafana-password diff --git a/lab7.env.example b/lab7.env.example new file mode 100644 index 0000000..0dcc587 --- /dev/null +++ b/lab7.env.example @@ -0,0 +1,121 @@ +# Изолированное имя Compose-проекта и его volumes/networks. +COMPOSE_PROJECT_NAME=mtusi2026lab7 + +# Адреса HTTPS API и локального health-only listener. +APP_HOST=0.0.0.0 +APP_PORT=8443 +APP_HEALTH_ADDRESS=127.0.0.1:8082 +MESSENGER_CONFIG_PATH=config/messenger.yaml + +# Адреса публикации сервисов на локальной машине. +API_BIND_ADDRESS=127.0.0.1:8443 +SWAGGER_BIND_ADDRESS=127.0.0.1:8081 +PROMETHEUS_BIND_ADDRESS=127.0.0.1:9090 +GRAFANA_BIND_ADDRESS=127.0.0.1:3000 +LOKI_BIND_ADDRESS=127.0.0.1:3100 +TEMPO_BIND_ADDRESS=127.0.0.1:3200 + +# Ресурсные атрибуты и внутренний OTLP endpoint приложений. +DEPLOYMENT_ENVIRONMENT=lab +SERVICE_VERSION=lab7 +OTEL_EXPORTER_OTLP_ENDPOINT=https://otel-gateway:4317 +OTEL_EXPORTER_OTLP_PROTOCOL=grpc + +# Число API-реплик за Nginx. +API_REPLICAS=2 + +# Учётные данные локального PostgreSQL и строка подключения API. +POSTGRES_USER=messenger +POSTGRES_DB=messenger +POSTGRES_PASSWORD=local-postgres-password +POSTGRES_API_PASSWORD=local-postgres-api-password +POSTGRES_DISPATCHER_PASSWORD=local-postgres-dispatcher-password +POSTGRES_WORKER_PASSWORD=local-postgres-worker-password +POSTGRES_RECONCILER_PASSWORD=local-postgres-reconciler-password +POSTGRES_EXPORTER_PASSWORD=local-postgres-exporter-password +POSTGRES_MIGRATE_PASSWORD=local-postgres-migrate-password +DATABASE_URL=postgres://messenger_api:local-postgres-api-password@postgres:5432/messenger?sslmode=verify-full&sslrootcert=/run/security/internal-ca/ca.crt&sslcert=/run/security/client/tls.crt&sslkey=/run/security/client/tls.key +DATABASE_MIGRATE_URL=postgres://messenger_migrate:local-postgres-migrate-password@postgres:5432/messenger?sslmode=verify-full&sslrootcert=/run/security/internal-ca/ca.crt&sslcert=/run/security/client/tls.crt&sslkey=/run/security/client/tls.key +DATABASE_DISPATCHER_URL=postgres://messenger_dispatcher:local-postgres-dispatcher-password@postgres:5432/messenger?sslmode=verify-full&sslrootcert=/run/security/internal-ca/ca.crt&sslcert=/run/security/client/tls.crt&sslkey=/run/security/client/tls.key +DATABASE_WORKER_URL=postgres://messenger_worker:local-postgres-worker-password@postgres:5432/messenger?sslmode=verify-full&sslrootcert=/run/security/internal-ca/ca.crt&sslcert=/run/security/client/tls.crt&sslkey=/run/security/client/tls.key +DATABASE_RECONCILER_URL=postgres://messenger_reconciler:local-postgres-reconciler-password@postgres:5432/messenger?sslmode=verify-full&sslrootcert=/run/security/internal-ca/ca.crt&sslcert=/run/security/client/tls.crt&sslkey=/run/security/client/tls.key + +# Пароль локального Valkey и строка подключения API. +VALKEY_API_PASSWORD=local-valkey-api-password +VALKEY_EXPORTER_PASSWORD=local-valkey-exporter-password +VALKEY_HEALTH_PASSWORD=local-valkey-health-password +CACHE_URL=rediss://messenger_api:local-valkey-api-password@redis-gateway:16379/0 + +# Redis Streams используется только как устойчивый брокер заданий. +REDIS_DISPATCHER_PASSWORD=local-redis-dispatcher-password +REDIS_WORKER_PASSWORD=local-redis-worker-password +REDIS_EXPORTER_PASSWORD=local-redis-exporter-password +REDIS_HEALTH_PASSWORD=local-redis-health-password +BROKER_DISPATCHER_URL=rediss://messenger_dispatcher:local-redis-dispatcher-password@redis-gateway:26379/0 +BROKER_WORKER_URL=rediss://messenger_worker:local-redis-worker-password@redis-gateway:36379/0 + +# Административные данные MinIO используются только при bootstrap. +MINIO_ROOT_USER=local-minio-admin +MINIO_ROOT_PASSWORD=local-minio-admin-password + +# API использует отдельного пользователя с доступом только к bucket вложений. +S3_ENDPOINT=s3:9000 +S3_REGION=us-east-1 +S3_BUCKET=messenger-attachments +S3_API_ACCESS_KEY=messenger-api +S3_API_SECRET_KEY=local-messenger-api-s3-password +S3_WORKER_ACCESS_KEY=messenger-worker +S3_WORKER_SECRET_KEY=local-messenger-worker-s3-password +S3_RECONCILER_ACCESS_KEY=messenger-reconciler +S3_RECONCILER_SECRET_KEY=local-messenger-reconciler-s3-password + +# Порт Swagger внутри конфигурации CORS API. +SWAGGER_PORT=8081 + +# Ограничения ресурсов контейнеров. +API_CPUS=1 +API_MEMORY=512m +MIGRATE_CPUS=0.5 +MIGRATE_MEMORY=128m +NGINX_CPUS=0.5 +NGINX_MEMORY=128m +SWAGGER_CPUS=0.25 +SWAGGER_MEMORY=128m +TEST_CPUS=2 +TEST_MEMORY=512m +EXPORTER_CPUS=0.25 +EXPORTER_MEMORY=128m +PROMETHEUS_CPUS=1 +PROMETHEUS_MEMORY=512m +GRAFANA_CPUS=1 +GRAFANA_MEMORY=512m +OTEL_COLLECTOR_CPUS=0.5 +OTEL_COLLECTOR_MEMORY=256m +OTEL_GATEWAY_CPUS=0.25 +OTEL_GATEWAY_MEMORY=128m +REDIS_GATEWAY_CPUS=0.25 +REDIS_GATEWAY_MEMORY=128m +OPENBAO_CPUS=0.5 +OPENBAO_MEMORY=256m +OPENBAO_BIND_ADDRESS=127.0.0.1:8200 +LOKI_CPUS=1 +LOKI_MEMORY=512m +TEMPO_CPUS=1 +TEMPO_MEMORY=512m +POSTGRES_CPUS=2 +POSTGRES_MEMORY=1g +VALKEY_CPUS=1 +VALKEY_MEMORY=256m +REDIS_BROKER_CPUS=1 +REDIS_BROKER_MEMORY=256m +DISPATCHER_CPUS=0.5 +DISPATCHER_MEMORY=128m +WORKER_CPUS=2 +WORKER_MEMORY=1g +S3_CPUS=1 +S3_MEMORY=512m +S3_BOOTSTRAP_CPUS=0.25 +S3_BOOTSTRAP_MEMORY=256m + +# Пароль локального администратора Grafana. +GRAFANA_ADMIN_PASSWORD=local-grafana-password diff --git a/monitoring/grafana/dashboards/messenger-lab6.json b/monitoring/grafana/dashboards/messenger-lab7.json similarity index 99% rename from monitoring/grafana/dashboards/messenger-lab6.json rename to monitoring/grafana/dashboards/messenger-lab7.json index f20cabe..7d03bec 100644 --- a/monitoring/grafana/dashboards/messenger-lab6.json +++ b/monitoring/grafana/dashboards/messenger-lab7.json @@ -1471,8 +1471,8 @@ "to": "now" }, "timezone": "browser", - "title": "Messenger lab6 observability", - "uid": "messenger-lab6", + "title": "Messenger lab7 security and observability", + "uid": "messenger-lab7", "version": 1, "links": [ { diff --git a/monitoring/grafana/provisioning/datasources/observability.yml b/monitoring/grafana/provisioning/datasources/observability.yml index 99af68b..2eb6a09 100644 --- a/monitoring/grafana/provisioning/datasources/observability.yml +++ b/monitoring/grafana/provisioning/datasources/observability.yml @@ -13,38 +13,49 @@ datasources: type: prometheus uid: prometheus access: proxy - url: http://prometheus:9090 + url: https://prometheus-grafana-gateway:8443 isDefault: true editable: false jsonData: httpMethod: POST + tlsAuthWithCACert: true + serverName: telemetry-gateway exemplarTraceIdDestinations: - name: trace_id datasourceUid: tempo + secureJsonData: &mtls + tlsCACert: $__file{/run/security/internal-ca/ca.crt} + tlsClientCert: $__file{/run/security/client/tls.crt} + tlsClientKey: $__file{/run/security/client/tls.key} - name: Loki type: loki uid: loki access: proxy - url: http://loki:3100 + url: https://loki-grafana-gateway:8443 editable: false jsonData: maxLines: 1000 + tlsAuthWithCACert: true + serverName: telemetry-gateway derivedFields: - name: TraceID matcherRegex: 'trace_id[=:" ]+([0-9a-f]{32})' datasourceUid: tempo url: '$${__value.raw}' + secureJsonData: *mtls - name: Tempo type: tempo uid: tempo access: proxy - url: http://tempo:3200 + url: https://tempo-grafana-gateway:8443 editable: false jsonData: nodeGraph: enabled: true + tlsAuthWithCACert: true + serverName: telemetry-gateway search: hide: false serviceMap: @@ -72,3 +83,4 @@ datasources: query: 'sum(rate(traces_spanmetrics_calls_total{$$__tags}[5m]))' - name: Error rate query: 'sum(rate(traces_spanmetrics_calls_total{$$__tags,span_status="STATUS_CODE_ERROR"}[5m]))' + secureJsonData: *mtls diff --git a/monitoring/prometheus.yml b/monitoring/prometheus.yml index 70b5dfd..1bef4f1 100644 --- a/monitoring/prometheus.yml +++ b/monitoring/prometheus.yml @@ -12,8 +12,15 @@ scrape_configs: dns_sd_configs: - names: ["api"] type: A - port: 8080 + port: 9091 refresh_interval: 2s + scheme: https + tls_config: + ca_file: /run/security/internal-ca/ca.crt + cert_file: /run/security/prometheus/tls.crt + key_file: /run/security/prometheus/tls.key + server_name: api + min_version: TLS13 relabel_configs: - target_label: service_name replacement: messenger-api @@ -44,6 +51,13 @@ scrape_configs: type: A port: 9091 refresh_interval: 2s + scheme: https + tls_config: &pipeline_tls + ca_file: /run/security/internal-ca/ca.crt + cert_file: /run/security/prometheus/tls.crt + key_file: /run/security/prometheus/tls.key + server_name: pipeline-metrics + min_version: TLS13 relabel_configs: - target_label: service_name replacement: messenger-worker @@ -55,6 +69,8 @@ scrape_configs: - job_name: outbox-dispatcher static_configs: - targets: ["dispatcher:9091"] + scheme: https + tls_config: *pipeline_tls relabel_configs: - target_label: service_name replacement: messenger-dispatcher @@ -65,6 +81,11 @@ scrape_configs: - job_name: minio metrics_path: /minio/v2/metrics/cluster + scheme: https + tls_config: + ca_file: /run/security/internal-ca/ca.crt + server_name: s3 + min_version: TLS13 static_configs: - targets: ["s3:9000"] diff --git a/nginx/nginx.conf b/nginx/nginx.conf index d62dcd6..8ff6fde 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -25,18 +25,32 @@ http { } server { - listen 8080; + listen 8443 ssl; client_max_body_size 11m; + ssl_certificate /run/security/ingress/tls.crt; + ssl_certificate_key /run/security/ingress/tls.key; + ssl_protocols TLSv1.2 TLSv1.3; + ssl_session_tickets off; + location / { - proxy_pass http://messenger; + proxy_pass https://messenger; proxy_http_version 1.1; proxy_set_header Connection ""; proxy_set_header Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Proto https; proxy_request_buffering off; + proxy_ssl_server_name on; + proxy_ssl_name api; + proxy_ssl_trusted_certificate /run/security/internal-ca/ca.crt; + proxy_ssl_verify on; + proxy_ssl_verify_depth 1; + proxy_ssl_certificate /run/security/load-balancer/tls.crt; + proxy_ssl_certificate_key /run/security/load-balancer/tls.key; + proxy_ssl_session_reuse off; + proxy_connect_timeout 1s; proxy_send_timeout 10s; proxy_read_timeout 10s; diff --git a/nginx/upstream.conf b/nginx/upstream.conf index f6131cb..3e60dfe 100644 --- a/nginx/upstream.conf +++ b/nginx/upstream.conf @@ -1 +1 @@ -server api:8080 resolve max_fails=1 fail_timeout=3s; +server api:8443 resolve max_fails=1 fail_timeout=3s;