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/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 33018c7..77aa40d 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -14,15 +14,19 @@ concurrency: jobs: verify: runs-on: ubuntu-latest - timeout-minutes: 45 + timeout-minutes: 60 env: - COMPOSE_PROJECT_NAME: mtusi2026lab6-${{ github.run_id }} + COMPOSE_PROJECT_NAME: mtusi2026lab7-${{ github.run_id }} API_BIND_ADDRESS: 127.0.0.1:0 SWAGGER_BIND_ADDRESS: 127.0.0.1:0 PROMETHEUS_BIND_ADDRESS: 127.0.0.1:0 GRAFANA_BIND_ADDRESS: 127.0.0.1:0 LOKI_BIND_ADDRESS: 127.0.0.1:0 TEMPO_BIND_ADDRESS: 127.0.0.1:0 + OPENBAO_BIND_ADDRESS: 127.0.0.1:0 + BAO_ADDR: https://openbao:8200 + DOCKER_WORKSPACE_MIRROR: "1" + CI_WORKSPACE: /tmp/mtusi2026lab7-${{ github.run_id }} steps: - name: Checkout exact commit run: | @@ -33,7 +37,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version-file: go.mod + go-version: "1.26.10" cache: false - name: Check contract @@ -48,8 +52,8 @@ jobs: - name: Check formatting and shell scripts run: | test -z "$(gofmt -l cmd internal migrations)" - sh -n infra/minio/bootstrap.sh scripts/restart.sh scripts/rolling-update.sh scripts/stop-one.sh scripts/test-lab5.sh scripts/test-lab5-acceptance.sh scripts/test-lab6.sh scripts/incident-worker.sh scripts/incident-database.sh scripts/incident-telemetry.sh - python3 -m py_compile scripts/lab6-traffic.py scripts/lab6-observe.py scripts/lab6-alert.py scripts/lab6-correlation.py scripts/validate-lab6-evidence.py + for file in infra/minio/*.sh infra/pki/*.sh infra/postgres/*.sh infra/redis/*.sh infra/security/*.sh infra/openbao/*.sh scripts/*.sh; do sh -n "$file"; done + python3 -m py_compile scripts/lab6-traffic.py scripts/lab6-observe.py scripts/lab6-alert.py scripts/lab6-correlation.py scripts/validate-lab6-evidence.py scripts/test-login-rate-limit.py - name: Lint uses: golangci/golangci-lint-action@v7 @@ -65,37 +69,79 @@ jobs: - name: Prepare local stack run: | - cp lab6.env.example .env + mkdir -p "$CI_WORKSPACE" + git archive HEAD | tar -x -C "$CI_WORKSPACE" + cd "$CI_WORKSPACE" + cp lab7.env.example .env docker compose config --quiet - docker compose up -d --build --scale api=2 --wait --wait-timeout 150 + ./infra/pki/bootstrap.sh + ./scripts/openbao-seed.sh .env + ./scripts/sync-docker-workspace.sh + docker compose up -d security-bootstrap openbao-permissions openbao + docker network connect "${COMPOSE_PROJECT_NAME}_secrets" "$HOSTNAME" + ./scripts/bootstrap-local.sh .env docker network connect "${COMPOSE_PROJECT_NAME}_application" "$HOSTNAME" docker network connect "${COMPOSE_PROJECT_NAME}_data" "$HOSTNAME" + docker network connect "${COMPOSE_PROJECT_NAME}_data_backend" "$HOSTNAME" docker network connect "${COMPOSE_PROJECT_NAME}_monitoring" "$HOSTNAME" + docker network connect "${COMPOSE_PROJECT_NAME}_secure_clients" "$HOSTNAME" + docker network connect "${COMPOSE_PROJECT_NAME}_telemetry_storage" "$HOSTNAME" - name: Integration checks run: | - set -a - . ./.env - set +a - test "$(curl --noproxy '*' -s -o /dev/null -w '%{http_code}' "http://s3:9000/$S3_BUCKET")" = "403" - make test BASE_URL=http://nginx:8080 + cd "$CI_WORKSPACE" + test "$(curl --noproxy '*' --cacert .runtime/security/internal-ca/ca.crt -s -o /dev/null -w '%{http_code}' "https://s3:9000/messenger-attachments")" = "403" + make test BASE_URL=https://nginx:8443 CA_FILE=.runtime/security/public-ca/ca.crt + make test-security BASE_URL=https://nginx:8443 CA_FILE=.runtime/security/public-ca/ca.crt + make test-tls-matrix ENV_FILE=.env + ENV_FILE=.env BASE_URL=https://nginx:8443 ./scripts/test-leaf-rotation.sh + docker compose --profile security run --rm dependency-tests + ENV_FILE=.env BAO_ADDR=https://openbao:8200 BAO_CACERT="$PWD/.runtime/security/openbao/ca.crt" ./scripts/openbao-test-policy.sh + ENV_FILE=.env BAO_ADDR=https://openbao:8200 BAO_CACERT="$PWD/.runtime/security/openbao/ca.crt" ./scripts/test-openbao-lifecycle.sh + make test-login-rate-limit BASE_URL=https://nginx:8443 CA_FILE=.runtime/security/public-ca/ca.crt docker compose --profile tests run --rm --build tests - go run ./cmd/dependencycheck -base-url=http://nginx:8080 - make test-persistence ACTION_SCRIPT=scripts/restart.sh BASE_URL=http://nginx:8080 - make test-failover ACTION_SCRIPT=scripts/stop-one.sh BASE_URL=http://nginx:8080 + go run ./cmd/dependencycheck -base-url=https://nginx:8443 -ca-file=.runtime/security/public-ca/ca.crt + make test-persistence ACTION_SCRIPT=scripts/restart.sh BASE_URL=https://nginx:8443 CA_FILE=.runtime/security/public-ca/ca.crt + make test-failover ACTION_SCRIPT=scripts/stop-one.sh BASE_URL=https://nginx:8443 CA_FILE=.runtime/security/public-ca/ca.crt docker compose up -d --scale api=2 --wait --wait-timeout 90 make test-lab5-acceptance - make test-lab5 - ENV_FILE=.env PROMETHEUS_URL=http://prometheus:9090 TEMPO_URL=http://tempo:3200 LOKI_URL=http://loki:3100 make test-lab6-smoke BASE_URL=http://nginx:8080 + make test-worker-compromise ENV_FILE=.env + make scan-security + ENV_FILE=.env CA_FILE=.runtime/security/public-ca/ca.crt PROMETHEUS_URL=http://prometheus:9090 TEMPO_URL=http://tempo:3200 LOKI_URL=http://loki:3100 make test-lab6-smoke BASE_URL=https://nginx:8443 + mkdir -p evidence/runtime + api_restart_counts=$(docker inspect --format '{{.RestartCount}}' $(docker compose ps -q api)) + go run ./cmd/loginburst -base-url=https://nginx:8443 -ca-file=.runtime/security/public-ca/ca.crt > evidence/runtime/login-burst.json + test "$(docker inspect --format '{{.RestartCount}}' $(docker compose ps -q api))" = "$api_restart_counts" - name: Container logs if: failure() - run: if [ -f .env ]; then docker compose logs --no-color --tail=200; fi + run: if [ -f "$CI_WORKSPACE/.env" ]; then cd "$CI_WORKSPACE"; docker compose logs --no-color --tail=200; fi + + - name: Upload security evidence + if: always() + uses: actions/upload-artifact@v3 + env: + ACTIONS_RUNTIME_URL: https://gitea.privcloud.tech/api/actions_pipeline/ + with: + name: lab7-security-${{ github.sha }} + path: | + ${{ env.CI_WORKSPACE }}/evidence/lab7-*.json + ${{ env.CI_WORKSPACE }}/evidence/runtime/security-scan + ${{ env.CI_WORKSPACE }}/evidence/runtime/login-burst.json + if-no-files-found: warn + retention-days: 14 - name: Stop local stack if: always() run: | + test -d "$CI_WORKSPACE" || exit 0 + cd "$CI_WORKSPACE" + trap './scripts/sync-docker-workspace.sh --clean' EXIT + docker network disconnect "${COMPOSE_PROJECT_NAME}_secrets" "$HOSTNAME" 2>/dev/null || true docker network disconnect "${COMPOSE_PROJECT_NAME}_application" "$HOSTNAME" 2>/dev/null || true docker network disconnect "${COMPOSE_PROJECT_NAME}_data" "$HOSTNAME" 2>/dev/null || true + docker network disconnect "${COMPOSE_PROJECT_NAME}_data_backend" "$HOSTNAME" 2>/dev/null || true docker network disconnect "${COMPOSE_PROJECT_NAME}_monitoring" "$HOSTNAME" 2>/dev/null || true + docker network disconnect "${COMPOSE_PROJECT_NAME}_secure_clients" "$HOSTNAME" 2>/dev/null || true + docker network disconnect "${COMPOSE_PROJECT_NAME}_telemetry_storage" "$HOSTNAME" 2>/dev/null || true if [ -f .env ]; then docker compose --profile tests down -v --remove-orphans; fi diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index b1b9a29..609de2a 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -12,7 +12,7 @@ jobs: name: Verify selected commit if: github.ref == 'refs/heads/main' runs-on: ubuntu-latest - timeout-minutes: 45 + timeout-minutes: 60 outputs: api_image: ${{ steps.publish.outputs.api_image }} nginx_image: ${{ steps.publish.outputs.nginx_image }} @@ -22,7 +22,7 @@ jobs: s3_image: ${{ steps.publish.outputs.s3_image }} s3_bootstrap_image: ${{ steps.publish.outputs.s3_bootstrap_image }} env: - COMPOSE_PROJECT_NAME: mtusi2026lab6-deploy-${{ github.run_id }} + COMPOSE_PROJECT_NAME: mtusi2026lab7-deploy-${{ github.run_id }} COMPOSE_FILE: compose.yaml:deploy/compose.images.yaml API_BIND_ADDRESS: 127.0.0.1:0 SWAGGER_BIND_ADDRESS: 127.0.0.1:0 @@ -30,13 +30,17 @@ jobs: GRAFANA_BIND_ADDRESS: 127.0.0.1:0 LOKI_BIND_ADDRESS: 127.0.0.1:0 TEMPO_BIND_ADDRESS: 127.0.0.1:0 - API_IMAGE: gitea.privcloud.tech/${{ github.repository_owner }}/mtusi2026lab6-api:${{ github.sha }} - NGINX_IMAGE: gitea.privcloud.tech/${{ github.repository_owner }}/mtusi2026lab6-nginx:${{ github.sha }} - SWAGGER_IMAGE: gitea.privcloud.tech/${{ github.repository_owner }}/mtusi2026lab6-swagger:${{ github.sha }} - PROMETHEUS_IMAGE: gitea.privcloud.tech/${{ github.repository_owner }}/mtusi2026lab6-prometheus:${{ github.sha }} - GRAFANA_IMAGE: gitea.privcloud.tech/${{ github.repository_owner }}/mtusi2026lab6-grafana:${{ github.sha }} - S3_IMAGE: gitea.privcloud.tech/${{ github.repository_owner }}/mtusi2026lab6-minio:${{ github.sha }} - S3_BOOTSTRAP_IMAGE: gitea.privcloud.tech/${{ github.repository_owner }}/mtusi2026lab6-minio-client:${{ github.sha }} + OPENBAO_BIND_ADDRESS: 127.0.0.1:0 + BAO_ADDR: https://openbao:8200 + DOCKER_WORKSPACE_MIRROR: "1" + CI_WORKSPACE: /tmp/mtusi2026lab7-${{ github.run_id }} + API_IMAGE: gitea.privcloud.tech/${{ github.repository_owner }}/mtusi2026lab7-api:${{ github.sha }} + NGINX_IMAGE: gitea.privcloud.tech/${{ github.repository_owner }}/mtusi2026lab7-nginx:${{ github.sha }} + SWAGGER_IMAGE: gitea.privcloud.tech/${{ github.repository_owner }}/mtusi2026lab7-swagger:${{ github.sha }} + PROMETHEUS_IMAGE: gitea.privcloud.tech/${{ github.repository_owner }}/mtusi2026lab7-prometheus:${{ github.sha }} + GRAFANA_IMAGE: gitea.privcloud.tech/${{ github.repository_owner }}/mtusi2026lab7-grafana:${{ github.sha }} + S3_IMAGE: gitea.privcloud.tech/${{ github.repository_owner }}/mtusi2026lab7-minio:${{ github.sha }} + S3_BOOTSTRAP_IMAGE: gitea.privcloud.tech/${{ github.repository_owner }}/mtusi2026lab7-minio-client:${{ github.sha }} steps: - name: Checkout exact commit run: | @@ -47,7 +51,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version-file: go.mod + go-version: "1.26.10" cache: false - name: Check contract @@ -62,8 +66,8 @@ jobs: - name: Check formatting and shell scripts run: | test -z "$(gofmt -l cmd internal migrations)" - sh -n infra/minio/bootstrap.sh scripts/restart.sh scripts/rolling-update.sh scripts/stop-one.sh scripts/test-lab5.sh scripts/test-lab5-acceptance.sh scripts/test-lab6.sh scripts/incident-worker.sh scripts/incident-database.sh scripts/incident-telemetry.sh - python3 -m py_compile scripts/lab6-traffic.py scripts/lab6-observe.py scripts/lab6-alert.py scripts/lab6-correlation.py scripts/validate-lab6-evidence.py + for file in infra/minio/*.sh infra/pki/*.sh infra/postgres/*.sh infra/redis/*.sh infra/security/*.sh infra/openbao/*.sh scripts/*.sh; do sh -n "$file"; done + python3 -m py_compile scripts/lab6-traffic.py scripts/lab6-observe.py scripts/lab6-alert.py scripts/lab6-correlation.py scripts/validate-lab6-evidence.py scripts/test-login-rate-limit.py - name: Lint uses: golangci/golangci-lint-action@v7 @@ -79,27 +83,47 @@ jobs: - name: Prepare local stack run: | - cp lab6.env.example .env + mkdir -p "$CI_WORKSPACE" + git archive HEAD | tar -x -C "$CI_WORKSPACE" + cd "$CI_WORKSPACE" + cp lab7.env.example .env docker compose config --quiet - docker compose up -d --build --scale api=2 --wait --wait-timeout 150 + ./infra/pki/bootstrap.sh + ./scripts/openbao-seed.sh .env + ./scripts/sync-docker-workspace.sh + docker compose up -d security-bootstrap openbao-permissions openbao + docker network connect "${COMPOSE_PROJECT_NAME}_secrets" "$HOSTNAME" + ./scripts/bootstrap-local.sh .env docker network connect "${COMPOSE_PROJECT_NAME}_application" "$HOSTNAME" docker network connect "${COMPOSE_PROJECT_NAME}_data" "$HOSTNAME" + docker network connect "${COMPOSE_PROJECT_NAME}_data_backend" "$HOSTNAME" docker network connect "${COMPOSE_PROJECT_NAME}_monitoring" "$HOSTNAME" + docker network connect "${COMPOSE_PROJECT_NAME}_secure_clients" "$HOSTNAME" + docker network connect "${COMPOSE_PROJECT_NAME}_telemetry_storage" "$HOSTNAME" - name: Integration checks run: | - set -a - . ./.env - set +a - test "$(curl --noproxy '*' -s -o /dev/null -w '%{http_code}' "http://s3:9000/$S3_BUCKET")" = "403" - make test BASE_URL=http://nginx:8080 + cd "$CI_WORKSPACE" + test "$(curl --noproxy '*' --cacert .runtime/security/internal-ca/ca.crt -s -o /dev/null -w '%{http_code}' "https://s3:9000/messenger-attachments")" = "403" + make test BASE_URL=https://nginx:8443 CA_FILE=.runtime/security/public-ca/ca.crt + make test-security BASE_URL=https://nginx:8443 CA_FILE=.runtime/security/public-ca/ca.crt + make test-tls-matrix ENV_FILE=.env + ENV_FILE=.env BASE_URL=https://nginx:8443 ./scripts/test-leaf-rotation.sh + docker compose --profile security run --rm dependency-tests + ENV_FILE=.env BAO_ADDR=https://openbao:8200 BAO_CACERT="$PWD/.runtime/security/openbao/ca.crt" ./scripts/openbao-test-policy.sh + ENV_FILE=.env BAO_ADDR=https://openbao:8200 BAO_CACERT="$PWD/.runtime/security/openbao/ca.crt" ./scripts/test-openbao-lifecycle.sh + make test-login-rate-limit BASE_URL=https://nginx:8443 CA_FILE=.runtime/security/public-ca/ca.crt docker compose --profile tests run --rm --build tests - go run ./cmd/dependencycheck -base-url=http://nginx:8080 - make test-persistence ACTION_SCRIPT=scripts/restart.sh BASE_URL=http://nginx:8080 - make test-failover ACTION_SCRIPT=scripts/stop-one.sh BASE_URL=http://nginx:8080 + go run ./cmd/dependencycheck -base-url=https://nginx:8443 -ca-file=.runtime/security/public-ca/ca.crt + make test-persistence ACTION_SCRIPT=scripts/restart.sh BASE_URL=https://nginx:8443 CA_FILE=.runtime/security/public-ca/ca.crt + make test-failover ACTION_SCRIPT=scripts/stop-one.sh BASE_URL=https://nginx:8443 CA_FILE=.runtime/security/public-ca/ca.crt make test-lab5-acceptance - make test-lab5 - ENV_FILE=.env PROMETHEUS_URL=http://prometheus:9090 TEMPO_URL=http://tempo:3200 LOKI_URL=http://loki:3100 make test-lab6-smoke BASE_URL=http://nginx:8080 + make test-worker-compromise ENV_FILE=.env + ENV_FILE=.env CA_FILE=.runtime/security/public-ca/ca.crt PROMETHEUS_URL=http://prometheus:9090 TEMPO_URL=http://tempo:3200 LOKI_URL=http://loki:3100 make test-lab6-smoke BASE_URL=https://nginx:8443 + mkdir -p evidence/runtime + api_restart_counts=$(docker inspect --format '{{.RestartCount}}' $(docker compose ps -q api)) + go run ./cmd/loginburst -base-url=https://nginx:8443 -ca-file=.runtime/security/public-ca/ca.crt > evidence/runtime/login-burst.json + test "$(docker inspect --format '{{.RestartCount}}' $(docker compose ps -q api))" = "$api_restart_counts" - name: Publish verified images id: publish @@ -130,14 +154,21 @@ jobs: - name: Container logs if: failure() - run: if [ -f .env ]; then docker compose logs --no-color --tail=200; fi + run: if [ -f "$CI_WORKSPACE/.env" ]; then cd "$CI_WORKSPACE"; docker compose logs --no-color --tail=200; fi - name: Stop local stack if: always() run: | + test -d "$CI_WORKSPACE" || exit 0 + cd "$CI_WORKSPACE" + trap './scripts/sync-docker-workspace.sh --clean' EXIT + docker network disconnect "${COMPOSE_PROJECT_NAME}_secrets" "$HOSTNAME" 2>/dev/null || true docker network disconnect "${COMPOSE_PROJECT_NAME}_application" "$HOSTNAME" 2>/dev/null || true docker network disconnect "${COMPOSE_PROJECT_NAME}_data" "$HOSTNAME" 2>/dev/null || true + docker network disconnect "${COMPOSE_PROJECT_NAME}_data_backend" "$HOSTNAME" 2>/dev/null || true docker network disconnect "${COMPOSE_PROJECT_NAME}_monitoring" "$HOSTNAME" 2>/dev/null || true + docker network disconnect "${COMPOSE_PROJECT_NAME}_secure_clients" "$HOSTNAME" 2>/dev/null || true + docker network disconnect "${COMPOSE_PROJECT_NAME}_telemetry_storage" "$HOSTNAME" 2>/dev/null || true if [ -f .env ]; then docker compose --profile tests down -v --remove-orphans; fi deploy: @@ -177,17 +208,17 @@ jobs: run: printf '%s' "$REGISTRY_PASSWORD" | ssh "$DEPLOY_USER@$DEPLOY_HOST" "docker login gitea.privcloud.tech --username '$REGISTRY_USERNAME' --password-stdin" - name: Upload image manifest - run: scp deploy-images.env "$DEPLOY_USER@$DEPLOY_HOST:/tmp/mtusi2026lab6-${{ github.run_id }}.env" + run: scp deploy-images.env "$DEPLOY_USER@$DEPLOY_HOST:/tmp/mtusi2026lab7-${{ github.run_id }}.env" - name: Deploy and verify run: | ssh "$DEPLOY_USER@$DEPLOY_HOST" " set -eu - cd ~/mtusi2026lab6 + cd ~/mtusi2026lab7 git fetch origin main git cat-file -e '$DEPLOY_SHA^{commit}' git reset --hard '$DEPLOY_SHA' - manifest='/tmp/mtusi2026lab6-${{ github.run_id }}.env' + manifest='/tmp/mtusi2026lab7-${{ github.run_id }}.env' if DEPLOY_GENERATION='${{ github.run_id }}' scripts/rolling-update.sh \"\$manifest\"; then rm -f \"\$manifest\" else diff --git a/.gitea/workflows/incidents.yml b/.gitea/workflows/incidents.yml index 244f11e..ab49dae 100644 --- a/.gitea/workflows/incidents.yml +++ b/.gitea/workflows/incidents.yml @@ -1,10 +1,10 @@ -name: Lab 6 incidents +name: Lab 7 inherited incidents on: workflow_dispatch: concurrency: - group: lab6-incidents-${{ github.repository }}-${{ github.ref }} + group: lab7-incidents-${{ github.repository }}-${{ github.ref }} cancel-in-progress: false jobs: @@ -12,13 +12,17 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 35 env: - COMPOSE_PROJECT_NAME: mtusi2026lab6-incidents-${{ github.run_id }} + COMPOSE_PROJECT_NAME: mtusi2026lab7-incidents-${{ github.run_id }} API_BIND_ADDRESS: 127.0.0.1:0 SWAGGER_BIND_ADDRESS: 127.0.0.1:0 PROMETHEUS_BIND_ADDRESS: 127.0.0.1:0 GRAFANA_BIND_ADDRESS: 127.0.0.1:0 LOKI_BIND_ADDRESS: 127.0.0.1:0 TEMPO_BIND_ADDRESS: 127.0.0.1:0 + OPENBAO_BIND_ADDRESS: 127.0.0.1:0 + BAO_ADDR: https://openbao:8200 + DOCKER_WORKSPACE_MIRROR: "1" + CI_WORKSPACE: /tmp/mtusi2026lab7-${{ github.run_id }} steps: - name: Checkout exact commit run: | @@ -29,22 +33,35 @@ jobs: - uses: actions/setup-go@v5 with: - go-version-file: go.mod + go-version: "1.26.10" cache: false - name: Prepare stack run: | - cp lab6.env.example .env + mkdir -p "$CI_WORKSPACE" + git archive HEAD | tar -x -C "$CI_WORKSPACE" + cd "$CI_WORKSPACE" + cp lab7.env.example .env docker compose config --quiet - docker compose up -d --build --scale api=2 --wait --wait-timeout 180 + ./infra/pki/bootstrap.sh + ./scripts/openbao-seed.sh .env + ./scripts/sync-docker-workspace.sh + docker compose up -d security-bootstrap openbao-permissions openbao + docker network connect "${COMPOSE_PROJECT_NAME}_secrets" "$HOSTNAME" + ./scripts/bootstrap-local.sh .env docker network connect "${COMPOSE_PROJECT_NAME}_application" "$HOSTNAME" docker network connect "${COMPOSE_PROJECT_NAME}_data" "$HOSTNAME" + docker network connect "${COMPOSE_PROJECT_NAME}_data_backend" "$HOSTNAME" docker network connect "${COMPOSE_PROJECT_NAME}_monitoring" "$HOSTNAME" + docker network connect "${COMPOSE_PROJECT_NAME}_secure_clients" "$HOSTNAME" + docker network connect "${COMPOSE_PROJECT_NAME}_telemetry_storage" "$HOSTNAME" - name: Reproduce SLO incidents run: | + cd "$CI_WORKSPACE" ENV_FILE=.env \ - BASE_URL=http://nginx:8080 \ + BASE_URL=https://nginx:8443 \ + CA_FILE=.runtime/security/public-ca/ca.crt \ PROMETHEUS_URL=http://prometheus:9090 \ TEMPO_URL=http://tempo:3200 \ LOKI_URL=http://loki:3100 \ @@ -53,21 +70,30 @@ jobs: - name: Upload sanitized evidence if: always() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 + env: + ACTIONS_RUNTIME_URL: https://gitea.privcloud.tech/api/actions_pipeline/ with: name: lab6-incidents-${{ github.sha }} - path: evidence/runtime/ci + path: ${{ env.CI_WORKSPACE }}/evidence/runtime/ci if-no-files-found: warn retention-days: 14 - name: Container logs if: failure() - run: docker compose logs --no-color --tail=200 + run: if [ -f "$CI_WORKSPACE/.env" ]; then cd "$CI_WORKSPACE"; docker compose logs --no-color --tail=200; fi - name: Stop local stack if: always() run: | + test -d "$CI_WORKSPACE" || exit 0 + cd "$CI_WORKSPACE" + trap './scripts/sync-docker-workspace.sh --clean' EXIT + docker network disconnect "${COMPOSE_PROJECT_NAME}_secrets" "$HOSTNAME" 2>/dev/null || true docker network disconnect "${COMPOSE_PROJECT_NAME}_application" "$HOSTNAME" 2>/dev/null || true docker network disconnect "${COMPOSE_PROJECT_NAME}_data" "$HOSTNAME" 2>/dev/null || true + docker network disconnect "${COMPOSE_PROJECT_NAME}_data_backend" "$HOSTNAME" 2>/dev/null || true docker network disconnect "${COMPOSE_PROJECT_NAME}_monitoring" "$HOSTNAME" 2>/dev/null || true + docker network disconnect "${COMPOSE_PROJECT_NAME}_secure_clients" "$HOSTNAME" 2>/dev/null || true + docker network disconnect "${COMPOSE_PROJECT_NAME}_telemetry_storage" "$HOSTNAME" 2>/dev/null || true docker compose down -v --remove-orphans diff --git a/.gitignore b/.gitignore index 7913498..66ededd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .env .env.* !.env.example +.runtime/ secrets/ certs/private/ *.key 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/Makefile b/Makefile index 5ad43ad..fcbd5c7 100644 --- a/Makefile +++ b/Makefile @@ -2,9 +2,10 @@ PYTHON ?= python3 BASE_URL ?= https://localhost:8443 CA_FILE ?= ACTION_SCRIPT ?= +ENV_FILE ?= $(if $(wildcard .env),.env,lab7.env.example) TLS_ARGS = $(if $(CA_FILE),--ca-file "$(CA_FILE)",) -.PHONY: help check validate test load test-persistence test-failover test-security +.PHONY: help check validate test load test-persistence test-failover test-security test-tls-matrix test-leaf-rotation test-openbao-lifecycle test-login-rate-limit test-worker-compromise scan-security test-lab5 test-lab5-acceptance lab6-load test-lab6-smoke test-lab6 help: @echo "check: offline structure; validate: full OpenAPI (requirements-dev.txt); test: running API; load: synthetic writes" @@ -31,3 +32,37 @@ test-failover: test-security: $(PYTHON) tests/security.py --base-url "$(BASE_URL)" $(TLS_ARGS) + +test-tls-matrix: + docker compose --env-file "$(ENV_FILE)" --profile security run --rm security-tests + +test-leaf-rotation: + ENV_FILE="$(ENV_FILE)" BASE_URL="$(BASE_URL)" ./scripts/test-leaf-rotation.sh + +test-openbao-lifecycle: + ENV_FILE="$(ENV_FILE)" ./scripts/test-openbao-lifecycle.sh + +test-login-rate-limit: + @test -n "$(CA_FILE)" || (echo "Set CA_FILE"; exit 2) + $(PYTHON) scripts/test-login-rate-limit.py --base-url "$(BASE_URL)" --ca-file "$(CA_FILE)" + +test-worker-compromise: + ENV_FILE="$(ENV_FILE)" ./scripts/lab7-worker-compromise.sh + +scan-security: + ./scripts/scan-security.sh + +test-lab5: + ./scripts/test-lab5.sh + +test-lab5-acceptance: + ./scripts/test-lab5-acceptance.sh + +lab6-load: + $(PYTHON) scripts/lab6-traffic.py --base-url "$(BASE_URL)" $(TLS_ARGS) --mode mixed --duration 60 --concurrency 4 --wait-ready + +test-lab6-smoke: + ENV_FILE="$(ENV_FILE)" BASE_URL="$(BASE_URL)" CA_FILE="$(CA_FILE)" ./scripts/test-lab6.sh smoke + +test-lab6: + ENV_FILE="$(ENV_FILE)" BASE_URL="$(BASE_URL)" CA_FILE="$(CA_FILE)" ./scripts/test-lab6.sh full diff --git a/REPORT.md b/REPORT.md index 9801db4..01ec188 100644 --- a/REPORT.md +++ b/REPORT.md @@ -1,37 +1,186 @@ -# Отчёт — лабораторная 7 +# Отчёт — лабораторная работа № 7 -- Автор, группа: TODO -- Целевая оценка; выбранный трек 5, если нужен: TODO -- Commit/PR: TODO после публикации -- Использованные источники, библиотеки и помощь ИИ: TODO +**Автор:** Пластинин Денис, БВТ2303 + +**Целевая оценка:** 5 + +**Выбранный трек:** 1 — компрометация worker + +## Цель работы + +Цель работы — провести границы доверия в ранее реализованном мессенджере, включить проверяемое TLS/mTLS взаимодействие, разделить права сервисов и вынести runtime secrets в OpenBao. За основу взята лабораторная работа № 6: сохранены API, обработка вложений через Redis Streams, PostgreSQL, MinIO и стек наблюдаемости. + +Внешний клиент подключается только к Nginx по HTTPS. Nginx обращается к двум API-репликам по mTLS, причём API принимает только сертификат с разрешённым URI SAN балансировщика. Внутренние зависимости используют TLS, отдельные service identities и минимальные ACL. Наличие сертификата, подписанного доверенным CA, само по себе не даёт доступ: identity дополнительно сопоставляется с разрешённой ролью. ## Запуск из чистого clone -TODO: версии runtime/образов, prerequisites, команды создания локальных secrets/.env, build, миграций, запуска, ожидания готовности, тестов и остановки. Указать необходимые действия оператора. Не вставлять секреты. Отдельно указать безопасную остановку и команду намеренного удаления учебных данных. +Требуются Docker с Compose v2, `make`, Python 3 и `curl`. Все используемые образы закреплены по версиям в `compose.yaml`. Локальные ключи и operator material создаются в игнорируемой директории `.runtime`. -## Архитектура и решения +```sh +cp lab7.env.example .env +./scripts/bootstrap-local.sh .env +``` -TODO: схема процессов/хранилищ, источник истины, транзакционные границы, ограничения. Что перенесено из lab6, что изменено в этой работе. Соответствие переменных из .env.example реальной конфигурации. +Скрипт создаёт локальную PKI, запускает OpenBao с Raft storage, при первом запуске выполняет `init`/`unseal`, создаёт policies и AppRole, затем поднимает стенд с двумя API-репликами. Повторный запуск использует сохранённое состояние OpenBao и выполняет только необходимый bootstrap. + +Основные интерфейсы: + +- API и Swagger через HTTPS: `https://localhost:8443` и `http://localhost:8081`; +- Grafana: `https://localhost:3000`; +- Prometheus: `http://localhost:9090`; +- OpenBao operator endpoint: `https://localhost:8200`. + +Публичный CA создаётся в `.runtime/security/public-ca/ca.crt`. Проверка API: + +```sh +make test BASE_URL=https://localhost:8443 CA_FILE="$PWD/.runtime/security/public-ca/ca.crt" +make test-security BASE_URL=https://localhost:8443 CA_FILE="$PWD/.runtime/security/public-ca/ca.crt" +``` + +Безопасная остановка сохраняет volumes: + +```sh +docker compose --env-file .env stop +``` + +Намеренное удаление учебного стенда и его данных: + +```sh +docker compose --env-file .env down --volumes --remove-orphans +rm -rf .runtime +``` + +Root token и unseal key находятся только в `.runtime/openbao/operator/init.json` с правами `0600`. Их хранит оператор; приложения и CI runtime их не получают. В production этот файл должен находиться во внешнем защищённом хранилище, а unseal shares должны быть разделены между операторами. + +## Архитектура + +```mermaid +flowchart LR + C[Client] -->|HTTPS + Bearer| N[Nginx] + N -->|mTLS| A1[API 1] + N -->|mTLS| A2[API 2] + A1 & A2 -->|TLS + api role| P[(PostgreSQL)] + A1 & A2 -->|mTLS + ACL| V[(Valkey)] + A1 & A2 -->|HTTPS + staging policy| S[(MinIO)] + D[Dispatcher] -->|mTLS producer| R[(Redis Streams)] + R -->|mTLS consumer| W[Worker] + W -->|HTTPS + attachment policy| S + A1 & A2 & D & W -->|mTLS| O[OTel gateway] + BA[OpenBao Agents] -->|TLS + AppRole| B[(OpenBao Raft)] + BA -->|secret file 0600| A1 & A2 & W +``` + +PostgreSQL остаётся источником истины для пользователей, чатов, сообщений, metadata вложений, outbox и состояния заданий. MinIO хранит содержимое вложений. Redis Streams переносит задания с гарантией at-least-once, а Valkey хранит session token hashes и общие счётчики login rate limit. Дедупликация и переходы состояний выполняются транзакционно в PostgreSQL. + +OpenBao работает в non-dev режиме на persistent Raft storage. API и worker имеют разные AppRole и KV policies. Agent аутентифицируется короткоживущим SecretID, обновляет renewable token и рендерит JSON secret в защищённый Docker volume; приложение получает путь через `MESSENGER_SECRETS_FILE`. Token Agent хранится в tmpfs, root token не используется приложением. SecretID действует один час и позволяет повторную аутентификацию после рестарта; затем оператор выдаёт новый. + +PostgreSQL использует `verify-full` и отдельные роли API, dispatcher, worker, reconciler, exporter и migrator. Valkey и Redis Streams защищены native TLS, ACL и Envoy gateway, который проверяет точный URI SAN клиента. MinIO использует HTTPS и отдельные scoped users. OTel ingest и metrics endpoints требуют mTLS с allowlist identities. Полная схема связей приведена в `contracts/trust-matrix.md`. + +Контейнеры приложения запускаются non-root, с `read_only`, `no-new-privileges`, `cap_drop: ALL`, отдельным `tmpfs` и лимитами CPU/RAM. Stateful компоненты сохраняют данные в named volumes; их исключения из `read_only` ограничены каталогами данных. + +## Пароли, сессии и защита login + +Пароли хешируются Argon2id с индивидуальной солью и сохранёнными параметрами. При успешном входе `NeedsRehash` сравнивает параметры хеша с текущей политикой; устаревший хеш обновляется compare-and-swap запросом, поэтому параллельный login не перезаписывает более новый пароль. + +Параметры `m=65536 KiB`, `t=3`, `p=2` измерены в Linux-контейнере с лимитом 2 CPU и 512 MiB. Пять операций дали около 60,0 мс на hash и 64,8 мс на verify при примерно 64 MiB памяти на операцию. Частотный лимит ограничивает login, а общий semaphore внутри Hasher допускает не более двух `Hash`/`Verify` на API-реплику, включая регистрацию и rehash. Поэтому одновременно занятая Argon2 память ограничена примерно 128 MiB на реплику; лишние операции сразу получают `429 Retry-After: 1`. Лимит задаётся `server.password.max_concurrent_operations`. Raw summary сохранён в `evidence/lab7-argon2-budget.json`. + +`cmd/loginburst` создаёт одновременные волны по 20 регистраций и login-запросов через Nginx, проверяет ответы `429` с положительным `Retry-After`, отсутствие `5xx` и readiness после нагрузки. CI дополнительно проверяет, что API containers не перезапускались. `X-Instance-Id` — случайный alias на время жизни процесса; hostname и IP в него не входят. + +Session token является случайным opaque bearer token. В Valkey сохраняется только его SHA-256 hash с TTL; logout удаляет запись. Login limiter общий для API-реплик: Lua script атомарно увеличивает счётчики по нормализованному login и адресу источника, выставляет TTL и возвращает время до повторной попытки. При превышении лимита API отвечает `429` и положительным `Retry-After`. ## Доказательства критериев -| Критерий README | Команда/сценарий | Наблюдаемый результат | Файл доказательства | +| Критерий | Команда/сценарий | Наблюдаемый результат | Доказательство | | --- | --- | --- | --- | -| Публичный smoke | make test | TODO | TODO | -| Остальные пункты уровня 3 | TODO | TODO | TODO | -| Все пункты уровня 4, если заявлен | TODO | TODO | TODO | -| Выбранный трек 5, если заявлен | TODO | TODO | TODO | +| Контракт и OpenAPI | `make check`, `make validate` | структура и OpenAPI 3.1 проходят проверку | CI `verify` | +| Unit и integration | `go test ./...`, PostgreSQL/Valkey integration tests | тесты проходят по TLS connections | CI и test output | +| Публичный API через HTTPS | `make test ... CA_FILE=...` | полный smoke проходит через Nginx | public smoke output | +| Недоверенный внешний TLS | `make test-security` | правильный CA проходит, пустой/чужой CA отклонён | security test output | +| LB→API mTLS | `make test-tls-matrix` | 13 положительных и отрицательных cases проходят | TLS matrix output | +| DB/S3/broker/OTel least privilege | `infra/security/test-dependency-matrix.sh` | разрешённые операции проходят, cross-role операции отклонены | dependency matrix output | +| OpenBao scoped policy | `scripts/openbao-test-policy.sh` | own read `200`, cross/write/policy `403`, token renew `200` | policy test output | +| OpenBao expiry/revoke/seal | `make test-openbao-lifecycle` | revoked/expired token `403`, sealed login `503`, Agent восстановил аутентификацию после unseal | lifecycle test output | +| Ротация leaf и отзыв identity | `make test-leaf-rotation` | новая LB identity проходит, прежняя same-CA identity и expired leaf отклонены на новых connections | rotation test output | +| Общий login limiter | `make test-login-rate-limit ...` | запросы через обе replicas завершаются `429` с `Retry-After` | rate-limit test output | +| Rehash Argon2id | `go test ./internal/password ./internal/postgres ./internal/messenger/httpapi` | проверены `NeedsRehash` и конкурентное CAS update | unit/integration tests | +| Argon2/login DoS budget | `go test ./internal/password -run '^$' -bench 'BenchmarkArgon2id(Hash\|Verify)$' -benchtime=5x -benchmem` | hash 60,0 мс, verify 64,8 мс, около 64 MiB/op при 2 CPU | `evidence/lab7-argon2-budget.json` | +| Dependency/image/security scan | `make scan-security` | secrets не найдены; исправляемые high/critical Go CVE обновлены | `evidence/lab7-security-scan.json` | +| Компрометация worker | `make test-worker-compromise` | старый broker credential отклонён, после rotation queued attachment обработан без потери | `evidence/lab7-worker-compromise.json` | -TODO: добавить отдельную строку для каждого заявленного критерия. PASS без команды и наблюдения не является доказательством. Проверка инфраструктурного hook требует подтверждения, какие реальные процессы/хранилища перезапущены. +## Эксперимент: компрометация worker -## Эксперименты и отказы +### Гипотеза -TODO: гипотеза, hardware/лимиты, версии, объём данных, профиль нагрузки, concurrency/arrival rate, длительность/прогрев, повторы, успешные RPS, ошибки, p50/p95/p99, CPU/RAM. Сохранить raw summary без tokens и объяснить ограничения измерения. +Если worker credential будет скомпрометирован, злоумышленник получит только consumer operations своего stream, ограниченные таблицы PostgreSQL и два MinIO prefix. После смены broker password и worker secret старая identity перестанет работать, а уже поставленное задание сохранится и завершится после восстановления worker. -| Воздействие | Что ожидаем | Что наблюдали | Время восстановления / потеря данных | +### Методика + +Стенд запускался в контейнерах с лимитом worker `2 CPU / 1 GiB`. Скрипт `scripts/lab7-worker-compromise.sh` останавливает worker, создаёт реальное задание загрузки через API, меняет Redis ACL password, не обновляя secret работающего worker, и проверяет отказ старой identity. Затем он записывает новый secret в OpenBao, пересоздаёт OpenBao Agent и worker и проверяет созданное вложение через API. В `trap` всегда восстанавливается исходный учебный secret. + +Отдельная dependency matrix моделирует возможности скомпрометированного worker: ему разрешены чтение/изменение attachment job state, consumer/ack операции stream и работа с `staging/`/`attachments/`; запрещены таблица `users`, unrelated Redis streams и произвольный S3 prefix. + +### Изменение blast radius относительно lab6 + +| Ресурс | До разделения прав в lab6 | После least privilege в lab7 | +| --- | --- | --- | +| PostgreSQL | API, dispatcher, worker и reconciler получали общий `DATABASE_URL`; worker мог использовать права основной роли на пользователей, чаты и сообщения | `messenger_worker` читает/обновляет только attachments/jobs/variants, создаёт audit/outbox; чтение `users` запрещено | +| MinIO | один `S3_ACCESS_KEY` имел `Get/Put/Delete` на весь bucket | worker видит только `staging/*` и `attachments/*`; `private/*` и управление users/policies запрещены | +| Redis Streams | dispatcher и worker использовали общий `BROKER_URL` | dispatcher может только `XADD` в `attachment-jobs`; worker может consumer/ack/recovery команды только для job/DLQ streams | +| TLS identity | внутренние зависимости принимали сетевое соединение без service URI проверки | gateway сопоставляет worker certificate с `spiffe://mtusi/lab7/worker`; same-CA чужая identity отклоняется | +| Secrets | все static credentials находились в общем `.env` процесса | worker получает отдельный JSON через scoped OpenBao AppRole; API policy не читает worker path | + +Таким образом, до разделения кража worker environment давала общий доступ к данным приложения и всему bucket. После разделения она ограничена обработкой вложений. Ротация в эксперименте меняет broker, PostgreSQL и MinIO credentials внутри worker secret; старые credentials не открывают новое соединение даже при наличии прежнего leaf certificate. + +### Результат + +| Воздействие | Ожидание | Наблюдение | Потеря данных | | --- | --- | --- | --- | -| TODO | TODO | TODO | TODO | +| Старый broker password после ротации | authentication error | worker получил `WRONGPASS/invalid username-password` | нет | +| Cross-role DB/S3/stream operations | ACL denial | все отрицательные cases dependency matrix отклонены | нет | +| Обновление worker secret в OpenBao | Agent рендерит новый secret, worker становится healthy | от начала сценария до проверки вложения — 21 секунда; возврат исходных паролей измеряется отдельно | нет | +| Проверка задания, созданного до отзыва | вложение обработано после восстановления | API verification прошла | queued attachment сохранён | -## Ограничения и следующие шаги +Эксперимент доказывает ограничение blast radius и восстановление задания, но не моделирует кражу root-доступа к Docker host. Сценарий разрывает broker connections перезапуском gateway и завершает PostgreSQL sessions роли worker через `pg_terminate_backend`; затем проверяет новые подключения со старыми паролями и отказ старому S3 key. Для production потребуются внешний KMS/HSM для CA, response-wrapped SecretID, автоматизированный revoke и несколько независимых повторов с измерением времени восстановления. -TODO: какие отказы выдерживаются и какие нет; что не реализовано; где учебное упрощение; какое улучшение подтверждено, а какое пока гипотеза. +## Scan triage + +`scripts/scan-security.sh` запускает Trivy filesystem scan и image scan всех образов работающего Compose-стенда. Raw JSON сохраняется в игнорируемом `evidence/runtime/security-scan` и CI artifact, компактная сводка — в `evidence/lab7-security-scan.json`. Найденные у приложения CVE устранены обновлением OpenTelemetry, gRPC, `x/net`, `klauspost/compress`, Go toolchain и Nginx. Весь стенд не объявляется свободным от CVE: сканирование сторонних образов находит отдельные уязвимые компоненты. Secrets в repository/images не найдены. + +| Finding / класс | Применимость и решение | +| --- | --- | +| `CVE-2026-81871`, `CVE-2026-81872`, `CVE-2026-81870` в OTLP | Затрагивают используемые приложением exporters/log SDK. Обновлены до OTLP `1.45.0` / log `0.21.0`; отключение TLS verification не используется | +| `CVE-2026-33322`, `CVE-2026-33419` в MinIO | Требуют OIDC/LDAP auth, которые в стенде не настроены; используется локальная scoped access-key auth. Образ не опубликован наружу. Обновление MinIO остаётся задачей перед production | +| `CVE-2026-77405`, `CVE-2026-77408`, `CVE-2026-77411` в AMQP library сторонних images | AMQP receivers/exporters и MinIO AMQP notifications не настроены; брокер стенда — Redis Streams. Пакет присутствует в бинарнике, но этот путь не используется конфигурацией | +| `CVE-2026-31789` в OpenSSL | Advisory относится к 32-bit обработке X.509; измеренный стенд `linux/arm64`. Не экстраполируем это исключение на остальные CVE OpenSSL | +| `CVE-2026-111497` (Brotli), `CVE-2026-48930` (Node.js) в UI images | Grafana/Swagger доступны только на loopback; приложение Go не использует эти пакеты. Достижимость уязвимых UI-путей не доказана; фиксированные upstream images нужны перед внешней публикацией | +| `CVE-2025-68121` и остальные stdlib/OS findings сторонних images | Собственный API пересобран patched Go. Для сторонних бинарников пересборка не выполнялась; это остаточный риск, который не снимается одной сетевой изоляцией. Ограничиваем доступ и ресурсы, сохраняем raw findings для обновления images | +| `UNKNOWN`, например `CVE-2026-39824` в Windows API | Severity не определена источником. Windows-only путь не выполняется в Linux; остальные UNKNOWN требуют отдельной проверки, а не считаются автоматически безопасными | + +Данный scan triage подтверждает применимость конкретных ограничений учебного стенда. Он не заменяет обновление сторонних образов и не является разрешением на production deployment. + +Замечания к отсутствию `HEALTHCHECK` внутри отдельных toolbox/bootstrap images не дают обхода runtime health: Compose задаёт healthchecks долговечным сервисам, а bootstrap containers одноразовые и должны завершиться с кодом 0. Это остаётся осознанным ограничением, а не исключением проверки приложения. + +## Ограничения + +- PKI локальная и не содержит CRL/OCSP. Отзыв leaf выполняется удалением доверия/сменой allowlist и пересозданием соединений. +- PostgreSQL, Valkey, Redis, MinIO и OpenBao запущены по одному экземпляру; работа проверяет безопасность границ, а не HA этих хранилищ. +- Operator init/unseal ручной. Это допустимо для учебного стенда, но production требует auto-unseal через KMS/HSM и раздельного хранения shares. +- Static S3/DB/broker credentials выдаются через OpenBao KV и ротируются оператором. Dynamic database credentials были бы следующим улучшением. +- Rate limiter хранится в Valkey и при его отказе блокирует login; уже выданные сессии также зависят от Valkey. + +## Источники + +- [OWASP Password Storage Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html) +- [OWASP File Upload Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/File_Upload_Cheat_Sheet.html) +- [OpenBao AppRole](https://openbao.org/docs/auth/approle/) +- [OpenBao policies](https://openbao.org/docs/concepts/policies/) +- [OpenBao production hardening](https://openbao.org/docs/internals/security/) +- [PostgreSQL SSL support](https://www.postgresql.org/docs/current/libpq-ssl.html) +- [Redis TLS](https://redis.io/docs/latest/operate/oss_and_stack/management/security/encryption/) +- [Redis ACL](https://redis.io/docs/latest/operate/oss_and_stack/management/security/acl/) +- [MinIO policy based access control](https://min.io/docs/minio/linux/administration/identity-access-management/policy-based-access-control.html) +- [OpenTelemetry Collector security](https://opentelemetry.io/docs/security/config-best-practices/) +- [Docker Engine security](https://docs.docker.com/engine/security/) +- [Trivy filesystem scanning](https://trivy.dev/latest/docs/target/filesystem/) + +OpenAI Codex использовался для подготовки и ревью реализации; результаты проверены тестами, CI-сценариями и воспроизводимыми отрицательными экспериментами. diff --git a/cmd/dependencycheck/main.go b/cmd/dependencycheck/main.go index eaa3d64..57fe0ef 100644 --- a/cmd/dependencycheck/main.go +++ b/cmd/dependencycheck/main.go @@ -2,6 +2,8 @@ package main import ( "bytes" + "crypto/tls" + "crypto/x509" "encoding/json" "flag" "fmt" @@ -17,10 +19,11 @@ import ( ) type apiClient struct { - baseURL string - client *http.Client - token string - userID string + baseURL string + client *http.Client + transport *http.Transport + token string + userID string } func main() { @@ -32,9 +35,23 @@ func main() { } func run() error { - baseURL := flag.String("base-url", "http://localhost:8080", "API base URL") + baseURL := flag.String("base-url", "https://localhost:8443", "API base URL") + caFile := flag.String("ca-file", ".runtime/security/public-ca/ca.crt", "trusted CA certificate") flag.Parse() - client := &apiClient{baseURL: *baseURL, client: &http.Client{Timeout: 10 * time.Second}} + caPEM, err := os.ReadFile(*caFile) + if err != nil { + return fmt.Errorf("read trusted CA: %w", err) + } + roots := x509.NewCertPool() + if !roots.AppendCertsFromPEM(caPEM) { + return fmt.Errorf("trusted CA does not contain a certificate") + } + transport := &http.Transport{TLSClientConfig: &tls.Config{MinVersion: tls.VersionTLS12, RootCAs: roots}} + defer transport.CloseIdleConnections() + client := &apiClient{ + baseURL: *baseURL, client: &http.Client{Transport: transport, Timeout: 10 * time.Second}, + transport: transport, + } if err := client.registerAndLogin(); err != nil { return err } @@ -130,7 +147,9 @@ func (c *apiClient) verifyConcurrentIdempotency() error { instances = make(map[string]struct{}) messageID string ) - transport := &http.Transport{DisableKeepAlives: true, MaxConnsPerHost: workers} + transport := c.transport.Clone() + transport.DisableKeepAlives = true + transport.MaxConnsPerHost = workers client := &http.Client{Transport: transport, Timeout: 10 * time.Second} defer transport.CloseIdleConnections() diff --git a/cmd/lab5experiment/api_scenario.go b/cmd/lab5experiment/api_scenario.go index 048a121..e238e09 100644 --- a/cmd/lab5experiment/api_scenario.go +++ b/cmd/lab5experiment/api_scenario.go @@ -3,6 +3,8 @@ package main import ( "bytes" "context" + "crypto/tls" + "crypto/x509" "encoding/base64" "encoding/json" "errors" @@ -12,16 +14,18 @@ import ( _ "image/jpeg" "io" "net/http" + "os" "strings" "time" "github.com/google/uuid" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" ) type apiState struct { BaseURL string `json:"base_url"` + CAFile string `json:"ca_file"` Token string `json:"token"` AttachmentID string `json:"attachment_id"` } @@ -41,11 +45,15 @@ type apiChat struct { func runAPIProduce(arguments []string, output io.Writer) error { flags := flag.NewFlagSet("api-produce", flag.ContinueOnError) flags.SetOutput(io.Discard) - baseURL := flags.String("base-url", "http://nginx:8080", "messenger base URL") + baseURL := flags.String("base-url", "https://nginx:8443", "messenger base URL") + caFile := flags.String("ca-file", "/run/security/public-ca/ca.crt", "trusted CA certificate") if err := flags.Parse(arguments); err != nil || flags.NArg() != 0 { - return errors.New("usage: lab5experiment api-produce [-base-url URL]") + return errors.New("usage: lab5experiment api-produce [-base-url URL] [-ca-file PATH]") + } + client, err := newAPIClient(*caFile) + if err != nil { + return err } - client := &http.Client{Timeout: 10 * time.Second} suffix := strings.ReplaceAll(uuid.NewString(), "-", "")[:12] password := "Lab5-" + uuid.NewString() owner, err := registerAPIUser(client, *baseURL, "qa_"+suffix, password) @@ -102,7 +110,9 @@ func runAPIProduce(arguments []string, output io.Writer) error { if response.StatusCode != http.StatusConflict { return fmt.Errorf("queued content returned %d, expected 409", response.StatusCode) } - return json.NewEncoder(output).Encode(apiState{BaseURL: *baseURL, Token: token, AttachmentID: attachment.ID}) + return json.NewEncoder(output).Encode(apiState{ + BaseURL: *baseURL, CAFile: *caFile, Token: token, AttachmentID: attachment.ID, + }) } func runAPIVerify(arguments []string, input io.Reader, output io.Writer) error { @@ -116,7 +126,10 @@ func runAPIVerify(arguments []string, input io.Reader, output io.Writer) error { if err := json.NewDecoder(input).Decode(&state); err != nil { return fmt.Errorf("decode API scenario state: %w", err) } - client := &http.Client{Timeout: 10 * time.Second} + client, err := newAPIClient(state.CAFile) + if err != nil { + return err + } ctx, cancel := context.WithTimeout(context.Background(), *waitTimeout) defer cancel() var attachment model.Attachment @@ -176,6 +189,19 @@ func runAPIVerify(arguments []string, input io.Reader, output io.Writer) error { }) } +func newAPIClient(caFile string) (*http.Client, error) { + caPEM, err := os.ReadFile(caFile) + if err != nil { + return nil, fmt.Errorf("read trusted CA: %w", err) + } + roots := x509.NewCertPool() + if !roots.AppendCertsFromPEM(caPEM) { + return nil, errors.New("trusted CA does not contain a certificate") + } + transport := &http.Transport{TLSClientConfig: &tls.Config{MinVersion: tls.VersionTLS12, RootCAs: roots}} + return &http.Client{Transport: transport, Timeout: 10 * time.Second}, nil +} + func registerAPIUser(client *http.Client, baseURL, username, password string) (apiUser, error) { body, err := json.Marshal(map[string]string{ "username": username, "display_name": username, "password": password, diff --git a/cmd/lab5experiment/main.go b/cmd/lab5experiment/main.go index 35c5241..8a0fc72 100644 --- a/cmd/lab5experiment/main.go +++ b/cmd/lab5experiment/main.go @@ -21,15 +21,16 @@ import ( "github.com/google/uuid" "github.com/redis/go-redis/v9" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/broker/redisstream" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/config" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/database" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/messenger/attachment/transform" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/messenger/attachment/worker" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/objectstore" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/outbox" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/postgres" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/broker/redisstream" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/config" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/database" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/messenger/attachment/transform" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/messenger/attachment/worker" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/objectstore" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/outbox" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/postgres" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/security/tlsconfig" ) const ( @@ -132,7 +133,7 @@ func newExperiment(ctx context.Context) (*experiment, func(), error) { objects, err := objectstore.New(objectstore.Config{ Endpoint: settings.S3Endpoint, Region: settings.S3Region, Bucket: settings.S3Bucket, AccessKey: settings.S3AccessKey, SecretKey: settings.S3SecretKey, - UseTLS: settings.S3UseTLS, Timeout: settings.S3Timeout, + UseTLS: settings.S3UseTLS, CAPath: settings.S3CAPath, Timeout: settings.S3Timeout, }) if err != nil { pool.Close() @@ -143,6 +144,15 @@ func newExperiment(ctx context.Context) (*experiment, func(), error) { pool.Close() return nil, nil, err } + brokerTLS, err := tlsconfig.LoadClient(tlsconfig.ClientConfig{ + CAPath: settings.BrokerTLS.CAPath, CertificatePath: settings.BrokerTLS.CertificatePath, + PrivateKeyPath: settings.BrokerTLS.PrivateKeyPath, ServerName: settings.BrokerTLS.ServerName, + }) + if err != nil { + pool.Close() + return nil, nil, err + } + redisOptions.TLSConfig = brokerTLS client := redis.NewClient(redisOptions) if err := client.Ping(ctx).Err(); err != nil { pool.Close() diff --git a/cmd/loginburst/main.go b/cmd/loginburst/main.go new file mode 100644 index 0000000..520a576 --- /dev/null +++ b/cmd/loginburst/main.go @@ -0,0 +1,175 @@ +package main + +import ( + "bytes" + "crypto/tls" + "crypto/x509" + "encoding/json" + "errors" + "flag" + "fmt" + "io" + "net/http" + "os" + "sort" + "strconv" + "strings" + "sync" + "time" +) + +type result struct { + status int + retryAfter string + instance string + duration time.Duration + err error +} + +type phase struct { + Name string `json:"name"` + Requests int `json:"requests"` + Statuses map[int]int `json:"statuses"` + DurationMS int64 `json:"duration_ms"` + P95MS int64 `json:"p95_ms"` +} + +func main() { + if err := run(); err != nil { + fmt.Fprintln(os.Stderr, err) + os.Exit(1) + } +} + +func run() error { + var ( + baseURL = flag.String("base-url", "https://localhost:8443", "API endpoint") + caFile = flag.String("ca-file", ".runtime/security/public-ca/ca.crt", "trusted public CA") + count = flag.Int("requests", 20, "concurrent requests per phase") + ) + flag.Parse() + if *count < 8 || *count > 100 { + return errors.New("requests must be between 8 and 100") + } + ca, err := os.ReadFile(*caFile) + if err != nil { + return err + } + roots := x509.NewCertPool() + if !roots.AppendCertsFromPEM(ca) { + return errors.New("invalid public CA") + } + transport := &http.Transport{ + TLSClientConfig: &tls.Config{MinVersion: tls.VersionTLS13, RootCAs: roots}, + DisableKeepAlives: true, MaxConnsPerHost: *count, + } + defer transport.CloseIdleConnections() + client := &http.Client{Transport: transport, Timeout: 10 * time.Second} + username := fmt.Sprintf("burst_%d", time.Now().UnixNano()) + body, err := json.Marshal(map[string]string{ + "username": username, "display_name": "Login burst", "password": "T3st-burst-password-123", + }) + if err != nil { + return err + } + register, err := burst(client, *count, "registration", func(index int) (*http.Request, error) { + request, err := http.NewRequest(http.MethodPost, *baseURL+"/api/v1/users", bytes.NewReader(body)) + if err != nil { + return nil, err + } + request.Header.Set("Content-Type", "application/json") + return request, nil + }) + if err != nil { + return err + } + login, err := burst(client, *count, "login", func(index int) (*http.Request, error) { + request, err := http.NewRequest(http.MethodPost, *baseURL+"/api/v1/auth/sessions", nil) + if err != nil { + return nil, err + } + request.SetBasicAuth(fmt.Sprintf("%s_%d", username, index), "wrong-password") + return request, nil + }) + if err != nil { + return err + } + response, err := client.Get(*baseURL + "/health/ready") + if err != nil { + return err + } + defer func() { _ = response.Body.Close() }() + if response.StatusCode != http.StatusOK { + return fmt.Errorf("readiness after burst: HTTP %d", response.StatusCode) + } + return json.NewEncoder(os.Stdout).Encode(struct { + Phases []phase `json:"phases"` + Ready bool `json:"ready_after_burst"` + }{[]phase{register, login}, true}) +} + +func burst(client *http.Client, count int, name string, request func(int) (*http.Request, error)) (phase, error) { + var ( + start = make(chan struct{}) + results = make(chan result, count) + group sync.WaitGroup + instances = make(map[string]struct{}) + statuses = make(map[int]int) + durations = make([]time.Duration, 0, count) + started = time.Now() + ) + for index := range count { + group.Add(1) + go func() { + defer group.Done() + <-start + began := time.Now() + value, err := request(index) + if err != nil { + results <- result{err: err} + return + } + response, err := client.Do(value) + if err != nil { + results <- result{err: err} + return + } + _, copyErr := io.Copy(io.Discard, response.Body) + _ = response.Body.Close() + results <- result{response.StatusCode, response.Header.Get("Retry-After"), response.Header.Get("X-Instance-Id"), time.Since(began), copyErr} + }() + } + close(start) + group.Wait() + close(results) + for value := range results { + if value.err != nil { + return phase{}, fmt.Errorf("%s burst: %w", name, value.err) + } + if value.status == http.StatusTooManyRequests { + retryAfter, err := strconv.Atoi(value.retryAfter) + if err != nil || retryAfter < 1 { + return phase{}, errors.New("overload response has no positive Retry-After") + } + } + allowed := value.status == http.StatusTooManyRequests + if name == "registration" { + allowed = allowed || value.status == http.StatusCreated || value.status == http.StatusConflict + } else { + allowed = allowed || value.status == http.StatusUnauthorized + } + if !allowed { + return phase{}, fmt.Errorf("%s burst: unexpected HTTP %d", name, value.status) + } + statuses[value.status]++ + durations = append(durations, value.duration) + if strings.TrimSpace(value.instance) != "" { + instances[value.instance] = struct{}{} + } + } + if statuses[http.StatusTooManyRequests] == 0 || len(instances) < 2 { + return phase{}, fmt.Errorf("%s burst: expected overload across two replicas, statuses=%v instances=%d", name, statuses, len(instances)) + } + sort.Slice(durations, func(i, j int) bool { return durations[i] < durations[j] }) + return phase{name, count, statuses, time.Since(started).Milliseconds(), durations[(count*95+99)/100-1].Milliseconds()}, nil +} diff --git a/cmd/messenger/main.go b/cmd/messenger/main.go index c2c6c96..b309dc7 100644 --- a/cmd/messenger/main.go +++ b/cmd/messenger/main.go @@ -2,33 +2,32 @@ package main import ( "errors" - "log/slog" "os" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/bootstrap" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/logger" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/bootstrap" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/logger" ) func main() { appLogger := logger.New() - if err := run(appLogger, os.Args[1:]); err != nil { + if err := run(os.Args[1:]); err != nil { appLogger.Error("application stopped", "error", err) os.Exit(1) } } -func run(logger *slog.Logger, arguments []string) error { +func run(arguments []string) error { if len(arguments) == 0 { - return bootstrap.RunServer(logger) + return bootstrap.RunServer() } if len(arguments) == 1 && arguments[0] == "migrate" { return bootstrap.RunMigrations() } if len(arguments) == 1 && arguments[0] == "dispatch" { - return bootstrap.RunDispatcher(logger) + return bootstrap.RunDispatcher() } if len(arguments) == 1 && arguments[0] == "worker" { - return bootstrap.RunWorker(logger) + return bootstrap.RunWorker() } if arguments[0] == "reconcile-attachments" { return bootstrap.RunReconciliation(arguments[1:], os.Stdout) diff --git a/cmd/mtlsproxy/main.go b/cmd/mtlsproxy/main.go new file mode 100644 index 0000000..30be9b4 --- /dev/null +++ b/cmd/mtlsproxy/main.go @@ -0,0 +1,43 @@ +package main + +import ( + "context" + "errors" + "fmt" + "os" + "os/signal" + "strings" + "syscall" + "time" + + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/security/mtlsproxy" +) + +func main() { + if err := run(); err != nil { + fmt.Fprintln(os.Stderr, err) + os.Exit(1) + } +} + +func run() error { + config := mtlsproxy.Config{ + ListenAddress: required("PROXY_LISTEN_ADDRESS"), TargetAddress: required("PROXY_TARGET_ADDRESS"), + CAPath: required("PROXY_TLS_CA_PATH"), CertificatePath: required("PROXY_TLS_CERTIFICATE_PATH"), + PrivateKeyPath: required("PROXY_TLS_PRIVATE_KEY_PATH"), AllowedClientURI: required("PROXY_ALLOWED_CLIENT_URI"), + ALPNProtocols: strings.Split(required("PROXY_ALPN_PROTOCOLS"), ","), + DialTimeout: 5 * time.Second, + } + if config.ListenAddress == "" || config.TargetAddress == "" || config.CAPath == "" || + config.CertificatePath == "" || config.PrivateKeyPath == "" || config.AllowedClientURI == "" || + len(config.ALPNProtocols) == 0 || config.ALPNProtocols[0] == "" { + return errors.New("mTLS proxy environment is incomplete") + } + ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM) + defer stop() + return mtlsproxy.Run(ctx, config) +} + +func required(name string) string { + return os.Getenv(name) +} diff --git a/compose.yaml b/compose.yaml index d21c2eb..c893395 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,231 @@ 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 + user: "0:0" + entrypoint: ["bao"] + 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 +475,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 +510,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 +549,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 +598,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 +670,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 +718,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 +735,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 +788,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 +796,7 @@ services: - --web.enable-remote-write-receiver volumes: - prometheus_data:/prometheus + - prometheus_security:/run/security:ro ports: - "${PROMETHEUS_BIND_ADDRESS}:9090" healthcheck: @@ -402,49 +805,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 +877,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 +885,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 +893,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 +901,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 +1057,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 +1104,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/config/messenger.yaml b/config/messenger.yaml index 031e152..80ee8ac 100644 --- a/config/messenger.yaml +++ b/config/messenger.yaml @@ -1,9 +1,21 @@ version: 1 server: + health_address: 127.0.0.1:8082 + metrics_address: 0.0.0.0:9091 + tls: + ca_path: /run/security/internal-ca/ca.crt + certificate_path: /run/security/api/tls.crt + private_key_path: /run/security/api/tls.key + allowed_client_uri: spiffe://mtusi/lab7/load-balancer + allowed_metrics_client_uri: spiffe://mtusi/lab7/prometheus session_store: valkey session_ttl: 1h idempotency_ttl: 24h + login_rate_limit: + account_attempts: 5 + source_attempts: 20 + window: 1m request_timeout: 5s http: read_header_timeout: 5s @@ -17,6 +29,7 @@ server: parallelism: 2 salt_length: 16 key_length: 32 + max_concurrent_operations: 2 database: min_connections: 1 @@ -26,11 +39,19 @@ database: health_check_period: 30s dependency_timeout: 5s +cache: + tls: + ca_path: /run/security/internal-ca/ca.crt + certificate_path: /run/security/client/tls.crt + private_key_path: /run/security/client/tls.key + server_name: redis-gateway + migration: timeout: 30s object_storage: - use_tls: false + use_tls: true + ca_path: /run/security/internal-ca/ca.crt timeout: 5s attachments: @@ -43,6 +64,11 @@ pipeline: version: 1 broker: + tls: + ca_path: /run/security/internal-ca/ca.crt + certificate_path: /run/security/client/tls.crt + private_key_path: /run/security/client/tls.key + server_name: redis-gateway stream: attachment-jobs consumer_group: attachment-workers failed_stream: attachment-jobs-failed @@ -74,3 +100,9 @@ worker: monitoring: metrics_address: 0.0.0.0:9091 + health_address: 127.0.0.1:9092 + tls: + ca_path: /run/security/internal-ca/ca.crt + certificate_path: /run/security/metrics/tls.crt + private_key_path: /run/security/metrics/tls.key + allowed_client_uri: spiffe://mtusi/lab7/prometheus diff --git a/contracts/trust-matrix.md b/contracts/trust-matrix.md index 0c2a977..9e82391 100644 --- a/contracts/trust-matrix.md +++ b/contracts/trust-matrix.md @@ -1,37 +1,27 @@ -# Матрица доверия — заполнить в решении lab7 +# Матрица доверия -Это обязательная матрица покрытия. Для каждой строки укажите реальный порт, endpoint, CA, service identity, проверку SAN/ACL, срок жизни credentials и команду положительного/отрицательного теста. TLS шифрует и подтверждает сервер; mTLS также проверяет клиента. При доверенном CA всё равно нужно ограничивать разрешённую identity. Plaintext hop допустим только внутри закрытого локального transport/proxy boundary, без опубликованного обхода; границу и rationale нужно доказать. +| Связь | Порт и протокол | Server trust и client identity | Минимальные права / lifecycle | Доказательство | +| --- | --- | --- | --- | --- | +| Клиент → Nginx | `8443`, TLS 1.3 | Public CA, SAN `localhost`; Bearer session | Сессия хранится как hash с TTL; общий login limiter | `make test-security`; `make test`; `make test-login-rate-limit` | +| Nginx → API replicas | `8443`, mTLS | Internal CA; server SAN `api`; client URI `spiffe://mtusi/lab7/load-balancer` | Leaf выпускается bootstrap и меняется без rebuild | `make test-tls-matrix`: allow LB, deny no-cert/foreign/forbidden | +| Prometheus → API metrics | `9091`, mTLS | Internal CA; URI `spiffe://mtusi/lab7/prometheus` | Только `/metrics`; business route отсутствует | `make test-tls-matrix` | +| API/worker/dispatcher/reconciler → PostgreSQL | `5432`, TLS 1.3 `verify-full` + client cert | SAN `postgres`; отдельные API, worker, dispatcher, reconciler certs | Разные DB roles/grants; migrator отдельный one-shot | `infra/security/test-dependency-matrix.sh` | +| API → Valkey | gateway `16379`, mTLS; backend TLS | SAN `redis-gateway`; API URI SAN; Valkey ACL user `messenger_api` | Только session/rate-limit prefixes; password приходит из OpenBao | dependency matrix: разрешён session key, запрещён arbitrary key | +| Dispatcher → Redis Streams | gateway `26379`, mTLS; backend TLS | Dispatcher URI SAN | Producer ACL без consume | dependency matrix: `XADD` разрешён, `XREAD` запрещён | +| Worker → Redis Streams | gateway `36379`, mTLS; backend TLS | Worker URI SAN | Consumer/ack ACL, unrelated stream запрещён; credential ротируется | dependency matrix и `make test-worker-compromise` | +| API/worker/reconciler → MinIO | `9000`, HTTPS | Internal CA, SAN `s3` | API: staging; worker: staging+attachments; reconciler: cleanup; разные keys | dependency matrix проверяет разрешённые и запрещённые prefixes | +| API/worker/dispatcher/reconciler → OTel gateway | `4317/4318`, mTLS | Internal CA; exact allowlist service URI SAN | Только telemetry ingest | dependency matrix отклоняет same-CA Prometheus identity | +| OTel Collector → Loki/Tempo/Prometheus | локальный TLS gateway → backend network | Collector identity и Internal CA | Backend ports не опубликованы; plaintext hop только внутри выделенной `telemetry_storage` network | `infra/otel/collector.yaml`, Prometheus targets, TLS matrix | +| Grafana → Prometheus/Loki/Tempo | отдельные HTTPS gateways | Grafana client certificate, Internal CA, exact URI SAN | Read-only datasource access; UI опубликован только на `127.0.0.1:3000` по HTTPS | provisioned datasource health API и gateway config | +| OpenBao Agent API/worker → OpenBao | `8200`, TLS 1.3 | OpenBao SAN; AppRole RoleID+SecretID с TTL 1 час | Раздельные KV policies; renewable token; rendered file `0600` в защищённом volume, Agent token в tmpfs | `scripts/openbao-test-policy.sh`, `scripts/openbao-rotate.sh` | +| Оператор → OpenBao | `127.0.0.1:8200`, TLS 1.3 | CA; root token только в operator runtime file | Init/unseal/bootstrap/rotation; Raft volume persistent | `scripts/bootstrap-local.sh`, `infra/openbao/README.md` | +| Оператор → Grafana | `127.0.0.1:3000`, HTTPS | Internal CA, login/password | Административный UI не слушает внешний интерфейс | `docker compose port grafana 3000` и HTTPS health | +| Replication/cluster channels | N/A | PostgreSQL, Valkey, Redis, MinIO и OpenBao запущены по одному экземпляру | Репликация не заявлена; отказ зависимости обнаруживается readiness | Документированное ограничение стенда | -| Связь | Минимум на 3 | Дополнительно на 4 | Доказательство / конфиг | -| --- | --- | --- | --- | -| Клиент → ingress/LB | TLS, CA + hostname, Bearer | Проверка expiry/revocation сессии и общего login rate limit | TODO | -| LB → API (все реплики) | mTLS + allowlist LB identity | Ротация leaf без обхода проверки | TODO | -| API/worker → PostgreSQL | TLS verify-full + раздельные ограниченные DB roles | Ротация credentials; mTLS — допустимое усиление | TODO | -| API/worker → S3 | TLS + разные scoped credentials/prefix rights | Проверка denied prefix и ротация | TODO | -| API/worker → broker | TLS + разные producer/consumer identities и ACL | mTLS + ограничение допустимых SAN/ролей | TODO | -| API/worker → Collector | TLS; сеть/аутентификация запрещает произвольный ingest | mTLS с раздельными identities | TODO | -| Collector → telemetry backends | TLS + scoped backend credentials или mTLS | Ротация и проверка least privilege | TODO | -| Grafana → data sources | TLS с проверкой сервера, ограниченная identity | Отрицательные проверки доступа | TODO | -| API/worker/agent → OpenBao | TLS + сервисный auth + scoped policy | Renewal/expiry/revocation | TODO | -| Оператор → OpenBao/Grafana/S3 admin | TLS + authentication, доступ локальный/через защищённый канал | Разделение operator/application roles | TODO | -| API → Redis/Valkey, если используется | TLS + ACL/пароль с минимальными правами | Ротация; mTLS по возможности | TODO | -| Replication/кластерные каналы, если добавлены | TLS/mTLS либо подтверждённый шифрованный transport | Проверка заявленной модели отказа | TODO | +## Каналы bootstrap, health и scrape -Нет выбранного компонента — отметьте N/A с причиной, а не оставляйте пустую строку. Внутренний публичный health listener, если нужен, минимален и изолирован; через него нельзя обращаться к бизнес-API без mTLS. Отдельно задокументируйте scrape/health/bootstrap каналы: они тоже не должны создавать обход. - -## Обязательные отрицательные проверки - -1. HTTPS с правильным CA/hostname проходит; с пустым/чужим CA и неправильным hostname — ошибка верификации, не «сервер недоступен». -2. LB→API: без client cert, с cert чужого CA, с запрещённой identity от доверенного CA — отказ; с разрешённой LB identity — успех. -3. На 4 повторите набор для broker и Collector; ограничение на network policy не заменяет проверку identity. -4. Пользователь вне чата не читает metadata/content и не прикрепляет чужой файл; поддельный X-User-Id не меняет Bearer identity. -5. OpenBao app policy читает только свой secret/path; запись policy и чтение чужого path запрещены. Worker не получает admin credentials API/БД/S3. -6. На 4 отзовите secret/cert и дождитесь контролируемого эффекта с учётом действующих соединений, TLS resumption и cache/TTL. Покажите новое подключение, иначе тест отзыва может ничего не проверить. - -## Bootstrap и эксплуатация - -В репозитории только открытые конфиги, policy templates и scripts. CA private key, leaf keys, root token, unseal shares и SecretID не коммитятся, не запекаются в образ и не печатаются в отчёте. Для локального стенда оператор создаёт их вне Git и передаёт через files/secrets с ограниченными правами. Опишите, кто имеет доступ к CA/unseal, что нужно после рестарта OpenBao и как восстановить работу. - -OpenBao не использует dev-mode. Выберите persistent storage и auth метод (например AppRole с короткоживущим SecretID/response wrapping, cert auth или иная обоснованная identity). Не подменяйте root token постоянной переменной BAO_TOKEN в приложении. Рабочие tokens имеют policy, TTL и renewal/re-auth сценарий. Статические KV secrets на 3 допустимы при реальном чтении через сервисную identity; динамические DB credentials — хорошее расширение, но не обязательное название технологии. - -Разрешённый компромисс учебного стенда: ручной operator init/unseal, если он безопасно документирован и не нужен при каждом обычном рестарте API. Автоматическое хранение всех unseal shares рядом с OpenBao без защиты не считается решённым bootstrap. +- `127.0.0.1:8082` существует только внутри каждого app container и используется Docker healthcheck; business router на нём отсутствует. +- Публичный `/health/ready` проходит через ingress TLS, но не раскрывает credentials или содержимое зависимостей. +- Metrics listener требует Prometheus URI SAN; сертификат LB и сертификаты приложений отклоняются. +- Bootstrap jobs подключены только к нужным внутренним сетям, не публикуют порты и завершаются после установки ACL/roles/secrets. +- Private keys, root token, unseal shares, RoleID/SecretID и rendered secrets хранятся в `.runtime`/Docker volumes и отсутствуют в Git. diff --git a/evidence/lab7-argon2-budget.json b/evidence/lab7-argon2-budget.json new file mode 100644 index 0000000..2f9022f --- /dev/null +++ b/evidence/lab7-argon2-budget.json @@ -0,0 +1,28 @@ +{ + "schema_version": 1, + "environment": { + "os": "linux", + "architecture": "arm64", + "cpu_limit": 2, + "memory_limit_mib": 512, + "go_version": "1.26.5" + }, + "parameters": { + "memory_kib": 65536, + "iterations": 3, + "parallelism": 2, + "salt_length": 16, + "key_length": 32 + }, + "method": "go test benchmark, 5 iterations per operation", + "hash": { + "nanoseconds_per_operation": 60029195, + "bytes_per_operation": 67114704, + "allocations_per_operation": 59 + }, + "verify": { + "nanoseconds_per_operation": 64816424, + "bytes_per_operation": 67113590, + "allocations_per_operation": 53 + } +} diff --git a/evidence/lab7-security-checks.json b/evidence/lab7-security-checks.json new file mode 100644 index 0000000..f5b43ff --- /dev/null +++ b/evidence/lab7-security-checks.json @@ -0,0 +1,19 @@ +{ + "schema_version": 1, + "generated_at": "2026-11-06T18:18:28.005396+00:00", + "scope": "local runtime checks on the lab7 Compose stack; remote CI is separate", + "public_https_smoke": "PASS", + "public_and_api_mtls_matrix_cases": 13, + "dependency_mtls_and_acl_matrix": "PASS", + "openbao_policy_allow_deny_and_renewal": "PASS", + "openbao_expiry_revoke_seal_and_reauth": "PASS", + "leaf_rotation_old_identity_and_expired_leaf_denied": "PASS", + "shared_login_rate_limit_across_two_replicas": "PASS", + "postgres_and_valkey_integration": "PASS", + "go_tests_and_vet": "PASS", + "grafana_datasource_health": { + "prometheus": "OK", + "loki": "OK", + "tempo": "OK" + } +} diff --git a/evidence/lab7-security-scan.json b/evidence/lab7-security-scan.json new file mode 100644 index 0000000..80ab1f1 --- /dev/null +++ b/evidence/lab7-security-scan.json @@ -0,0 +1,331 @@ +{ + "schema_version": 1, + "scanner": "Trivy 0.76.2", + "generated_at": "2026-11-06T18:17:33+00:00", + "scope": "repository filesystem: vulnerabilities, misconfigurations, secrets", + "vulnerabilities": { + "UNKNOWN": 3 + }, + "misconfigurations": { + "LOW": 2 + }, + "secret_findings": 0, + "scanned_images": [ + "envoyproxy/envoy:v1.35.2", + "grafana/loki:3.7.9", + "grafana/tempo:2.10.10", + "mtusi-grafana:lab7", + "mtusi-messenger:lab7", + "mtusi-minio:RELEASE.2025-10-15T17-29-55Z", + "mtusi-nginx:lab7", + "mtusi-prometheus:lab7", + "mtusi-swagger:lab7", + "nginx/nginx-prometheus-exporter:1.5.1", + "oliver006/redis_exporter:v1.89.0-alpine", + "openbao/openbao:2.7.1", + "otel/opentelemetry-collector-contrib:0.160.0", + "postgres:17.6-alpine3.22", + "quay.io/prometheuscommunity/postgres-exporter:v0.20.1", + "redis:8.2.2-alpine", + "valkey/valkey:8.1.4-alpine" + ], + "image_vulnerabilities": { + "CRITICAL": 26, + "HIGH": 479, + "LOW": 508, + "MEDIUM": 795, + "UNKNOWN": 92 + }, + "image_secret_findings": 0, + "findings": [ + { + "id": "CVE-2026-111497", + "package": "brotli-libs", + "installed_version": "1.2.0-r1", + "fixed_version": "1.2.1-r0", + "severity": "CRITICAL", + "title": "brotli: Out-of-Bounds Write in Google Brotli Decoder", + "scopes": [ + "mtusi-grafana:lab7" + ] + }, + { + "id": "CVE-2026-111497", + "package": "brotli-libs", + "installed_version": "1.2.0-r0", + "fixed_version": "1.2.1-r0", + "severity": "CRITICAL", + "title": "brotli: Out-of-Bounds Write in Google Brotli Decoder", + "scopes": [ + "mtusi-swagger:lab7" + ] + }, + { + "id": "CVE-2026-33322", + "package": "github.com/minio/minio", + "installed_version": "v0.0.0-20251015172955-9e49d5e7a648", + "fixed_version": "", + "severity": "CRITICAL", + "title": "MinIO has JWT Algorithm Confusion in OIDC Authentication", + "scopes": [ + "mtusi-minio:RELEASE.2025-10-15T17-29-55Z" + ] + }, + { + "id": "CVE-2026-33419", + "package": "github.com/minio/minio", + "installed_version": "v0.0.0-20251015172955-9e49d5e7a648", + "fixed_version": "", + "severity": "CRITICAL", + "title": "MinIO LDAP login brute-force via user enumeration and missing rate limit", + "scopes": [ + "mtusi-minio:RELEASE.2025-10-15T17-29-55Z" + ] + }, + { + "id": "CVE-2026-77405", + "package": "github.com/rabbitmq/amqp091-go", + "installed_version": "v1.10.0", + "fixed_version": "1.13.0", + "severity": "CRITICAL", + "title": "github.com/rabbitmq/amqp091-go: RabbitMQ amqp091-go: Missing Explicit TLS Minimum Version Configuration In URI Parser", + "scopes": [ + "mtusi-minio:RELEASE.2025-10-15T17-29-55Z" + ] + }, + { + "id": "CVE-2026-77405", + "package": "github.com/rabbitmq/amqp091-go", + "installed_version": "v1.12.0", + "fixed_version": "1.13.0", + "severity": "CRITICAL", + "title": "github.com/rabbitmq/amqp091-go: RabbitMQ amqp091-go: Missing Explicit TLS Minimum Version Configuration In URI Parser", + "scopes": [ + "otel/opentelemetry-collector-contrib:0.160.0" + ] + }, + { + "id": "CVE-2026-77408", + "package": "github.com/rabbitmq/amqp091-go", + "installed_version": "v1.10.0", + "fixed_version": "1.13.0", + "severity": "CRITICAL", + "title": "github.com/rabbitmq/amqp091-go: RabbitMQ amqp091-go: Silent Data Truncation and State Corruption via Shortstr Integer Overflow", + "scopes": [ + "mtusi-minio:RELEASE.2025-10-15T17-29-55Z" + ] + }, + { + "id": "CVE-2026-77408", + "package": "github.com/rabbitmq/amqp091-go", + "installed_version": "v1.12.0", + "fixed_version": "1.13.0", + "severity": "CRITICAL", + "title": "github.com/rabbitmq/amqp091-go: RabbitMQ amqp091-go: Silent Data Truncation and State Corruption via Shortstr Integer Overflow", + "scopes": [ + "otel/opentelemetry-collector-contrib:0.160.0" + ] + }, + { + "id": "CVE-2026-77411", + "package": "github.com/rabbitmq/amqp091-go", + "installed_version": "v1.10.0", + "fixed_version": "1.13.0", + "severity": "CRITICAL", + "title": "github.com/rabbitmq/amqp091-go: RabbitMQ amqp091-go: Protocol Desynchronization and Frame Injection via Integer Overflow in readLongstr", + "scopes": [ + "mtusi-minio:RELEASE.2025-10-15T17-29-55Z" + ] + }, + { + "id": "CVE-2026-77411", + "package": "github.com/rabbitmq/amqp091-go", + "installed_version": "v1.12.0", + "fixed_version": "1.13.0", + "severity": "CRITICAL", + "title": "github.com/rabbitmq/amqp091-go: RabbitMQ amqp091-go: Protocol Desynchronization and Frame Injection via Integer Overflow in readLongstr", + "scopes": [ + "otel/opentelemetry-collector-contrib:0.160.0" + ] + }, + { + "id": "GO-2026-5932", + "package": "golang.org/x/crypto", + "installed_version": "v0.57.0", + "fixed_version": "0.58.1-0.20261009181718-2f1f834330b2", + "severity": "UNKNOWN", + "title": "The golang.org/x/crypto/openpgp package is unmaintained, unsafe by design, and has known security issues", + "scopes": [ + "repository", + "grafana/tempo:2.10.10", + "mtusi-grafana:lab7", + "mtusi-messenger:lab7" + ] + }, + { + "id": "CVE-2026-78661", + "package": "golang.org/x/net", + "installed_version": "v0.60.0", + "fixed_version": "0.62.0", + "severity": "UNKNOWN", + "title": "When coalescing adjacent text nodes in addText and fosterParent, appen ...", + "scopes": [ + "repository", + "grafana/tempo:2.10.10", + "mtusi-grafana:lab7", + "mtusi-messenger:lab7" + ] + }, + { + "id": "CVE-2026-97045", + "package": "golang.org/x/net", + "installed_version": "v0.60.0", + "fixed_version": "0.62.0", + "severity": "UNKNOWN", + "title": "In childTextNodesAreLiteral, walking up the tree previously stopped at ...", + "scopes": [ + "repository", + "grafana/tempo:2.10.10", + "mtusi-grafana:lab7", + "mtusi-messenger:lab7" + ] + }, + { + "id": "CVE-2026-33186", + "package": "google.golang.org/grpc", + "installed_version": "v1.72.0", + "fixed_version": "1.79.3", + "severity": "CRITICAL", + "title": "google.golang.org/grpc/grpc-go: google.golang.org/grpc/authz: gRPC-Go: Authorization bypass due to improper HTTP/2 path validation", + "scopes": [ + "mtusi-minio:RELEASE.2025-10-15T17-29-55Z" + ] + }, + { + "id": "CVE-2026-31789", + "package": "libcrypto3", + "installed_version": "3.5.4-r0", + "fixed_version": "3.5.6-r0", + "severity": "CRITICAL", + "title": "openssl: OpenSSL: Heap buffer overflow on 32-bit systems from large X.509 certificate processing", + "scopes": [ + "mtusi-minio:RELEASE.2025-10-15T17-29-55Z", + "postgres:17.6-alpine3.22", + "redis:8.2.2-alpine", + "valkey/valkey:8.1.4-alpine" + ] + }, + { + "id": "CVE-2026-31789", + "package": "libcrypto3", + "installed_version": "3.5.5-r0", + "fixed_version": "3.5.6-r0", + "severity": "CRITICAL", + "title": "openssl: OpenSSL: Heap buffer overflow on 32-bit systems from large X.509 certificate processing", + "scopes": [ + "mtusi-swagger:lab7" + ] + }, + { + "id": "CVE-2026-31789", + "package": "libssl3", + "installed_version": "3.5.4-r0", + "fixed_version": "3.5.6-r0", + "severity": "CRITICAL", + "title": "openssl: OpenSSL: Heap buffer overflow on 32-bit systems from large X.509 certificate processing", + "scopes": [ + "mtusi-minio:RELEASE.2025-10-15T17-29-55Z", + "postgres:17.6-alpine3.22", + "redis:8.2.2-alpine", + "valkey/valkey:8.1.4-alpine" + ] + }, + { + "id": "CVE-2026-31789", + "package": "libssl3", + "installed_version": "3.5.5-r0", + "fixed_version": "3.5.6-r0", + "severity": "CRITICAL", + "title": "openssl: OpenSSL: Heap buffer overflow on 32-bit systems from large X.509 certificate processing", + "scopes": [ + "mtusi-swagger:lab7" + ] + }, + { + "id": "CVE-2026-48930", + "package": "nodejs", + "installed_version": "24.13.0-r1", + "fixed_version": "24.17.0-r0", + "severity": "CRITICAL", + "title": "nodejs: Node.js: Silent authority rebinding due to embedded-nul hostnames in TLS handling", + "scopes": [ + "mtusi-swagger:lab7" + ] + }, + { + "id": "CVE-2026-31789", + "package": "openssl", + "installed_version": "3.5.4-r0", + "fixed_version": "3.5.6-r0", + "severity": "CRITICAL", + "title": "openssl: OpenSSL: Heap buffer overflow on 32-bit systems from large X.509 certificate processing", + "scopes": [ + "valkey/valkey:8.1.4-alpine" + ] + }, + { + "id": "CVE-2025-68121", + "package": "stdlib", + "installed_version": "v1.24.8", + "fixed_version": "1.24.13, 1.25.7, 1.26.0-rc.3", + "severity": "CRITICAL", + "title": "crypto/tls: crypto/tls: Incorrect certificate validation during TLS session resumption", + "scopes": [ + "mtusi-minio:RELEASE.2025-10-15T17-29-55Z" + ] + }, + { + "id": "CVE-2025-68121", + "package": "stdlib", + "installed_version": "v1.25.3", + "fixed_version": "1.24.13, 1.25.7, 1.26.0-rc.3", + "severity": "CRITICAL", + "title": "crypto/tls: crypto/tls: Incorrect certificate validation during TLS session resumption", + "scopes": [ + "nginx/nginx-prometheus-exporter:1.5.1" + ] + }, + { + "id": "CVE-2025-68121", + "package": "stdlib", + "installed_version": "v1.24.6", + "fixed_version": "1.24.13, 1.25.7, 1.26.0-rc.3", + "severity": "CRITICAL", + "title": "crypto/tls: crypto/tls: Incorrect certificate validation during TLS session resumption", + "scopes": [ + "postgres:17.6-alpine3.22" + ] + } + ], + "findings_scope": "all repository findings and critical image findings; full findings in raw reports", + "raw_report": "evidence/runtime/security-scan/trivy-fs.json", + "image_raw_reports": [ + "evidence/runtime/security-scan/trivy-image-1.json", + "evidence/runtime/security-scan/trivy-image-2.json", + "evidence/runtime/security-scan/trivy-image-3.json", + "evidence/runtime/security-scan/trivy-image-4.json", + "evidence/runtime/security-scan/trivy-image-5.json", + "evidence/runtime/security-scan/trivy-image-6.json", + "evidence/runtime/security-scan/trivy-image-7.json", + "evidence/runtime/security-scan/trivy-image-8.json", + "evidence/runtime/security-scan/trivy-image-9.json", + "evidence/runtime/security-scan/trivy-image-10.json", + "evidence/runtime/security-scan/trivy-image-11.json", + "evidence/runtime/security-scan/trivy-image-12.json", + "evidence/runtime/security-scan/trivy-image-13.json", + "evidence/runtime/security-scan/trivy-image-14.json", + "evidence/runtime/security-scan/trivy-image-15.json", + "evidence/runtime/security-scan/trivy-image-16.json", + "evidence/runtime/security-scan/trivy-image-17.json" + ] +} diff --git a/evidence/lab7-worker-compromise.json b/evidence/lab7-worker-compromise.json new file mode 100644 index 0000000..83d3f96 --- /dev/null +++ b/evidence/lab7-worker-compromise.json @@ -0,0 +1,12 @@ +{ + "schema_version": 1, + "scenario": "worker credential compromise and rotation", + "generated_at": "2026-11-06T18:08:45+00:00", + "recovery_seconds": 21, + "old_credential_rejected": true, + "old_database_credential_rejected": true, + "old_s3_credential_rejected": true, + "openbao_secret_rotated": true, + "queued_attachment_preserved": true, + "result": "PASS" +} diff --git a/go.mod b/go.mod index 37c0a6e..e046575 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,9 @@ -module gitea.privcloud.tech/dizi/mtusi2026lab6 +module gitea.privcloud.tech/dizi/mtusi2026lab7 go 1.26.0 +toolchain go1.26.10 + require ( github.com/deepteams/webp v1.2.8 github.com/google/uuid v1.6.0 @@ -12,20 +14,21 @@ require ( github.com/spf13/viper v1.21.0 github.com/stretchr/testify v1.11.1 github.com/valkey-io/valkey-go v1.0.78 - go.opentelemetry.io/contrib/bridges/otelslog v0.13.0 + go.opentelemetry.io/contrib/bridges/otelslog v0.20.0 go.opentelemetry.io/contrib/instrumentation/runtime v0.60.0 - go.opentelemetry.io/otel v1.38.0 - go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0 - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 + go.opentelemetry.io/otel v1.45.0 + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.21.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.45.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.45.0 go.opentelemetry.io/otel/exporters/prometheus v0.60.0 - go.opentelemetry.io/otel/metric v1.38.0 - go.opentelemetry.io/otel/sdk v1.38.0 - go.opentelemetry.io/otel/sdk/log v0.14.0 - go.opentelemetry.io/otel/sdk/metric v1.38.0 - go.opentelemetry.io/otel/trace v1.38.0 + go.opentelemetry.io/otel/metric v1.45.0 + go.opentelemetry.io/otel/sdk v1.45.0 + go.opentelemetry.io/otel/sdk/log v0.21.0 + go.opentelemetry.io/otel/sdk/metric v1.45.0 + go.opentelemetry.io/otel/trace v1.45.0 golang.org/x/crypto v0.57.0 golang.org/x/sync v0.23.0 + google.golang.org/grpc v1.83.2 ) require ( @@ -37,15 +40,15 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/go-ini/ini v1.67.0 // indirect - github.com/go-logr/logr v1.4.3 // indirect + github.com/go-logr/logr v1.4.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/puddle/v2 v2.2.2 // indirect - github.com/klauspost/compress v1.18.2 // indirect + github.com/klauspost/compress v1.18.7 // indirect github.com/klauspost/cpuid/v2 v2.2.11 // indirect github.com/klauspost/crc32 v1.3.0 // indirect github.com/minio/crc64nvme v1.1.1 // indirect @@ -66,18 +69,17 @@ require ( github.com/spf13/pflag v1.0.10 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/tinylib/msgp v1.6.1 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect - go.opentelemetry.io/proto/otlp v1.7.1 // indirect + go.opentelemetry.io/auto/sdk v1.2.1 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.45.0 // indirect + go.opentelemetry.io/otel/log v0.21.0 // indirect + go.opentelemetry.io/proto/otlp v1.11.0 // indirect go.yaml.in/yaml/v2 v2.4.2 // indirect go.yaml.in/yaml/v3 v3.0.5 // indirect - golang.org/x/net v0.58.0 // indirect + golang.org/x/net v0.60.0 // indirect golang.org/x/sys v0.48.0 // indirect golang.org/x/text v0.42.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect - google.golang.org/grpc v1.75.0 // indirect - google.golang.org/protobuf v1.36.8 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260803160001-6ac0973c030d // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260803160001-6ac0973c030d // indirect + google.golang.org/protobuf v1.36.11 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 63eb5b2..08c0288 100644 --- a/go.sum +++ b/go.sum @@ -24,8 +24,8 @@ github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8 github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs= @@ -38,8 +38,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248= github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 h1:8Tjv8EJ+pM1xP8mK6egEbD1OgnVTyacbefKhmbLhIhU= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2/go.mod h1:pkJQ2tZHJ0aFOVEEot6oZmaVEZcRme73eIFmhiVuRWs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= @@ -48,8 +48,8 @@ github.com/jackc/pgx/v5 v5.11.0 h1:IzBBtyK9AHqf98cctWFifYSci2hgQR/cd56wB4p+ogg= github.com/jackc/pgx/v5 v5.11.0/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4= github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= -github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk= -github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4= +github.com/klauspost/compress v1.18.7 h1:aUyZsS4kH3QTKurYhAOwAHxllVPnOthb3vPfnF1Ehjw= +github.com/klauspost/compress v1.18.7/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.11 h1:0OwqZRYI2rFrjS4kvkDnqJkKHdHaRnCm68/DY4OxRzU= github.com/klauspost/cpuid/v2 v2.2.11/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= @@ -89,8 +89,8 @@ github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7D github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw= github.com/redis/go-redis/v9 v9.17.2 h1:P2EGsA4qVIM3Pp+aPocCJ7DguDHhqrXNhVcEp4ViluI= github.com/redis/go-redis/v9 v9.17.2/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370= -github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= -github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= +github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= +github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc= @@ -116,40 +116,42 @@ github.com/tinylib/msgp v1.6.1 h1:ESRv8eL3u+DNHUoSAAQRE50Hm162zqAnBoGv9PzScPY= github.com/tinylib/msgp v1.6.1/go.mod h1:RSp0LW9oSxFut3KzESt5Voq4GVWyS+PSulT77roAqEA= github.com/valkey-io/valkey-go v1.0.78 h1:1Ce8hRaaNXpKfqmqZQRhnbVh1eW8MGR873pdXVvE4y8= github.com/valkey-io/valkey-go v1.0.78/go.mod h1:gvC/r2m3eW4Hbj0YnjogTzNtFdPSM/D+NCqen+5OABM= -go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= -go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelslog v0.13.0 h1:bwnLpizECbPr1RrQ27waeY2SPIPeccCx/xLuoYADZ9s= -go.opentelemetry.io/contrib/bridges/otelslog v0.13.0/go.mod h1:3nWlOiiqA9UtUnrcNk82mYasNxD8ehOspL0gOfEo6Y4= +go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= +go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= +go.opentelemetry.io/contrib/bridges/otelslog v0.20.0 h1:oEl2Pw/i4OQwhAuda2pAHFAcOMivA+Xa+iTccBfab/g= +go.opentelemetry.io/contrib/bridges/otelslog v0.20.0/go.mod h1:yMSQaiiq5dpfrSJCYLBcqFeJkFFI67seT4ngvx6jfVo= go.opentelemetry.io/contrib/instrumentation/runtime v0.60.0 h1:0NgN/3SYkqYJ9NBlDfl/2lzVlwos/YQLvi8sUrzJRBE= go.opentelemetry.io/contrib/instrumentation/runtime v0.60.0/go.mod h1:oxpUfhTkhgQaYIjtBt3T3w135dLoxq//qo3WPlPIKkE= -go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= -go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0 h1:OMqPldHt79PqWKOMYIAQs3CxAi7RLgPxwfFSwr4ZxtM= -go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0/go.mod h1:1biG4qiqTxKiUCtoWDPpL3fB3KxVwCiGw81j3nKMuHE= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0 h1:vl9obrcoWVKp/lwl8tRE33853I8Xru9HFbw/skNeLs8= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0/go.mod h1:GAXRxmLJcVM3u22IjTg74zWBrRCKq8BnOqUVLodpcpw= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 h1:GqRJVj7UmLjCVyVJ3ZFLdPRmhDUp2zFmQe3RHIOsw24= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0/go.mod h1:ri3aaHSmCTVYu2AWv44YMauwAQc0aqI9gHKIcSbI1pU= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 h1:lwI4Dc5leUqENgGuQImwLo4WnuXFPetmPpkLi2IrX54= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0/go.mod h1:Kz/oCE7z5wuyhPxsXDuaPteSWqjSBD5YaSdbxZYGbGk= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.21.0 h1:WseeVYf5dJZTsyPiyW5L14k5qsSibqXAMTSiFEDiWr0= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.21.0/go.mod h1:SiLZnQS6Qk2eCpvr2CH/XMAOa64TWGXxEZJZCpD2Lmc= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.45.0 h1:klTViGcsvLCd1xN3rZzfZ12NslC/OimbmR+k+A006RI= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.45.0/go.mod h1:jRsK04CWmXuY8A0O+wMpSf+t90RHZ53o5Qmxn2PQPfk= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.45.0 h1:QRefszxJmfPdjXUUm3j6iDzY03mTPXMjqErFqQ67vUg= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.45.0/go.mod h1:Tiz03lTBVBrm7eWZBOidzEaYaJa8tjwGUGv6d8mlTyk= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.45.0 h1:fG5MCxGz8+2VtrN/WgqSpJFctVz24gpxj8CxkKmc8Ww= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.45.0/go.mod h1:BmAYTn+3ysbRe+IU2msxmf5Rx3g6DHvex+tWI3LdhYI= go.opentelemetry.io/otel/exporters/prometheus v0.60.0 h1:cGtQxGvZbnrWdC2GyjZi0PDKVSLWP/Jocix3QWfXtbo= go.opentelemetry.io/otel/exporters/prometheus v0.60.0/go.mod h1:hkd1EekxNo69PTV4OWFGZcKQiIqg0RfuWExcPKFvepk= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= -go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= -go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= -go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= -go.opentelemetry.io/otel/sdk/log v0.14.0 h1:JU/U3O7N6fsAXj0+CXz21Czg532dW2V4gG1HE/e8Zrg= -go.opentelemetry.io/otel/sdk/log v0.14.0/go.mod h1:imQvII+0ZylXfKU7/wtOND8Hn4OpT3YUoIgqJVksUkM= -go.opentelemetry.io/otel/sdk/log/logtest v0.14.0 h1:Ijbtz+JKXl8T2MngiwqBlPaHqc4YCaP/i13Qrow6gAM= -go.opentelemetry.io/otel/sdk/log/logtest v0.14.0/go.mod h1:dCU8aEL6q+L9cYTqcVOk8rM9Tp8WdnHOPLiBgp0SGOA= -go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= -go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= -go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= -go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs= -go.opentelemetry.io/proto/otlp v1.7.1 h1:gTOMpGDb0WTBOP8JaO72iL3auEZhVmAQg4ipjOVAtj4= -go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE= +go.opentelemetry.io/otel/log v0.21.0 h1:SLsVDGmtyBrdw8/a2Z0bOIxou/+bN4z56GebH7T0LvA= +go.opentelemetry.io/otel/log v0.21.0/go.mod h1:iReetQrZL9Wyg84cCkOoCmqDHS5RCFfyxC7J+r8fn8g= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/metric/x v0.67.0 h1:PcicCNZFkZ4bXfSooXdo3WN7RBOVOtjVdo1wD358Uns= +go.opentelemetry.io/otel/metric/x v0.67.0/go.mod h1:FBjCWZe6wgcqxcMtjdGiClDKXb2YxxXii0CXftE4QtI= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/log v0.21.0 h1:QsE7XSR0ktQdKmRKGnR+f1ObGF32WG+7MER/P9KgmYc= +go.opentelemetry.io/otel/sdk/log v0.21.0/go.mod h1:m9mApjCoD2/1QuKCAptjv+BrG9WKOvQLVdNx+iBldTo= +go.opentelemetry.io/otel/sdk/log/logtest v0.21.0 h1:X+JBBgKlswCGYsmgL0CnoUUtlE//VB345c84jYAYkdQ= +go.opentelemetry.io/otel/sdk/log/logtest v0.21.0/go.mod h1:HD1575K8e6sIFBBDd5tZB3t9DlMytWXq9FuR+Y4rfjE= +go.opentelemetry.io/otel/sdk/metric v1.45.0 h1:oVFszMfyj1Am6s24Vtc7wBb8BKLcwepJjNEYILuiE3o= +go.opentelemetry.io/otel/sdk/metric v1.45.0/go.mod h1:vUWUxDZvu1WVRj8JA8S0AdhsPrZoDpA2DdZauIh4mDA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= +go.opentelemetry.io/proto/otlp v1.11.0 h1:5rrYs0Ykyj50sdU/JU0x8etU+LubXWb+gED6TbEdMIk= +go.opentelemetry.io/proto/otlp v1.11.0/go.mod h1:SmVizdCOAm3XBtG1g1NnOdhW6jtddT72hLMhv8VwA8E= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI= @@ -158,24 +160,24 @@ go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M= golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA= -golang.org/x/net v0.58.0 h1:ynWG7rqYi4ccpTEuPZ2QGWHktVEM9DMCj9yzDE0Q7To= -golang.org/x/net v0.58.0/go.mod h1:YwCddHnFlT7eLQqVprV19OnhLGtc5xOKgE0RyqgfWAU= +golang.org/x/net v0.60.0 h1:79p50tfZlm0J9YfoDsSi639qSXNGVwEzOPLCxM2FsYU= +golang.org/x/net v0.60.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg= golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk= golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo= golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI= golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E= -gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= -gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= -google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 h1:BIRfGDEjiHRrk0QKZe3Xv2ieMhtgRGeLcZQ0mIVn4EY= -google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5/go.mod h1:j3QtIyytwqGr1JUDtYXwtMXWPKsEa5LtzIFN1Wn5WvE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 h1:eaY8u2EuxbRv7c3NiGK0/NedzVsCcV6hDuU5qPX5EGE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5/go.mod h1:M4/wBTSeyLxupu3W3tJtOgB14jILAS/XWPSSa3TAlJc= -google.golang.org/grpc v1.75.0 h1:+TW+dqTd2Biwe6KKfhE5JpiYIBWq865PhKGSXiivqt4= -google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ= -google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc= -google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU= +gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= +gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= +google.golang.org/genproto/googleapis/api v0.0.0-20260803160001-6ac0973c030d h1:FarXi840EJWSHYTN3ERkADbPWjl307+FGrA22KAVjjc= +google.golang.org/genproto/googleapis/api v0.0.0-20260803160001-6ac0973c030d/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260803160001-6ac0973c030d h1:IL4hdHzcUv2l/gcg98/Rj3FbtE6axwqslOW8SW0C+S0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260803160001-6ac0973c030d/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.83.2 h1:EManeRomTObA0BU7I8vXgg/78uE5MJ9M8B39EX2WscU= +google.golang.org/grpc v1.83.2/go.mod h1:YPI1hK3kDked6iHvgX3tR0y+nX/qpMFKhPgFsokw1S8= +google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= +google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= 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..37037f6 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 \ + "$PWD/.runtime/openbao/seed/api.json" \ + "$PWD/.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 "$PWD/.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..6e7ab45 --- /dev/null +++ b/infra/openbao/agent/api-secrets.ctmpl @@ -0,0 +1,3 @@ +{{- 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..5f7bf0b --- /dev/null +++ b/infra/openbao/agent/api.hcl @@ -0,0 +1,43 @@ +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..211b79d --- /dev/null +++ b/infra/openbao/agent/worker-secrets.ctmpl @@ -0,0 +1,3 @@ +{{- 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..762e83c --- /dev/null +++ b/infra/openbao/agent/worker.hcl @@ -0,0 +1,43 @@ +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..38e734a --- /dev/null +++ b/infra/openbao/config.hcl @@ -0,0 +1,19 @@ +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..4b4edb6 --- /dev/null +++ b/infra/openbao/policies/messenger-api.hcl @@ -0,0 +1,31 @@ +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..4eba2a5 --- /dev/null +++ b/infra/openbao/policies/messenger-worker.hcl @@ -0,0 +1,31 @@ +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/internal/bootstrap/migration.go b/internal/bootstrap/migration.go index 0e7dd49..3ce60ec 100644 --- a/internal/bootstrap/migration.go +++ b/internal/bootstrap/migration.go @@ -3,8 +3,8 @@ package bootstrap import ( "context" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/config" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/database" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/config" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/database" ) func RunMigrations() error { diff --git a/internal/bootstrap/pipeline.go b/internal/bootstrap/pipeline.go index 1539107..031c87d 100644 --- a/internal/bootstrap/pipeline.go +++ b/internal/bootstrap/pipeline.go @@ -2,6 +2,7 @@ package bootstrap import ( "context" + "crypto/tls" "errors" "log/slog" "net" @@ -14,19 +15,20 @@ import ( "github.com/google/uuid" "github.com/redis/go-redis/v9" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/broker/redisstream" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/config" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/database" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/messenger/attachment/pipeline" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/messenger/attachment/transform" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/messenger/attachment/worker" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/objectstore" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/outbox" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/postgres" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/telemetry" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/broker/redisstream" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/config" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/database" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/messenger/attachment/pipeline" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/messenger/attachment/transform" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/messenger/attachment/worker" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/objectstore" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/outbox" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/postgres" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/security/tlsconfig" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/telemetry" ) -func RunDispatcher(logger *slog.Logger) error { +func RunDispatcher() error { settings, err := config.LoadDispatcher() if err != nil { return err @@ -48,7 +50,11 @@ func RunDispatcher(logger *slog.Logger) error { if err := telemetry.ObserveDatabasePool(observability.MeterProvider().Meter("messenger-dispatcher/database"), pool); err != nil { return err } - client, err := newRedisClient(settings.BrokerURL) + brokerTLSConfiguration, err := loadClientTLS(settings.BrokerTLS) + if err != nil { + return err + } + client, err := newRedisClient(settings.BrokerURL, brokerTLSConfiguration) if err != nil { return err } @@ -61,9 +67,6 @@ func RunDispatcher(logger *slog.Logger) error { if err != nil { return err } - if err := broker.Ensure(context.Background()); err != nil { - return err - } metrics := pipeline.NewMetrics(observability.MeterProvider().Meter("messenger-dispatcher"), observability.MetricsHandler(), 0) dispatcher, err := outbox.New(postgres.New(pool), broker, metrics, outbox.Config{ BatchSize: settings.BatchSize, LeaseDuration: settings.LeaseDuration, @@ -74,11 +77,17 @@ func RunDispatcher(logger *slog.Logger) error { if err != nil { return err } + metricsTLSConfiguration, err := loadServerTLS(settings.MetricsTLS) + if err != nil { + return err + } logger.Info("outbox dispatcher started", "stream", settings.Stream) - return runPipelineProcess(logger, settings.MetricsAddress, metrics.Handler(), dispatcher.Run) + return runPipelineProcess( + logger, settings.MetricsAddress, settings.HealthAddress, metricsTLSConfiguration, metrics.Handler(), dispatcher.Run, + ) } -func RunWorker(logger *slog.Logger) error { +func RunWorker() error { settings, err := config.LoadWorker() if err != nil { return err @@ -103,12 +112,16 @@ func RunWorker(logger *slog.Logger) error { objects, err := objectstore.New(objectstore.Config{ Endpoint: settings.S3Endpoint, Region: settings.S3Region, Bucket: settings.S3Bucket, AccessKey: settings.S3AccessKey, SecretKey: settings.S3SecretKey, - UseTLS: settings.S3UseTLS, Timeout: settings.S3Timeout, + UseTLS: settings.S3UseTLS, CAPath: settings.S3CAPath, Timeout: settings.S3Timeout, }) if err != nil { return err } - client, err := newRedisClient(settings.BrokerURL) + brokerTLSConfiguration, err := loadClientTLS(settings.BrokerTLS) + if err != nil { + return err + } + client, err := newRedisClient(settings.BrokerURL, brokerTLSConfiguration) if err != nil { return err } @@ -144,15 +157,36 @@ func RunWorker(logger *slog.Logger) error { if err != nil { return err } + metricsTLSConfiguration, err := loadServerTLS(settings.MetricsTLS) + if err != nil { + return err + } logger.Info("attachment worker started", "consumer", consumer, "concurrency", settings.Concurrency) - return runPipelineProcess(logger, settings.MetricsAddress, metrics.Handler(), processorWorker.Run) + return runPipelineProcess( + logger, settings.MetricsAddress, settings.HealthAddress, metricsTLSConfiguration, metrics.Handler(), processorWorker.Run, + ) } -func newRedisClient(rawURL string) (*redis.Client, error) { +func loadClientTLS(config config.ClientTLSConfig) (*tls.Config, error) { + return tlsconfig.LoadClient(tlsconfig.ClientConfig{ + CAPath: config.CAPath, CertificatePath: config.CertificatePath, + PrivateKeyPath: config.PrivateKeyPath, ServerName: config.ServerName, + }) +} + +func loadServerTLS(config config.ServerTLSConfig) (*tls.Config, error) { + return tlsconfig.LoadServer(tlsconfig.ServerConfig{ + CAPath: config.CAPath, CertificatePath: config.CertificatePath, + PrivateKeyPath: config.PrivateKeyPath, AllowedClientURI: config.AllowedClientURI, + }) +} + +func newRedisClient(rawURL string, tlsConfiguration *tls.Config) (*redis.Client, error) { options, err := redis.ParseURL(rawURL) if err != nil { return nil, err } + options.TLSConfig = tlsConfiguration.Clone() client := redis.NewClient(options) ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() @@ -166,19 +200,32 @@ func newRedisClient(rawURL string) (*redis.Client, error) { func runPipelineProcess( logger *slog.Logger, metricsAddress string, + healthAddress string, + metricsTLSConfiguration *tls.Config, metricsHandler http.Handler, run func(context.Context) error, ) error { - mux := http.NewServeMux() - mux.Handle("/metrics", metricsHandler) - mux.HandleFunc("/health/live", func(w http.ResponseWriter, _ *http.Request) { w.WriteHeader(http.StatusNoContent) }) - server := &http.Server{Addr: metricsAddress, Handler: mux, ReadHeaderTimeout: 5 * time.Second} - listener, err := net.Listen("tcp", metricsAddress) + metricsMux := http.NewServeMux() + metricsMux.Handle("/metrics", metricsHandler) + metricsServer := &http.Server{ + Addr: metricsAddress, Handler: metricsMux, ReadHeaderTimeout: 5 * time.Second, + TLSConfig: metricsTLSConfiguration, + } + healthMux := http.NewServeMux() + healthMux.HandleFunc("/health/live", func(w http.ResponseWriter, _ *http.Request) { w.WriteHeader(http.StatusNoContent) }) + healthServer := &http.Server{Addr: healthAddress, Handler: healthMux, ReadHeaderTimeout: 5 * time.Second} + metricsListener, err := net.Listen("tcp", metricsAddress) if err != nil { return err } - serveResult := make(chan error, 1) - go func() { serveResult <- server.Serve(listener) }() + healthListener, err := net.Listen("tcp", healthAddress) + if err != nil { + _ = metricsListener.Close() + return err + } + serveResult := make(chan error, 2) + go func() { serveResult <- metricsServer.Serve(tls.NewListener(metricsListener, metricsTLSConfiguration)) }() + go func() { serveResult <- healthServer.Serve(healthListener) }() ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM) defer stop() @@ -195,8 +242,10 @@ func runPipelineProcess( } shutdownCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() - if err := server.Shutdown(shutdownCtx); err != nil && result == nil { - result = err + for _, server := range []*http.Server{metricsServer, healthServer} { + if err := server.Shutdown(shutdownCtx); err != nil && result == nil { + result = err + } } if errors.Is(result, http.ErrServerClosed) || errors.Is(result, context.Canceled) { return nil diff --git a/internal/bootstrap/reconciliation.go b/internal/bootstrap/reconciliation.go index 3f09a3f..e018498 100644 --- a/internal/bootstrap/reconciliation.go +++ b/internal/bootstrap/reconciliation.go @@ -10,11 +10,11 @@ import ( "syscall" "time" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/config" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/database" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/objectstore" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/postgres" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/reconcile" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/config" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/database" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/objectstore" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/postgres" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/reconcile" ) type reconciliationOutput struct { @@ -57,7 +57,7 @@ func RunReconciliation(arguments []string, output io.Writer) error { objects, err := objectstore.New(objectstore.Config{ Endpoint: settings.S3Endpoint, Region: settings.S3Region, Bucket: settings.S3Bucket, AccessKey: settings.S3AccessKey, SecretKey: settings.S3SecretKey, - UseTLS: settings.S3UseTLS, Timeout: settings.S3Timeout, + UseTLS: settings.S3UseTLS, CAPath: settings.S3CAPath, Timeout: settings.S3Timeout, }) if err != nil { return err diff --git a/internal/bootstrap/replay.go b/internal/bootstrap/replay.go index 70cc3e8..3c59e70 100644 --- a/internal/bootstrap/replay.go +++ b/internal/bootstrap/replay.go @@ -6,9 +6,9 @@ import ( "fmt" "io" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/config" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/database" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/postgres" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/config" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/database" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/postgres" ) func RunAttachmentReplay(arguments []string, output io.Writer) error { diff --git a/internal/bootstrap/server.go b/internal/bootstrap/server.go index 473c0b7..e21d9c0 100644 --- a/internal/bootstrap/server.go +++ b/internal/bootstrap/server.go @@ -2,33 +2,58 @@ package bootstrap import ( "context" - "log/slog" + "crypto/tls" + "errors" + "fmt" "net" "net/http" - "os" "os/signal" "syscall" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/config" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/database" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/messenger/attachment" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/messenger/httpapi" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/objectstore" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/password" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/postgres" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/session" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/telemetry" + "github.com/google/uuid" + + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/config" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/database" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/loginlimit" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/messenger/attachment" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/messenger/httpapi" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/objectstore" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/password" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/postgres" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/security/tlsconfig" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/session" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/telemetry" ) -func RunServer(logger *slog.Logger) error { +type serverResult struct { + name string + err error +} + +func RunServer() error { settings, err := config.LoadServer() if err != nil { return err } - instanceID, err := os.Hostname() + apiTLSConfiguration, err := tlsconfig.LoadServer(tlsconfig.ServerConfig{ + CAPath: settings.TLSCAPath, CertificatePath: settings.TLSCertificatePath, + PrivateKeyPath: settings.TLSPrivateKeyPath, AllowedClientURI: settings.TLSAllowedClientURI, + }) if err != nil { return err } + metricsTLSConfiguration, err := tlsconfig.LoadServer(tlsconfig.ServerConfig{ + CAPath: settings.TLSCAPath, CertificatePath: settings.TLSCertificatePath, + PrivateKeyPath: settings.TLSPrivateKeyPath, AllowedClientURI: settings.TLSAllowedMetricsClientURI, + }) + if err != nil { + return err + } + instanceUUID, err := uuid.NewRandom() + if err != nil { + return err + } + instanceID := "api-" + instanceUUID.String() observability, logger, err := startTelemetry("messenger-api", instanceID) if err != nil { return err @@ -42,16 +67,32 @@ func RunServer(logger *slog.Logger) error { if err := telemetry.ObserveDatabasePool(observability.MeterProvider().Meter("messenger-api/database"), pool); err != nil { return err } - sessions, err := session.New(settings.CacheURL) + cacheTLSConfiguration, err := tlsconfig.LoadClient(tlsconfig.ClientConfig{ + CAPath: settings.CacheTLS.CAPath, CertificatePath: settings.CacheTLS.CertificatePath, + PrivateKeyPath: settings.CacheTLS.PrivateKeyPath, ServerName: settings.CacheTLS.ServerName, + }) + if err != nil { + return err + } + sessions, err := session.New(settings.CacheURL, cacheTLSConfiguration) if err != nil { return err } defer func() { _ = sessions.Close() }() + loginLimiter, err := loginlimit.New(settings.CacheURL, loginlimit.Config{ + AccountAttempts: int64(settings.LoginRateLimitAccountAttempts), + SourceAttempts: int64(settings.LoginRateLimitSourceAttempts), + Window: settings.LoginRateLimitWindow, + }, cacheTLSConfiguration) + if err != nil { + return err + } + defer func() { _ = loginLimiter.Close() }() passwords, err := password.New(password.Config{ MemoryKiB: settings.PasswordMemoryKiB, Iterations: settings.PasswordIterations, Parallelism: settings.PasswordParallelism, SaltLength: settings.PasswordSaltLength, KeyLength: settings.PasswordKeyLength, - }) + }, settings.PasswordMaxConcurrentOperations) if err != nil { return err } @@ -70,40 +111,85 @@ func RunServer(logger *slog.Logger) error { } app := httpapi.NewServer(logger, httpapi.Dependencies{ Users: repository, Chats: repository, Messages: repository, Attachments: attachments, - Sessions: sessions, Passwords: passwords, Database: repository, Objects: objects, + Sessions: sessions, Passwords: passwords, LoginLimiter: loginLimiter, + Database: repository, Objects: objects, Meter: observability.MeterProvider().Meter("messenger-api"), Metrics: observability.MetricsHandler(), }, httpapi.Config{ SessionTTL: settings.SessionTTL, IdempotencyTTL: settings.IdempotencyTTL, RequestTTL: settings.RequestTimeout, InstanceID: instanceID, SwaggerPort: settings.SwaggerPort, }) - server := &http.Server{ + apiServer := &http.Server{ Addr: settings.Address, Handler: app.Handler(), ReadHeaderTimeout: settings.HTTPReadHeaderTimeout, ReadTimeout: settings.HTTPReadTimeout, WriteTimeout: settings.HTTPWriteTimeout, - IdleTimeout: settings.HTTPIdleTimeout, + IdleTimeout: settings.HTTPIdleTimeout, TLSConfig: apiTLSConfiguration, } - listener, err := net.Listen("tcp", server.Addr) + healthServer := &http.Server{ + Addr: settings.HealthAddress, Handler: app.HealthHandler(), + ReadHeaderTimeout: settings.HTTPReadHeaderTimeout, ReadTimeout: settings.HTTPReadTimeout, + WriteTimeout: settings.HTTPWriteTimeout, IdleTimeout: settings.HTTPIdleTimeout, + } + metricsServer := &http.Server{ + Addr: settings.MetricsAddress, Handler: app.MetricsHandler(), + ReadHeaderTimeout: settings.HTTPReadHeaderTimeout, ReadTimeout: settings.HTTPReadTimeout, + WriteTimeout: settings.HTTPWriteTimeout, IdleTimeout: settings.HTTPIdleTimeout, + TLSConfig: metricsTLSConfiguration, + } + apiListener, err := net.Listen("tcp", apiServer.Addr) if err != nil { return err } - serveResult := make(chan error, 1) - go func() { serveResult <- server.Serve(listener) }() - logger.Info("server started", "address", server.Addr) + healthListener, err := net.Listen("tcp", healthServer.Addr) + if err != nil { + _ = apiListener.Close() + return err + } + metricsListener, err := net.Listen("tcp", metricsServer.Addr) + if err != nil { + _ = apiListener.Close() + _ = healthListener.Close() + return err + } + serveResults := make(chan serverResult, 3) + go serveHTTP(serveResults, "api", apiServer, tls.NewListener(apiListener, apiTLSConfiguration)) + go serveHTTP(serveResults, "health", healthServer, healthListener) + go serveHTTP(serveResults, "metrics", metricsServer, tls.NewListener(metricsListener, metricsTLSConfiguration)) + logger.Info("servers started", "api_address", apiServer.Addr, "health_address", healthServer.Addr, "metrics_address", metricsServer.Addr) ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM) defer stop() + var serveErr error select { - case err := <-serveResult: - return err + case result := <-serveResults: + serveErr = fmt.Errorf("%s server stopped: %w", result.name, result.err) case <-ctx.Done(): logger.Info("shutdown requested") - app.SetReady(false) - shutdownCtx, cancel := context.WithTimeout(context.Background(), settings.HTTPShutdownTimeout) - defer cancel() - if err := server.Shutdown(shutdownCtx); err != nil { - _ = server.Close() - return err - } + } + app.SetReady(false) + shutdownCtx, cancel := context.WithTimeout(context.Background(), settings.HTTPShutdownTimeout) + defer cancel() + shutdownErr := shutdownServers(shutdownCtx, apiServer, healthServer, metricsServer) + return errors.Join(serveErr, shutdownErr) +} + +func serveHTTP(results chan<- serverResult, name string, server *http.Server, listener net.Listener) { + results <- serverResult{name: name, err: server.Serve(listener)} +} + +func shutdownServers(ctx context.Context, servers ...*http.Server) error { + results := make(chan error, len(servers)) + for _, server := range servers { + go func() { results <- server.Shutdown(ctx) }() + } + var shutdownErr error + for range servers { + shutdownErr = errors.Join(shutdownErr, <-results) + } + if shutdownErr == nil { return nil } + for _, server := range servers { + _ = server.Close() + } + return shutdownErr } func databaseConfig(settings config.ServerConfig) database.Config { @@ -118,6 +204,6 @@ func objectStoreConfig(settings config.ServerConfig) objectstore.Config { return objectstore.Config{ Endpoint: settings.S3Endpoint, Region: settings.S3Region, Bucket: settings.S3Bucket, AccessKey: settings.S3AccessKey, SecretKey: settings.S3SecretKey, - UseTLS: settings.S3UseTLS, Timeout: settings.S3Timeout, + UseTLS: settings.S3UseTLS, CAPath: settings.S3CAPath, Timeout: settings.S3Timeout, } } diff --git a/internal/bootstrap/telemetry.go b/internal/bootstrap/telemetry.go index bb1dcd9..e055263 100644 --- a/internal/bootstrap/telemetry.go +++ b/internal/bootstrap/telemetry.go @@ -5,7 +5,7 @@ import ( "log/slog" "time" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/telemetry" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/telemetry" ) func startTelemetry(serviceName, instanceID string) (*telemetry.Runtime, *slog.Logger, error) { diff --git a/internal/broker/redisstream/broker.go b/internal/broker/redisstream/broker.go index 0788997..45fa60a 100644 --- a/internal/broker/redisstream/broker.go +++ b/internal/broker/redisstream/broker.go @@ -16,7 +16,7 @@ import ( "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/outbox" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/outbox" ) const ( diff --git a/internal/config/config.go b/internal/config/config.go index 977abc5..707aa92 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -12,41 +12,54 @@ import ( ) type ServerConfig struct { - Address string - DatabaseURL string - CacheURL string - SessionTTL time.Duration - IdempotencyTTL time.Duration - DBMaxConns int32 - DBMinConns int32 - DBMaxConnectionAge time.Duration - DBMaxConnectionIdle time.Duration - DBHealthCheckPeriod time.Duration - DependencyTimeout time.Duration - RequestTimeout time.Duration - HTTPReadHeaderTimeout time.Duration - HTTPReadTimeout time.Duration - HTTPWriteTimeout time.Duration - HTTPIdleTimeout time.Duration - HTTPShutdownTimeout time.Duration - PasswordMemoryKiB uint32 - PasswordIterations uint32 - PasswordParallelism uint8 - PasswordSaltLength uint32 - PasswordKeyLength uint32 - SwaggerPort string - S3Endpoint string - S3Region string - S3Bucket string - S3AccessKey string - S3SecretKey string - S3UseTLS bool - S3Timeout time.Duration - AttachmentMaxBytes int64 - AttachmentMaxPixels int64 - AttachmentBodyMemory int64 - AttachmentDecodeMemory int64 - PipelineVersion int + Address string + HealthAddress string + MetricsAddress string + TLSCAPath string + TLSCertificatePath string + TLSPrivateKeyPath string + TLSAllowedClientURI string + TLSAllowedMetricsClientURI string + DatabaseURL string + CacheURL string + CacheTLS ClientTLSConfig + SessionTTL time.Duration + IdempotencyTTL time.Duration + LoginRateLimitAccountAttempts int + LoginRateLimitSourceAttempts int + LoginRateLimitWindow time.Duration + DBMaxConns int32 + DBMinConns int32 + DBMaxConnectionAge time.Duration + DBMaxConnectionIdle time.Duration + DBHealthCheckPeriod time.Duration + DependencyTimeout time.Duration + RequestTimeout time.Duration + HTTPReadHeaderTimeout time.Duration + HTTPReadTimeout time.Duration + HTTPWriteTimeout time.Duration + HTTPIdleTimeout time.Duration + HTTPShutdownTimeout time.Duration + PasswordMemoryKiB uint32 + PasswordIterations uint32 + PasswordParallelism uint8 + PasswordSaltLength uint32 + PasswordKeyLength uint32 + PasswordMaxConcurrentOperations int + SwaggerPort string + S3Endpoint string + S3Region string + S3Bucket string + S3AccessKey string + S3SecretKey string + S3UseTLS bool + S3CAPath string + S3Timeout time.Duration + AttachmentMaxBytes int64 + AttachmentMaxPixels int64 + AttachmentBodyMemory int64 + AttachmentDecodeMemory int64 + PipelineVersion int } type MigrationConfig struct { @@ -74,6 +87,7 @@ type ReconciliationConfig struct { S3AccessKey string S3SecretKey string S3UseTLS bool + S3CAPath string S3Timeout time.Duration } @@ -94,9 +108,24 @@ type objectStorageConfig struct { accessKey string secretKey string useTLS bool + caPath string timeout time.Duration } +type ClientTLSConfig struct { + CAPath string + CertificatePath string + PrivateKeyPath string + ServerName string +} + +type ServerTLSConfig struct { + CAPath string + CertificatePath string + PrivateKeyPath string + AllowedClientURI string +} + func LoadServer() (ServerConfig, error) { values, err := loadValues() if err != nil { @@ -111,6 +140,34 @@ func LoadServer() (ServerConfig, error) { if err != nil { return ServerConfig{}, err } + healthAddress, err := loopbackAddress(values, "server.health_address") + if err != nil { + return ServerConfig{}, err + } + metricsAddress, err := nonLoopbackAddress(values, "server.metrics_address") + if err != nil { + return ServerConfig{}, err + } + tlsCAPath, err := requiredString(values, "server.tls.ca_path") + if err != nil { + return ServerConfig{}, err + } + tlsCertificatePath, err := requiredString(values, "server.tls.certificate_path") + if err != nil { + return ServerConfig{}, err + } + tlsPrivateKeyPath, err := requiredString(values, "server.tls.private_key_path") + if err != nil { + return ServerConfig{}, err + } + tlsAllowedClientURI, err := requiredString(values, "server.tls.allowed_client_uri") + if err != nil { + return ServerConfig{}, err + } + tlsAllowedMetricsClientURI, err := requiredString(values, "server.tls.allowed_metrics_client_uri") + if err != nil { + return ServerConfig{}, err + } database, err := loadDatabaseConfig(values) if err != nil { return ServerConfig{}, err @@ -119,6 +176,10 @@ func LoadServer() (ServerConfig, error) { if err != nil { return ServerConfig{}, err } + cacheTLS, err := loadClientTLSConfig(values, "cache.tls") + if err != nil { + return ServerConfig{}, err + } store, err := requiredString(values, "server.session_store") if err != nil { return ServerConfig{}, err @@ -135,6 +196,18 @@ func LoadServer() (ServerConfig, error) { if err != nil { return ServerConfig{}, err } + loginRateLimitAccountAttempts, err := integer(values, "server.login_rate_limit.account_attempts", 1, 1_000_000) + if err != nil { + return ServerConfig{}, err + } + loginRateLimitSourceAttempts, err := integer(values, "server.login_rate_limit.source_attempts", 1, 1_000_000) + if err != nil { + return ServerConfig{}, err + } + loginRateLimitWindow, err := duration(values, "server.login_rate_limit.window", time.Second, 24*time.Hour) + if err != nil { + return ServerConfig{}, err + } requestTimeout, err := duration(values, "server.request_timeout", time.Second, 5*time.Minute) if err != nil { return ServerConfig{}, err @@ -179,6 +252,10 @@ func LoadServer() (ServerConfig, error) { if err != nil { return ServerConfig{}, err } + passwordMaxConcurrentOperations, err := integer(values, "server.password.max_concurrent_operations", 1, 64) + if err != nil { + return ServerConfig{}, err + } swaggerPort, err := requiredPort(values, "server.swagger_port") if err != nil { return ServerConfig{}, err @@ -216,9 +293,16 @@ func LoadServer() (ServerConfig, error) { } return ServerConfig{ - Address: net.JoinHostPort(host, port), DatabaseURL: database.url, CacheURL: cacheURL, + Address: net.JoinHostPort(host, port), HealthAddress: healthAddress, MetricsAddress: metricsAddress, + TLSCAPath: tlsCAPath, TLSCertificatePath: tlsCertificatePath, + TLSPrivateKeyPath: tlsPrivateKeyPath, TLSAllowedClientURI: tlsAllowedClientURI, + TLSAllowedMetricsClientURI: tlsAllowedMetricsClientURI, + DatabaseURL: database.url, CacheURL: cacheURL, CacheTLS: cacheTLS, SessionTTL: sessionTTL, IdempotencyTTL: idempotencyTTL, - DBMaxConns: int32(database.maxConns), DBMinConns: int32(database.minConns), + LoginRateLimitAccountAttempts: loginRateLimitAccountAttempts, + LoginRateLimitSourceAttempts: loginRateLimitSourceAttempts, + LoginRateLimitWindow: loginRateLimitWindow, + DBMaxConns: int32(database.maxConns), DBMinConns: int32(database.minConns), DBMaxConnectionAge: database.maxConnectionAge, DBMaxConnectionIdle: database.maxConnectionIdle, DBHealthCheckPeriod: database.healthCheckPeriod, DependencyTimeout: database.dependencyTimeout, RequestTimeout: requestTimeout, @@ -227,9 +311,10 @@ func LoadServer() (ServerConfig, error) { HTTPShutdownTimeout: shutdownTimeout, PasswordMemoryKiB: uint32(passwordMemory), PasswordIterations: uint32(passwordIterations), PasswordParallelism: uint8(passwordParallelism), PasswordSaltLength: uint32(passwordSaltLength), PasswordKeyLength: uint32(passwordKeyLength), - SwaggerPort: swaggerPort, S3Endpoint: storage.endpoint, S3Region: storage.region, S3Bucket: storage.bucket, + PasswordMaxConcurrentOperations: passwordMaxConcurrentOperations, + SwaggerPort: swaggerPort, S3Endpoint: storage.endpoint, S3Region: storage.region, S3Bucket: storage.bucket, S3AccessKey: storage.accessKey, S3SecretKey: storage.secretKey, - S3UseTLS: storage.useTLS, S3Timeout: storage.timeout, + S3UseTLS: storage.useTLS, S3CAPath: storage.caPath, S3Timeout: storage.timeout, AttachmentMaxBytes: int64(attachmentMaxBytes), AttachmentMaxPixels: int64(attachmentMaxPixels), AttachmentBodyMemory: int64(attachmentBodyMemory), AttachmentDecodeMemory: int64(attachmentDecodeMemory), @@ -277,7 +362,7 @@ func LoadReconciliation() (ReconciliationConfig, error) { DBHealthCheckPeriod: database.healthCheckPeriod, DependencyTimeout: database.dependencyTimeout, S3Endpoint: storage.endpoint, S3Region: storage.region, S3Bucket: storage.bucket, S3AccessKey: storage.accessKey, S3SecretKey: storage.secretKey, - S3UseTLS: storage.useTLS, S3Timeout: storage.timeout, + S3UseTLS: storage.useTLS, S3CAPath: storage.caPath, S3Timeout: storage.timeout, }, nil } @@ -306,13 +391,40 @@ func loadObjectStorageConfig(values *viper.Viper) (objectStorageConfig, error) { if err != nil { return objectStorageConfig{}, err } + caPath, err := requiredString(values, "object_storage.ca_path") + if err != nil { + return objectStorageConfig{}, err + } timeout, err := duration(values, "object_storage.timeout", time.Second, 5*time.Minute) if err != nil { return objectStorageConfig{}, err } return objectStorageConfig{ endpoint: endpoint, region: region, bucket: bucket, accessKey: accessKey, - secretKey: secretKey, useTLS: useTLS, timeout: timeout, + secretKey: secretKey, useTLS: useTLS, caPath: caPath, timeout: timeout, + }, nil +} + +func loadClientTLSConfig(values *viper.Viper, prefix string) (ClientTLSConfig, error) { + caPath, err := requiredString(values, prefix+".ca_path") + if err != nil { + return ClientTLSConfig{}, err + } + certificatePath, err := requiredString(values, prefix+".certificate_path") + if err != nil { + return ClientTLSConfig{}, err + } + privateKeyPath, err := requiredString(values, prefix+".private_key_path") + if err != nil { + return ClientTLSConfig{}, err + } + serverName, err := requiredString(values, prefix+".server_name") + if err != nil { + return ClientTLSConfig{}, err + } + return ClientTLSConfig{ + CAPath: caPath, CertificatePath: certificatePath, + PrivateKeyPath: privateKeyPath, ServerName: serverName, }, nil } @@ -371,6 +483,39 @@ func requiredPort(values *viper.Viper, name string) (string, error) { return value, nil } +func loopbackAddress(values *viper.Viper, name string) (string, error) { + value, err := requiredString(values, name) + if err != nil { + return "", err + } + host, port, err := net.SplitHostPort(value) + if err != nil || host != "127.0.0.1" { + return "", fmt.Errorf("%s: must use 127.0.0.1 with an explicit port", name) + } + if _, err := integerValue(port, 1, 65535); err != nil { + return "", fmt.Errorf("%s: %w", name, err) + } + return net.JoinHostPort(host, port), nil +} + +func nonLoopbackAddress(values *viper.Viper, name string) (string, error) { + value, err := requiredString(values, name) + if err != nil { + return "", err + } + host, port, err := net.SplitHostPort(value) + if err != nil || host == "" || strings.EqualFold(host, "localhost") { + return "", fmt.Errorf("%s: must use a non-loopback host with an explicit port", name) + } + if address := net.ParseIP(host); address != nil && address.IsLoopback() { + return "", fmt.Errorf("%s: must use a non-loopback host with an explicit port", name) + } + if _, err := integerValue(port, 1, 65535); err != nil { + return "", fmt.Errorf("%s: %w", name, err) + } + return net.JoinHostPort(host, port), nil +} + func duration(values *viper.Viper, name string, minimum, maximum time.Duration) (time.Duration, error) { value, err := requiredString(values, name) if err != nil { diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 80d2216..6c97dec 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -46,6 +46,67 @@ func TestLoadValuesRejectsUnknownVersion(t *testing.T) { require.ErrorContains(t, err, "version: must be 1") } +func TestLoadServerLoadsTLSAndHealthSettings(t *testing.T) { + setConfigEnvironment(t, validTestConfig) + + settings, err := LoadServer() + require.NoError(t, err) + require.Equal(t, "127.0.0.1:8082", settings.HealthAddress) + require.Equal(t, "0.0.0.0:9091", settings.MetricsAddress) + require.Equal(t, "/run/security/internal-ca/ca.crt", settings.TLSCAPath) + require.Equal(t, "spiffe://mtusi/lab7/load-balancer", settings.TLSAllowedClientURI) + require.Equal(t, "spiffe://mtusi/lab7/prometheus", settings.TLSAllowedMetricsClientURI) + require.Equal(t, 5, settings.LoginRateLimitAccountAttempts) + require.Equal(t, 20, settings.LoginRateLimitSourceAttempts) + require.Equal(t, time.Minute, settings.LoginRateLimitWindow) + require.Equal(t, 2, settings.PasswordMaxConcurrentOperations) +} + +func TestLoadServerRejectsNonLoopbackHealthAddress(t *testing.T) { + content := strings.Replace(validTestConfig, "health_address: 127.0.0.1:8082", "health_address: 0.0.0.0:8082", 1) + setConfigEnvironment(t, content) + + _, err := LoadServer() + require.ErrorContains(t, err, "server.health_address: must use 127.0.0.1") +} + +func TestLoadServerRejectsLoopbackMetricsAddress(t *testing.T) { + content := strings.Replace(validTestConfig, "metrics_address: 0.0.0.0:9091", "metrics_address: 127.0.0.1:9091", 1) + setConfigEnvironment(t, content) + + _, err := LoadServer() + require.ErrorContains(t, err, "server.metrics_address: must use a non-loopback host") +} + +func TestLoadServerUsesRenderedOpenBaoSecrets(t *testing.T) { + setConfigEnvironment(t, validTestConfig) + path := filepath.Join(t.TempDir(), "secrets.json") + require.NoError(t, os.WriteFile(path, []byte(`{ + "database_url":"postgres://openbao/database", + "cache_url":"rediss://openbao/cache", + "s3_access_key":"openbao-api", + "s3_secret_key":"openbao-secret" +}`), 0o600)) + t.Setenv("MESSENGER_SECRETS_FILE", path) + + settings, err := LoadServer() + require.NoError(t, err) + require.Equal(t, "postgres://openbao/database", settings.DatabaseURL) + require.Equal(t, "rediss://openbao/cache", settings.CacheURL) + require.Equal(t, "openbao-api", settings.S3AccessKey) + require.Equal(t, "openbao-secret", settings.S3SecretKey) +} + +func TestLoadServerRejectsUnknownOpenBaoSecret(t *testing.T) { + setConfigEnvironment(t, validTestConfig) + path := filepath.Join(t.TempDir(), "secrets.json") + require.NoError(t, os.WriteFile(path, []byte(`{"root_token":"forbidden"}`), 0o600)) + t.Setenv("MESSENGER_SECRETS_FILE", path) + + _, err := LoadServer() + require.ErrorContains(t, err, "unsupported field root_token") +} + func setConfigEnvironment(t *testing.T, content string) { t.Helper() path := filepath.Join(t.TempDir(), "messenger.yaml") @@ -64,9 +125,21 @@ func setConfigEnvironment(t *testing.T, content string) { const validTestConfig = `version: 1 server: + health_address: 127.0.0.1:8082 + metrics_address: 0.0.0.0:9091 + tls: + ca_path: /run/security/internal-ca/ca.crt + certificate_path: /run/security/api/tls.crt + private_key_path: /run/security/api/tls.key + allowed_client_uri: spiffe://mtusi/lab7/load-balancer + allowed_metrics_client_uri: spiffe://mtusi/lab7/prometheus session_store: valkey session_ttl: 1h idempotency_ttl: 24h + login_rate_limit: + account_attempts: 5 + source_attempts: 20 + window: 1m request_timeout: 5s http: read_header_timeout: 5s @@ -80,6 +153,7 @@ server: parallelism: 2 salt_length: 16 key_length: 32 + max_concurrent_operations: 2 database: min_connections: 0 max_connections: 4 @@ -87,10 +161,17 @@ database: max_connection_idle: 1m health_check_period: 30s dependency_timeout: 5s +cache: + tls: + ca_path: /run/security/internal-ca/ca.crt + certificate_path: /run/security/client/tls.crt + private_key_path: /run/security/client/tls.key + server_name: redis-gateway migration: timeout: 30s object_storage: use_tls: false + ca_path: /run/security/internal-ca/ca.crt timeout: 5s attachments: max_bytes: 10485760 @@ -100,6 +181,11 @@ attachments: pipeline: version: 1 broker: + tls: + ca_path: /run/security/internal-ca/ca.crt + certificate_path: /run/security/client/tls.crt + private_key_path: /run/security/client/tls.key + server_name: redis-gateway stream: attachment-jobs consumer_group: attachment-workers failed_stream: attachment-jobs-failed @@ -128,4 +214,10 @@ worker: memory_bytes: 738197504 monitoring: metrics_address: 0.0.0.0:9091 + health_address: 127.0.0.1:9092 + tls: + ca_path: /run/security/internal-ca/ca.crt + certificate_path: /run/security/metrics/tls.crt + private_key_path: /run/security/metrics/tls.key + allowed_client_uri: spiffe://mtusi/lab7/prometheus ` diff --git a/internal/config/loader.go b/internal/config/loader.go index 6cd115c..00e6ea0 100644 --- a/internal/config/loader.go +++ b/internal/config/loader.go @@ -1,8 +1,10 @@ package config import ( + "encoding/json" "errors" "fmt" + "io" "os" "strings" @@ -12,17 +14,32 @@ import ( const supportedConfigVersion = 1 var environmentKeys = map[string]string{ - "server.host": "APP_HOST", - "server.port": "APP_PORT", - "server.swagger_port": "SWAGGER_PORT", - "database.url": "DATABASE_URL", - "cache.url": "CACHE_URL", - "object_storage.endpoint": "S3_ENDPOINT", - "object_storage.region": "S3_REGION", - "object_storage.bucket": "S3_BUCKET", - "object_storage.access_key": "S3_ACCESS_KEY", - "object_storage.secret_key": "S3_SECRET_KEY", - "broker.url": "BROKER_URL", + "server.host": "APP_HOST", + "server.port": "APP_PORT", + "server.health_address": "APP_HEALTH_ADDRESS", + "server.metrics_address": "APP_METRICS_ADDRESS", + "server.tls.ca_path": "APP_TLS_CA_PATH", + "server.tls.certificate_path": "APP_TLS_CERTIFICATE_PATH", + "server.tls.private_key_path": "APP_TLS_PRIVATE_KEY_PATH", + "server.tls.allowed_client_uri": "APP_TLS_ALLOWED_CLIENT_URI", + "server.tls.allowed_metrics_client_uri": "APP_TLS_ALLOWED_METRICS_CLIENT_URI", + "server.swagger_port": "SWAGGER_PORT", + "database.url": "DATABASE_URL", + "cache.url": "CACHE_URL", + "object_storage.endpoint": "S3_ENDPOINT", + "object_storage.region": "S3_REGION", + "object_storage.bucket": "S3_BUCKET", + "object_storage.access_key": "S3_ACCESS_KEY", + "object_storage.secret_key": "S3_SECRET_KEY", + "broker.url": "BROKER_URL", +} + +var secretKeys = map[string]string{ + "database_url": "database.url", + "cache_url": "cache.url", + "broker_url": "broker.url", + "s3_access_key": "object_storage.access_key", + "s3_secret_key": "object_storage.secret_key", } func loadValues() (*viper.Viper, error) { @@ -43,5 +60,40 @@ func loadValues() (*viper.Viper, error) { return nil, fmt.Errorf("bind %s: %w", name, err) } } + if err := loadSecretFile(values, strings.TrimSpace(os.Getenv("MESSENGER_SECRETS_FILE"))); err != nil { + return nil, err + } return values, nil } + +func loadSecretFile(values *viper.Viper, path string) error { + if path == "" { + return nil + } + file, err := os.Open(path) + if err != nil { + return fmt.Errorf("open messenger secrets: %w", err) + } + defer func() { _ = file.Close() }() + decoder := json.NewDecoder(io.LimitReader(file, 64<<10)) + var secrets map[string]string + if err := decoder.Decode(&secrets); err != nil { + return fmt.Errorf("decode messenger secrets: %w", err) + } + var trailing any + if err := decoder.Decode(&trailing); !errors.Is(err, io.EOF) { + return errors.New("decode messenger secrets: trailing JSON value") + } + for name, value := range secrets { + key, ok := secretKeys[name] + if !ok { + return fmt.Errorf("messenger secrets: unsupported field %s", name) + } + value = strings.TrimSpace(value) + if value == "" { + return fmt.Errorf("messenger secrets: %s is empty", name) + } + values.Set(key, value) + } + return nil +} diff --git a/internal/config/pipeline.go b/internal/config/pipeline.go index 76b4f5d..0536ddb 100644 --- a/internal/config/pipeline.go +++ b/internal/config/pipeline.go @@ -18,6 +18,7 @@ type DispatcherConfig struct { DBHealthCheckPeriod time.Duration DependencyTimeout time.Duration BrokerURL string + BrokerTLS ClientTLSConfig Stream string ConsumerGroup string FailedStream string @@ -31,6 +32,8 @@ type DispatcherConfig struct { CleanupInterval time.Duration CleanupBatchSize int MetricsAddress string + HealthAddress string + MetricsTLS ServerTLSConfig } type WorkerConfig struct { @@ -47,8 +50,10 @@ type WorkerConfig struct { S3AccessKey string S3SecretKey string S3UseTLS bool + S3CAPath string S3Timeout time.Duration BrokerURL string + BrokerTLS ClientTLSConfig Stream string ConsumerGroup string FailedStream string @@ -67,6 +72,8 @@ type WorkerConfig struct { AttachmentMaxPixels int64 MemoryBytes int64 MetricsAddress string + HealthAddress string + MetricsTLS ServerTLSConfig } type JobAdminConfig struct { @@ -116,6 +123,10 @@ func LoadDispatcher() (DispatcherConfig, error) { if err != nil { return DispatcherConfig{}, err } + brokerTLS, err := loadClientTLSConfig(values, "broker.tls") + if err != nil { + return DispatcherConfig{}, err + } batchSize, err := integer(values, "outbox.batch_size", 1, 1000) if err != nil { return DispatcherConfig{}, err @@ -152,16 +163,24 @@ func LoadDispatcher() (DispatcherConfig, error) { if err != nil { return DispatcherConfig{}, err } + healthAddress, err := loopbackAddress(values, "monitoring.health_address") + if err != nil { + return DispatcherConfig{}, err + } + metricsTLS, err := loadServerTLSConfig(values, "monitoring.tls") + if err != nil { + return DispatcherConfig{}, err + } return DispatcherConfig{ DatabaseURL: database.url, DBMaxConns: int32(database.maxConns), DBMinConns: int32(database.minConns), DBMaxConnectionAge: database.maxConnectionAge, DBMaxConnectionIdle: database.maxConnectionIdle, DBHealthCheckPeriod: database.healthCheckPeriod, DependencyTimeout: database.dependencyTimeout, - BrokerURL: broker.url, Stream: broker.stream, ConsumerGroup: broker.consumerGroup, + BrokerURL: broker.url, BrokerTLS: brokerTLS, Stream: broker.stream, ConsumerGroup: broker.consumerGroup, FailedStream: broker.failedStream, FailedStreamMaxLength: int64(broker.failedStreamMaxLength), BatchSize: batchSize, LeaseDuration: leaseDuration, PollInterval: pollInterval, RecoveryInterval: recoveryInterval, RetryDelay: retryDelay, Retention: retention, CleanupInterval: cleanupInterval, CleanupBatchSize: cleanupBatchSize, - MetricsAddress: metricsAddress, + MetricsAddress: metricsAddress, HealthAddress: healthAddress, MetricsTLS: metricsTLS, }, nil } @@ -182,6 +201,10 @@ func LoadWorker() (WorkerConfig, error) { if err != nil { return WorkerConfig{}, err } + brokerTLS, err := loadClientTLSConfig(values, "broker.tls") + if err != nil { + return WorkerConfig{}, err + } concurrency, err := integer(values, "worker.concurrency", 1, 64) if err != nil { return WorkerConfig{}, err @@ -247,13 +270,22 @@ func LoadWorker() (WorkerConfig, error) { if err != nil { return WorkerConfig{}, err } + healthAddress, err := loopbackAddress(values, "monitoring.health_address") + if err != nil { + return WorkerConfig{}, err + } + metricsTLS, err := loadServerTLSConfig(values, "monitoring.tls") + if err != nil { + return WorkerConfig{}, err + } return WorkerConfig{ DatabaseURL: database.url, DBMaxConns: int32(database.maxConns), DBMinConns: int32(database.minConns), DBMaxConnectionAge: database.maxConnectionAge, DBMaxConnectionIdle: database.maxConnectionIdle, DBHealthCheckPeriod: database.healthCheckPeriod, DependencyTimeout: database.dependencyTimeout, S3Endpoint: storage.endpoint, S3Region: storage.region, S3Bucket: storage.bucket, S3AccessKey: storage.accessKey, S3SecretKey: storage.secretKey, S3UseTLS: storage.useTLS, - S3Timeout: storage.timeout, BrokerURL: broker.url, Stream: broker.stream, + S3CAPath: storage.caPath, S3Timeout: storage.timeout, + BrokerURL: broker.url, BrokerTLS: brokerTLS, Stream: broker.stream, ConsumerGroup: broker.consumerGroup, FailedStream: broker.failedStream, FailedStreamMaxLength: int64(broker.failedStreamMaxLength), Concurrency: concurrency, Prefetch: prefetch, LeaseDuration: leaseDuration, @@ -261,6 +293,7 @@ func LoadWorker() (WorkerConfig, error) { ReclaimInterval: reclaimInterval, MaxAttempts: maxAttempts, RetryBase: retryBase, RetryMax: retryMax, AttachmentMaxBytes: int64(attachmentMaxBytes), AttachmentMaxPixels: int64(attachmentMaxPixels), MemoryBytes: int64(memoryBytes), MetricsAddress: metricsAddress, + HealthAddress: healthAddress, MetricsTLS: metricsTLS, }, nil } @@ -279,6 +312,29 @@ func metricsAddress(values *viper.Viper) (string, error) { return address, nil } +func loadServerTLSConfig(values *viper.Viper, prefix string) (ServerTLSConfig, error) { + caPath, err := requiredString(values, prefix+".ca_path") + if err != nil { + return ServerTLSConfig{}, err + } + certificatePath, err := requiredString(values, prefix+".certificate_path") + if err != nil { + return ServerTLSConfig{}, err + } + privateKeyPath, err := requiredString(values, prefix+".private_key_path") + if err != nil { + return ServerTLSConfig{}, err + } + allowedClientURI, err := requiredString(values, prefix+".allowed_client_uri") + if err != nil { + return ServerTLSConfig{}, err + } + return ServerTLSConfig{ + CAPath: caPath, CertificatePath: certificatePath, + PrivateKeyPath: privateKeyPath, AllowedClientURI: allowedClientURI, + }, nil +} + func loadBrokerConfig(values *viper.Viper) (brokerConfig, error) { url, err := requiredString(values, "broker.url") if err != nil { diff --git a/internal/database/database.go b/internal/database/database.go index c631b06..0a00149 100644 --- a/internal/database/database.go +++ b/internal/database/database.go @@ -8,7 +8,7 @@ import ( "github.com/jackc/pgx/v5/pgxpool" - "gitea.privcloud.tech/dizi/mtusi2026lab6/migrations" + "gitea.privcloud.tech/dizi/mtusi2026lab7/migrations" ) var ( diff --git a/internal/loginlimit/limiter.go b/internal/loginlimit/limiter.go new file mode 100644 index 0000000..bf7f2b9 --- /dev/null +++ b/internal/loginlimit/limiter.go @@ -0,0 +1,111 @@ +package loginlimit + +import ( + "context" + "crypto/sha256" + "crypto/tls" + "encoding/hex" + "errors" + "fmt" + "strconv" + "time" + + "github.com/valkey-io/valkey-go" +) + +const keyPrefix = "login-rate:{login}:" + +var ( + ErrInvalidConfig = errors.New("invalid login rate limit configuration") + ErrStore = errors.New("login rate limit store unavailable") +) + +type Config struct { + AccountAttempts int64 + SourceAttempts int64 + Window time.Duration +} + +type Limiter struct { + client valkey.Client + script *valkey.Lua + config Config +} + +func New(rawURL string, config Config, tlsConfiguration ...*tls.Config) (*Limiter, error) { + if config.AccountAttempts < 1 || config.SourceAttempts < 1 || config.Window < time.Second { + return nil, ErrInvalidConfig + } + option, err := valkey.ParseURL(rawURL) + if err != nil { + return nil, fmt.Errorf("%w: parse Valkey URL: %w", ErrStore, err) + } + if len(tlsConfiguration) > 0 && tlsConfiguration[0] != nil { + option.TLSConfig = tlsConfiguration[0].Clone() + } + option.DisableCache = true + client, err := valkey.NewClient(option) + if err != nil { + return nil, fmt.Errorf("%w: create Valkey client: %w", ErrStore, err) + } + return &Limiter{client: client, script: valkey.NewLuaScript(limitScript), config: config}, nil +} + +func (l *Limiter) Allow(ctx context.Context, username, source string) (bool, time.Duration, error) { + result, err := l.script.Exec(ctx, l.client, + []string{key("account", username), key("source", source)}, + []string{ + strconv.FormatInt(l.config.Window.Milliseconds(), 10), + strconv.FormatInt(l.config.AccountAttempts, 10), + strconv.FormatInt(l.config.SourceAttempts, 10), + }, + ).AsIntSlice() + if err != nil { + return false, 0, fmt.Errorf("%w: account login attempt: %w", ErrStore, err) + } + if len(result) != 2 { + return false, 0, fmt.Errorf("%w: unexpected script result", ErrStore) + } + return result[0] == 1, time.Duration(result[1]) * time.Millisecond, nil +} + +func (l *Limiter) Close() error { + l.client.Close() + return nil +} + +func key(scope, value string) string { + digest := sha256.Sum256([]byte(value)) + return keyPrefix + scope + ":" + hex.EncodeToString(digest[:]) +} + +const limitScript = ` +local function increment(key, window) + local count = redis.call('INCR', key) + if count == 1 then + redis.call('PEXPIRE', key, window) + end + local ttl = redis.call('PTTL', key) + if ttl < 1 then + redis.call('PEXPIRE', key, window) + ttl = window + end + return count, ttl +end + +local window = tonumber(ARGV[1]) +local account_count, account_ttl = increment(KEYS[1], window) +local source_count, source_ttl = increment(KEYS[2], window) +local retry_after = 0 + +if account_count > tonumber(ARGV[2]) then + retry_after = account_ttl +end +if source_count > tonumber(ARGV[3]) and source_ttl > retry_after then + retry_after = source_ttl +end +if retry_after > 0 then + return {0, retry_after} +end +return {1, 0} +` diff --git a/internal/loginlimit/limiter_integration_test.go b/internal/loginlimit/limiter_integration_test.go new file mode 100644 index 0000000..312a20f --- /dev/null +++ b/internal/loginlimit/limiter_integration_test.go @@ -0,0 +1,111 @@ +package loginlimit_test + +import ( + "context" + "crypto/tls" + "os" + "strings" + "sync" + "testing" + "time" + + "github.com/google/uuid" + "github.com/stretchr/testify/require" + + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/loginlimit" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/security/tlsconfig" +) + +func TestLimitIsSharedByInstances(t *testing.T) { + rawURL := testCacheURL(t) + tlsConfiguration := testCacheTLS(t) + config := loginlimit.Config{AccountAttempts: 5, SourceAttempts: 20, Window: time.Minute} + first, err := loginlimit.New(rawURL, config, tlsConfiguration) + require.NoError(t, err) + t.Cleanup(func() { require.NoError(t, first.Close()) }) + second, err := loginlimit.New(rawURL, config, tlsConfiguration) + require.NoError(t, err) + t.Cleanup(func() { require.NoError(t, second.Close()) }) + + username := "rate_" + uuid.NewString() + limiters := []*loginlimit.Limiter{first, second} + results := make(chan bool, 16) + errors := make(chan error, 16) + var group sync.WaitGroup + for i := range 16 { + group.Add(1) + go func() { + defer group.Done() + allowed, retryAfter, err := limiters[i%len(limiters)].Allow(context.Background(), username, "192.0.2.10") + if err != nil { + errors <- err + return + } + if !allowed && retryAfter <= 0 { + errors <- loginlimit.ErrStore + return + } + results <- allowed + }() + } + group.Wait() + close(results) + close(errors) + for err := range errors { + require.NoError(t, err) + } + var allowed int + for result := range results { + if result { + allowed++ + } + } + require.Equal(t, int(config.AccountAttempts), allowed) +} + +func TestSourceLimitCoversDifferentAccounts(t *testing.T) { + limiter, err := loginlimit.New(testCacheURL(t), loginlimit.Config{ + AccountAttempts: 10, + SourceAttempts: 2, + Window: time.Minute, + }, testCacheTLS(t)) + require.NoError(t, err) + t.Cleanup(func() { require.NoError(t, limiter.Close()) }) + + suffix := uuid.NewString() + for i, expected := range []bool{true, true, false} { + allowed, retryAfter, err := limiter.Allow(context.Background(), suffix+string(rune('a'+i)), "198.51.100.20") + require.NoError(t, err) + require.Equal(t, expected, allowed) + if !allowed { + require.Positive(t, retryAfter) + } + } +} + +func testCacheTLS(t *testing.T) *tls.Config { + t.Helper() + configuration, err := tlsconfig.LoadClient(tlsconfig.ClientConfig{ + CAPath: os.Getenv("TEST_CACHE_TLS_CA_PATH"), + CertificatePath: os.Getenv("TEST_CACHE_TLS_CERTIFICATE_PATH"), + PrivateKeyPath: os.Getenv("TEST_CACHE_TLS_PRIVATE_KEY_PATH"), + ServerName: os.Getenv("TEST_CACHE_TLS_SERVER_NAME"), + }) + require.NoError(t, err) + return configuration +} + +func testCacheURL(t *testing.T) string { + t.Helper() + rawURL := strings.TrimSpace(os.Getenv("TEST_CACHE_URL")) + if rawURL != "" { + return rawURL + } + path := strings.TrimSpace(os.Getenv("TEST_CACHE_URL_FILE")) + if path == "" { + t.Skip("set TEST_CACHE_URL or TEST_CACHE_URL_FILE to run integration tests") + } + data, err := os.ReadFile(path) + require.NoError(t, err) + return strings.TrimSpace(string(data)) +} diff --git a/internal/messenger/attachment/service.go b/internal/messenger/attachment/service.go index 38e5bdc..3054d5f 100644 --- a/internal/messenger/attachment/service.go +++ b/internal/messenger/attachment/service.go @@ -19,8 +19,8 @@ import ( "github.com/google/uuid" "golang.org/x/sync/semaphore" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/telemetry" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/telemetry" ) type Repository interface { diff --git a/internal/messenger/attachment/service_test.go b/internal/messenger/attachment/service_test.go index 296f283..448c4ac 100644 --- a/internal/messenger/attachment/service_test.go +++ b/internal/messenger/attachment/service_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" ) func TestUploadLifecycle(t *testing.T) { diff --git a/internal/messenger/attachment/worker/worker.go b/internal/messenger/attachment/worker/worker.go index 45ff600..6ef0db2 100644 --- a/internal/messenger/attachment/worker/worker.go +++ b/internal/messenger/attachment/worker/worker.go @@ -23,11 +23,11 @@ import ( "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/broker/redisstream" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/messenger/attachment/transform" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/objectstore" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/telemetry" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/broker/redisstream" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/messenger/attachment/transform" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/objectstore" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/telemetry" ) type Repository interface { diff --git a/internal/messenger/attachment/worker/worker_test.go b/internal/messenger/attachment/worker/worker_test.go index c2ca384..05d1cdd 100644 --- a/internal/messenger/attachment/worker/worker_test.go +++ b/internal/messenger/attachment/worker/worker_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/require" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/messenger/attachment/transform" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/objectstore" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/messenger/attachment/transform" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/objectstore" ) func TestConfigRequiresEnoughMemoryForMaximumImage(t *testing.T) { diff --git a/internal/messenger/httpapi/attachments.go b/internal/messenger/httpapi/attachments.go index 2e832d6..09c9236 100644 --- a/internal/messenger/httpapi/attachments.go +++ b/internal/messenger/httpapi/attachments.go @@ -6,7 +6,6 @@ import ( "mime" "net/http" "net/url" - "regexp" "strconv" "strings" "time" @@ -16,9 +15,9 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/messenger/attachment" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/telemetry" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/messenger/attachment" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/telemetry" ) func (s *Server) uploadAttachment(w http.ResponseWriter, r *http.Request) *apiError { @@ -153,22 +152,6 @@ func attachmentVariant(query url.Values) (string, bool) { } } -var traceparentPattern = regexp.MustCompile(`^00-[0-9a-f]{32}-[0-9a-f]{16}-[0-9a-f]{2}$`) - -func traceparent(value string) string { - if traceparentPattern.MatchString(value) { - return value - } - return "" -} - -func tracestate(value string) string { - if len(value) <= 512 { - return value - } - return "" -} - func attachmentIDFromRequest(r *http.Request) (string, *apiError) { parts := strings.Split(strings.Trim(r.URL.Path, "/"), "/") attachmentID, valid := canonicalID(parts[3]) diff --git a/internal/messenger/httpapi/auth.go b/internal/messenger/httpapi/auth.go index 29419a1..9197881 100644 --- a/internal/messenger/httpapi/auth.go +++ b/internal/messenger/httpapi/auth.go @@ -1,12 +1,16 @@ package httpapi import ( + "context" "errors" "io" + "math" + "net" "net/http" + "strconv" "strings" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" ) func (s *Server) createSession(w http.ResponseWriter, r *http.Request) *apiError { @@ -21,10 +25,19 @@ func (s *Server) createSession(w http.ResponseWriter, r *http.Request) *apiError if !ok { return unauthorized() } + allowed, retryAfter, err := s.loginLimiter.Allow(r.Context(), username, loginSource(r)) + if err != nil { + return unavailable() + } + if !allowed { + retrySeconds := max(int64(1), int64(math.Ceil(retryAfter.Seconds()))) + w.Header().Set("Retry-After", strconv.FormatInt(retrySeconds, 10)) + return rateLimited() + } credentials, err := s.userRepository.UserByUsername(r.Context(), username) if errors.Is(err, model.ErrNotFound) { if _, verifyErr := s.passwords.Verify(passwordValue, s.passwords.DummyHash()); verifyErr != nil { - return internalError() + return passwordOperationError(verifyErr) } return unauthorized() } @@ -33,11 +46,14 @@ func (s *Server) createSession(w http.ResponseWriter, r *http.Request) *apiError } verified, err := s.passwords.Verify(passwordValue, credentials.PasswordHash) if err != nil { - return internalError() + return passwordOperationError(err) } if !verified { return unauthorized() } + if rehashErr := s.rehashPassword(r.Context(), credentials, passwordValue); rehashErr != nil { + return rehashErr + } token, expiresAt, err := s.sessions.Create(r.Context(), credentials.ID, s.sessionTTL) if err != nil { return unavailable() @@ -51,6 +67,57 @@ func (s *Server) createSession(w http.ResponseWriter, r *http.Request) *apiError return nil } +func (s *Server) rehashPassword(ctx context.Context, credentials model.UserCredentials, passwordValue string) *apiError { + needsRehash, err := s.passwords.NeedsRehash(credentials.PasswordHash) + if err != nil { + return passwordOperationError(err) + } + if !needsRehash { + return nil + } + passwordHash, err := s.passwords.Hash(passwordValue) + if err != nil { + return passwordOperationError(err) + } + updated, err := s.userRepository.UpdatePasswordHash(ctx, credentials.ID, credentials.PasswordHash, passwordHash) + if err != nil { + return unavailable() + } + if updated { + return nil + } + current, err := s.userRepository.UserByUsername(ctx, credentials.Username) + if errors.Is(err, model.ErrNotFound) { + return unauthorized() + } + if err != nil { + return unavailable() + } + verified, err := s.passwords.Verify(passwordValue, current.PasswordHash) + if err != nil { + return passwordOperationError(err) + } + if !verified { + return unauthorized() + } + return nil +} + +func loginSource(r *http.Request) string { + forwarded := strings.Split(r.Header.Get("X-Forwarded-For"), ",") + // Nginx appends the address it observed last, so preceding client-supplied entries are not trusted. + if address := net.ParseIP(strings.TrimSpace(forwarded[len(forwarded)-1])); address != nil { + return address.String() + } + host, _, err := net.SplitHostPort(r.RemoteAddr) + if err == nil { + if address := net.ParseIP(host); address != nil { + return address.String() + } + } + return "unknown" +} + func singleBasicAuth(r *http.Request) (string, string, bool) { if len(r.Header.Values("Authorization")) != 1 { return "", "", false diff --git a/internal/messenger/httpapi/errors.go b/internal/messenger/httpapi/errors.go index 95ffd1c..95b6af4 100644 --- a/internal/messenger/httpapi/errors.go +++ b/internal/messenger/httpapi/errors.go @@ -2,7 +2,10 @@ package httpapi import ( "encoding/json" + "errors" "net/http" + + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/password" ) const ( @@ -36,6 +39,17 @@ func unauthorized() *apiError { return &apiError{http.StatusUnauthorized, errorCodeUnauthorized, "authentication required"} } +func rateLimited() *apiError { + return &apiError{http.StatusTooManyRequests, errorCodeRateLimited, "too many requests"} +} + +func passwordOperationError(err error) *apiError { + if errors.Is(err, password.ErrBusy) { + return rateLimited() + } + return internalError() +} + func notFound() *apiError { return &apiError{http.StatusNotFound, errorCodeNotFound, "resource not found"} } diff --git a/internal/messenger/httpapi/handlers.go b/internal/messenger/httpapi/handlers.go index 9084d13..70e63c3 100644 --- a/internal/messenger/httpapi/handlers.go +++ b/internal/messenger/httpapi/handlers.go @@ -9,7 +9,7 @@ import ( "time" "unicode/utf8" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" ) var usernamePattern = regexp.MustCompile(`^[a-z0-9_]{3,32}$`) @@ -32,12 +32,15 @@ func (s *Server) readiness(w http.ResponseWriter, r *http.Request) *apiError { ctx, cancel := context.WithTimeout(r.Context(), 2*time.Second) defer cancel() if err := s.database.Ping(ctx); err != nil { + s.logger.ErrorContext(ctx, "readiness dependency failed", "dependency", "postgres", "error", err) return unavailable() } if err := s.sessions.Ping(ctx); err != nil { + s.logger.ErrorContext(ctx, "readiness dependency failed", "dependency", "valkey", "error", err) return unavailable() } if err := s.objects.Ping(ctx); err != nil { + s.logger.ErrorContext(ctx, "readiness dependency failed", "dependency", "s3", "error", err) return unavailable() } writeJSON(w, http.StatusOK, map[string]string{"status": "ok"}) @@ -61,7 +64,7 @@ func (s *Server) users(w http.ResponseWriter, r *http.Request) *apiError { } passwordHash, err := s.passwords.Hash(input.Password) if err != nil { - return internalError() + return passwordOperationError(err) } user, err := s.userRepository.CreateUser(r.Context(), input.Username, input.DisplayName, passwordHash) if errors.Is(err, model.ErrConflict) { diff --git a/internal/messenger/httpapi/messenger_interface.go b/internal/messenger/httpapi/messenger_interface.go index 9844c25..54d8bf1 100644 --- a/internal/messenger/httpapi/messenger_interface.go +++ b/internal/messenger/httpapi/messenger_interface.go @@ -4,14 +4,15 @@ import ( "context" "time" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/messenger/attachment" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/messenger/attachment" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" ) type UserRepository interface { CreateUser(context.Context, string, string, string) (model.User, error) UserByID(context.Context, string) (model.User, error) UserByUsername(context.Context, string) (model.UserCredentials, error) + UpdatePasswordHash(context.Context, string, string, string) (bool, error) } type ChatRepository interface { @@ -45,5 +46,10 @@ type SessionStore interface { type PasswordService interface { Hash(string) (string, error) Verify(string, string) (bool, error) + NeedsRehash(string) (bool, error) DummyHash() string } + +type LoginLimiter interface { + Allow(context.Context, string, string) (bool, time.Duration, error) +} diff --git a/internal/messenger/httpapi/model.go b/internal/messenger/httpapi/model.go index 7f3f6dc..366c128 100644 --- a/internal/messenger/httpapi/model.go +++ b/internal/messenger/httpapi/model.go @@ -1,7 +1,7 @@ package httpapi import ( - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" "github.com/google/uuid" ) diff --git a/internal/messenger/httpapi/routes.go b/internal/messenger/httpapi/routes.go index f272767..6912660 100644 --- a/internal/messenger/httpapi/routes.go +++ b/internal/messenger/httpapi/routes.go @@ -14,9 +14,6 @@ func (s *Server) route(w http.ResponseWriter, r *http.Request) *apiError { handler = s.live case "/health/ready": handler = s.readiness - case "/metrics": - s.metrics.handler.ServeHTTP(w, r) - return nil case "/api/v1/users": handler = s.users case "/api/v1/users/me": diff --git a/internal/messenger/httpapi/server.go b/internal/messenger/httpapi/server.go index fcc18bf..64867fd 100644 --- a/internal/messenger/httpapi/server.go +++ b/internal/messenger/httpapi/server.go @@ -15,20 +15,21 @@ import ( semconv "go.opentelemetry.io/otel/semconv/v1.34.0" "go.opentelemetry.io/otel/trace" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/telemetry" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/telemetry" ) type Dependencies struct { - Users UserRepository - Chats ChatRepository - Messages MessageRepository - Attachments AttachmentService - Sessions SessionStore - Passwords PasswordService - Database HealthChecker - Objects HealthChecker - Meter metric.Meter - Metrics http.Handler + Users UserRepository + Chats ChatRepository + Messages MessageRepository + Attachments AttachmentService + Sessions SessionStore + Passwords PasswordService + LoginLimiter LoginLimiter + Database HealthChecker + Objects HealthChecker + Meter metric.Meter + Metrics http.Handler } type Config struct { @@ -46,6 +47,7 @@ type Server struct { attachments AttachmentService sessions SessionStore passwords PasswordService + loginLimiter LoginLimiter database HealthChecker objects HealthChecker sessionTTL time.Duration @@ -77,7 +79,8 @@ func NewServer( userRepository: dependencies.Users, chatRepository: dependencies.Chats, messageRepository: dependencies.Messages, attachments: dependencies.Attachments, sessions: dependencies.Sessions, - passwords: dependencies.Passwords, database: dependencies.Database, objects: dependencies.Objects, + passwords: dependencies.Passwords, loginLimiter: dependencies.LoginLimiter, + database: dependencies.Database, objects: dependencies.Objects, sessionTTL: config.SessionTTL, idempotencyTTL: config.IdempotencyTTL, requestTTL: config.RequestTTL, instanceID: config.InstanceID, logger: logger, swaggerPort: config.SwaggerPort, metrics: newMetrics(dependencies.Meter, dependencies.Metrics), @@ -94,6 +97,30 @@ func (s *Server) Handler() http.Handler { return http.HandlerFunc(s.serve) } +func (s *Server) HealthHandler() http.Handler { + mux := http.NewServeMux() + mux.HandleFunc("/health/live", func(w http.ResponseWriter, r *http.Request) { + s.serveHealth(w, r, s.live) + }) + mux.HandleFunc("/health/ready", func(w http.ResponseWriter, r *http.Request) { + s.serveHealth(w, r, s.readiness) + }) + return mux +} + +func (s *Server) MetricsHandler() http.Handler { + mux := http.NewServeMux() + mux.Handle("/metrics", s.metrics.handler) + return mux +} + +func (s *Server) serveHealth(w http.ResponseWriter, r *http.Request, handler requestHandler) { + w.Header().Set("X-Instance-Id", s.instanceID) + if err := handler(w, r); err != nil { + writeError(w, "", err) + } +} + func (s *Server) serve(w http.ResponseWriter, r *http.Request) { requestContext := telemetry.Extract(r.Context(), propagation.HeaderCarrier(r.Header)) tracer := otel.Tracer("messenger-api/http") @@ -142,6 +169,9 @@ func (s *Server) serve(w http.ResponseWriter, r *http.Request) { if apiErr.status == http.StatusUnauthorized { wrapped.Header().Set("WWW-Authenticate", authenticationChallenge(r)) } + if apiErr.status == http.StatusTooManyRequests && wrapped.Header().Get("Retry-After") == "" { + wrapped.Header().Set("Retry-After", "1") + } writeError(wrapped, requestID, apiErr) } } diff --git a/internal/messenger/httpapi/server_test.go b/internal/messenger/httpapi/server_test.go index c1bf91d..675c420 100644 --- a/internal/messenger/httpapi/server_test.go +++ b/internal/messenger/httpapi/server_test.go @@ -14,8 +14,9 @@ import ( "github.com/stretchr/testify/suite" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/messenger/attachment" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/messenger/attachment" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/password" ) var errDependency = errors.New("dependency unavailable") @@ -34,14 +35,15 @@ func (s *MessengerSuite) SetupTest() { } type messengerStoreStub struct { - pingErr error - userByID model.User - userByIDErr error - credentials model.UserCredentials - credentialsErr error - message model.Message - messageReplay bool - messageErr error + pingErr error + userByID model.User + userByIDErr error + credentials model.UserCredentials + credentialsErr error + message model.Message + messageReplay bool + messageErr error + updatePasswordHash func(context.Context, string, string, string) (bool, error) } func (s messengerStoreStub) Ping(context.Context) error { return s.pingErr } @@ -54,6 +56,12 @@ func (s messengerStoreStub) UserByID(context.Context, string) (model.User, error func (s messengerStoreStub) UserByUsername(context.Context, string) (model.UserCredentials, error) { return s.credentials, s.credentialsErr } +func (s messengerStoreStub) UpdatePasswordHash(ctx context.Context, userID, previousHash, passwordHash string) (bool, error) { + if s.updatePasswordHash == nil { + return false, nil + } + return s.updatePasswordHash(ctx, userID, previousHash, passwordHash) +} func (messengerStoreStub) CreateChat(context.Context, string, []string, string) (model.Chat, error) { return model.Chat{}, nil } @@ -109,15 +117,37 @@ func (s sessionStub) UserID(context.Context, string) (string, error) { return s. func (sessionStub) Delete(context.Context, string) error { return nil } type passwordsStub struct { - verified bool - err error + verified bool + err error + hash string + hashErr error + needsRehash bool + needsRehashErr error } -func (passwordsStub) Hash(string) (string, error) { return "hash", nil } -func (passwordsStub) DummyHash() string { return "hash" } +func (s passwordsStub) Hash(string) (string, error) { + if s.hash == "" { + return "hash", s.hashErr + } + return s.hash, s.hashErr +} +func (passwordsStub) DummyHash() string { return "hash" } func (s passwordsStub) Verify(string, string) (bool, error) { return s.verified, s.err } +func (s passwordsStub) NeedsRehash(string) (bool, error) { + return s.needsRehash, s.needsRehashErr +} + +type loginLimiterStub struct { + allowed bool + retryAfter time.Duration + err error +} + +func (s loginLimiterStub) Allow(context.Context, string, string) (bool, time.Duration, error) { + return s.allowed, s.retryAfter, s.err +} func (s *MessengerSuite) TestReadinessReturnsUnavailableForDependencyFailure() { t := s.T() @@ -135,7 +165,7 @@ func (s *MessengerSuite) TestReadinessReturnsUnavailableForDependencyFailure() { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { server := s.server(tt.store, tt.sessions, passwordsStub{}, tt.objects, attachmentServiceStub{}) - response := serveRequest(server, http.MethodGet, "/health/ready", "") + response := serveHealthRequest(server, http.MethodGet, "/health/ready") if response.Code != http.StatusServiceUnavailable { t.Fatalf("status = %d, want %d", response.Code, http.StatusServiceUnavailable) } @@ -143,6 +173,29 @@ func (s *MessengerSuite) TestReadinessReturnsUnavailableForDependencyFailure() { } } +func (s *MessengerSuite) TestHealthHandlerDoesNotExposeBusinessAPI() { + server := s.newTestServer(messengerStoreStub{}, sessionStub{}, passwordsStub{}) + response := serveHealthRequest(server, http.MethodGet, "/api/v1/users/me") + s.Equal(http.StatusNotFound, response.Code) +} + +func (s *MessengerSuite) TestMetricsHandlerOnlyExposesMetrics() { + server := s.newTestServer(messengerStoreStub{}, sessionStub{}, passwordsStub{}) + server.metrics.handler = http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { + w.WriteHeader(http.StatusNoContent) + }) + + metrics := httptest.NewRecorder() + server.MetricsHandler().ServeHTTP(metrics, httptest.NewRequest(http.MethodGet, "/metrics", nil)) + s.Equal(http.StatusNoContent, metrics.Code) + for _, path := range []string{"/health/ready", "/api/v1/users/me"} { + response := httptest.NewRecorder() + server.MetricsHandler().ServeHTTP(response, httptest.NewRequest(http.MethodGet, path, nil)) + s.Equal(http.StatusNotFound, response.Code, path) + } + s.Equal(http.StatusNotFound, serveRequest(server, http.MethodGet, "/metrics", "").Code) +} + func (s *MessengerSuite) TestBusinessRequestReturnsUnavailableForDependencyFailure() { t := s.T() tests := []struct { @@ -187,6 +240,64 @@ func (s *MessengerSuite) TestAuthenticationChallenges() { } } +func (s *MessengerSuite) TestSessionCreationReturnsRateLimitWithRetryAfter() { + server := s.serverWithLoginLimiter( + messengerStoreStub{}, sessionStub{}, passwordsStub{}, + loginLimiterStub{retryAfter: 1500 * time.Millisecond}, + ) + request := httptest.NewRequest(http.MethodPost, "/api/v1/auth/sessions", nil) + request.SetBasicAuth("student", "T3st-password-123") + response := httptest.NewRecorder() + server.Handler().ServeHTTP(response, request) + + s.Equal(http.StatusTooManyRequests, response.Code) + s.Equal("2", response.Header().Get("Retry-After")) + s.Contains(response.Body.String(), `"code":"rate_limited"`) +} + +func (s *MessengerSuite) TestPasswordOperationLimitReturnsRateLimit() { + registration := s.newTestServer(messengerStoreStub{}, sessionStub{}, passwordsStub{hashErr: password.ErrBusy}) + response := serveRequest(registration, http.MethodPost, "/api/v1/users", `{"username":"student","display_name":"Student","password":"T3st-password-123"}`) + s.Equal(http.StatusTooManyRequests, response.Code) + s.Equal("1", response.Header().Get("Retry-After")) + + store := messengerStoreStub{credentials: model.UserCredentials{PasswordHash: "hash"}} + login := s.newTestServer(store, sessionStub{}, passwordsStub{err: password.ErrBusy}) + request := httptest.NewRequest(http.MethodPost, "/api/v1/auth/sessions", nil) + request.SetBasicAuth("student", "T3st-password-123") + response = httptest.NewRecorder() + login.Handler().ServeHTTP(response, request) + s.Equal(http.StatusTooManyRequests, response.Code) + s.Equal("1", response.Header().Get("Retry-After")) +} + +func (s *MessengerSuite) TestSessionCreationRehashesPasswordWithCompareAndSwap() { + var updated []string + store := messengerStoreStub{ + credentials: model.UserCredentials{User: model.User{ID: "user-id"}, PasswordHash: "old-hash"}, + updatePasswordHash: func(_ context.Context, userID, previousHash, passwordHash string) (bool, error) { + updated = []string{userID, previousHash, passwordHash} + return true, nil + }, + } + server := s.newTestServer(store, sessionStub{}, passwordsStub{ + verified: true, needsRehash: true, hash: "new-hash", + }) + request := httptest.NewRequest(http.MethodPost, "/api/v1/auth/sessions", nil) + request.SetBasicAuth("student", "T3st-password-123") + response := httptest.NewRecorder() + server.Handler().ServeHTTP(response, request) + + s.Equal(http.StatusCreated, response.Code) + s.Equal([]string{"user-id", "old-hash", "new-hash"}, updated) +} + +func (s *MessengerSuite) TestLoginSourceUsesAddressAppendedByIngress() { + request := httptest.NewRequest(http.MethodPost, "/api/v1/auth/sessions", nil) + request.Header.Set("X-Forwarded-For", "203.0.113.9, 198.51.100.7") + s.Equal("198.51.100.7", loginSource(request)) +} + func (s *MessengerSuite) TestAttachmentContentAuthenticatesBeforeVariantValidation() { server := s.newTestServer(messengerStoreStub{}, sessionStub{}, passwordsStub{}) response := serveRequest( @@ -357,10 +468,34 @@ func (s *MessengerSuite) server( passwords PasswordService, objects objectStoreStub, attachments AttachmentService, +) *Server { + return s.serverWithDependencies( + store, sessions, passwords, loginLimiterStub{allowed: true}, objects, attachments, + ) +} + +func (s *MessengerSuite) serverWithLoginLimiter( + store messengerStoreStub, + sessions SessionStore, + passwords PasswordService, + limiter LoginLimiter, +) *Server { + return s.serverWithDependencies( + store, sessions, passwords, limiter, objectStoreStub{}, attachmentServiceStub{}, + ) +} + +func (s *MessengerSuite) serverWithDependencies( + store messengerStoreStub, + sessions SessionStore, + passwords PasswordService, + limiter LoginLimiter, + objects objectStoreStub, + attachments AttachmentService, ) *Server { return NewServer(s.logger, Dependencies{ Users: store, Chats: store, Messages: store, Attachments: attachments, - Sessions: sessions, Passwords: passwords, Database: store, Objects: objects, + Sessions: sessions, Passwords: passwords, LoginLimiter: limiter, Database: store, Objects: objects, }, Config{ SessionTTL: time.Hour, IdempotencyTTL: 24 * time.Hour, RequestTTL: time.Second, InstanceID: "test-instance", SwaggerPort: "8081", @@ -376,3 +511,10 @@ func serveRequest(server *Server, method, path, body string) *httptest.ResponseR server.Handler().ServeHTTP(response, request) return response } + +func serveHealthRequest(server *Server, method, path string) *httptest.ResponseRecorder { + request := httptest.NewRequest(method, path, nil) + response := httptest.NewRecorder() + server.HealthHandler().ServeHTTP(response, request) + return response +} diff --git a/internal/objectstore/store.go b/internal/objectstore/store.go index e2d6ded..d5c214b 100644 --- a/internal/objectstore/store.go +++ b/internal/objectstore/store.go @@ -6,6 +6,8 @@ import ( "errors" "fmt" "io" + "net" + "net/http" "net/url" "strings" "time" @@ -18,7 +20,8 @@ import ( "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/security/tlsconfig" ) var ErrNotFound = errors.New("object not found") @@ -30,6 +33,7 @@ type Config struct { AccessKey string SecretKey string UseTLS bool + CAPath string Timeout time.Duration } @@ -47,11 +51,27 @@ func New(config Config) (*Store, error) { if strings.TrimSpace(config.Bucket) == "" || config.Timeout <= 0 { return nil, errors.New("invalid object store configuration") } - client, err := minio.New(endpoint, &minio.Options{ + options := &minio.Options{ Creds: credentials.NewStaticV4(config.AccessKey, config.SecretKey, ""), Secure: config.UseTLS, Region: config.Region, - }) + } + if config.UseTLS { + host, _, err := net.SplitHostPort(endpoint) + if err != nil { + return nil, errors.New("S3 endpoint must include a port") + } + tlsConfiguration, err := tlsconfig.LoadClient(tlsconfig.ClientConfig{ + CAPath: config.CAPath, ServerName: host, + }) + if err != nil { + return nil, fmt.Errorf("load S3 TLS configuration: %w", err) + } + transport := http.DefaultTransport.(*http.Transport).Clone() + transport.TLSClientConfig = tlsConfiguration + options.Transport = transport + } + client, err := minio.New(endpoint, options) if err != nil { return nil, fmt.Errorf("create S3 client: %w", err) } @@ -79,12 +99,8 @@ func endpointHost(value string, useTLS bool) (string, error) { func (s *Store) Ping(ctx context.Context) error { ctx, cancel := context.WithTimeout(ctx, s.timeout) defer cancel() - exists, err := s.client.BucketExists(ctx, s.bucket) - if err != nil { - return fmt.Errorf("check S3 bucket: %w", err) - } - if !exists { - return errors.New("S3 bucket does not exist") + if _, err := s.client.GetBucketLocation(ctx, s.bucket); err != nil { + return fmt.Errorf("check S3 bucket location: %w", err) } return nil } diff --git a/internal/outbox/dispatcher.go b/internal/outbox/dispatcher.go index ea74f61..5b76b75 100644 --- a/internal/outbox/dispatcher.go +++ b/internal/outbox/dispatcher.go @@ -11,8 +11,8 @@ import ( "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/telemetry" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/telemetry" ) var errLeaseLost = errors.New("outbox lease lost") diff --git a/internal/outbox/dispatcher_test.go b/internal/outbox/dispatcher_test.go index b9d792c..51c4145 100644 --- a/internal/outbox/dispatcher_test.go +++ b/internal/outbox/dispatcher_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" "github.com/stretchr/testify/require" ) diff --git a/internal/password/password.go b/internal/password/password.go index 5dd8b1b..f8d771f 100644 --- a/internal/password/password.go +++ b/internal/password/password.go @@ -15,6 +15,7 @@ import ( var ( ErrInvalidConfig = errors.New("invalid password configuration") ErrInvalidHash = errors.New("invalid password hash") + ErrBusy = errors.New("password operation limit reached") ) type Config struct { @@ -26,17 +27,24 @@ type Config struct { } type Hasher struct { - config Config - dummyHash string + config Config + dummyHash string + operations chan struct{} } -func New(config Config) (*Hasher, error) { +func New(config Config, maxConcurrentOperations int) (*Hasher, error) { if err := validateConfig(config); err != nil { return nil, err } + if maxConcurrentOperations < 1 || maxConcurrentOperations > 64 { + return nil, ErrInvalidConfig + } salt := make([]byte, config.SaltLength) digest := argon2.IDKey([]byte("invalid-user-password"), salt, config.Iterations, config.MemoryKiB, config.Parallelism, config.KeyLength) - return &Hasher{config: config, dummyHash: encode(config, salt, digest)}, nil + return &Hasher{ + config: config, dummyHash: encode(config, salt, digest), + operations: make(chan struct{}, maxConcurrentOperations), + }, nil } func validateConfig(config Config) error { @@ -51,6 +59,10 @@ func validateConfig(config Config) error { } func (h *Hasher) Hash(value string) (string, error) { + if !h.acquire() { + return "", ErrBusy + } + defer h.release() salt := make([]byte, h.config.SaltLength) if _, err := rand.Read(salt); err != nil { return "", fmt.Errorf("generate password salt: %w", err) @@ -60,6 +72,10 @@ func (h *Hasher) Hash(value string) (string, error) { } func (h *Hasher) Verify(value, encodedHash string) (bool, error) { + if !h.acquire() { + return false, ErrBusy + } + defer h.release() config, salt, digest, err := decode(encodedHash) if err != nil { return false, err @@ -68,6 +84,27 @@ func (h *Hasher) Verify(value, encodedHash string) (bool, error) { return subtle.ConstantTimeCompare(actual, digest) == 1, nil } +func (h *Hasher) acquire() bool { + select { + case h.operations <- struct{}{}: + return true + default: + return false + } +} + +func (h *Hasher) release() { + <-h.operations +} + +func (h *Hasher) NeedsRehash(encodedHash string) (bool, error) { + config, _, _, err := decode(encodedHash) + if err != nil { + return false, err + } + return config != h.config, nil +} + func (h *Hasher) DummyHash() string { return h.dummyHash } diff --git a/internal/password/password_test.go b/internal/password/password_test.go index 8e88875..5ff2d96 100644 --- a/internal/password/password_test.go +++ b/internal/password/password_test.go @@ -16,7 +16,7 @@ func TestPasswordSuite(t *testing.T) { } func (s *PasswordSuite) SetupTest() { - hasher, err := New(testConfig()) + hasher, err := New(testConfig(), 2) s.Require().NoError(err) s.hasher = hasher } @@ -39,6 +39,83 @@ func (s *PasswordSuite) TestVerifyRejectsMalformedHash() { s.Error(err) } +func (s *PasswordSuite) TestNeedsRehashDetectsChangedParameters() { + currentHash, err := s.hasher.Hash("T3st-password-123") + s.Require().NoError(err) + needsRehash, err := s.hasher.NeedsRehash(currentHash) + s.Require().NoError(err) + s.False(needsRehash) + + legacyConfig := testConfig() + legacyConfig.KeyLength = 16 + legacy, err := New(legacyConfig, 2) + s.Require().NoError(err) + legacyHash, err := legacy.Hash("T3st-password-123") + s.Require().NoError(err) + needsRehash, err = s.hasher.NeedsRehash(legacyHash) + s.Require().NoError(err) + s.True(needsRehash) +} + +func (s *PasswordSuite) TestBusyOperationsRecoverAfterCapacityIsReleased() { + s.hasher.operations <- struct{}{} + s.hasher.operations <- struct{}{} + defer func() { <-s.hasher.operations }() + _, err := s.hasher.Hash("T3st-password-123") + s.ErrorIs(err, ErrBusy) + _, err = s.hasher.Verify("T3st-password-123", s.hasher.DummyHash()) + s.ErrorIs(err, ErrBusy) + + <-s.hasher.operations + hash, err := s.hasher.Hash("T3st-password-123") + s.Require().NoError(err) + verified, err := s.hasher.Verify("T3st-password-123", hash) + s.Require().NoError(err) + s.True(verified) +} + +func (s *PasswordSuite) TestNewRejectsInvalidOperationLimit() { + _, err := New(testConfig(), 0) + s.ErrorIs(err, ErrInvalidConfig) +} + func testConfig() Config { return Config{MemoryKiB: 8 * 1024, Iterations: 1, Parallelism: 1, SaltLength: 16, KeyLength: 32} } + +func BenchmarkArgon2idHash(b *testing.B) { + hasher, err := New(productionConfig(), 2) + if err != nil { + b.Fatal(err) + } + b.ReportAllocs() + b.ResetTimer() + for range b.N { + if _, err := hasher.Hash("T3st-password-123"); err != nil { + b.Fatal(err) + } + } +} + +func BenchmarkArgon2idVerify(b *testing.B) { + hasher, err := New(productionConfig(), 2) + if err != nil { + b.Fatal(err) + } + hash, err := hasher.Hash("T3st-password-123") + if err != nil { + b.Fatal(err) + } + b.ReportAllocs() + b.ResetTimer() + for range b.N { + verified, err := hasher.Verify("T3st-password-123", hash) + if err != nil || !verified { + b.Fatalf("verify: result=%v error=%v", verified, err) + } + } +} + +func productionConfig() Config { + return Config{MemoryKiB: 64 * 1024, Iterations: 3, Parallelism: 2, SaltLength: 16, KeyLength: 32} +} diff --git a/internal/postgres/attachment_jobs.go b/internal/postgres/attachment_jobs.go index 6c959de..314e7fc 100644 --- a/internal/postgres/attachment_jobs.go +++ b/internal/postgres/attachment_jobs.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/jackc/pgx/v5" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" ) const attachmentJobTopic = "attachment.jobs" diff --git a/internal/postgres/attachment_lease.go b/internal/postgres/attachment_lease.go index 9e631a9..261f3b9 100644 --- a/internal/postgres/attachment_lease.go +++ b/internal/postgres/attachment_lease.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" ) func (s *Store) RenewAttachmentJobLease( diff --git a/internal/postgres/attachment_recovery.go b/internal/postgres/attachment_recovery.go index e305a79..4774764 100644 --- a/internal/postgres/attachment_recovery.go +++ b/internal/postgres/attachment_recovery.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "github.com/jackc/pgx/v5" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" ) func (s *Store) RecoverExpiredAttachmentJobs( diff --git a/internal/postgres/attachments.go b/internal/postgres/attachments.go index 2765eda..6b1beb6 100644 --- a/internal/postgres/attachments.go +++ b/internal/postgres/attachments.go @@ -8,7 +8,7 @@ import ( "github.com/jackc/pgx/v5" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" ) const attachmentColumns = ` @@ -263,21 +263,6 @@ func scanAttachmentWithReferenceAndObjectKey( return err } -func scanAttachmentWithReference(row rowScanner, attachment *model.Attachment) error { - var stagingKey *string - err := row.Scan( - &attachment.ID, &attachment.ChatID, &attachment.OwnerID, &attachment.Filename, - &attachment.ContentType, &attachment.SizeBytes, &attachment.SHA256, &attachment.ObjectKey, - &attachment.Status, &attachment.CreatedAt, &attachment.UpdatedAt, &attachment.ReadyAt, - &attachment.PipelineVersion, &attachment.ErrorCode, &stagingKey, - &attachment.Referenced, - ) - if stagingKey != nil { - attachment.StagingKey = *stagingKey - } - return err -} - func (s *Store) AttachmentReferenced(ctx context.Context, attachmentID string) (bool, error) { const query = `SELECT EXISTS (SELECT 1 FROM message_attachments WHERE attachment_id = $1)` var referenced bool diff --git a/internal/postgres/errors.go b/internal/postgres/errors.go index 39509ad..8c13bb9 100644 --- a/internal/postgres/errors.go +++ b/internal/postgres/errors.go @@ -1,6 +1,6 @@ package postgres -import "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" +import "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" var ( ErrConflict = model.ErrConflict diff --git a/internal/postgres/idempotency.go b/internal/postgres/idempotency.go index 4bbb95b..3261e66 100644 --- a/internal/postgres/idempotency.go +++ b/internal/postgres/idempotency.go @@ -12,7 +12,7 @@ import ( "github.com/google/uuid" "github.com/jackc/pgx/v5" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" ) const expiredIdempotencyCleanupBatch = 100 diff --git a/internal/postgres/outbox.go b/internal/postgres/outbox.go index 0817f7c..b6b056a 100644 --- a/internal/postgres/outbox.go +++ b/internal/postgres/outbox.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/jackc/pgx/v5" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" ) func (s *Store) ClaimOutboxEvents( diff --git a/internal/postgres/store.go b/internal/postgres/store.go index 44980b7..5489fe8 100644 --- a/internal/postgres/store.go +++ b/internal/postgres/store.go @@ -10,7 +10,7 @@ import ( "github.com/jackc/pgx/v5/pgconn" "github.com/jackc/pgx/v5/pgxpool" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" ) type Store struct { @@ -100,6 +100,19 @@ func (s *Store) UserByUsername(ctx context.Context, username string) (model.User return credentials, nil } +func (s *Store) UpdatePasswordHash(ctx context.Context, userID, previousHash, passwordHash string) (bool, error) { + const query = ` + UPDATE users + SET password_hash = $1 + WHERE id = $2 AND password_hash = $3` + + result, err := s.pool.Exec(ctx, query, passwordHash, userID, previousHash) + if err != nil { + return false, fmt.Errorf("update password hash: %w", err) + } + return result.RowsAffected() == 1, nil +} + func (s *Store) CreateChat( ctx context.Context, title string, diff --git a/internal/postgres/store_integration_test.go b/internal/postgres/store_integration_test.go index e4184db..5e3b4f3 100644 --- a/internal/postgres/store_integration_test.go +++ b/internal/postgres/store_integration_test.go @@ -15,10 +15,10 @@ import ( "github.com/jackc/pgx/v5/pgxpool" "github.com/stretchr/testify/suite" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/database" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/postgres" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/reconcile" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/database" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/postgres" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/reconcile" ) type PostgresSuite struct { @@ -77,6 +77,27 @@ func (s *PostgresSuite) TestConcurrentUsernameCreation() { } } +func (s *PostgresSuite) TestPasswordHashUpdateUsesCompareAndSwap() { + username := uniqueUsername() + user, err := s.store.CreateUser(context.Background(), username, "Password user", "old-hash") + s.Require().NoError(err) + + updated, err := s.store.UpdatePasswordHash(context.Background(), user.ID, "other-hash", "new-hash") + s.Require().NoError(err) + s.False(updated) + + updated, err = s.store.UpdatePasswordHash(context.Background(), user.ID, "old-hash", "new-hash") + s.Require().NoError(err) + s.True(updated) + updated, err = s.store.UpdatePasswordHash(context.Background(), user.ID, "old-hash", "stale-hash") + s.Require().NoError(err) + s.False(updated) + + credentials, err := s.store.UserByUsername(context.Background(), username) + s.Require().NoError(err) + s.Equal("new-hash", credentials.PasswordHash) +} + func (s *PostgresSuite) TestCreateChatRollsBackForUnknownMember() { t := s.T() pool := s.pool diff --git a/internal/reconcile/reconcile.go b/internal/reconcile/reconcile.go index 15607f8..4c04575 100644 --- a/internal/reconcile/reconcile.go +++ b/internal/reconcile/reconcile.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" ) type MetadataStore interface { diff --git a/internal/reconcile/reconcile_test.go b/internal/reconcile/reconcile_test.go index 36a2955..2236ab8 100644 --- a/internal/reconcile/reconcile_test.go +++ b/internal/reconcile/reconcile_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" ) func TestReconcilerLifecycleAndRepeat(t *testing.T) { diff --git a/internal/security/mtlsproxy/proxy.go b/internal/security/mtlsproxy/proxy.go new file mode 100644 index 0000000..29e435f --- /dev/null +++ b/internal/security/mtlsproxy/proxy.go @@ -0,0 +1,95 @@ +package mtlsproxy + +import ( + "context" + "crypto/tls" + "errors" + "fmt" + "io" + "net" + "sync" + "time" + + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/security/tlsconfig" +) + +type Config struct { + ListenAddress string + TargetAddress string + CAPath string + CertificatePath string + PrivateKeyPath string + AllowedClientURI string + ALPNProtocols []string + DialTimeout time.Duration +} + +func Run(ctx context.Context, config Config) error { + if config.ListenAddress == "" || config.TargetAddress == "" || config.DialTimeout <= 0 { + return errors.New("invalid mTLS proxy configuration") + } + tlsConfiguration, err := tlsconfig.LoadServer(tlsconfig.ServerConfig{ + CAPath: config.CAPath, CertificatePath: config.CertificatePath, + PrivateKeyPath: config.PrivateKeyPath, AllowedClientURI: config.AllowedClientURI, + }) + if err != nil { + return err + } + tlsConfiguration.NextProtos = config.ALPNProtocols + listener, err := net.Listen("tcp", config.ListenAddress) + if err != nil { + return fmt.Errorf("listen: %w", err) + } + defer func() { _ = listener.Close() }() + go func() { + <-ctx.Done() + _ = listener.Close() + }() + + var connections sync.WaitGroup + defer connections.Wait() + for { + connection, err := listener.Accept() + if err != nil { + if ctx.Err() != nil { + return nil + } + return fmt.Errorf("accept: %w", err) + } + connections.Add(1) + go func() { + defer connections.Done() + serve(ctx, connection, config, tlsConfiguration) + }() + } +} + +func serve(ctx context.Context, connection net.Conn, config Config, tlsConfiguration *tls.Config) { + client := tls.Server(connection, tlsConfiguration) + defer func() { _ = client.Close() }() + handshakeCtx, cancel := context.WithTimeout(ctx, config.DialTimeout) + defer cancel() + if err := client.HandshakeContext(handshakeCtx); err != nil { + return + } + target, err := (&net.Dialer{Timeout: config.DialTimeout}).DialContext(ctx, "tcp", config.TargetAddress) + if err != nil { + return + } + defer func() { _ = target.Close() }() + + result := make(chan struct{}, 2) + copyConnection := func(destination, source net.Conn) { + _, _ = io.Copy(destination, source) + if writer, ok := destination.(interface{ CloseWrite() error }); ok { + _ = writer.CloseWrite() + } + result <- struct{}{} + } + go copyConnection(target, client) + go copyConnection(client, target) + select { + case <-ctx.Done(): + case <-result: + } +} diff --git a/internal/security/tlsconfig/client.go b/internal/security/tlsconfig/client.go new file mode 100644 index 0000000..e0ac0da --- /dev/null +++ b/internal/security/tlsconfig/client.go @@ -0,0 +1,50 @@ +package tlsconfig + +import ( + "crypto/tls" + "crypto/x509" + "errors" + "fmt" + "os" + "strings" +) + +type ClientConfig struct { + CAPath string + CertificatePath string + PrivateKeyPath string + ServerName string +} + +func LoadClient(config ClientConfig) (*tls.Config, error) { + if strings.TrimSpace(config.ServerName) == "" { + return nil, errors.New("TLS server name is required") + } + caPEM, err := os.ReadFile(config.CAPath) + if err != nil { + return nil, fmt.Errorf("read server CA: %w", err) + } + roots := x509.NewCertPool() + if !roots.AppendCertsFromPEM(caPEM) { + return nil, errors.New("server CA does not contain a certificate") + } + + var certificates []tls.Certificate + if config.CertificatePath != "" || config.PrivateKeyPath != "" { + if config.CertificatePath == "" || config.PrivateKeyPath == "" { + return nil, errors.New("TLS client certificate and private key must be configured together") + } + certificate, err := tls.LoadX509KeyPair(config.CertificatePath, config.PrivateKeyPath) + if err != nil { + return nil, fmt.Errorf("load client certificate: %w", err) + } + certificates = []tls.Certificate{certificate} + } + + return &tls.Config{ + MinVersion: tls.VersionTLS13, + RootCAs: roots, + Certificates: certificates, + ServerName: config.ServerName, + }, nil +} diff --git a/internal/security/tlsconfig/client_test.go b/internal/security/tlsconfig/client_test.go new file mode 100644 index 0000000..f36bdaa --- /dev/null +++ b/internal/security/tlsconfig/client_test.go @@ -0,0 +1,60 @@ +package tlsconfig + +import ( + "crypto/rand" + "crypto/rsa" + "crypto/x509" + "crypto/x509/pkix" + "encoding/pem" + "math/big" + "os" + "path/filepath" + "testing" + "time" + + "github.com/stretchr/testify/require" +) + +func TestLoadClientLoadsTrustAndIdentity(t *testing.T) { + caPath, certificatePath, keyPath := writeClientCertificate(t) + + configuration, err := LoadClient(ClientConfig{ + CAPath: caPath, CertificatePath: certificatePath, PrivateKeyPath: keyPath, ServerName: "collector", + }) + require.NoError(t, err) + require.Equal(t, uint16(0x0304), configuration.MinVersion) + require.Equal(t, "collector", configuration.ServerName) + require.Len(t, configuration.Certificates, 1) + require.NotNil(t, configuration.RootCAs) +} + +func TestLoadClientRejectsPartialIdentity(t *testing.T) { + caPath, certificatePath, _ := writeClientCertificate(t) + + _, err := LoadClient(ClientConfig{CAPath: caPath, CertificatePath: certificatePath, ServerName: "collector"}) + require.ErrorContains(t, err, "configured together") +} + +func writeClientCertificate(t *testing.T) (string, string, string) { + t.Helper() + directory := t.TempDir() + key, err := rsa.GenerateKey(rand.Reader, 2048) + require.NoError(t, err) + template := &x509.Certificate{ + SerialNumber: big.NewInt(1), Subject: pkix.Name{CommonName: "test"}, + NotBefore: time.Now().Add(-time.Hour), NotAfter: time.Now().Add(time.Hour), + KeyUsage: x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign, + BasicConstraintsValid: true, IsCA: true, + } + der, err := x509.CreateCertificate(rand.Reader, template, template, &key.PublicKey, key) + require.NoError(t, err) + certificate := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: der}) + privateKey := pem.EncodeToMemory(&pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(key)}) + caPath := filepath.Join(directory, "ca.crt") + certificatePath := filepath.Join(directory, "tls.crt") + keyPath := filepath.Join(directory, "tls.key") + require.NoError(t, os.WriteFile(caPath, certificate, 0o600)) + require.NoError(t, os.WriteFile(certificatePath, certificate, 0o600)) + require.NoError(t, os.WriteFile(keyPath, privateKey, 0o600)) + return caPath, certificatePath, keyPath +} diff --git a/internal/security/tlsconfig/server.go b/internal/security/tlsconfig/server.go new file mode 100644 index 0000000..c767c26 --- /dev/null +++ b/internal/security/tlsconfig/server.go @@ -0,0 +1,54 @@ +package tlsconfig + +import ( + "crypto/tls" + "crypto/x509" + "errors" + "fmt" + "net/url" + "os" +) + +type ServerConfig struct { + CAPath string + CertificatePath string + PrivateKeyPath string + AllowedClientURI string +} + +func LoadServer(config ServerConfig) (*tls.Config, error) { + allowedURI, err := url.Parse(config.AllowedClientURI) + if err != nil || allowedURI.Scheme == "" || allowedURI.Host == "" || allowedURI.String() != config.AllowedClientURI { + return nil, errors.New("allowed client URI must be an absolute canonical URI") + } + caPEM, err := os.ReadFile(config.CAPath) + if err != nil { + return nil, fmt.Errorf("read client CA: %w", err) + } + clientCAs := x509.NewCertPool() + if !clientCAs.AppendCertsFromPEM(caPEM) { + return nil, errors.New("client CA does not contain a certificate") + } + certificate, err := tls.LoadX509KeyPair(config.CertificatePath, config.PrivateKeyPath) + if err != nil { + return nil, fmt.Errorf("load server certificate: %w", err) + } + + return &tls.Config{ + MinVersion: tls.VersionTLS13, + Certificates: []tls.Certificate{certificate}, + ClientAuth: tls.RequireAndVerifyClientCert, + ClientCAs: clientCAs, + VerifyConnection: func(state tls.ConnectionState) error { + if len(state.PeerCertificates) == 0 { + return errors.New("client certificate is required") + } + for _, identity := range state.PeerCertificates[0].URIs { + if identity.String() == config.AllowedClientURI { + return nil + } + } + return fmt.Errorf("client certificate URI SAN is not allowed: want %s", config.AllowedClientURI) + }, + }, nil +} diff --git a/internal/security/tlsconfig/server_test.go b/internal/security/tlsconfig/server_test.go new file mode 100644 index 0000000..55c9a1b --- /dev/null +++ b/internal/security/tlsconfig/server_test.go @@ -0,0 +1,185 @@ +package tlsconfig + +import ( + "crypto/ecdsa" + "crypto/elliptic" + "crypto/rand" + "crypto/tls" + "crypto/x509" + "crypto/x509/pkix" + "encoding/pem" + "math/big" + "net" + "net/url" + "os" + "path/filepath" + "testing" + "time" + + "github.com/stretchr/testify/require" +) + +const allowedClientURI = "spiffe://mtusi/lab7/load-balancer" + +func TestServerRequiresAllowedClientIdentity(t *testing.T) { + files := issueTestCertificates(t) + serverConfig, err := LoadServer(ServerConfig{ + CAPath: files.caPath, CertificatePath: files.serverCertificatePath, + PrivateKeyPath: files.serverPrivateKeyPath, AllowedClientURI: allowedClientURI, + }) + require.NoError(t, err) + + tests := []struct { + name string + certificatePath string + privateKeyPath string + wantServerError bool + }{ + {name: "allowed identity", certificatePath: files.allowedCertificatePath, privateKeyPath: files.allowedPrivateKeyPath}, + {name: "other identity from trusted CA", certificatePath: files.otherCertificatePath, privateKeyPath: files.otherPrivateKeyPath, wantServerError: true}, + {name: "missing certificate", wantServerError: true}, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + clientConfig := &tls.Config{RootCAs: files.caPool, ServerName: "api.internal", MinVersion: tls.VersionTLS13} + if tt.certificatePath != "" { + certificate, loadErr := tls.LoadX509KeyPair(tt.certificatePath, tt.privateKeyPath) + require.NoError(t, loadErr) + clientConfig.Certificates = []tls.Certificate{certificate} + } + serverErr, clientErr := handshake(serverConfig, clientConfig) + if tt.wantServerError { + require.Error(t, serverErr) + return + } + require.NoError(t, serverErr) + require.NoError(t, clientErr) + }) + } +} + +func TestLoadServerRejectsInvalidClientCA(t *testing.T) { + directory := t.TempDir() + caPath := filepath.Join(directory, "ca.pem") + require.NoError(t, os.WriteFile(caPath, []byte("not a certificate"), 0o600)) + + _, err := LoadServer(ServerConfig{CAPath: caPath, AllowedClientURI: allowedClientURI}) + require.ErrorContains(t, err, "client CA does not contain a certificate") +} + +func handshake(serverConfig, clientConfig *tls.Config) (error, error) { + listener, err := net.Listen("tcp", "127.0.0.1:0") + if err != nil { + return err, err + } + defer func() { _ = listener.Close() }() + serverResult := make(chan error, 1) + go func() { + connection, acceptErr := listener.Accept() + if acceptErr != nil { + serverResult <- acceptErr + return + } + server := tls.Server(connection, serverConfig) + serverResult <- server.Handshake() + _ = server.Close() + }() + client, clientErr := tls.Dial("tcp", listener.Addr().String(), clientConfig) + if client != nil { + _ = client.Close() + } + serverErr := <-serverResult + return serverErr, clientErr +} + +type testCertificateFiles struct { + caPath string + serverCertificatePath string + serverPrivateKeyPath string + allowedCertificatePath string + allowedPrivateKeyPath string + otherCertificatePath string + otherPrivateKeyPath string + caPool *x509.CertPool +} + +func issueTestCertificates(t *testing.T) testCertificateFiles { + t.Helper() + directory := t.TempDir() + caCertificate, caKey := issueCA(t) + caPath := filepath.Join(directory, "ca.pem") + writeCertificate(t, caPath, caCertificate.Raw) + caPool := x509.NewCertPool() + caPool.AddCert(caCertificate) + + serverCertificatePath, serverPrivateKeyPath := issueLeaf(t, directory, caCertificate, caKey, "server", nil, []string{"api.internal"}, x509.ExtKeyUsageServerAuth) + allowed := mustParseURI(t, allowedClientURI) + allowedCertificatePath, allowedPrivateKeyPath := issueLeaf(t, directory, caCertificate, caKey, "allowed", []*url.URL{allowed}, nil, x509.ExtKeyUsageClientAuth) + other := mustParseURI(t, "spiffe://mtusi/lab7/worker") + otherCertificatePath, otherPrivateKeyPath := issueLeaf(t, directory, caCertificate, caKey, "other", []*url.URL{other}, nil, x509.ExtKeyUsageClientAuth) + + return testCertificateFiles{ + caPath: caPath, serverCertificatePath: serverCertificatePath, serverPrivateKeyPath: serverPrivateKeyPath, + allowedCertificatePath: allowedCertificatePath, allowedPrivateKeyPath: allowedPrivateKeyPath, + otherCertificatePath: otherCertificatePath, otherPrivateKeyPath: otherPrivateKeyPath, caPool: caPool, + } +} + +func issueCA(t *testing.T) (*x509.Certificate, *ecdsa.PrivateKey) { + t.Helper() + key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader) + require.NoError(t, err) + template := &x509.Certificate{ + SerialNumber: big.NewInt(1), Subject: pkix.Name{CommonName: "test CA"}, + NotBefore: time.Now().Add(-time.Hour), NotAfter: time.Now().Add(time.Hour), + IsCA: true, BasicConstraintsValid: true, KeyUsage: x509.KeyUsageCertSign, + } + der, err := x509.CreateCertificate(rand.Reader, template, template, &key.PublicKey, key) + require.NoError(t, err) + certificate, err := x509.ParseCertificate(der) + require.NoError(t, err) + return certificate, key +} + +func issueLeaf( + t *testing.T, + directory string, + ca *x509.Certificate, + caKey *ecdsa.PrivateKey, + name string, + identities []*url.URL, + dnsNames []string, + usage x509.ExtKeyUsage, +) (string, string) { + t.Helper() + key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader) + require.NoError(t, err) + template := &x509.Certificate{ + SerialNumber: big.NewInt(time.Now().UnixNano()), Subject: pkix.Name{CommonName: name}, + NotBefore: time.Now().Add(-time.Hour), NotAfter: time.Now().Add(time.Hour), + KeyUsage: x509.KeyUsageDigitalSignature, ExtKeyUsage: []x509.ExtKeyUsage{usage}, + URIs: identities, DNSNames: dnsNames, + } + der, err := x509.CreateCertificate(rand.Reader, template, ca, &key.PublicKey, caKey) + require.NoError(t, err) + certificatePath := filepath.Join(directory, name+".crt") + privateKeyPath := filepath.Join(directory, name+".key") + writeCertificate(t, certificatePath, der) + keyDER, err := x509.MarshalPKCS8PrivateKey(key) + require.NoError(t, err) + require.NoError(t, os.WriteFile(privateKeyPath, pem.EncodeToMemory(&pem.Block{Type: "PRIVATE KEY", Bytes: keyDER}), 0o600)) + return certificatePath, privateKeyPath +} + +func writeCertificate(t *testing.T, path string, der []byte) { + t.Helper() + require.NoError(t, os.WriteFile(path, pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: der}), 0o600)) +} + +func mustParseURI(t *testing.T, value string) *url.URL { + t.Helper() + identity, err := url.Parse(value) + require.NoError(t, err) + return identity +} diff --git a/internal/session/session.go b/internal/session/session.go index a7df4b9..2a57716 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -4,6 +4,7 @@ import ( "context" "crypto/rand" "crypto/sha256" + "crypto/tls" "encoding/base64" "encoding/hex" "encoding/json" @@ -14,7 +15,7 @@ import ( "github.com/valkey-io/valkey-go" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/model" ) const ( @@ -40,11 +41,15 @@ type Store struct { client valkey.Client } -func New(rawURL string) (*Store, error) { +func New(rawURL string, tlsConfiguration ...*tls.Config) (*Store, error) { option, err := valkey.ParseURL(rawURL) if err != nil { return nil, fmt.Errorf("%w: parse Valkey URL: %w", ErrStore, err) } + if len(tlsConfiguration) > 0 && tlsConfiguration[0] != nil { + option.TLSConfig = tlsConfiguration[0].Clone() + } + option.DisableCache = true client, err := valkey.NewClient(option) if err != nil { diff --git a/internal/session/session_integration_test.go b/internal/session/session_integration_test.go index a82e5eb..f231828 100644 --- a/internal/session/session_integration_test.go +++ b/internal/session/session_integration_test.go @@ -11,7 +11,8 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/suite" - "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/session" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/security/tlsconfig" + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/session" ) type SessionSuite struct { @@ -34,7 +35,14 @@ func (s *SessionSuite) SetupSuite() { s.Require().NoError(err) rawURL = strings.TrimSpace(string(data)) } - store, err := session.New(rawURL) + tlsConfiguration, err := tlsconfig.LoadClient(tlsconfig.ClientConfig{ + CAPath: os.Getenv("TEST_CACHE_TLS_CA_PATH"), + CertificatePath: os.Getenv("TEST_CACHE_TLS_CERTIFICATE_PATH"), + PrivateKeyPath: os.Getenv("TEST_CACHE_TLS_PRIVATE_KEY_PATH"), + ServerName: os.Getenv("TEST_CACHE_TLS_SERVER_NAME"), + }) + s.Require().NoError(err) + store, err := session.New(rawURL, tlsConfiguration) s.Require().NoError(err) s.store = store } diff --git a/internal/telemetry/runtime.go b/internal/telemetry/runtime.go index 90267e6..2eb7642 100644 --- a/internal/telemetry/runtime.go +++ b/internal/telemetry/runtime.go @@ -26,6 +26,9 @@ import ( "go.opentelemetry.io/otel/sdk/resource" "go.opentelemetry.io/otel/sdk/trace" semconv "go.opentelemetry.io/otel/semconv/v1.34.0" + "google.golang.org/grpc/credentials" + + "gitea.privcloud.tech/dizi/mtusi2026lab7/internal/security/tlsconfig" ) const ( @@ -34,13 +37,17 @@ const ( ) type Config struct { - ServiceName string - Version string - InstanceID string - Endpoint string - Environment string - Namespace string - Insecure bool + ServiceName string + Version string + InstanceID string + Endpoint string + Environment string + Namespace string + Insecure bool + TLSCAPath string + TLSCertificatePath string + TLSPrivateKeyPath string + TLSServerName string } type Runtime struct { @@ -54,13 +61,17 @@ type Runtime struct { func ConfigFromEnvironment(serviceName, instanceID string) Config { resourceAttributes := parseResourceAttributes(os.Getenv("OTEL_RESOURCE_ATTRIBUTES")) return Config{ - ServiceName: serviceName, - Version: firstValue(os.Getenv("SERVICE_VERSION"), resourceAttributes["service.version"], "dev"), - InstanceID: instanceID, - Endpoint: strings.TrimSpace(os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT")), - Environment: firstValue(os.Getenv("DEPLOYMENT_ENVIRONMENT"), resourceAttributes["deployment.environment.name"], defaultEnvironment), - Namespace: firstValue(os.Getenv("SERVICE_NAMESPACE"), resourceAttributes["service.namespace"], defaultNamespace), - Insecure: true, + ServiceName: serviceName, + Version: firstValue(os.Getenv("SERVICE_VERSION"), resourceAttributes["service.version"], "dev"), + InstanceID: instanceID, + Endpoint: strings.TrimSpace(os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT")), + Environment: firstValue(os.Getenv("DEPLOYMENT_ENVIRONMENT"), resourceAttributes["deployment.environment.name"], defaultEnvironment), + Namespace: firstValue(os.Getenv("SERVICE_NAMESPACE"), resourceAttributes["service.namespace"], defaultNamespace), + Insecure: strings.EqualFold(strings.TrimSpace(os.Getenv("OTEL_EXPORTER_OTLP_INSECURE")), "true"), + TLSCAPath: strings.TrimSpace(os.Getenv("OTEL_EXPORTER_OTLP_CERTIFICATE")), + TLSCertificatePath: strings.TrimSpace(os.Getenv("OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE")), + TLSPrivateKeyPath: strings.TrimSpace(os.Getenv("OTEL_EXPORTER_OTLP_CLIENT_KEY")), + TLSServerName: strings.TrimSpace(os.Getenv("OTEL_EXPORTER_OTLP_SERVER_NAME")), } } @@ -187,6 +198,12 @@ func newTraceExporter(ctx context.Context, config Config) (trace.SpanExporter, e } if config.Insecure { options = append(options, otlptracegrpc.WithInsecure()) + } else { + transportCredentials, err := telemetryCredentials(config) + if err != nil { + return nil, err + } + options = append(options, otlptracegrpc.WithTLSCredentials(transportCredentials)) } exporter, err := otlptracegrpc.New(ctx, options...) if err != nil { @@ -204,6 +221,12 @@ func newMetricExporter(ctx context.Context, config Config) (*otlpmetricgrpc.Expo } if config.Insecure { options = append(options, otlpmetricgrpc.WithInsecure()) + } else { + transportCredentials, err := telemetryCredentials(config) + if err != nil { + return nil, err + } + options = append(options, otlpmetricgrpc.WithTLSCredentials(transportCredentials)) } exporter, err := otlpmetricgrpc.New(ctx, options...) if err != nil { @@ -221,6 +244,12 @@ func newLogExporter(ctx context.Context, config Config) (*otlploggrpc.Exporter, } if config.Insecure { options = append(options, otlploggrpc.WithInsecure()) + } else { + transportCredentials, err := telemetryCredentials(config) + if err != nil { + return nil, err + } + options = append(options, otlploggrpc.WithTLSCredentials(transportCredentials)) } exporter, err := otlploggrpc.New(ctx, options...) if err != nil { @@ -229,6 +258,17 @@ func newLogExporter(ctx context.Context, config Config) (*otlploggrpc.Exporter, return exporter, nil } +func telemetryCredentials(config Config) (credentials.TransportCredentials, error) { + tlsConfiguration, err := tlsconfig.LoadClient(tlsconfig.ClientConfig{ + CAPath: config.TLSCAPath, CertificatePath: config.TLSCertificatePath, + PrivateKeyPath: config.TLSPrivateKeyPath, ServerName: config.TLSServerName, + }) + if err != nil { + return nil, fmt.Errorf("load OTLP TLS configuration: %w", err) + } + return credentials.NewTLS(tlsConfiguration), nil +} + func (r *Runtime) Logger() *slog.Logger { return r.logger } 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; diff --git a/scripts/bao-docker.sh b/scripts/bao-docker.sh new file mode 100755 index 0000000..ed51bc4 --- /dev/null +++ b/scripts/bao-docker.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +set -eu + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +repo_dir=$(CDPATH= cd -- "$script_dir/.." && pwd) +env_file=${ENV_FILE:-$repo_dir/lab7.env.example} + +"$script_dir/sync-docker-workspace.sh" + +exec docker compose --project-directory "$repo_dir" --env-file "$env_file" run --rm --no-deps -T \ + -v "$repo_dir:$repo_dir:ro" openbao-cli "$@" diff --git a/scripts/bootstrap-local.sh b/scripts/bootstrap-local.sh new file mode 100755 index 0000000..fa35970 --- /dev/null +++ b/scripts/bootstrap-local.sh @@ -0,0 +1,59 @@ +#!/bin/sh + +set -eu + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +repo_dir=$(CDPATH= cd -- "$script_dir/.." && pwd) +env_file=${1:-$repo_dir/lab7.env.example} + +if [ ! -f "$env_file" ]; then + echo "environment file not found: $env_file" >&2 + exit 2 +fi + +compose() { + docker compose --project-directory "$repo_dir" --env-file "$env_file" "$@" +} + +if [ ! -f "$repo_dir/.runtime/security/openbao/tls.crt" ]; then + "$repo_dir/infra/pki/bootstrap.sh" +fi + +"$script_dir/openbao-seed.sh" "$env_file" +"$script_dir/sync-docker-workspace.sh" +compose up -d security-bootstrap openbao-permissions openbao +if [ -z "${BAO_ADDR:-}" ]; then + openbao_address=$(compose port openbao 8200) + BAO_ADDR="https://$openbao_address" +fi +BAO_CACERT="$repo_dir/.runtime/security/openbao/ca.crt" +export BAO_ADDR BAO_CACERT ENV_FILE="$env_file" + +remaining=60 +until curl --silent --show-error --connect-timeout 2 --max-time 3 --cacert "$BAO_CACERT" \ + --output /dev/null "$BAO_ADDR/v1/sys/health"; do + remaining=$((remaining - 1)) + [ "$remaining" -gt 0 ] || { + echo "OpenBao did not start" >&2 + exit 1 + } + sleep 1 +done + +ENV_FILE="$env_file" "$script_dir/openbao-init.sh" +ENV_FILE="$env_file" "$script_dir/openbao-unseal.sh" +remaining=60 +until curl --fail --silent --show-error --connect-timeout 2 --max-time 3 --cacert "$BAO_CACERT" \ + --output /dev/null "$BAO_ADDR/v1/sys/health"; do + remaining=$((remaining - 1)) + [ "$remaining" -gt 0 ] || { + echo "OpenBao did not become active after unseal" >&2 + exit 1 + } + sleep 1 +done +ENV_FILE="$env_file" "$script_dir/openbao-bootstrap.sh" \ + "$repo_dir/.runtime/openbao/seed/api.json" \ + "$repo_dir/.runtime/openbao/seed/worker.json" + +compose up -d --build --scale api=2 --wait --wait-timeout 240 diff --git a/scripts/incident-database.sh b/scripts/incident-database.sh index bc3c6e0..6bc3cc6 100755 --- a/scripts/incident-database.sh +++ b/scripts/incident-database.sh @@ -2,8 +2,9 @@ set -eu -env_file=${ENV_FILE:-lab6.env.example} -base_url=${BASE_URL:-http://127.0.0.1:8080} +env_file=${ENV_FILE:-lab7.env.example} +base_url=${BASE_URL:-https://localhost:8443} +ca_file=${CA_FILE:-.runtime/security/public-ca/ca.crt} prometheus_url=${PROMETHEUS_URL:-http://127.0.0.1:9090} tempo_url=${TEMPO_URL:-http://127.0.0.1:3200} loki_url=${LOKI_URL:-http://127.0.0.1:3100} @@ -33,6 +34,7 @@ trap restore EXIT INT TERM python3 scripts/lab6-observe.py --prometheus-url "$prometheus_url" --phase baseline --output "$output_dir/baseline.json" >/dev/null python3 scripts/lab6-traffic.py \ --base-url "$base_url" \ + --ca-file "$ca_file" \ --mode messages \ --duration "$((outage_seconds + 20))" \ --concurrency 4 \ diff --git a/scripts/incident-telemetry.sh b/scripts/incident-telemetry.sh index 1f0cc50..716414a 100755 --- a/scripts/incident-telemetry.sh +++ b/scripts/incident-telemetry.sh @@ -2,8 +2,9 @@ set -eu -env_file=${ENV_FILE:-lab6.env.example} -base_url=${BASE_URL:-http://127.0.0.1:8080} +env_file=${ENV_FILE:-lab7.env.example} +base_url=${BASE_URL:-https://localhost:8443} +ca_file=${CA_FILE:-.runtime/security/public-ca/ca.crt} prometheus_url=${PROMETHEUS_URL:-http://127.0.0.1:9090} evidence_root=${EVIDENCE_DIR:-evidence/runtime} outage_seconds=${TELEMETRY_OUTAGE_SECONDS:-30} @@ -30,6 +31,7 @@ started_at=$(date -u +%Y-%m-%dT%H:%M:%SZ) compose stop tempo loki >/dev/null python3 scripts/lab6-traffic.py \ --base-url "$base_url" \ + --ca-file "$ca_file" \ --mode mixed \ --duration "$outage_seconds" \ --concurrency 4 \ @@ -41,7 +43,7 @@ load_pid=$! sleep "$outage_seconds" wait "$load_pid" load_pid= -health_code=$(curl --silent --output /dev/null --write-out '%{http_code}' "$base_url/health/ready") +health_code=$(curl --silent --output /dev/null --write-out '%{http_code}' --cacert "$ca_file" "$base_url/health/ready") python3 scripts/lab6-observe.py --prometheus-url "$prometheus_url" --phase degraded --output "$output_dir/degraded.json" >/dev/null recovery_started_at=$(date -u +%Y-%m-%dT%H:%M:%SZ) compose up -d --wait --wait-timeout 90 tempo loki >/dev/null diff --git a/scripts/incident-worker.sh b/scripts/incident-worker.sh index 016df05..f5477de 100755 --- a/scripts/incident-worker.sh +++ b/scripts/incident-worker.sh @@ -3,8 +3,9 @@ set -eu mode=${1:-short} -env_file=${ENV_FILE:-lab6.env.example} -base_url=${BASE_URL:-http://127.0.0.1:8080} +env_file=${ENV_FILE:-lab7.env.example} +base_url=${BASE_URL:-https://localhost:8443} +ca_file=${CA_FILE:-.runtime/security/public-ca/ca.crt} prometheus_url=${PROMETHEUS_URL:-http://127.0.0.1:9090} evidence_root=${EVIDENCE_DIR:-evidence/runtime} require_alerts=${REQUIRE_ALERT_TRANSITIONS:-1} @@ -51,6 +52,7 @@ started_at=$(date -u +%Y-%m-%dT%H:%M:%SZ) compose stop worker >/dev/null python3 scripts/lab6-traffic.py \ --base-url "$base_url" \ + --ca-file "$ca_file" \ --mode attachments \ --duration "$load_seconds" \ --requests "$requests" \ diff --git a/scripts/lab6-traffic.py b/scripts/lab6-traffic.py index 244d53b..e87ece1 100755 --- a/scripts/lab6-traffic.py +++ b/scripts/lab6-traffic.py @@ -7,6 +7,7 @@ import json import math from pathlib import Path import secrets +import ssl import struct import threading import time @@ -16,6 +17,7 @@ import urllib.request import zlib MAX_RESPONSE_BYTES = 1 << 20 +TLS_CONTEXT = None def png_fixture(width=96, height=64): @@ -37,7 +39,7 @@ def png_fixture(width=96, height=64): def request(method, url, body=None, headers=None, timeout=10): req = urllib.request.Request(url, data=body, method=method, headers=headers or {}) try: - with urllib.request.urlopen(req, timeout=timeout) as response: + with urllib.request.urlopen(req, timeout=timeout, context=TLS_CONTEXT) as response: payload = response.read(MAX_RESPONSE_BYTES) return response.status, payload except urllib.error.HTTPError as error: @@ -167,7 +169,8 @@ def wait_for_attachments(base_url, token, attachment_ids, timeout): def main(): parser = argparse.ArgumentParser(description="Bounded synthetic load for Lab 6 telemetry and incidents") - parser.add_argument("--base-url", default="http://127.0.0.1:8080") + parser.add_argument("--base-url", default="https://localhost:8443") + parser.add_argument("--ca-file", default=".runtime/security/public-ca/ca.crt") parser.add_argument("--mode", choices=("messages", "attachments", "mixed"), default="mixed") parser.add_argument("--duration", type=float, default=30) parser.add_argument("--requests", type=int, default=0, help="Maximum requests; zero means duration only") @@ -179,6 +182,10 @@ def main(): parser.add_argument("--started-file", help="Touch after synthetic session and chat are ready") args = parser.parse_args() + global TLS_CONTEXT + if args.base_url.startswith("https://"): + TLS_CONTEXT = ssl.create_default_context(cafile=args.ca_file) + if args.duration <= 0 or args.duration > 1800: parser.error("duration must be in (0, 1800]") if args.requests < 0: diff --git a/scripts/lab7-worker-compromise.sh b/scripts/lab7-worker-compromise.sh new file mode 100755 index 0000000..5239a8c --- /dev/null +++ b/scripts/lab7-worker-compromise.sh @@ -0,0 +1,211 @@ +#!/bin/sh + +set -eu + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +repo_dir=$(CDPATH= cd -- "$script_dir/.." && pwd) +env_file=${ENV_FILE:-$repo_dir/lab7.env.example} +runtime_dir="$repo_dir/.runtime/evidence/lab7-worker" +state_file="$runtime_dir/queued-attachment.json" +rotated_secret="$repo_dir/.runtime/openbao/seed/worker-rotated.json" +rotated_password="rotated-worker-$(date -u +%Y%m%d%H%M%S)" +rotated_database_password="rotated-db-$(date -u +%Y%m%d%H%M%S)" +rotated_s3_secret="rotated-s3-$(date -u +%Y%m%d%H%M%S)" +summary_file="$repo_dir/evidence/lab7-worker-compromise.json" +started_at=$(date +%s) + +compose() { + docker compose --project-directory "$repo_dir" --env-file "$env_file" "$@" +} + +wait_healthy() { + service=$1 + remaining=60 + while [ "$remaining" -gt 0 ]; do + container=$(compose ps -q "$service") + if [ -n "$container" ] && [ "$(docker inspect --format '{{if .State.Health}}{{.State.Health.Status}}{{else}}{{.State.Status}}{{end}}' "$container")" = healthy ]; then + return 0 + fi + remaining=$((remaining - 1)) + sleep 1 + done + echo "$service did not become healthy" >&2 + return 1 +} + +rotate_worker_secret() { + secret_file=$1 + compose stop openbao-agent-worker >/dev/null + ENV_FILE="$env_file" BAO_ADDR="$BAO_ADDR" BAO_CACERT="$BAO_CACERT" \ + "$script_dir/openbao-rotate.sh" worker "$secret_file" >/dev/null + docker start "$(compose ps -aq openbao-agent-worker)" >/dev/null + wait_healthy openbao-agent-worker +} + +restore() { + compose stop worker openbao-agent-worker >/dev/null 2>&1 || true + compose run --rm --no-deps acl-bootstrap >/dev/null 2>&1 || true + compose restart redis-broker redis-gateway >/dev/null 2>&1 || true + compose run --rm --no-deps postgres-roles >/dev/null 2>&1 || true + compose run --rm --no-deps s3-bootstrap >/dev/null 2>&1 || true + rotate_worker_secret "$repo_dir/.runtime/openbao/seed/worker.json" >/dev/null 2>&1 || true + compose up -d --no-deps --force-recreate worker >/dev/null 2>&1 || true +} + +mkdir -p "$runtime_dir" +chmod 0700 "$repo_dir/.runtime/evidence" "$runtime_dir" +trap restore EXIT HUP INT TERM + +if [ -z "${BAO_ADDR:-}" ]; then + openbao_address=$(compose port openbao 8200) + BAO_ADDR="https://$openbao_address" +fi +BAO_CACERT="$repo_dir/.runtime/security/openbao/ca.crt" +export BAO_ADDR BAO_CACERT + +compose stop worker >/dev/null +compose --profile experiments run --rm --no-deps lab5-experiment /app/lab5experiment api-produce >"$state_file" +chmod 0600 "$state_file" + +old_database_password=$(python3 - "$repo_dir/.runtime/openbao/seed/worker.json" <<'PY' +import json +import sys +import urllib.parse + +with open(sys.argv[1], encoding="utf-8") as source: + secret = json.load(source) +print(urllib.parse.urlsplit(secret["database_url"]).password) +PY +) +old_broker_password=$(python3 - "$repo_dir/.runtime/openbao/seed/worker.json" <<'PY' +import json +import sys +import urllib.parse + +with open(sys.argv[1], encoding="utf-8") as source: + print(urllib.parse.urlsplit(json.load(source)["broker_url"]).password) +PY +) +old_s3_access_key=$(python3 - "$repo_dir/.runtime/openbao/seed/worker.json" <<'PY' +import json +import sys + +with open(sys.argv[1], encoding="utf-8") as source: + print(json.load(source)["s3_access_key"]) +PY +) +old_s3_secret=$(python3 - "$repo_dir/.runtime/openbao/seed/worker.json" <<'PY' +import json +import sys + +with open(sys.argv[1], encoding="utf-8") as source: + print(json.load(source)["s3_secret_key"]) +PY +) + +python3 - "$repo_dir/.runtime/openbao/seed/worker.json" "$rotated_secret" \ + "$rotated_password" "$rotated_database_password" "$rotated_s3_secret" <<'PY' +import json +import os +import sys +import urllib.parse + + +def replace_password(url, password): + parsed = urllib.parse.urlsplit(url) + username = urllib.parse.quote(parsed.username or "", safe="") + netloc = f"{username}:{urllib.parse.quote(password, safe='')}@{parsed.hostname}" + if parsed.port: + netloc += f":{parsed.port}" + return urllib.parse.urlunsplit((parsed.scheme, netloc, parsed.path, parsed.query, parsed.fragment)) + +with open(sys.argv[1], encoding="utf-8") as source: + secret = json.load(source) +secret["broker_url"] = replace_password(secret["broker_url"], sys.argv[3]) +secret["database_url"] = replace_password(secret["database_url"], sys.argv[4]) +secret["s3_secret_key"] = sys.argv[5] +with open(sys.argv[2], "w", encoding="utf-8") as destination: + json.dump(secret, destination, separators=(",", ":")) + destination.write("\n") +os.chmod(sys.argv[2], 0o600) +PY + +compose run --rm --no-deps -e REDIS_WORKER_PASSWORD="$rotated_password" acl-bootstrap >/dev/null +compose restart redis-broker redis-gateway >/dev/null +compose exec -T postgres sh -c \ + "psql --set=ON_ERROR_STOP=1 --username \"\$POSTGRES_USER\" --dbname \"\$POSTGRES_DB\" --command \"ALTER ROLE messenger_worker PASSWORD '$rotated_database_password'\"" >/dev/null +compose exec -T postgres sh -c \ + 'psql --set=ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" --command="SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE usename = '\''messenger_worker'\'' AND pid <> pg_backend_pid()"' >/dev/null +compose run --rm --no-deps -e S3_WORKER_SECRET_KEY="$rotated_s3_secret" s3-bootstrap >/dev/null +compose --profile security run --rm --no-deps \ + -e REDISCLI_AUTH="$old_broker_password" \ + --entrypoint /bin/sh dependency-tests -c ' + output=$(redis-cli --tls --cacert /run/security-source/internal-ca/ca.crt \ + --cert /run/security-source/worker-client/tls.crt --key /run/security-source/worker-client/tls.key \ + --user messenger_worker -h redis-gateway -p 36379 PING 2>&1 || true) + case "$output" in + *WRONGPASS*|*invalid\ username-password*) exit 0 ;; + *) echo "expected old broker credential rejection" >&2; exit 1 ;; + esac + ' + +if compose --profile security run --rm --no-deps \ + -e OLD_DATABASE_PASSWORD="$old_database_password" \ + --entrypoint /bin/sh dependency-tests -c ' + psql "postgresql://messenger_worker:${OLD_DATABASE_PASSWORD}@postgres:5432/messenger?sslmode=verify-full&sslrootcert=/run/security-source/internal-ca/ca.crt&sslcert=/run/security-source/worker-client/tls.crt&sslkey=/run/security-source/worker-client/tls.key" \ + --set=ON_ERROR_STOP=1 --command="SELECT 1" >/dev/null 2>&1 + '; then + echo "old worker database credential was not rejected" >&2 + exit 1 +fi + +if compose --profile security run --rm --no-deps \ + -e OLD_S3_ACCESS_KEY="$old_s3_access_key" -e OLD_S3_SECRET="$old_s3_secret" \ + --entrypoint /bin/sh dependency-tests -c ' + export SSL_CERT_FILE=/run/security-source/internal-ca/ca.crt + export MC_CONFIG_DIR=/tmp/old-worker-mc + mc alias set old https://s3:9000 "$OLD_S3_ACCESS_KEY" "$OLD_S3_SECRET" >/dev/null 2>&1 && + mc ls old/messenger-attachments/attachments/ >/dev/null 2>&1 + '; then + echo "old worker S3 credential was not rejected" >&2 + exit 1 +fi + +rotate_worker_secret "$rotated_secret" +compose up -d --no-deps --force-recreate worker >/dev/null +wait_healthy worker + +compose --profile experiments run --rm --no-deps -T lab5-experiment \ + /app/lab5experiment api-verify <"$state_file" >/dev/null + +finished_at=$(date +%s) +python3 - "$summary_file" "$started_at" "$finished_at" <<'PY' +import datetime +import json +import sys + +started_at = int(sys.argv[2]) +finished_at = int(sys.argv[3]) +summary = { + "schema_version": 1, + "scenario": "worker credential compromise and rotation", + "generated_at": datetime.datetime.fromtimestamp( + finished_at, datetime.timezone.utc + ).replace(microsecond=0).isoformat(), + "recovery_seconds": finished_at - started_at, + "old_credential_rejected": True, + "old_database_credential_rejected": True, + "old_s3_credential_rejected": True, + "openbao_secret_rotated": True, + "queued_attachment_preserved": True, + "result": "PASS", +} +with open(sys.argv[1], "w", encoding="utf-8") as destination: + json.dump(summary, destination, ensure_ascii=False, indent=2) + destination.write("\n") +PY + +trap - EXIT HUP INT TERM +restore +rm -f "$rotated_secret" +echo "PASS: revoked worker credential failed; rotated OpenBao secret restored processing without losing the queued attachment" diff --git a/scripts/openbao-bootstrap.sh b/scripts/openbao-bootstrap.sh new file mode 100755 index 0000000..e27e458 --- /dev/null +++ b/scripts/openbao-bootstrap.sh @@ -0,0 +1,92 @@ +#!/bin/sh + +set -eu + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +. "$script_dir/openbao-common.sh" + +if [ "$#" -ne 2 ]; then + echo "usage: $0 " >&2 + exit 2 +fi + +api_secret_file=$1 +worker_secret_file=$2 + +require_command "$BAO_BIN" +require_command python3 +require_runtime_path "$api_secret_file" +require_runtime_path "$worker_secret_file" +require_private_file "$api_secret_file" +require_private_file "$worker_secret_file" +require_unsealed +load_operator_token + +python3 - "$api_secret_file" "$worker_secret_file" <<'PY' +import json +import sys + +for path in sys.argv[1:]: + with open(path, encoding="utf-8") as source: + value = json.load(source) + if not isinstance(value, dict) or not value: + raise SystemExit(f"secret input must be a non-empty JSON object: {path}") +PY + +mounts_file=$(mktemp "$openbao_runtime_dir/.mounts.XXXXXX") +auth_file=$(mktemp "$openbao_runtime_dir/.auth.XXXXXX") +chmod 0600 "$mounts_file" "$auth_file" + +cleanup() { + rm -f "$mounts_file" "$auth_file" +} + +trap cleanup EXIT HUP INT TERM + +"$BAO_BIN" secrets list -format=json >"$mounts_file" +if ! python3 - "$mounts_file" <<'PY' +import json +import sys + +with open(sys.argv[1], encoding="utf-8") as source: + raise SystemExit(0 if "secret/" in json.load(source) else 1) +PY +then + "$BAO_BIN" secrets enable -path=secret -version=2 kv >/dev/null +fi + +"$BAO_BIN" auth list -format=json >"$auth_file" +if ! python3 - "$auth_file" <<'PY' +import json +import sys + +with open(sys.argv[1], encoding="utf-8") as source: + raise SystemExit(0 if "approle/" in json.load(source) else 1) +PY +then + "$BAO_BIN" auth enable approle >/dev/null +fi + +"$BAO_BIN" policy write messenger-api "$repo_dir/infra/openbao/policies/messenger-api.hcl" >/dev/null +"$BAO_BIN" policy write messenger-worker "$repo_dir/infra/openbao/policies/messenger-worker.hcl" >/dev/null + +for service in api worker; do + "$BAO_BIN" delete "auth/approle/role/messenger-$service" >/dev/null 2>&1 || true + "$BAO_BIN" write "auth/approle/role/messenger-$service" \ + bind_secret_id=true \ + secret_id_ttl=1h \ + secret_id_num_uses=0 \ + token_policies="messenger-$service" \ + token_no_default_policy=true \ + token_ttl=15m \ + token_max_ttl=1h \ + token_num_uses=0 >/dev/null +done + +"$BAO_BIN" kv put -mount=secret messenger/api @"$api_secret_file" >/dev/null +"$BAO_BIN" kv put -mount=secret messenger/worker @"$worker_secret_file" >/dev/null + +"$script_dir/openbao-issue-approle.sh" api "$openbao_runtime_dir/approle/api" +"$script_dir/openbao-issue-approle.sh" worker "$openbao_runtime_dir/approle/worker" + +echo "OpenBao policies, AppRoles and KV v2 secrets configured" diff --git a/scripts/openbao-common.sh b/scripts/openbao-common.sh new file mode 100755 index 0000000..385486a --- /dev/null +++ b/scripts/openbao-common.sh @@ -0,0 +1,92 @@ +#!/bin/sh + +set -eu + +umask 077 + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +repo_dir=$(CDPATH= cd -- "$script_dir/.." && pwd) +openbao_runtime_dir="$repo_dir/.runtime/openbao" +openbao_operator_file="$openbao_runtime_dir/operator/init.json" + +BAO_BIN=${BAO_BIN:-$repo_dir/scripts/bao-docker.sh} +BAO_ADDR=${BAO_ADDR:-https://localhost:8200} +BAO_CACERT=${BAO_CACERT:-$repo_dir/.runtime/security/openbao/ca.crt} + +export BAO_ADDR BAO_CACERT + +fail() { + echo "$*" >&2 + exit 1 +} + +require_command() { + command -v "$1" >/dev/null 2>&1 || fail "required command not found: $1" +} + +require_file() { + [ -f "$1" ] || fail "required file not found: $1" +} + +require_private_file() { + require_file "$1" + if ! permissions=$(stat -c '%a' "$1" 2>/dev/null); then + permissions=$(stat -f '%Lp' "$1") + fi + case "$permissions" in + 600|400) ;; + *) fail "file must have permissions 0600 or 0400: $1" ;; + esac +} + +require_runtime_path() { + case "$1" in + "$openbao_runtime_dir"/*) ;; + *) fail "runtime credentials must stay under $openbao_runtime_dir" ;; + esac +} + +json_field() { + file=$1 + expression=$2 + python3 - "$file" "$expression" <<'PY' +import json +import sys + +with open(sys.argv[1], encoding="utf-8") as source: + value = json.load(source) + +for component in sys.argv[2].split("."): + value = value[component] + +if isinstance(value, bool): + print(str(value).lower()) +else: + print(value) +PY +} + +load_operator_token() { + require_private_file "$openbao_operator_file" + BAO_TOKEN=$(json_field "$openbao_operator_file" root_token) + export BAO_TOKEN +} + +openbao_status() { + status_file=$1 + "$BAO_BIN" status -format=json >"$status_file" 2>/dev/null || true + [ -s "$status_file" ] || fail "OpenBao is not reachable at $BAO_ADDR" +} + +require_unsealed() { + mkdir -p "$openbao_runtime_dir" + chmod 0700 "$openbao_runtime_dir" + status_file=$(mktemp "$openbao_runtime_dir/.status.XXXXXX") + chmod 0600 "$status_file" + openbao_status "$status_file" + initialized=$(json_field "$status_file" initialized) + sealed=$(json_field "$status_file" sealed) + rm -f "$status_file" + [ "$initialized" = "true" ] || fail "OpenBao is not initialized" + [ "$sealed" = "false" ] || fail "OpenBao is sealed" +} diff --git a/scripts/openbao-init.sh b/scripts/openbao-init.sh new file mode 100755 index 0000000..7725646 --- /dev/null +++ b/scripts/openbao-init.sh @@ -0,0 +1,45 @@ +#!/bin/sh + +set -eu + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +. "$script_dir/openbao-common.sh" + +require_command "$BAO_BIN" +require_command python3 +require_file "$BAO_CACERT" + +mkdir -p "$openbao_runtime_dir/operator" +chmod 0700 "$openbao_runtime_dir" "$openbao_runtime_dir/operator" + +status_file=$(mktemp "$openbao_runtime_dir/.status.XXXXXX") +init_file=$(mktemp "$openbao_runtime_dir/operator/.init.XXXXXX") +chmod 0600 "$status_file" "$init_file" + +cleanup() { + rm -f "$status_file" "$init_file" +} + +trap cleanup EXIT HUP INT TERM + +openbao_status "$status_file" + +if [ "$(json_field "$status_file" initialized)" = "true" ]; then + echo "OpenBao is already initialized" + exit 0 +fi + +if [ -e "$openbao_operator_file" ]; then + fail "operator material already exists for an uninitialized OpenBao instance" +fi + +"$BAO_BIN" operator init \ + -key-shares=3 \ + -key-threshold=2 \ + -format=json >"$init_file" + +chmod 0600 "$init_file" +mv "$init_file" "$openbao_operator_file" + +echo "OpenBao initialized; operator material saved to .runtime/openbao/operator/init.json" +echo "Keep this file offline and run scripts/openbao-unseal.sh" diff --git a/scripts/openbao-issue-approle.sh b/scripts/openbao-issue-approle.sh new file mode 100755 index 0000000..82a340b --- /dev/null +++ b/scripts/openbao-issue-approle.sh @@ -0,0 +1,87 @@ +#!/bin/sh + +set -eu + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +. "$script_dir/openbao-common.sh" + +if [ "$#" -ne 2 ]; then + echo "usage: $0 " >&2 + exit 2 +fi + +service=$1 +output_dir=$2 + +case "$service" in + api|worker) ;; + *) fail "service must be api or worker" ;; +esac + +require_runtime_path "$output_dir" +require_command "$BAO_BIN" +require_command python3 +require_unsealed + +if [ -z "${BAO_TOKEN:-}" ]; then + load_operator_token +fi + +role="messenger-$service" +parent_dir=$(dirname "$output_dir") +staging_dir="$parent_dir/.${service}.$$" +response_file="$staging_dir/response.json" + +cleanup() { + rm -rf "$staging_dir" +} + +trap cleanup EXIT HUP INT TERM + +mkdir -p "$parent_dir" "$staging_dir" +chmod 0700 "$parent_dir" "$staging_dir" + +"$BAO_BIN" read -field=role_id "auth/approle/role/$role/role-id" >"$staging_dir/role-id" +"$BAO_BIN" write -f -format=json "auth/approle/role/$role/secret-id" >"$response_file" + +python3 - "$response_file" "$staging_dir" <<'PY' +import json +import os +import sys + +with open(sys.argv[1], encoding="utf-8") as source: + data = json.load(source)["data"] + +for name, field in (("secret-id", "secret_id"), ("secret-id-accessor", "secret_id_accessor")): + path = os.path.join(sys.argv[2], name) + with open(path, "w", encoding="utf-8") as destination: + destination.write(data[field] + "\n") + os.chmod(path, 0o600) +PY + +rm -f "$response_file" +chmod 0600 "$staging_dir/role-id" + +old_accessor= +if [ -f "$output_dir/secret-id-accessor" ]; then + old_accessor=$(cat "$output_dir/secret-id-accessor") +fi + +mkdir -p "$output_dir" +chmod 0700 "$output_dir" +for file in role-id secret-id secret-id-accessor; do + mv "$staging_dir/$file" "$output_dir/$file" +done + +if [ -n "$old_accessor" ]; then + "$BAO_BIN" write "auth/approle/role/$role/secret-id-accessor/destroy" \ + secret_id_accessor="$old_accessor" >/dev/null 2>&1 || true +fi + +if [ "$output_dir" = "$openbao_runtime_dir/approle/$service" ]; then + "$script_dir/sync-docker-workspace.sh" + docker compose --project-directory "$repo_dir" --env-file "${ENV_FILE:-$repo_dir/lab7.env.example}" \ + run --rm --no-deps -e SERVICE="$service" openbao-identity-install +fi + +echo "issued short-lived AppRole credentials for $service in ${output_dir#"$repo_dir/"}" diff --git a/scripts/openbao-rotate.sh b/scripts/openbao-rotate.sh new file mode 100755 index 0000000..3ab0485 --- /dev/null +++ b/scripts/openbao-rotate.sh @@ -0,0 +1,41 @@ +#!/bin/sh + +set -eu + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +. "$script_dir/openbao-common.sh" + +if [ "$#" -ne 2 ]; then + echo "usage: $0 " >&2 + exit 2 +fi + +service=$1 +secret_file=$2 + +case "$service" in + api|worker) ;; + *) fail "service must be api or worker" ;; +esac + +require_command "$BAO_BIN" +require_command python3 +require_runtime_path "$secret_file" +require_private_file "$secret_file" +require_unsealed +load_operator_token + +python3 - "$secret_file" <<'PY' +import json +import sys + +with open(sys.argv[1], encoding="utf-8") as source: + value = json.load(source) +if not isinstance(value, dict) or not value: + raise SystemExit("replacement secret must be a non-empty JSON object") +PY + +"$BAO_BIN" kv put -mount=secret "messenger/$service" @"$secret_file" >/dev/null +"$script_dir/openbao-issue-approle.sh" "$service" "$openbao_runtime_dir/approle/$service" + +echo "$service secret rotated; OpenBao Agent will render the new KV version" diff --git a/scripts/openbao-seed.sh b/scripts/openbao-seed.sh new file mode 100755 index 0000000..c20f553 --- /dev/null +++ b/scripts/openbao-seed.sh @@ -0,0 +1,62 @@ +#!/bin/sh + +set -eu + +if [ "$#" -ne 1 ] || [ ! -f "$1" ]; then + echo "usage: $0 " >&2 + exit 2 +fi + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +repo_dir=$(CDPATH= cd -- "$script_dir/.." && pwd) +seed_dir="$repo_dir/.runtime/openbao/seed" +mkdir -p "$seed_dir" +chmod 0700 "$repo_dir/.runtime/openbao" "$seed_dir" + +python3 - "$1" "$seed_dir/api.json" "$seed_dir/worker.json" <<'PY' +import json +import os +import sys + +values = {} +with open(sys.argv[1], encoding="utf-8") as source: + for raw_line in source: + line = raw_line.strip() + if not line or line.startswith("#"): + continue + name, separator, value = line.partition("=") + if not separator: + raise SystemExit(f"invalid env line: {raw_line.rstrip()}") + values[name.strip()] = os.environ.get(name.strip(), value) + +required = ( + "DATABASE_URL", "DATABASE_WORKER_URL", "CACHE_URL", "BROKER_WORKER_URL", + "S3_API_ACCESS_KEY", "S3_API_SECRET_KEY", "S3_WORKER_ACCESS_KEY", "S3_WORKER_SECRET_KEY", +) +missing = [name for name in required if not values.get(name)] +if missing: + raise SystemExit("missing environment values: " + ", ".join(missing)) + +documents = ( + (sys.argv[2], { + "database_url": values["DATABASE_URL"], + "cache_url": values["CACHE_URL"], + "s3_access_key": values["S3_API_ACCESS_KEY"], + "s3_secret_key": values["S3_API_SECRET_KEY"], + }), + (sys.argv[3], { + "database_url": values["DATABASE_WORKER_URL"], + "broker_url": values["BROKER_WORKER_URL"], + "s3_access_key": values["S3_WORKER_ACCESS_KEY"], + "s3_secret_key": values["S3_WORKER_SECRET_KEY"], + }), +) + +for path, value in documents: + with open(path, "w", encoding="utf-8") as destination: + json.dump(value, destination, separators=(",", ":")) + destination.write("\n") + os.chmod(path, 0o600) +PY + +echo "OpenBao seed files created under .runtime/openbao/seed" diff --git a/scripts/openbao-test-policy.sh b/scripts/openbao-test-policy.sh new file mode 100755 index 0000000..f6301e6 --- /dev/null +++ b/scripts/openbao-test-policy.sh @@ -0,0 +1,139 @@ +#!/bin/sh + +set -eu + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +. "$script_dir/openbao-common.sh" + +require_command curl +require_command python3 +require_command "$BAO_BIN" +require_file "$BAO_CACERT" +require_unsealed +load_operator_token + +test_dir="$openbao_runtime_dir/policy-test.$$" +mkdir -p "$test_dir" +chmod 0700 "$test_dir" + +cleanup() { + for service in api worker; do + headers="$test_dir/$service/token-header" + if [ -f "$headers" ]; then + curl --silent --show-error --cacert "$BAO_CACERT" \ + --header @"$headers" \ + --request POST \ + "$BAO_ADDR/v1/auth/token/revoke-self" >/dev/null 2>&1 || true + fi + done + rm -rf "$test_dir" +} + +trap cleanup EXIT HUP INT TERM + +login() { + service=$1 + identity_dir="$test_dir/$service/identity" + session_dir="$test_dir/$service" + response_file="$session_dir/login.json" + payload_file="$session_dir/login-payload.json" + + mkdir -p "$session_dir" + chmod 0700 "$session_dir" + "$script_dir/openbao-issue-approle.sh" "$service" "$identity_dir" >/dev/null + + python3 - "$identity_dir/role-id" "$identity_dir/secret-id" "$payload_file" <<'PY' +import json +import os +import sys + +with open(sys.argv[1], encoding="utf-8") as role_source: + role_id = role_source.read().strip() +with open(sys.argv[2], encoding="utf-8") as secret_source: + secret_id = secret_source.read().strip() +with open(sys.argv[3], "w", encoding="utf-8") as destination: + json.dump({"role_id": role_id, "secret_id": secret_id}, destination) +os.chmod(sys.argv[3], 0o600) +PY + + status=$(curl --silent --show-error --cacert "$BAO_CACERT" \ + --header "Content-Type: application/json" \ + --request POST \ + --data-binary @"$payload_file" \ + --output "$response_file" \ + --write-out '%{http_code}' \ + "$BAO_ADDR/v1/auth/approle/login") + [ "$status" = "200" ] || fail "$service AppRole login returned HTTP $status" + chmod 0600 "$response_file" + + python3 - "$response_file" "$service" "$session_dir/token-header" <<'PY' +import json +import os +import sys + +with open(sys.argv[1], encoding="utf-8") as source: + auth = json.load(source)["auth"] + +expected_policy = f"messenger-{sys.argv[2]}" +if not auth["renewable"]: + raise SystemExit("AppRole token is not renewable") +if not 0 < auth["lease_duration"] <= 3600: + raise SystemExit("AppRole token TTL is outside the configured limit") +if auth["policies"] != [expected_policy]: + raise SystemExit(f"unexpected token policies: {auth['policies']}") + +with open(sys.argv[3], "w", encoding="utf-8") as destination: + destination.write(f"X-Vault-Token: {auth['client_token']}\n") +os.chmod(sys.argv[3], 0o600) +PY + + rm -f "$payload_file" "$response_file" "$identity_dir/secret-id" +} + +expect_status() { + service=$1 + method=$2 + path=$3 + expected=$4 + payload=${5:-} + headers="$test_dir/$service/token-header" + output="$test_dir/$service/response.json" + + if [ -n "$payload" ]; then + status=$(curl --silent --show-error --cacert "$BAO_CACERT" \ + --header @"$headers" \ + --header "Content-Type: application/json" \ + --request "$method" \ + --data-binary "$payload" \ + --output "$output" \ + --write-out '%{http_code}' \ + "$BAO_ADDR/v1/$path") + else + status=$(curl --silent --show-error --cacert "$BAO_CACERT" \ + --header @"$headers" \ + --request "$method" \ + --output "$output" \ + --write-out '%{http_code}' \ + "$BAO_ADDR/v1/$path") + fi + + [ "$status" = "$expected" ] || fail "$service $method $path: expected HTTP $expected, got $status" + echo "PASS $service $method $path -> $status" +} + +login api +login worker + +expect_status api GET secret/data/messenger/api 200 +expect_status api GET secret/data/messenger/worker 403 +expect_status api POST secret/data/messenger/api/probe 403 '{"data":{"probe":"denied"}}' +expect_status api GET sys/policies/acl 403 +expect_status api POST auth/token/renew-self 200 '{}' + +expect_status worker GET secret/data/messenger/worker 200 +expect_status worker GET secret/data/messenger/api 403 +expect_status worker POST secret/data/messenger/worker/probe 403 '{"data":{"probe":"denied"}}' +expect_status worker GET sys/policies/acl 403 +expect_status worker POST auth/token/renew-self 200 '{}' + +echo "OpenBao AppRole allow/deny and renewal checks passed" diff --git a/scripts/openbao-unseal.sh b/scripts/openbao-unseal.sh new file mode 100755 index 0000000..5bc6c8a --- /dev/null +++ b/scripts/openbao-unseal.sh @@ -0,0 +1,50 @@ +#!/bin/sh + +set -eu + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +. "$script_dir/openbao-common.sh" + +require_command "$BAO_BIN" +require_command python3 +require_file "$BAO_CACERT" +require_private_file "$openbao_operator_file" + +mkdir -p "$openbao_runtime_dir" +keys_file=$(mktemp "$openbao_runtime_dir/.unseal.XXXXXX") +status_file=$(mktemp "$openbao_runtime_dir/.status.XXXXXX") +chmod 0600 "$keys_file" "$status_file" + +cleanup() { + rm -f "$keys_file" "$status_file" +} + +trap cleanup EXIT HUP INT TERM + +openbao_status "$status_file" + +if [ "$(json_field "$status_file" sealed)" = "false" ]; then + echo "OpenBao is already unsealed" + exit 0 +fi + +python3 - "$openbao_operator_file" >"$keys_file" <<'PY' +import json +import sys + +with open(sys.argv[1], encoding="utf-8") as source: + material = json.load(source) + +threshold = material["unseal_threshold"] +for key in material["unseal_keys_b64"][:threshold]: + print(key) +PY + +while IFS= read -r key; do + "$BAO_BIN" operator unseal "$key" /dev/null +done <"$keys_file" + +openbao_status "$status_file" +[ "$(json_field "$status_file" sealed)" = "false" ] || fail "OpenBao remains sealed" + +echo "OpenBao unsealed" diff --git a/scripts/rolling-update.sh b/scripts/rolling-update.sh index 695e3f8..d29cd0b 100755 --- a/scripts/rolling-update.sh +++ b/scripts/rolling-update.sh @@ -8,7 +8,7 @@ if [ "$#" -ne 1 ] || [ ! -f "$1" ]; then fi manifest=$1 -deploy_dir=${DEPLOY_STATE_DIR:-"$HOME/.local/state/mtusi2026lab5"} +deploy_dir=${DEPLOY_STATE_DIR:-"$HOME/.local/state/mtusi2026lab7"} current_manifest=$deploy_dir/current-images.env active_containers=$deploy_dir/active-api-containers previous_containers=$deploy_dir/previous-api-containers @@ -16,7 +16,9 @@ upstream_file=$deploy_dir/upstream.conf upstream_backup=$deploy_dir/upstream.previous.conf candidate_file=$deploy_dir/candidate-api-containers replicas=${API_REPLICAS:-2} -project=${COMPOSE_PROJECT_NAME:-mtusi2026lab5} +project=${COMPOSE_PROJECT_NAME:-mtusi2026lab7} +public_base_url=${PUBLIC_BASE_URL:-https://localhost:8443} +public_ca_file=${PUBLIC_CA_FILE:-.runtime/security/public-ca/ca.crt} switched=false nginx_created=false upstream_changed=false @@ -52,7 +54,7 @@ write_upstream() { : > "$output" for container in $containers; do name=$(container_name "$container") - printf 'server %s:8080 resolve max_fails=1 fail_timeout=3s;\n' "$name" >> "$output" + printf 'server %s:8443 resolve max_fails=1 fail_timeout=3s;\n' "$name" >> "$output" done } @@ -81,7 +83,8 @@ wait_for_containers() { } smoke_check() { - compose exec -T nginx wget -q -O /dev/null http://127.0.0.1:8080/health/ready + curl --fail --silent --show-error --noproxy '*' \ + --cacert "$public_ca_file" "$public_base_url/health/ready" >/dev/null } remove_containers() { @@ -123,6 +126,7 @@ trap 'exit 143' TERM load_manifest "$manifest" new_api_image=$API_IMAGE +test -r "$public_ca_file" if [ -f "$previous_containers" ]; then remove_containers "$(cat "$previous_containers")" @@ -151,6 +155,7 @@ cp "$upstream_file" "$upstream_backup" compose pull api nginx swagger prometheus grafana s3 s3-bootstrap compose up -d --no-build --wait --wait-timeout 120 postgres valkey redis-broker s3 +compose run --rm security-bootstrap compose run --rm --no-deps s3-bootstrap compose run --rm --no-deps migrate diff --git a/scripts/scan-security.sh b/scripts/scan-security.sh new file mode 100755 index 0000000..f6c8fce --- /dev/null +++ b/scripts/scan-security.sh @@ -0,0 +1,135 @@ +#!/bin/sh + +set -eu + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +repo_dir=$(CDPATH= cd -- "$script_dir/.." && pwd) +runtime_dir="$repo_dir/evidence/runtime/security-scan" +cache_dir="$repo_dir/.runtime/trivy-cache" +raw_file="$runtime_dir/trivy-fs.json" +summary_file="$repo_dir/evidence/lab7-security-scan.json" +env_file=${ENV_FILE:-$repo_dir/lab7.env.example} +image_list=${SCAN_IMAGES:-} +if [ -z "$image_list" ]; then + containers=$(docker compose --project-directory "$repo_dir" --env-file "$env_file" ps -q) + [ -n "$containers" ] || { echo "start the stack or set SCAN_IMAGES" >&2; exit 1; } + image_list=$(docker inspect --format '{{.Config.Image}}' $containers | sort -u) +fi + +mkdir -p "$runtime_dir" "$cache_dir" +"$script_dir/sync-docker-workspace.sh" + +docker run --rm \ + -v "$repo_dir:/src:ro" \ + -v "$runtime_dir:/out" \ + -v "$cache_dir:/root/.cache/trivy" \ + aquasec/trivy:0.76.2 fs \ + --scanners vuln,misconfig,secret \ + --format json \ + --output /out/trivy-fs.json \ + --skip-dirs /src/.git \ + --skip-dirs /src/.runtime \ + --skip-dirs /src/.venv \ + --skip-dirs /src/evidence/runtime \ + --skip-files /src/Dockerfile.example \ + /src + +image_reports= +index=0 +for image in $image_list; do + index=$((index + 1)) + report="$runtime_dir/trivy-image-$index.json" + docker run --rm \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -v "$runtime_dir:/out" \ + -v "$cache_dir:/root/.cache/trivy" \ + aquasec/trivy:0.76.2 image \ + --scanners vuln,secret \ + --format json \ + --output "/out/trivy-image-$index.json" \ + "$image" + image_reports="$image_reports $image=$report" +done + +"$script_dir/sync-docker-workspace.sh" --pull-scan + +python3 - "$raw_file" "$summary_file" $image_reports <<'PY' +import datetime +import json +import sys +from collections import Counter + +with open(sys.argv[1], encoding="utf-8") as source: + report = json.load(source) + +vulnerabilities = Counter() +misconfigurations = Counter() +secrets = 0 +for result in report.get("Results") or []: + for vulnerability in result.get("Vulnerabilities") or []: + vulnerabilities[vulnerability.get("Severity", "UNKNOWN")] += 1 + for finding in result.get("Misconfigurations") or []: + misconfigurations[finding.get("Severity", "UNKNOWN")] += 1 + secrets += len(result.get("Secrets") or []) + +image_vulnerabilities = Counter() +image_secrets = 0 +scanned_images = [] +image_raw_reports = [] +findings = {} + + +def record_findings(report, scope): + for result in report.get("Results") or []: + for finding in result.get("Vulnerabilities") or []: + key = (finding["VulnerabilityID"], finding["PkgName"], finding.get("InstalledVersion", "")) + entry = findings.setdefault(key, { + "id": finding["VulnerabilityID"], + "package": finding["PkgName"], + "installed_version": finding.get("InstalledVersion", ""), + "fixed_version": finding.get("FixedVersion", ""), + "severity": finding.get("Severity", "UNKNOWN"), + "title": finding.get("Title", ""), + "scopes": [], + }) + if scope not in entry["scopes"]: + entry["scopes"].append(scope) + + +record_findings(report, "repository") +for item in sys.argv[3:]: + image, path = item.split("=", 1) + scanned_images.append(image) + with open(path, encoding="utf-8") as source: + image_report = json.load(source) + image_raw_reports.append("evidence/runtime/security-scan/" + path.rsplit("/", 1)[-1]) + record_findings(image_report, image) + for result in image_report.get("Results") or []: + for vulnerability in result.get("Vulnerabilities") or []: + image_vulnerabilities[vulnerability.get("Severity", "UNKNOWN")] += 1 + image_secrets += len(result.get("Secrets") or []) + +summary = { + "schema_version": 1, + "scanner": "Trivy 0.76.2", + "generated_at": datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0).isoformat(), + "scope": "repository filesystem: vulnerabilities, misconfigurations, secrets", + "vulnerabilities": dict(sorted(vulnerabilities.items())), + "misconfigurations": dict(sorted(misconfigurations.items())), + "secret_findings": secrets, + "scanned_images": scanned_images, + "image_vulnerabilities": dict(sorted(image_vulnerabilities.items())), + "image_secret_findings": image_secrets, + "findings": sorted((finding for finding in findings.values() + if "repository" in finding["scopes"] or finding["severity"] == "CRITICAL"), + key=lambda finding: (finding["package"], finding["id"])), + "findings_scope": "all repository findings and critical image findings; full findings in raw reports", + "raw_report": "evidence/runtime/security-scan/trivy-fs.json", + "image_raw_reports": image_raw_reports, +} +with open(sys.argv[2], "w", encoding="utf-8") as destination: + json.dump(summary, destination, ensure_ascii=False, indent=2) + destination.write("\n") +PY + +cat "$summary_file" diff --git a/scripts/stop-one.sh b/scripts/stop-one.sh index 5327251..a8fdc02 100755 --- a/scripts/stop-one.sh +++ b/scripts/stop-one.sh @@ -5,7 +5,8 @@ set -eu : "${TARGET_INSTANCE_ID:?TARGET_INSTANCE_ID is required}" for container in $(docker compose ps -q api); do - instance=$(docker inspect --format '{{.Config.Hostname}}' "$container") + instance=$(docker exec "$container" wget -S -q -O /dev/null http://127.0.0.1:8082/health/live 2>&1 | + sed -n 's/^[[:space:]]*X-Instance-Id:[[:space:]]*//p' | tr -d '\r') if [ "$instance" = "$TARGET_INSTANCE_ID" ]; then docker stop --time 6 "$container" >/dev/null exit 0 diff --git a/scripts/sync-docker-workspace.sh b/scripts/sync-docker-workspace.sh new file mode 100755 index 0000000..9a9ec75 --- /dev/null +++ b/scripts/sync-docker-workspace.sh @@ -0,0 +1,51 @@ +#!/bin/sh + +set -eu + +[ "${DOCKER_WORKSPACE_MIRROR:-0}" = "1" ] || exit 0 + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +repo_dir=$(CDPATH= cd -- "$script_dir/.." && pwd) +mode=${1:-sync} + +case "$mode" in + sync|--pull-scan) ;; + --clean) + case "$repo_dir" in + /tmp/mtusi2026lab7-*) ;; + *) echo "cleanup is restricted to temporary CI workspaces" >&2; exit 2 ;; + esac + run_id=${repo_dir#/tmp/mtusi2026lab7-} + case "$run_id" in + ''|*[!0-9]*) echo "invalid CI workspace name" >&2; exit 2 ;; + esac + docker run --rm --network none -v "$repo_dir:/workspace" alpine:3.24.2 \ + find /workspace -mindepth 1 -delete + exit 0 + ;; + *) echo "usage: $0 [--pull-scan|--clean]" >&2; exit 2 ;; +esac + +[ -f "$repo_dir/compose.yaml" ] || { + echo "repository checkout is incomplete" >&2 + exit 1 +} + +container=$(docker create --network none \ + -v "$repo_dir:/workspace" \ + alpine:3.24.2 /bin/true) + +cleanup() { + docker rm -f "$container" >/dev/null 2>&1 || true +} + +trap cleanup EXIT HUP INT TERM + +if [ "$mode" = "--pull-scan" ]; then + destination=$repo_dir/evidence/runtime/security-scan + mkdir -p "$destination" + docker cp "$container:/workspace/evidence/runtime/security-scan/." "$destination" + exit 0 +fi + +docker cp "$repo_dir/." "$container:/workspace" diff --git a/scripts/test-lab6.sh b/scripts/test-lab6.sh index c2ffb45..4e26b5e 100755 --- a/scripts/test-lab6.sh +++ b/scripts/test-lab6.sh @@ -11,8 +11,9 @@ case "$profile" in ;; esac -env_file=${ENV_FILE:-lab6.env.example} -base_url=${BASE_URL:-http://127.0.0.1:8080} +env_file=${ENV_FILE:-lab7.env.example} +base_url=${BASE_URL:-https://localhost:8443} +ca_file=${CA_FILE:-.runtime/security/public-ca/ca.crt} prometheus_url=${PROMETHEUS_URL:-http://127.0.0.1:9090} tempo_url=${TEMPO_URL:-http://127.0.0.1:3200} loki_url=${LOKI_URL:-http://127.0.0.1:3100} @@ -35,6 +36,7 @@ compose config --quiet compose up -d --build --wait --wait-timeout 180 python3 scripts/lab6-traffic.py \ --base-url "$base_url" \ + --ca-file "$ca_file" \ --mode mixed \ --duration "${BASELINE_LOAD_SECONDS:-15}" \ --requests "${BASELINE_REQUESTS:-120}" \ @@ -54,10 +56,10 @@ python3 scripts/lab6-correlation.py \ --require >/dev/null if [ "$profile" = "full" ]; then - ENV_FILE="$env_file" BASE_URL="$base_url" PROMETHEUS_URL="$prometheus_url" TEMPO_URL="$tempo_url" LOKI_URL="$loki_url" EVIDENCE_DIR="$output_dir/incidents" scripts/incident-database.sh - ENV_FILE="$env_file" BASE_URL="$base_url" PROMETHEUS_URL="$prometheus_url" EVIDENCE_DIR="$output_dir/incidents" scripts/incident-worker.sh long - ENV_FILE="$env_file" BASE_URL="$base_url" PROMETHEUS_URL="$prometheus_url" EVIDENCE_DIR="$output_dir/incidents" scripts/incident-worker.sh short - ENV_FILE="$env_file" BASE_URL="$base_url" PROMETHEUS_URL="$prometheus_url" EVIDENCE_DIR="$output_dir/incidents" scripts/incident-telemetry.sh + ENV_FILE="$env_file" BASE_URL="$base_url" CA_FILE="$ca_file" PROMETHEUS_URL="$prometheus_url" TEMPO_URL="$tempo_url" LOKI_URL="$loki_url" EVIDENCE_DIR="$output_dir/incidents" scripts/incident-database.sh + ENV_FILE="$env_file" BASE_URL="$base_url" CA_FILE="$ca_file" PROMETHEUS_URL="$prometheus_url" EVIDENCE_DIR="$output_dir/incidents" scripts/incident-worker.sh long + ENV_FILE="$env_file" BASE_URL="$base_url" CA_FILE="$ca_file" PROMETHEUS_URL="$prometheus_url" EVIDENCE_DIR="$output_dir/incidents" scripts/incident-worker.sh short + ENV_FILE="$env_file" BASE_URL="$base_url" CA_FILE="$ca_file" PROMETHEUS_URL="$prometheus_url" EVIDENCE_DIR="$output_dir/incidents" scripts/incident-telemetry.sh fi arguments= diff --git a/scripts/test-leaf-rotation.sh b/scripts/test-leaf-rotation.sh new file mode 100755 index 0000000..729e70a --- /dev/null +++ b/scripts/test-leaf-rotation.sh @@ -0,0 +1,161 @@ +#!/bin/sh + +set -eu + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +repo_dir=$(CDPATH= cd -- "$script_dir/.." && pwd) +env_file=${ENV_FILE:-$repo_dir/lab7.env.example} +security_dir=$repo_dir/.runtime/security +rotation_dir=$security_dir/rotation-test +old_dir=$rotation_dir/old-load-balancer +new_dir=$rotation_dir/new-load-balancer +expired_dir=$rotation_dir/expired-load-balancer +override_file=$repo_dir/.runtime/leaf-rotation.override.yaml +new_identity=spiffe://mtusi/lab7/load-balancer-v2 +rotation_active=0 +base_url=${BASE_URL:-https://localhost:8443} + +compose() { + docker compose --env-file "$env_file" -f "$repo_dir/compose.yaml" "$@" +} + +compose_rotated() { + docker compose --env-file "$env_file" \ + -f "$repo_dir/compose.yaml" -f "$override_file" "$@" +} + +install_security_material() { + "$script_dir/sync-docker-workspace.sh" + compose run --rm --no-deps security-bootstrap >/dev/null +} + +wait_for_https() { + attempts=0 + while [ "$attempts" -lt 30 ]; do + if curl --silent --show-error --fail \ + --cacert "$security_dir/public-ca/ca.crt" \ + "$base_url/health/ready" >/dev/null 2>&1; then + return 0 + fi + attempts=$((attempts + 1)) + sleep 1 + done + return 1 +} + +restore() { + status=$? + trap - EXIT HUP INT TERM + + if [ "$rotation_active" -eq 1 ] && [ -f "$old_dir/tls.crt" ]; then + cp "$old_dir/tls.crt" "$security_dir/load-balancer/tls.crt" + cp "$old_dir/tls.key" "$security_dir/load-balancer/tls.key" + chmod 0600 "$security_dir/load-balancer/tls.crt" "$security_dir/load-balancer/tls.key" + install_security_material || status=1 + compose up -d --no-deps --no-build --force-recreate api nginx >/dev/null || status=1 + wait_for_https || status=1 + fi + + rm -rf "$rotation_dir" + rm -f "$override_file" + exit "$status" +} + +trap restore EXIT HUP INT TERM + +[ -f "$env_file" ] || { + echo "environment file not found: $env_file" >&2 + exit 1 +} +[ -f "$security_dir/internal-ca/ca.crt" ] || { + echo "run infra/pki/bootstrap.sh first" >&2 + exit 1 +} + +umask 077 +rm -rf "$rotation_dir" +mkdir -p "$old_dir" "$new_dir" "$expired_dir" +cp "$security_dir/load-balancer/tls.crt" "$old_dir/tls.crt" +cp "$security_dir/load-balancer/tls.key" "$old_dir/tls.key" + +cat >"$rotation_dir/extensions.cnf" </dev/null + rm "$directory/tls.csr" +} + +issue_leaf "$new_dir" 30 +issue_leaf "$expired_dir" 0 + +openssl verify -purpose sslclient \ + -CAfile "$security_dir/internal-ca/ca.crt" "$new_dir/tls.crt" >/dev/null +if openssl verify -purpose sslclient -attime "$(( $(date +%s) + 2 ))" \ + -CAfile "$security_dir/internal-ca/ca.crt" "$expired_dir/tls.crt" >/dev/null 2>&1; then + echo "zero-lifetime certificate unexpectedly passed expiry verification" >&2 + exit 1 +fi + +cat >"$override_file" </dev/null +wait_for_https + +compose_rotated --profile security run --rm --no-deps --entrypoint /bin/sh security-tests -c ' + set -eu + curl --silent --show-error --fail \ + --cacert /src/.runtime/security/internal-ca/ca.crt \ + --cert /src/.runtime/security/load-balancer/tls.crt \ + --key /src/.runtime/security/load-balancer/tls.key \ + https://api:8443/health/ready >/dev/null + if curl --silent --show-error --fail \ + --cacert /src/.runtime/security/internal-ca/ca.crt \ + --cert /src/.runtime/security/rotation-test/old-load-balancer/tls.crt \ + --key /src/.runtime/security/rotation-test/old-load-balancer/tls.key \ + https://api:8443/health/ready >/dev/null 2>&1; then + echo "retired load-balancer identity unexpectedly reached API" >&2 + exit 1 + fi + if curl --silent --show-error --fail \ + --cacert /src/.runtime/security/internal-ca/ca.crt \ + --cert /src/.runtime/security/rotation-test/expired-load-balancer/tls.crt \ + --key /src/.runtime/security/rotation-test/expired-load-balancer/tls.key \ + https://api:8443/health/ready >/dev/null 2>&1; then + echo "expired load-balancer leaf unexpectedly reached API" >&2 + exit 1 + fi +' + +echo "leaf rotation passed: new identity accepted, retired identity rejected, expired leaf rejected" diff --git a/scripts/test-login-rate-limit.py b/scripts/test-login-rate-limit.py new file mode 100644 index 0000000..3db9269 --- /dev/null +++ b/scripts/test-login-rate-limit.py @@ -0,0 +1,66 @@ +#!/usr/bin/env python3 + +import argparse +import base64 +import json +import secrets +import ssl +import urllib.error +import urllib.request + + +def request(context, method, url, payload=None, headers=None): + data = None if payload is None else json.dumps(payload).encode("utf-8") + request_headers = dict(headers or {}) + if data is not None: + request_headers["Content-Type"] = "application/json" + request = urllib.request.Request(url, data=data, method=method, headers=request_headers) + try: + with urllib.request.urlopen(request, context=context, timeout=10) as response: + return response.status, response.headers + except urllib.error.HTTPError as error: + return error.code, error.headers + + +def main(): + parser = argparse.ArgumentParser() + parser.add_argument("--base-url", default="https://localhost:8443") + parser.add_argument("--ca-file", required=True) + args = parser.parse_args() + + context = ssl.create_default_context(cafile=args.ca_file) + username = "limit_" + secrets.token_hex(6) + password = "Rate-limit-" + secrets.token_urlsafe(18) + status, _ = request(context, "POST", args.base_url + "/api/v1/users", { + "username": username, + "display_name": "Rate limit check", + "password": password, + }) + if status != 201: + raise SystemExit(f"registration returned {status}") + + authorization = "Basic " + base64.b64encode((username + ":wrong-password").encode()).decode() + instances = set() + statuses = [] + retry_after = None + for _ in range(6): + status, headers = request(context, "POST", args.base_url + "/api/v1/auth/sessions", headers={ + "Authorization": authorization, + }) + statuses.append(status) + instances.add(headers.get("X-Instance-Id")) + if status == 429: + retry_after = headers.get("Retry-After") + + if statuses != [401, 401, 401, 401, 401, 429]: + raise SystemExit(f"unexpected statuses: {statuses}") + if not retry_after or int(retry_after) < 1: + raise SystemExit("429 response has no positive Retry-After") + instances.discard(None) + if len(instances) < 2: + raise SystemExit(f"requests reached {len(instances)} API instance") + print("PASS: shared login rate limit returned 429 with Retry-After across two API replicas") + + +if __name__ == "__main__": + main() diff --git a/scripts/test-openbao-lifecycle.sh b/scripts/test-openbao-lifecycle.sh new file mode 100755 index 0000000..0ffd61f --- /dev/null +++ b/scripts/test-openbao-lifecycle.sh @@ -0,0 +1,177 @@ +#!/bin/sh + +set -eu + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +. "$script_dir/openbao-common.sh" + +require_command curl +require_command docker +require_command python3 +require_command "$BAO_BIN" +require_file "$BAO_CACERT" +require_unsealed +load_operator_token + +test_dir=$(mktemp -d "$openbao_runtime_dir/.lifecycle.XXXXXX") +chmod 0700 "$test_dir" +sealed=0 + +compose() { + docker compose --project-directory "$repo_dir" \ + --env-file "${ENV_FILE:-$repo_dir/lab7.env.example}" "$@" +} + +agent_lookup() { + compose exec -T openbao-agent-worker sh -c ' + 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 + ' +} + +recover() { + status=$? + trap - EXIT HUP INT TERM + if [ "$sealed" -eq 1 ]; then + "$script_dir/openbao-unseal.sh" >/dev/null || status=1 + compose restart openbao-agent-worker >/dev/null || status=1 + attempts=0 + while [ "$attempts" -lt 30 ] && ! agent_lookup; do + attempts=$((attempts + 1)) + sleep 1 + done + agent_lookup || status=1 + fi + rm -rf "$test_dir" + exit "$status" +} + +trap recover EXIT HUP INT TERM + +http_status() { + header_file=$1 + method=$2 + path=$3 + payload=${4:-} + output=$test_dir/response.json + + if [ -n "$payload" ]; then + curl --silent --show-error --cacert "$BAO_CACERT" \ + --header @"$header_file" \ + --header "Content-Type: application/json" \ + --request "$method" \ + --data-binary "$payload" \ + --output "$output" \ + --write-out '%{http_code}' \ + "$BAO_ADDR/v1/$path" + else + curl --silent --show-error --cacert "$BAO_CACERT" \ + --header @"$header_file" \ + --request "$method" \ + --output "$output" \ + --write-out '%{http_code}' \ + "$BAO_ADDR/v1/$path" + fi +} + +write_token_header() { + response_file=$1 + header_file=$2 + python3 - "$response_file" "$header_file" <<'PY' +import json +import os +import sys + +with open(sys.argv[1], encoding="utf-8") as source: + document = json.load(source) +token = document.get("auth", document)["client_token"] +with open(sys.argv[2], "w", encoding="utf-8") as destination: + destination.write(f"X-Vault-Token: {token}\n") +os.chmod(sys.argv[2], 0o600) +PY +} + +issue_login_material() { + name=$1 + identity_dir=$test_dir/$name-identity + payload_file=$test_dir/$name-login.json + + "$script_dir/openbao-issue-approle.sh" worker "$identity_dir" >/dev/null + python3 - "$identity_dir/role-id" "$identity_dir/secret-id" "$payload_file" <<'PY' +import json +import os +import sys + +with open(sys.argv[1], encoding="utf-8") as source: + role_id = source.read().strip() +with open(sys.argv[2], encoding="utf-8") as source: + secret_id = source.read().strip() +with open(sys.argv[3], "w", encoding="utf-8") as destination: + json.dump({"role_id": role_id, "secret_id": secret_id}, destination) +os.chmod(sys.argv[3], 0o600) +PY + printf '%s\n' "$payload_file" +} + +login_payload=$(issue_login_material renewable) +login_response=$test_dir/renewable-login-response.json +login_status=$(curl --silent --show-error --cacert "$BAO_CACERT" \ + --header "Content-Type: application/json" \ + --request POST \ + --data-binary @"$login_payload" \ + --output "$login_response" \ + --write-out '%{http_code}' \ + "$BAO_ADDR/v1/auth/approle/login") +[ "$login_status" = 200 ] || fail "AppRole login returned HTTP $login_status" +chmod 0600 "$login_response" +renewable_header=$test_dir/renewable-token-header +write_token_header "$login_response" "$renewable_header" + +[ "$(http_status "$renewable_header" GET secret/data/messenger/worker)" = 200 ] || fail "worker token cannot read own secret" +[ "$(http_status "$renewable_header" POST auth/token/renew-self '{}')" = 200 ] || fail "worker token renewal failed" +[ "$(http_status "$renewable_header" POST auth/token/revoke-self)" = 204 ] || fail "worker token self-revocation failed" +[ "$(http_status "$renewable_header" GET auth/token/lookup-self)" = 403 ] || fail "revoked token remained valid" + +short_response=$test_dir/short-token-response.json +"$BAO_BIN" token create \ + -policy=messenger-worker \ + -no-default-policy \ + -ttl=2s \ + -explicit-max-ttl=2s \ + -format=json >"$short_response" +chmod 0600 "$short_response" +short_header=$test_dir/short-token-header +write_token_header "$short_response" "$short_header" +[ "$(http_status "$short_header" GET secret/data/messenger/worker)" = 200 ] || fail "short-lived token cannot read own secret" +sleep 3 +[ "$(http_status "$short_header" GET secret/data/messenger/worker)" = 403 ] || fail "expired token remained valid" + +sealed_login_payload=$(issue_login_material sealed) +"$BAO_BIN" operator seal >/dev/null +sealed=1 + +if agent_lookup; then + fail "Agent token lookup succeeded while OpenBao was sealed" +fi +sealed_status=$(curl --silent --show-error --cacert "$BAO_CACERT" \ + --header "Content-Type: application/json" \ + --request POST \ + --data-binary @"$sealed_login_payload" \ + --output "$test_dir/sealed-login-response.json" \ + --write-out '%{http_code}' \ + "$BAO_ADDR/v1/auth/approle/login") +[ "$sealed_status" = 503 ] || fail "sealed AppRole login: expected HTTP 503, got $sealed_status" + +"$script_dir/openbao-unseal.sh" >/dev/null +compose restart openbao-agent-worker >/dev/null +attempts=0 +while [ "$attempts" -lt 30 ] && ! agent_lookup; do + attempts=$((attempts + 1)) + sleep 1 +done +agent_lookup || fail "Agent did not authenticate after unseal" +sealed=0 + +echo "OpenBao lifecycle passed: renew, revoke, expiry, seal denial and Agent re-authentication" diff --git a/scripts/test-tls-matrix.sh b/scripts/test-tls-matrix.sh new file mode 100755 index 0000000..a88a8bb --- /dev/null +++ b/scripts/test-tls-matrix.sh @@ -0,0 +1,163 @@ +#!/bin/sh + +set -eu + +script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +repo_dir=$(CDPATH= cd -- "$script_dir/.." && pwd) +security_dir=${SECURITY_DIR:-$repo_dir/.runtime/security} +public_port=${PUBLIC_TLS_PORT:-8443} +public_host=${PUBLIC_TLS_HOST:-localhost} +api_address=${API_TLS_ADDRESS:-api:8443} +metrics_address=${METRICS_TLS_ADDRESS:-api:9091} +empty_ca="${TMPDIR:-/tmp}/lab7-empty-ca.$$" + +cleanup() { + rm -f "$empty_ca" +} + +trap cleanup EXIT HUP INT TERM + +require_file() { + if [ ! -r "$1" ]; then + echo "missing security material: $1" >&2 + exit 1 + fi +} + +expect_failure() { + name=$1 + shift + + if "$@" >/dev/null 2>&1; then + echo "FAIL: $name unexpectedly succeeded" >&2 + exit 1 + fi + echo "PASS: $name" +} + +expect_tls_success() { + name=$1 + certificate=$2 + key=$3 + + if curl --fail --silent --show-error --noproxy '*' \ + --connect-timeout 5 --max-time 10 \ + --cacert "$security_dir/internal-ca/ca.crt" \ + --cert "$certificate" --key "$key" \ + "https://$api_address/health/ready" >/dev/null 2>&1; then + echo "PASS: $name" + return + fi + echo "FAIL: $name" >&2 + exit 1 +} + +expect_tls_failure() { + name=$1 + shift + + if curl --fail --silent --show-error --noproxy '*' \ + --connect-timeout 5 --max-time 10 \ + --cacert "$security_dir/internal-ca/ca.crt" \ + "$@" "https://$api_address/health/ready" >/dev/null 2>&1; then + echo "FAIL: $name unexpectedly succeeded" >&2 + exit 1 + fi + echo "PASS: $name" +} + +expect_public_hostname_failure() { + if openssl s_client \ + -connect "$public_host:$public_port" \ + -servername wrong.local \ + -verify_hostname wrong.local \ + -verify_return_error \ + -CAfile "$security_dir/public-ca/ca.crt" /dev/null 2>&1; then + echo "FAIL: public TLS with wrong hostname unexpectedly succeeded" >&2 + exit 1 + fi + echo "PASS: public TLS with wrong hostname" +} + +for file in \ + "$security_dir/public-ca/ca.crt" \ + "$security_dir/internal-ca/ca.crt" \ + "$security_dir/foreign-ca/ca.crt" \ + "$security_dir/load-balancer/tls.crt" \ + "$security_dir/load-balancer/tls.key" \ + "$security_dir/prometheus/tls.crt" \ + "$security_dir/prometheus/tls.key" \ + "$security_dir/forbidden-client/tls.crt" \ + "$security_dir/forbidden-client/tls.key" \ + "$security_dir/foreign-client/tls.crt" \ + "$security_dir/foreign-client/tls.key"; do + require_file "$file" +done + +: >"$empty_ca" +chmod 0600 "$empty_ca" + +curl --fail --silent --show-error --noproxy '*' \ + --connect-timeout 5 --max-time 10 \ + --cacert "$security_dir/public-ca/ca.crt" \ + "https://$public_host:$public_port/health/ready" >/dev/null +echo "PASS: public TLS with trusted CA and hostname" + +expect_failure "public TLS with empty CA" \ + curl --fail --silent --show-error --noproxy '*' \ + --connect-timeout 5 --max-time 10 \ + --cacert "$empty_ca" \ + "https://$public_host:$public_port/health/ready" + +expect_failure "public TLS with foreign CA" \ + curl --fail --silent --show-error --noproxy '*' \ + --connect-timeout 5 --max-time 10 \ + --cacert "$security_dir/foreign-ca/ca.crt" \ + "https://$public_host:$public_port/health/ready" + +expect_public_hostname_failure + +expect_tls_failure "API mTLS without client certificate" +expect_tls_failure "API mTLS with forbidden trusted identity" \ + --cert "$security_dir/forbidden-client/tls.crt" \ + --key "$security_dir/forbidden-client/tls.key" +expect_tls_failure "API mTLS with client certificate from foreign CA" \ + --cert "$security_dir/foreign-client/tls.crt" \ + --key "$security_dir/foreign-client/tls.key" +expect_tls_success "API mTLS with load-balancer identity" \ + "$security_dir/load-balancer/tls.crt" \ + "$security_dir/load-balancer/tls.key" + +expect_tls_failure "business API with Prometheus identity" \ + --cert "$security_dir/prometheus/tls.crt" \ + --key "$security_dir/prometheus/tls.key" + +expect_failure "metrics mTLS without client certificate" \ + curl --fail --silent --show-error --noproxy '*' \ + --connect-timeout 5 --max-time 10 \ + --cacert "$security_dir/internal-ca/ca.crt" \ + "https://$metrics_address/metrics" + +expect_failure "metrics mTLS with load-balancer identity" \ + curl --fail --silent --show-error --noproxy '*' \ + --connect-timeout 5 --max-time 10 \ + --cacert "$security_dir/internal-ca/ca.crt" \ + --cert "$security_dir/load-balancer/tls.crt" \ + --key "$security_dir/load-balancer/tls.key" \ + "https://$metrics_address/metrics" + +expect_failure "metrics mTLS with client certificate from foreign CA" \ + curl --fail --silent --show-error --noproxy '*' \ + --connect-timeout 5 --max-time 10 \ + --cacert "$security_dir/internal-ca/ca.crt" \ + --cert "$security_dir/foreign-client/tls.crt" \ + --key "$security_dir/foreign-client/tls.key" \ + "https://$metrics_address/metrics" + +curl --fail --silent --show-error --noproxy '*' \ + --connect-timeout 5 --max-time 10 \ + --cacert "$security_dir/internal-ca/ca.crt" \ + --cert "$security_dir/prometheus/tls.crt" \ + --key "$security_dir/prometheus/tls.key" \ + "https://$metrics_address/metrics" >/dev/null +echo "PASS: metrics mTLS with Prometheus identity" diff --git a/security/THREAT_MODEL.md b/security/THREAT_MODEL.md index 31da287..54eec22 100644 --- a/security/THREAT_MODEL.md +++ b/security/THREAT_MODEL.md @@ -1,19 +1,50 @@ -# Модель угроз — заполнить +# Модель угроз ## Активы и акторы -TODO: пользовательские credentials/сессии, сообщения/вложения, service identities, CA/secrets, telemetry. Акторы: участник чата, посторонний пользователь, внешний клиент, скомпрометированный сервис, оператор. Опишите доступ атакующего и границы учебного стенда. +Защищаются пароли и сессии пользователей, сообщения и вложения, задания обработки, сервисные учётные данные, ключи PKI, секреты OpenBao и telemetry. В модели участвуют пользователь чата, посторонний пользователь, внешний клиент, скомпрометированный сервис и оператор стенда. + +Внешний клиент видит только HTTPS ingress. Сервисные сети, PostgreSQL, Valkey, Redis Streams, MinIO, OpenBao и telemetry не публикуются наружу. Оператор владеет CA private keys, root token и unseal material; приложения их не получают. Границы и identities перечислены в [матрице доверия](../contracts/trust-matrix.md). ## Границы доверия -TODO: схема и ссылка на заполненную contracts/trust-matrix.md; публичные/внутренние интерфейсы, процессы, секреты и их выдача. +```mermaid +flowchart LR + C[Клиент] -->|TLS + Bearer| N[Nginx] + N -->|mTLS: load-balancer| A[API x2] + A -->|TLS + отдельная роль| P[(PostgreSQL)] + A -->|mTLS + ACL| V[(Valkey)] + A -->|HTTPS + scoped key| S[(MinIO)] + D[Dispatcher] -->|mTLS + producer ACL| R[(Redis Streams)] + W[Worker] -->|mTLS + consumer ACL| R + W -->|HTTPS + scoped key| S + A -->|mTLS| O[OTel gateway] + W -->|mTLS| O + BA[OpenBao Agent] -->|TLS + AppRole| B[(OpenBao Raft)] + BA -->|0600 file| A +``` | Угроза и конкретный путь | Нарушаемый инвариант | Контроль | Отрицательный тест | Остаточное ограничение | | --- | --- | --- | --- | --- | -| TODO | TODO | TODO | TODO | TODO | - -На 4 минимум 6 конкретных угроз. Не заменяйте сценарии словами «SQL injection», «безопасный Docker», «mTLS включён» без пути и проверки. +| Клиент подменяет ingress или подключается к нему с чужим CA/hostname | Клиент общается с ожидаемым сервером | TLS 1.3, проверка публичного CA и SAN `localhost` | `make test-security` отклоняет пустой/чужой CA и неверный hostname | Локальный CA учебный; его private key хранит оператор | +| Процесс в сети обращается прямо к API, выдавая себя за LB | Бизнес API доступен только ingress | API требует client certificate и URI SAN `spiffe://mtusi/lab7/load-balancer` | `make test-tls-matrix`: нет cert, чужой CA и same-CA forbidden identity отклоняются | Нет полноценной service mesh revocation; leaf меняется оператором | +| Postgres role одного сервиса читает таблицы другого | Компрометация worker/dispatcher не раскрывает пользователей и сообщения | Раздельные роли, `pg_hba`, grants по таблицам, TLS `verify-full`, сопоставление role и client certificate | dependency matrix: worker не читает `users`, dispatcher не читает `attachments`, API с worker cert не входит | Миграционная роль привилегированна и запускается только одноразовым job | +| API или worker выходит за разрешённый S3 prefix | Временные и готовые объекты доступны только владельцу этапа | Разные MinIO users/policies и HTTPS | dependency matrix запрещает API писать `attachments/` и worker писать `private/` | MinIO root credentials нужны bootstrap job и не монтируются в приложения | +| Producer читает очередь или worker пишет произвольный stream | Разделены отправка и обработка заданий | Redis ACL, разные users и mTLS identities | dependency matrix запрещает dispatcher `XREAD`, worker — `XADD` в unrelated stream | Redis Streams даёт at-least-once; дедупликация остаётся в PostgreSQL | +| Чужой same-CA сервис отправляет telemetry | Только известные сервисы создают traces/logs/metrics | OTel Envoy проверяет URI SAN API/worker/dispatcher/reconciler | dependency matrix отклоняет Prometheus identity | Collector доступен через gateway; локальный hop gateway→collector изолирован сетью | +| Украденный password hash перебирается offline | Пароль остаётся дорогим для перебора | Argon2id с salt и параметрами; rehash после успешного login | unit tests проверяют формат, verify и `NeedsRehash` | Слабый пароль всё ещё можно подобрать; параметры требуют периодического пересмотра | +| Login DoS или подбор пароля идёт через разные API replicas | Лимит един для всего ingress | Атомарный Lua limiter в Valkey по login и source address, `429 Retry-After` | `make test-login-rate-limit` распределяет запросы между двумя replicas | При недоступности Valkey login закрывается ошибкой зависимости | +| Пользователь подделывает `X-User-Id` или читает чужое вложение | Identity берётся только из Bearer session; ACL чата обязательна | Hash session token в Valkey, membership checks в PostgreSQL | публичный smoke/security и унаследованные ACL tests | Отзыв сессии зависит от доступности Valkey | +| API получает worker secret или меняет политики OpenBao | Сервис видит только свой KV path | Отдельные AppRole, policies, renewable token и Agent template | `scripts/openbao-test-policy.sh`: own read 200, cross/write/policy 403, renew 200 | Initial SecretID записывает оператор в файл `0600`; в production нужен response wrapping | +| Компрометированный worker продолжает работать после отзыва | Отозванная identity больше не обрабатывает задания | Ротация Redis credential и worker KV secret, перезапуск Agent/worker | `make test-worker-compromise`: старый credential отвергнут, новая задача сохранена и обработана после ротации | Уже открытое соединение живёт до разрыва; сценарий принудительно перезапускает broker gateway | +| Секрет или private key попадает в Git/image/log | Credentials не покидают runtime storage | `.runtime` игнорируется, secrets как files, read-only mounts, scan secret detector | `make scan-security`, `secret_findings=0` | Локальный Docker volume и host filesystem защищает оператор | ## Lifecycle и инциденты -TODO: bootstrap, expiry/renewal, revoke/rotation, компрометация identity, sealed OpenBao и восстановление. Указать владельца CA/unseal и способ защиты bootstrap credentials. Сопоставить scan findings с реальной применимостью и исправлением/остаточным риском. +`infra/pki/bootstrap.sh` создаёт три CA и leaf certificates в `.runtime/security` с правами `0700/0600`; `security-bootstrap` переносит только нужные материалы в отдельные volumes. OpenBao работает в non-dev режиме на persistent Raft storage. Первый `init` сохраняет operator material в игнорируемом каталоге с правами `0600`; оператор выполняет `unseal`, bootstrap policies и выдачу AppRole. Root token не передаётся приложениям. + +OpenBao Agent аутентифицируется через отдельный AppRole, обновляет renewable token и рендерит JSON secret в защищённый Docker volume. Короткоживущий SecretID допускает повторный вход в пределах часа; затем оператор выдаёт новый. Ротация выполняется `scripts/openbao-rotate.sh`, после чего Agent перечитывает KV и приложение перезапускается без пересборки образа. При sealed OpenBao уже запущенный процесс продолжает работать с последним отрендеренным secret до его перезапуска; новый Agent не получит token, и расширенный healthcheck не признает его healthy по одному старому файлу. + +При компрометации worker оператор меняет broker password, обновляет `secret/messenger/worker`, отзывает старый AppRole SecretID/токен и пересоздаёт worker. Задание остаётся в Redis Stream/PostgreSQL и после восстановления обрабатывается повторно безопасно. + +Trivy проверяет зависимости, Docker/Compose misconfiguration и secrets. Исправляемые CRITICAL/HIGH зависимости обновляются до fixed versions. Замечания к одноразовым bootstrap/test containers оцениваются отдельно: они не публикуют портов, не входят в runtime приложения и запускаются только оператором; где возможно, для них также используется non-root user.