From 4408471ed5fd5bdb1204a75e1b4688e7f30f8b22 Mon Sep 17 00:00:00 2001 From: Nurlygayanova Ekaterina Date: Fri, 13 Nov 2026 12:41:35 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=207:=20=D0=B1=D0=B5=D0=B7=D0=BE?= =?UTF-8?q?=D0=BF=D0=B0=D1=81=D0=BD=D0=BE=D1=81=D1=82=D1=8C,=20mTLS=20?= =?UTF-8?q?=D0=B8=20OpenBao,=20=D0=BE=D1=86=D0=B5=D0=BD=D0=BA=D0=B0=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 1 + .env.example | 49 +- .gitignore | 1 + Dockerfile | 119 + PR_DESCRIPTION.md | 13 + REPORT.md | 149 +- app/cmd/janitor/main.go | 104 + app/cmd/loadgen/main.go | 601 +++ app/cmd/loadgen/main_test.go | 31 + app/cmd/messenger/main.go | 214 + app/cmd/s3check/main.go | 226 + app/cmd/s3init/main.go | 55 + app/e2e/lb_idempotency_test.go | 228 + app/go.mod | 60 + app/go.sum | 132 + app/internal/api/http/access_test.go | 115 + app/internal/api/http/attachments.go | 134 + app/internal/api/http/attachments_test.go | 546 ++ app/internal/api/http/auth.go | 73 + app/internal/api/http/auth_test.go | 242 + app/internal/api/http/chats.go | 103 + app/internal/api/http/concurrency_test.go | 84 + app/internal/api/http/direct_upload.go | 54 + app/internal/api/http/dto/attachment.go | 27 + app/internal/api/http/dto/chat.go | 18 + app/internal/api/http/dto/message.go | 37 + app/internal/api/http/dto/timestamp.go | 20 + app/internal/api/http/dto/timestamp_test.go | 48 + app/internal/api/http/dto/user.go | 21 + app/internal/api/http/errors.go | 83 + app/internal/api/http/health.go | 24 + app/internal/api/http/helpers_test.go | 358 ++ app/internal/api/http/idempotency_test.go | 119 + app/internal/api/http/instance_test.go | 121 + app/internal/api/http/limits_test.go | 318 ++ app/internal/api/http/messages.go | 80 + app/internal/api/http/middleware/auth.go | 61 + .../api/http/middleware/content_type.go | 42 + .../api/http/middleware/instance_id.go | 14 + app/internal/api/http/middleware/limits.go | 112 + app/internal/api/http/middleware/logger.go | 48 + app/internal/api/http/middleware/recover.go | 32 + .../api/http/middleware/request_id.go | 22 + app/internal/api/http/pagination_test.go | 126 + app/internal/api/http/router.go | 37 + app/internal/api/http/server.go | 215 + app/internal/api/http/users.go | 114 + app/internal/api/http/validation_test.go | 230 + app/internal/cache/history.go | 478 ++ app/internal/cache/history_test.go | 208 + app/internal/config/attachments.go | 40 + app/internal/config/config.go | 209 + app/internal/config/database.go | 13 + app/internal/config/env.go | 176 + app/internal/config/env_test.go | 85 + app/internal/config/history_cache.go | 11 + app/internal/config/http.go | 12 + app/internal/config/idempotency.go | 8 + app/internal/config/limits.go | 8 + app/internal/config/logger.go | 5 + app/internal/config/session.go | 13 + app/internal/domain/attachment.go | 39 + app/internal/domain/chat.go | 10 + app/internal/domain/errors.go | 27 + app/internal/domain/message.go | 13 + app/internal/domain/page.go | 67 + app/internal/domain/session.go | 9 + app/internal/domain/user.go | 10 + app/internal/imagecheck/imagecheck.go | 128 + app/internal/imagecheck/imagecheck_test.go | 139 + app/internal/janitor/janitor.go | 133 + app/internal/janitor/janitor_test.go | 186 + app/internal/logging/logging.go | 51 + app/internal/objectstore/memory.go | 117 + app/internal/objectstore/objectstore.go | 34 + app/internal/objectstore/s3.go | 251 + app/internal/password/benchmark_test.go | 16 + app/internal/password/password.go | 143 + app/internal/password/password_test.go | 111 + app/internal/service/attachments.go | 290 + app/internal/service/auth.go | 101 + app/internal/service/chats.go | 47 + app/internal/service/direct_upload.go | 177 + app/internal/service/direct_upload_test.go | 87 + app/internal/service/messages.go | 50 + app/internal/service/service.go | 50 + app/internal/service/users.go | 44 + app/internal/session/memory.go | 49 + app/internal/session/session.go | 21 + app/internal/session/valkey.go | 120 + app/internal/store/db/attachments.go | 117 + app/internal/store/db/chats.go | 165 + app/internal/store/db/db.go | 143 + app/internal/store/db/db_test.go | 46 + app/internal/store/db/invalidations.go | 59 + app/internal/store/db/messages.go | 218 + app/internal/store/db/text.go | 22 + app/internal/store/db/text_test.go | 18 + app/internal/store/db/users.go | 89 + app/internal/store/memory.go | 368 ++ app/internal/store/store.go | 43 + app/internal/telemetry/database.go | 98 + app/internal/telemetry/telemetry.go | 122 + app/internal/token/token.go | 42 + app/internal/token/token_test.go | 65 + app/internal/validate/attachment.go | 70 + app/internal/validate/attachment_test.go | 39 + app/internal/validate/chat.go | 42 + app/internal/validate/idempotency.go | 12 + app/internal/validate/message.go | 14 + app/internal/validate/rules.go | 80 + app/internal/validate/user.go | 30 + compose.yaml | 793 +++ contracts/trust-matrix.md | 54 +- evidence/README.md | 19 +- evidence/api-build.txt | 83 + evidence/app-restart.txt | 8 + evidence/argon2-benchmark.txt | 8 + evidence/bao-recreate.txt | 10 + evidence/bao-start.txt | 128 + evidence/build.txt | 370 ++ evidence/check.txt | 2 + evidence/dependencies.txt | 54 + evidence/external-security.txt | 2 + evidence/failover-1.txt | 4 + evidence/failover-2.txt | 4 + evidence/failover-each.txt | 3 + evidence/failover-stopped.txt | 6 + evidence/final-build.txt | 308 ++ evidence/final-start.txt | 133 + evidence/gateways.txt | 33 + evidence/go-tests.txt | 24 + evidence/hardening.txt | 22 + evidence/internal-security.txt | 30 + evidence/load.json | 17 + evidence/load.txt | 17 + evidence/observability.txt | 1 + evidence/persistence-containers.txt | 44 + evidence/persistence.txt | 3 + evidence/public-tls.txt | 2 + evidence/rebuild.txt | 315 ++ evidence/recover-sidecars.txt | 133 + evidence/resources.txt | 42 + evidence/restore.txt | 95 + evidence/review-build.txt | 84 + evidence/review-check.txt | 2 + evidence/review-failover.txt | 3 + evidence/review-go-tests.txt | 24 + evidence/review-hardening.txt | 22 + evidence/review-internal.txt | 30 + evidence/review-observability.txt | 1 + evidence/review-persistence.txt | 3 + evidence/review-public-tls.txt | 2 + evidence/review-secret-scan.txt | 1 + evidence/review-smoke.txt | 2 + evidence/review-update.txt | 38 + evidence/review-worker-tests.txt | 11 + evidence/runtime.txt | 1 + evidence/secret-scan.txt | 1 + evidence/session-expiry.txt | 29 + evidence/setup.txt | 44 + evidence/smoke.txt | 2 + evidence/start.txt | 109 + evidence/telemetry.json | 4701 +++++++++++++++++ evidence/test-build.txt | 60 + evidence/tls-start.txt | 64 + infra/README.md | 16 +- infra/grafana/dashboards/messenger.json | 225 + .../provisioning/dashboards/default.yaml | 7 + .../provisioning/datasources/sources.yaml | 30 + infra/haproxy/haproxy.cfg | 58 + infra/openbao/README.md | 16 +- infra/openbao/api.hcl | 2 + infra/openbao/config.hcl | 14 + infra/openbao/dispatcher.hcl | 2 + infra/openbao/worker.hcl | 2 + infra/otel/README.md | 10 +- infra/otel/collector.yaml | 63 + infra/otel/loki.yaml | 34 + infra/otel/prometheus.yaml | 21 + infra/otel/tempo.yaml | 22 + infra/s3-gateway/haproxy.cfg | 12 + infra/seaweedfs/master.toml | 4 + infra/security/Dockerfile | 4 + infra/security/pg_hba.conf | 5 + infra/security/runtime.py | 97 + migrations/00001_create_users_table.sql | 22 + migrations/00002_create_chats_table.sql | 16 + .../00003_create_chat_members_table.sql | 16 + migrations/00004_create_messages_table.sql | 25 + migrations/00005_escape_nul_in_text.sql | 45 + ...00006_create_cache_invalidations_table.sql | 23 + ..._create_message_idempotency_keys_table.sql | 32 + .../00008_create_attachments_tables.sql | 69 + migrations/00009_async_jobs.sql | 31 + migrations/00010_trace_context.sql | 24 + migrations/00011_service_grants.sql | 13 + scripts/bao-setup.py | 42 + scripts/bootstrap.py | 111 + scripts/check-expiry.sh | 14 + scripts/check-internal.sh | 4 + scripts/restart.sh | 25 + scripts/start.sh | 20 + scripts/stop-one.sh | 14 + scripts/wait-ready.py | 11 + security/THREAT_MODEL.md | 31 +- student-tests/external.py | 21 + student-tests/failover-each.py | 40 + student-tests/hardening.py | 25 + student-tests/internal.py | 128 + student-tests/observability.py | 88 + student-tests/secret-scan.py | 24 + worker/Dockerfile | 7 + worker/main.py | 257 + worker/requirements.txt | 6 + worker/telemetry.py | 146 + worker/test_thumbnail.py | 70 + 217 files changed, 21288 insertions(+), 106 deletions(-) create mode 100644 Dockerfile create mode 100644 PR_DESCRIPTION.md create mode 100644 app/cmd/janitor/main.go create mode 100644 app/cmd/loadgen/main.go create mode 100644 app/cmd/loadgen/main_test.go create mode 100644 app/cmd/messenger/main.go create mode 100644 app/cmd/s3check/main.go create mode 100644 app/cmd/s3init/main.go create mode 100644 app/e2e/lb_idempotency_test.go create mode 100644 app/go.mod create mode 100644 app/go.sum create mode 100644 app/internal/api/http/access_test.go create mode 100644 app/internal/api/http/attachments.go create mode 100644 app/internal/api/http/attachments_test.go create mode 100644 app/internal/api/http/auth.go create mode 100644 app/internal/api/http/auth_test.go create mode 100644 app/internal/api/http/chats.go create mode 100644 app/internal/api/http/concurrency_test.go create mode 100644 app/internal/api/http/direct_upload.go create mode 100644 app/internal/api/http/dto/attachment.go create mode 100644 app/internal/api/http/dto/chat.go create mode 100644 app/internal/api/http/dto/message.go create mode 100644 app/internal/api/http/dto/timestamp.go create mode 100644 app/internal/api/http/dto/timestamp_test.go create mode 100644 app/internal/api/http/dto/user.go create mode 100644 app/internal/api/http/errors.go create mode 100644 app/internal/api/http/health.go create mode 100644 app/internal/api/http/helpers_test.go create mode 100644 app/internal/api/http/idempotency_test.go create mode 100644 app/internal/api/http/instance_test.go create mode 100644 app/internal/api/http/limits_test.go create mode 100644 app/internal/api/http/messages.go create mode 100644 app/internal/api/http/middleware/auth.go create mode 100644 app/internal/api/http/middleware/content_type.go create mode 100644 app/internal/api/http/middleware/instance_id.go create mode 100644 app/internal/api/http/middleware/limits.go create mode 100644 app/internal/api/http/middleware/logger.go create mode 100644 app/internal/api/http/middleware/recover.go create mode 100644 app/internal/api/http/middleware/request_id.go create mode 100644 app/internal/api/http/pagination_test.go create mode 100644 app/internal/api/http/router.go create mode 100644 app/internal/api/http/server.go create mode 100644 app/internal/api/http/users.go create mode 100644 app/internal/api/http/validation_test.go create mode 100644 app/internal/cache/history.go create mode 100644 app/internal/cache/history_test.go create mode 100644 app/internal/config/attachments.go create mode 100644 app/internal/config/config.go create mode 100644 app/internal/config/database.go create mode 100644 app/internal/config/env.go create mode 100644 app/internal/config/env_test.go create mode 100644 app/internal/config/history_cache.go create mode 100644 app/internal/config/http.go create mode 100644 app/internal/config/idempotency.go create mode 100644 app/internal/config/limits.go create mode 100644 app/internal/config/logger.go create mode 100644 app/internal/config/session.go create mode 100644 app/internal/domain/attachment.go create mode 100644 app/internal/domain/chat.go create mode 100644 app/internal/domain/errors.go create mode 100644 app/internal/domain/message.go create mode 100644 app/internal/domain/page.go create mode 100644 app/internal/domain/session.go create mode 100644 app/internal/domain/user.go create mode 100644 app/internal/imagecheck/imagecheck.go create mode 100644 app/internal/imagecheck/imagecheck_test.go create mode 100644 app/internal/janitor/janitor.go create mode 100644 app/internal/janitor/janitor_test.go create mode 100644 app/internal/logging/logging.go create mode 100644 app/internal/objectstore/memory.go create mode 100644 app/internal/objectstore/objectstore.go create mode 100644 app/internal/objectstore/s3.go create mode 100644 app/internal/password/benchmark_test.go create mode 100644 app/internal/password/password.go create mode 100644 app/internal/password/password_test.go create mode 100644 app/internal/service/attachments.go create mode 100644 app/internal/service/auth.go create mode 100644 app/internal/service/chats.go create mode 100644 app/internal/service/direct_upload.go create mode 100644 app/internal/service/direct_upload_test.go create mode 100644 app/internal/service/messages.go create mode 100644 app/internal/service/service.go create mode 100644 app/internal/service/users.go create mode 100644 app/internal/session/memory.go create mode 100644 app/internal/session/session.go create mode 100644 app/internal/session/valkey.go create mode 100644 app/internal/store/db/attachments.go create mode 100644 app/internal/store/db/chats.go create mode 100644 app/internal/store/db/db.go create mode 100644 app/internal/store/db/db_test.go create mode 100644 app/internal/store/db/invalidations.go create mode 100644 app/internal/store/db/messages.go create mode 100644 app/internal/store/db/text.go create mode 100644 app/internal/store/db/text_test.go create mode 100644 app/internal/store/db/users.go create mode 100644 app/internal/store/memory.go create mode 100644 app/internal/store/store.go create mode 100644 app/internal/telemetry/database.go create mode 100644 app/internal/telemetry/telemetry.go create mode 100644 app/internal/token/token.go create mode 100644 app/internal/token/token_test.go create mode 100644 app/internal/validate/attachment.go create mode 100644 app/internal/validate/attachment_test.go create mode 100644 app/internal/validate/chat.go create mode 100644 app/internal/validate/idempotency.go create mode 100644 app/internal/validate/message.go create mode 100644 app/internal/validate/rules.go create mode 100644 app/internal/validate/user.go create mode 100644 compose.yaml create mode 100644 evidence/api-build.txt create mode 100644 evidence/app-restart.txt create mode 100644 evidence/argon2-benchmark.txt create mode 100644 evidence/bao-recreate.txt create mode 100644 evidence/bao-start.txt create mode 100644 evidence/build.txt create mode 100644 evidence/check.txt create mode 100644 evidence/dependencies.txt create mode 100644 evidence/external-security.txt create mode 100644 evidence/failover-1.txt create mode 100644 evidence/failover-2.txt create mode 100644 evidence/failover-each.txt create mode 100644 evidence/failover-stopped.txt create mode 100644 evidence/final-build.txt create mode 100644 evidence/final-start.txt create mode 100644 evidence/gateways.txt create mode 100644 evidence/go-tests.txt create mode 100644 evidence/hardening.txt create mode 100644 evidence/internal-security.txt create mode 100644 evidence/load.json create mode 100644 evidence/load.txt create mode 100644 evidence/observability.txt create mode 100644 evidence/persistence-containers.txt create mode 100644 evidence/persistence.txt create mode 100644 evidence/public-tls.txt create mode 100644 evidence/rebuild.txt create mode 100644 evidence/recover-sidecars.txt create mode 100644 evidence/resources.txt create mode 100644 evidence/restore.txt create mode 100644 evidence/review-build.txt create mode 100644 evidence/review-check.txt create mode 100644 evidence/review-failover.txt create mode 100644 evidence/review-go-tests.txt create mode 100644 evidence/review-hardening.txt create mode 100644 evidence/review-internal.txt create mode 100644 evidence/review-observability.txt create mode 100644 evidence/review-persistence.txt create mode 100644 evidence/review-public-tls.txt create mode 100644 evidence/review-secret-scan.txt create mode 100644 evidence/review-smoke.txt create mode 100644 evidence/review-update.txt create mode 100644 evidence/review-worker-tests.txt create mode 100644 evidence/runtime.txt create mode 100644 evidence/secret-scan.txt create mode 100644 evidence/session-expiry.txt create mode 100644 evidence/setup.txt create mode 100644 evidence/smoke.txt create mode 100644 evidence/start.txt create mode 100644 evidence/telemetry.json create mode 100644 evidence/test-build.txt create mode 100644 evidence/tls-start.txt create mode 100644 infra/grafana/dashboards/messenger.json create mode 100644 infra/grafana/provisioning/dashboards/default.yaml create mode 100644 infra/grafana/provisioning/datasources/sources.yaml create mode 100644 infra/haproxy/haproxy.cfg create mode 100644 infra/openbao/api.hcl create mode 100644 infra/openbao/config.hcl create mode 100644 infra/openbao/dispatcher.hcl create mode 100644 infra/openbao/worker.hcl create mode 100644 infra/otel/collector.yaml create mode 100644 infra/otel/loki.yaml create mode 100644 infra/otel/prometheus.yaml create mode 100644 infra/otel/tempo.yaml create mode 100644 infra/s3-gateway/haproxy.cfg create mode 100644 infra/seaweedfs/master.toml create mode 100644 infra/security/Dockerfile create mode 100644 infra/security/pg_hba.conf create mode 100644 infra/security/runtime.py create mode 100644 migrations/00001_create_users_table.sql create mode 100644 migrations/00002_create_chats_table.sql create mode 100644 migrations/00003_create_chat_members_table.sql create mode 100644 migrations/00004_create_messages_table.sql create mode 100644 migrations/00005_escape_nul_in_text.sql create mode 100644 migrations/00006_create_cache_invalidations_table.sql create mode 100644 migrations/00007_create_message_idempotency_keys_table.sql create mode 100644 migrations/00008_create_attachments_tables.sql create mode 100644 migrations/00009_async_jobs.sql create mode 100644 migrations/00010_trace_context.sql create mode 100644 migrations/00011_service_grants.sql create mode 100644 scripts/bao-setup.py create mode 100644 scripts/bootstrap.py create mode 100755 scripts/check-expiry.sh create mode 100755 scripts/check-internal.sh create mode 100755 scripts/restart.sh create mode 100755 scripts/start.sh create mode 100755 scripts/stop-one.sh create mode 100644 scripts/wait-ready.py create mode 100644 student-tests/external.py create mode 100644 student-tests/failover-each.py create mode 100644 student-tests/hardening.py create mode 100644 student-tests/internal.py create mode 100644 student-tests/observability.py create mode 100644 student-tests/secret-scan.py create mode 100644 worker/Dockerfile create mode 100644 worker/main.py create mode 100644 worker/requirements.txt create mode 100644 worker/telemetry.py create mode 100644 worker/test_thumbnail.py diff --git a/.dockerignore b/.dockerignore index bc16e55..3b1d981 100644 --- a/.dockerignore +++ b/.dockerignore @@ -18,3 +18,4 @@ __pycache__ node_modules evidence .DS_Store +operator diff --git a/.env.example b/.env.example index 2e9f054..388e32b 100644 --- a/.env.example +++ b/.env.example @@ -1,41 +1,36 @@ -# Copy to .env for your LOCAL synthetic test environment; never commit .env. -# These are logical interface suggestions; map actual framework names in REPORT.md. APP_HOST=0.0.0.0 APP_PORT=8080 APP_ENV=lab SESSION_TTL_SECONDS=3600 -# Choose credentials locally. File paths contain no secret values. -DATABASE_URL_FILE=/run/secrets/database_url -# Optional on 3, required use on 4 in lab2; Redis OR Valkey: -SESSION_STORE=postgres -CACHE_URL_FILE=/run/secrets/cache_url -API_REPLICAS=2 -IDEMPOTENCY_TTL_SECONDS=86400 -S3_ENDPOINT=https://s3:9000 +SESSION_STORE=valkey +DATABASE_URL_FILE=/run/app-secrets/database_url +CACHE_URL_FILE=/run/app-secrets/cache_url +BROKER_URL_FILE=/run/app-secrets/broker_url +S3_ACCESS_KEY_ID_FILE=/run/app-secrets/s3_access_key_id +S3_SECRET_ACCESS_KEY_FILE=/run/app-secrets/s3_secret_access_key +S3_ENDPOINT=https://s3:9443 S3_REGION=us-east-1 S3_BUCKET=messenger-attachments -S3_ACCESS_KEY_ID_FILE=/run/secrets/s3_access_key_id -S3_SECRET_ACCESS_KEY_FILE=/run/secrets/s3_secret_access_key MAX_UPLOAD_BYTES=10485760 MAX_IMAGE_PIXELS=40000000 -BROKER_URL_FILE=/run/secrets/broker_url -WORKER_CONCURRENCY=2 +MAX_CONCURRENT_UPLOADS=2 +WORKER_CONCURRENCY=1 JOB_MAX_ATTEMPTS=5 JOB_TIMEOUT_SECONDS=60 STAGING_RETENTION_SECONDS=86400 -OTEL_SERVICE_NAME=messenger-api -# Worker must set a distinct service.name. -OTEL_EXPORTER_OTLP_ENDPOINT=https://otel-collector:4318 +IDEMPOTENCY_TTL_SECONDS=86400 +HISTORY_CACHE=off +OTEL_EXPORTER_OTLP_ENDPOINT=https://otel-collector:4438 OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf +OTEL_EXPORTER_OTLP_CERTIFICATE=/tls/ca.crt OTEL_RESOURCE_ATTRIBUTES=deployment.environment.name=lab -# TLS and OpenBao: actual paths/ports depend on your implemented trust matrix. -PUBLIC_BASE_URL=https://localhost:8443 -TLS_CA_FILE=/run/secrets/ca.crt -TLS_CERT_FILE=/run/secrets/service.crt -TLS_KEY_FILE=/run/secrets/service.key +SSL_CERT_FILE=/tls/ca.crt +REQUESTS_CA_BUNDLE=/tls/ca.crt +AWS_CA_BUNDLE=/tls/ca.crt BAO_ADDR=https://openbao:8200 -BAO_CACERT=/run/secrets/bao-ca.crt -# No root token here. Bootstrap operator -> short-lived service auth -> scoped token. -ARGON2_MEMORY_KIB=19456 -ARGON2_ITERATIONS=2 -ARGON2_PARALLELISM=1 +TLS_CA_FILE=/tls/ca.crt +TLS_CERT_FILE=/tls/service.crt +TLS_KEY_FILE=/tls/service.key +PUBLIC_BASE_URL=https://localhost:8443 +OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE=/tls/service.crt +OTEL_EXPORTER_OTLP_CLIENT_KEY=/tls/service.key diff --git a/.gitignore b/.gitignore index b5a7189..d51db57 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ coverage/ .vscode/ # Keep small, sanitized evidence summaries in evidence/ under version control. # Inspect git diff --cached: ignore rules are not a secret scanner. +operator/ diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..01bc871 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,119 @@ +# syntax=docker/dockerfile:1.7 + +# Многоэтапная сборка: компилятор и исходники остаются в промежуточных этапах, а в итоговые +# образы попадают только готовые файлы. Какой этап собрать, задаёт target в compose.yaml. +# Версии образов закреплены, чтобы сборка повторялась. + +# Этап 1: компиляция всех программ проекта. +FROM golang:1.26.10-alpine3.24 AS builder +WORKDIR /src + +# Сначала только списки зависимостей: при изменении кода их загрузка берётся из кэша Docker. +COPY app/go.mod app/go.sum ./ +RUN go mod download + +# Затем весь код. Лишнее отсекает .dockerignore. +COPY app/ ./ + +# Основной сервер API. CGO_ENABLED=0 — статический файл без зависимостей от системных библиотек, +# -s -w убирают отладочные данные и уменьшают размер, -trimpath убирает локальные пути из файла. +RUN CGO_ENABLED=0 GOOS=linux go build \ + -ldflags="-s -w" \ + -trimpath \ + -o /out/messenger ./cmd/messenger + +# Генератор нагрузки для проверок под нагрузкой. +RUN CGO_ENABLED=0 GOOS=linux go build \ + -ldflags="-s -w" \ + -trimpath \ + -o /out/loadgen ./cmd/loadgen + +# Одноразовая подготовка S3-bucket. +RUN CGO_ENABLED=0 GOOS=linux go build \ + -ldflags="-s -w" \ + -trimpath \ + -o /out/s3init ./cmd/s3init + +# Очиститель объектов без метаданных и проверка прав S3 мимо API. +RUN CGO_ENABLED=0 GOOS=linux go build \ + -ldflags="-s -w" \ + -trimpath \ + -o /out/janitor ./cmd/janitor +RUN CGO_ENABLED=0 GOOS=linux go build \ + -ldflags="-s -w" \ + -trimpath \ + -o /out/s3check ./cmd/s3check + +# Этап 2: сборка инструмента миграций goose. Версия закреплена, драйверы ненужных БД +# исключены тегами: нужен только PostgreSQL. +FROM golang:1.26.10-alpine3.24 AS goose-builder +RUN CGO_ENABLED=0 go install -trimpath -ldflags="-s -w" \ + -tags='no_clickhouse no_libsql no_mssql no_mysql no_sqlite3 no_vertica no_ydb' \ + github.com/pressly/goose/v3/cmd/goose@v3.26.0 + +# Образ одноразового сервиса migrate: только goose и файлы миграций. +# Адрес БД читается из секрета при запуске, поэтому в образ не попадает. +# exec заменяет оболочку на goose, и тот сам получает сигналы остановки. +FROM alpine:3.24.3 AS migrate +COPY --from=goose-builder /go/bin/goose /usr/local/bin/goose +COPY migrations /migrations +ENTRYPOINT ["/bin/sh", "-c", "exec goose -dir /migrations postgres \"$(cat \"$DATABASE_URL_FILE\")\" up"] + +# Образ генератора нагрузки (профиль bench). Работает не от root. +FROM alpine:3.24.3 AS loadgen +COPY --from=builder /out/loadgen /usr/local/bin/loadgen +USER nobody +ENTRYPOINT ["/usr/local/bin/loadgen"] + +# Образ одноразового сервиса s3-init. Credentials читаются из секретов при запуске. Работает не от root. +FROM alpine:3.24.3 AS s3init +COPY --from=builder /out/s3init /usr/local/bin/s3init +USER nobody +ENTRYPOINT ["/usr/local/bin/s3init"] + +# Образ очистителя. Работает не от root. +FROM alpine:3.24.3 AS janitor +COPY --from=builder /out/janitor /usr/local/bin/janitor +USER nobody +ENTRYPOINT ["/usr/local/bin/janitor"] + +# Образ проверки прав S3 (профиль tools). Работает не от root. +FROM alpine:3.24.3 AS s3check +COPY --from=builder /out/s3check /usr/local/bin/s3check +USER nobody +ENTRYPOINT ["/usr/local/bin/s3check"] + +# Итоговый образ API. Это последний этап, поэтому он собирается, когда target не указан. +# В нём нет ни компилятора, ни goose, ни файлов миграций: реплики не могут запускать их при старте. +FROM alpine:3.24.3 AS api + +# Метка версии сборки: видна в образе и в окружении. По ней rolling update показывает смену версии. +ARG APP_BUILD=dev +ENV APP_VERSION=$APP_BUILD +LABEL org.opencontainers.image.version=$APP_BUILD + +# Корневые сертификаты и отдельный пользователь без прав: процесс работает не от root. +RUN apk add --no-cache ca-certificates python3 && \ + addgroup -S app && \ + adduser -S -G app -H app + +WORKDIR /app + +# Из этапа сборки берётся только готовый файл. +COPY --from=builder /out/messenger /app/messenger + +# Все следующие команды и сам сервер выполняются от этого пользователя. +USER app + +# Документация порта. Наружу он не публикуется: снаружи доступен только LB. +EXPOSE 8080 +# Docker останавливает контейнер этим сигналом: приложение выводит себя из балансировки +# и завершает открытые запросы. +STOPSIGNAL SIGTERM + +# Проверка готовности для Docker (статус healthy). Трафик направляет не она, а собственные +# проверки LB. wget входит в alpine, отдельно его ставить не нужно. +HEALTHCHECK --interval=10s --timeout=3s --start-period=5s --retries=3 \ + CMD wget --quiet --spider "http://127.0.0.1:${APP_PORT:-8080}/health/ready" || exit 1 + +ENTRYPOINT ["/app/messenger"] diff --git a/PR_DESCRIPTION.md b/PR_DESCRIPTION.md new file mode 100644 index 0000000..403549b --- /dev/null +++ b/PR_DESCRIPTION.md @@ -0,0 +1,13 @@ +## Лабораторная 7 — целевая оценка 3 + +Автор: Нурлыгаянова Екатерина. Группа: БПИ2302. + +Перенесён самостоятельный Go/Python мессенджер из lab6. Внешний API работает через HTTPS, каждый API принимает только mTLS identity балансировщика. Все зависимости используют TLS с проверкой CA/SAN; OpenBao non-dev Raft выдаёт разные scoped KV credentials по cert-auth API/worker/dispatcher. Добавлены ограничения login/body, SQL/Valkey/S3 ACL, non-root app containers и ресурсные лимиты. + +Из чистого clone: `sh scripts/start.sh`. Подробности, ограничения и таблица evidence: [REPORT.md](REPORT.md). Контракт и публичные tests сохранены без ослабления. Источники и помощь ИИ перечислены в отчёте. + +Проверено: public HTTPS smoke/trust, обе API mTLS identities, TLS matrix, OpenBao allow/deny/revoke, ACL, logout/expiry, request/login limits, persistence с перезапуском всех stores, failover обеих конкретных API реплик, реальные telemetry log/trace/metrics, Go tests и actual Docker hardening. + +Ограничения: один Docker host, один DB/S3/broker/Bao/LB; static KV credentials, ручной unseal и certificate maintenance, локальный Grafana Viewer. Автоматическая ротация и уровень4/5 не заявлены. Секреты создаются только локально, вне Git/образов. + +Повторная проверка: исправлены небезопасные параметры повреждённых Argon2id hashes, добавлены регрессионные тесты и краевые случаи thumbnail. Актуальные результаты Go/worker, HTTPS, persistence, отказов обеих реплик и telemetry — в `REPORT.md` и `evidence/review-*.txt`. diff --git a/REPORT.md b/REPORT.md index 9801db4..57d5cc7 100644 --- a/REPORT.md +++ b/REPORT.md @@ -1,37 +1,144 @@ # Отчёт — лабораторная 7 -- Автор, группа: TODO -- Целевая оценка; выбранный трек 5, если нужен: TODO -- Commit/PR: TODO после публикации -- Использованные источники, библиотеки и помощь ИИ: TODO +Автор: **Нурлыгаянова Екатерина**. Группа: **БПИ2302**. Целевая оценка: **3**. Треки 4/5 не заявлены. + +Использована собственная реализация из соседнего lab6: Go REST API, SQL migrations/outbox, Valkey sessions/Streams, Python image worker, SeaweedFS, OpenTelemetry и Grafana. Код перенесён в этот репозиторий полностью: соседние каталоги для запуска не нужны. TLS/mTLS, scoped roles, bootstrap, OpenBao и проверки безопасности добавлены в lab7. При подготовке тестов и документации использовался ИИ Codex; + +Источники: [OpenBao cert auth](https://openbao.org/docs/auth/cert/), [policies](https://openbao.org/docs/concepts/policies/), [официальные образы](https://openbao.org/docs/install/), [HAProxy TLS](https://www.haproxy.com/documentation/haproxy-configuration-tutorials/security/ssl-tls/basics-enable-tls/), исходники библиотек Echo и OTel (зависимости закреплены app/go.mod и worker/requirements.txt). ## Запуск из чистого clone -TODO: версии runtime/образов, prerequisites, команды создания локальных secrets/.env, build, миграций, запуска, ожидания готовности, тестов и остановки. Указать необходимые действия оператора. Не вставлять секреты. Отдельно указать безопасную остановку и команду намеренного удаления учебных данных. +Нужны Docker Desktop/Engine с Compose v2, Python3.9+ на host и OpenSSL/LibreSSL. Проверено на Docker Desktop29.2.1 linux/aarch64 VM, 12 CPU, 8 216 776 704 bytes RAM (`evidence/runtime.txt`). На host одновременно работали другие лабораторные; это ограничивает сравнимость измерений. Контейнеры собираются из исходников. -## Архитектура и решения +```sh +sh scripts/start.sh +make check +make test CA_FILE="$PWD/secrets/ca.crt" +make test-security CA_FILE="$PWD/secrets/ca.crt" +sh scripts/check-internal.sh +python3 student-tests/external.py +python3 student-tests/hardening.py +sh scripts/check-expiry.sh +make test-persistence CA_FILE="$PWD/secrets/ca.crt" ACTION_SCRIPT=scripts/restart.sh +make test-failover CA_FILE="$PWD/secrets/ca.crt" ACTION_SCRIPT=scripts/stop-one.sh +docker compose up -d --wait +python3 student-tests/failover-each.py +python3 student-tests/secret-scan.py +``` -TODO: схема процессов/хранилищ, источник истины, транзакционные границы, ограничения. Что перенесено из lab6, что изменено в этой работе. Соответствие переменных из .env.example реальной конфигурации. +`start.sh`: создаёт .env, CA, 30-дневные leaf и credentials, собирает images, запускает OpenBao, выполняет operator init/unseal и config, затем запускает остальные роли и ждёт HTTPS readiness. На повторном запуске identities и passwords не меняются; миграции goose повторно не применяются. Нужен сетевой доступ к registry/dependency repositories при первой сборке. Из Docker Hub OpenBao скачать не удалось (TLS timeout); использован официальный GHCR. -## Доказательства критериев +API: **https://localhost:8443**, Grafana Viewer: **https://localhost:13007**, Bao operator endpoint: **https://localhost:18200**. Все три доступны только с этого host. Для браузера можно импортировать публичный secrets/ca.crt. API UI не требуется и не реализован. -| Критерий README | Команда/сценарий | Наблюдаемый результат | Файл доказательства | +После отдельного restart OpenBao: `python3 scripts/bao-setup.py --unseal-only`. Операторские root token и 3 unseal shares находятся в operator/bao-init.json (0600, каталог0700), никогда не передаются сервисам. Для unseal используются 2 shares. В реальной эксплуатации их нужно хранить у отдельных держателей/офлайн; здесь это локальное operator хранилище на учебном host. + +Остановка с сохранением данных: `docker compose down`. Повторный запуск — `sh scripts/start.sh`. **Намеренное удаление учебных данных**: `docker compose down -v`. После удаления volumes нужно архивировать/убрать старые secrets и operator и выполнить новый bootstrap; не смешивать новый SQL volume/новый Bao с прежними operator init keys. Не удалять файлы credentials при сохранённых volumes. + +Проверка telemetry: + +```sh +docker run --rm --network mtusi-lab7_default \ + -v "$PWD:/audit:ro" -v "$PWD/evidence:/audit/evidence" \ + --entrypoint python mtusi-lab7-worker /audit/student-tests/observability.py +``` + +Тестовый контейнер — временный operator probe. Только ему для отрицательных проверок монтируется полный проект; app/worker получают исключительно собственные leaf/CA и свои secrets из Bao. Probe никогда не печатает tokens/пароли/ключи. + +## Архитектура + +```mermaid +flowchart LR + C[Клиент] -->|HTTPS| LB[HAProxy] + LB -->|mTLS: URI lb| A[2 Go API] + A -->|TLS, api role| DB[(PostgreSQL)] + A -->|TLS, session ACL| V[(Valkey sessions)] + A -->|HTTPS, staging key| S[(Private S3)] + DB --> O[SQL outbox dispatcher] + O -->|TLS, producer ACL| B[(Valkey Streams)] + B -->|TLS, consumer ACL| W[Python worker] + W -->|TLS| DB + W -->|HTTPS, worker key| S + A -->|cert auth| BAO[OpenBao Raft] + W -->|cert auth| BAO + A -->|mTLS| OT[OTel Collector] + W -->|mTLS| OT + OT -->|mTLS| T[Tempo / Loki] + P[Prometheus] -->|mTLS scrape| OT + G[Grafana] -->|mTLS| T + G -->|mTLS| P +``` + +Источник истины — PostgreSQL. Сессии общие, hashes Bearer хранятся в persistent Valkey с абсолютным TTL. Idempotency key и message фиксируются в одной SQL transaction. Upload до202 сохраняется в устойчивый S3 staging, trigger создаёт job в той же SQL transaction. Dispatcher публикует ID и trace context в Streams; worker с advisory lock идемпотентно создаёт original/thumbnail и фиксирует ready перед ACK. До60s ждёт публичный smoke; worker deadline60s, максимум5 попыток, CPU1/RAM1GiB, concurrency1. Thumbnail JPEG вписан в256×256 без увеличения, EXIF orientation применяется, alpha на белом. + +Все app credentials получаются при запуске через реальную cert-auth в non-dev OpenBao. API, worker, dispatcher имеют разные SQL/S3/broker права. Scoped token TTL5m/max10m, read своего KV, немедленный revoke-self. Значения записываются в tmpfs0700, файлы0600. При sealed/unavailable Bao новый процесс завершается. Уже работающий процесс продолжает использовать static credentials — token TTL не отзывает пароль БД. + +[Матрица всех связей](contracts/trust-matrix.md), [модель угроз](security/THREAT_MODEL.md), [operator runbook](infra/openbao/README.md). Внешний API требует TLS1.2+, API внутри — обязательный client certificate плюс точный URI `spiffe://lab7/lb`, независимо от принадлежности CA. Alias X-Instance-Id — случайный UUID, без hostname/IP. Нет опубликованного API-порта. + +Для S3/telemetry без native TLS используется sidecar: TLS termination → localhost в том же namespace; незашифрованный порт недоступен по адресу контейнера. S3 дополнительно в internal private network; TCP gateway передаёт только TLS9443 и закрывает служебные SeaweedFS ports. Restart hook после перезапуска backend пересоздаёт sidecar namespace: это исправлено после обнаружения в persistence тесте. + +## Версии, хранение и конфигурация + +| Роль | Образ/runtime | Persistent volume / интерфейс | +| --- | --- | --- | +| API и migration | Go1.26.10; Alpine3.24.3; goose3.26.0 | API stateless, tmpfs; api:8080 только mTLS | +| Worker/dispatcher | Python3.13.9-slim; Pillow12.0.0 | stateless, credentials tmpfs | +| TLS sidecar | Python3.13.9-alpine3.22 | stateless, readonly | +| LB/S3 TCP gateway | HAProxy3.2.9-alpine | TLS8443 / passthrough9443 | +| PostgreSQL | postgres17.6-alpine | pgdata; native TLS5432, hostnossl reject | +| Sessions/broker | Valkey8.1.3-alpine | valkeydata/brokerdata, AOF always; native TLS6379 | +| S3 | SeaweedFS4.00 | s3data, private network | +| OpenBao | GHCR OpenBao2.7.1 | baodata single-node Raft, TLS8200 | +| Collector | contrib0.137.0 | bounded queues, no durable signal storage | +| Prometheus/Loki/Tempo | 3.5.0 / 3.5.5 / 2.8.2 | prometheusdata/lokidata/tempodata, retention72h/3d | +| Grafana | 12.2.0 | grafanadata, provisioned dashboard | + +Compose задаёт resource limits для **всех** ролей. API/worker/dispatcher: UID65534, CPU1/RAM1GiB, read_only, cap_drop ALL, no-new-privileges, tmpfs. Остальные по умолчанию CPU0.5/RAM256MiB, TLS sidecar CPU0.25/RAM64MiB. PostgreSQL initialization и Tempo используют root в своём контейнере; bao-volume-init одноразово меняет владельца каталога данных. Privileged/host network/socket отсутствуют. + +`.env.example` соответствует реально читаемой конфигурации: DATABASE_URL_FILE/CACHE_URL_FILE/BROKER_URL_FILE/S3_*_FILE указывают в /run/app-secrets, а не на host; SESSION_STORE=valkey, HISTORY_CACHE=off; S3_ENDPOINT=https://s3:9443; OTLP=https://otel-collector:4438; SSL_CERT_FILE/REQUESTS_CA_BUNDLE/AWS_CA_BUNDLE и OTLP_CERTIFICATE обеспечивают проверку CA; OTLP_CLIENT_CERTIFICATE/KEY задают сервисную identity. TLS_CERT_FILE/KEY/CA включают API mTLS. BAO_ROLE задаётся отдельно Compose для каждой роли. Replicas2 и limits фиксируются compose.yaml. Argon2id параметры фиксированы в password.Default (переменных ARGON2_* с неработающим override нет). + +## Доказательства оценки 3 + +| Критерий | Команда/сценарий | Результат | Доказательство | | --- | --- | --- | --- | -| Публичный smoke | make test | TODO | TODO | -| Остальные пункты уровня 3 | TODO | TODO | TODO | -| Все пункты уровня 4, если заявлен | TODO | TODO | TODO | -| Выбранный трек 5, если заявлен | TODO | TODO | TODO | +| Предыдущий обязательный API через HTTPS | make test CA_FILE=... | PASS: chats, messages, paging, idempotency, ACL, attachment, thumbnail, logout | evidence/smoke.txt | +| Проверка внешнего CA | make test-security CA_FILE=... | доверенный HTTPS200; пустой trust store → verify failure | evidence/public-tls.txt | +| Argon2id19MiB/t2/p1 | Go benchmark, 3 повтора по3s при CPU1/RAM1GiB | 17.77–17.83ms/hash; ~19.93MB allocations/op | evidence/argon2-benchmark.txt | +| mTLS каждой API реплики | sh scripts/check-internal.sh | LB accepted; missing cert, foreign CA, same-CA wrong URI denied | evidence/internal-security.txt | +| TLS всей матрицы / без обхода | internal.py | проверенные SAN на12 endpoints; native DB TLS; plaintext ports недоступны | evidence/internal-security.txt | +| Отдельные identities/minimum rights | internal.py | DB DDL/password hashes denied worker; broker unrelated key denied; S3 List denied | evidence/internal-security.txt | +| OpenBao non-dev/persistent/scoped | internal.py + restart hook | cert login; own200/other403/admin403; revoked token403; unseal послеrestart | evidence/internal-security.txt, evidence/persistence-containers.txt | +| Non-root/limits/ports | python3 student-tests/hardening.py | actual Docker inspection PASS | evidence/hardening.txt | +| Login rate/body limits | python3 student-tests/external.py | 429+Retry-After и413 | evidence/external-security.txt | +| Logout/expiry/чужой доступ | smoke + sh scripts/check-expiry.sh | logout401, чужой доступ404, sessionTTL2s→401 | evidence/smoke.txt, evidence/session-expiry.txt | +| Сохранность при restart | make test-persistence ... | прежняя сессия, messages и original bytes сохранены | evidence/persistence.txt, evidence/persistence-containers.txt | +| Отказ API | два публичных failover прогона | каждый128 successful writes, 0 failed attempts; без дублей/потери | evidence/failover-1.txt, evidence/failover-2.txt | +| Последовательный отказ разных контейнеров | python3 student-tests/failover-each.py | api-1 и api-2 остановлены по очереди; session/data сохранены | evidence/failover-each.txt | +| Telemetry сохранена | observability.py | API/worker matching trace/log и4 SDK metrics | evidence/observability.txt, evidence/telemetry.json | +| Исходники и секреты | make check; Go tests; secret-scan.py | контракт не изменялся, проверки в evidence | evidence/check.txt, evidence/go-tests.txt, evidence/secret-scan.txt | -TODO: добавить отдельную строку для каждого заявленного критерия. PASS без команды и наблюдения не является доказательством. Проверка инфраструктурного hook требует подтверждения, какие реальные процессы/хранилища перезапущены. +## Измерения и ограничения -## Эксперименты и отказы +Argon2id PHC содержит random salt16bytes, version19, m19456/t2/p1, key32bytes. Три серии: 17.832 / 17.773 / 17.817ms на hash, allocations около19.93MB/op. Это microbenchmark Hash, не p95 login под атакой. Семафор KDF ограничивает одновременные вычисления четырьмя или GOMAXPROCS (меньшим); один ingress ограничивает login20/10s/IP с Retry-After10. На минимальных параметрах время умеренное, а лимиты отделяют KDF память от других запросов. Измерения не доказывают устойчивость к распределённому DoS. -TODO: гипотеза, hardware/лимиты, версии, объём данных, профиль нагрузки, concurrency/arrival rate, длительность/прогрев, повторы, успешные RPS, ошибки, p50/p95/p99, CPU/RAM. Сохранить raw summary без tokens и объяснить ограничения измерения. +HTTP load — closed-loop synthetic POST сообщений, duration30s, concurrency4, уникальные сообщения в одном тестовом чате. Отдельный итоговый прогон: 6962 успешных запросов, 0 ошибок, 231.974 successful RPS; p50/p95/p99 = 6.973/69.041/73.826ms (evidence/load.json). Percentiles только успешных HTTP подтверждений; client overhead/coordinated omission не позволяют называть это максимальной пропускной способностью. Docker ресурсы и моментальный snapshot — evidence/runtime.txt и evidence/resources.txt. Нагрузка не является исследовательским треком5. -| Воздействие | Что ожидаем | Что наблюдали | Время восстановления / потеря данных | -| --- | --- | --- | --- | -| TODO | TODO | TODO | TODO | +Публичный failover1:128 writes/0 failed, first_recovery3.591s; failover2:128/0,3.421s. Это время от запуска hook до первого подтверждения после его завершения, включая штатный drain, а не длительность простоя. Сохранность проверялась по истории и побайтному original; явный restart hook перезапускает все используемые хранилища, включая PostgreSQL, Valkey, S3, Bao и telemetry. Times before/after в persistence-containers.txt подтверждают scope. -## Ограничения и следующие шаги +Одноузловые DB/S3/broker/Bao/LB и один Docker host остаются точками отказа. Автоматическая ротация, CRL/renewal, dynamic DB credentials, rehash при login, vulnerability scan triage и исследование на5 не заявлены. TLS/mTLS защищает transport, а membership/Bearer — действия пользователя. Grafana имеет локальный Viewer без пользовательского login, telemetry identities доверенные; полное разделение read/write HTTP методов backend и multi-tenant auth не реализовано. -TODO: какие отказы выдерживаются и какие нет; что не реализовано; где учебное упрощение; какое улучшение подтверждено, а какое пока гипотеза. +До сдачи нужно изучить scripts и объяснить границу CA trust vs URI authorization, operator unseal и отличие TTL Bao token от срока действия static KV credentials. + + +## Повторная проверка и краевые случаи (13.11.2026) + +Автор: Нурлыгаянова Екатерина, БПИ2302. Целевая оценка — 3. + +Исправлена обработка повреждённых Argon2id PHC-хешей: версия и параметры разбираются полностью, нулевые значения и чрезмерные затраты отвергаются до запуска KDF. Допустимый диапазон чтения: память от 8×parallelism до 64 MiB, iterations 1–10, parallelism 1–16, salt 8–64 bytes, digest 16–64 bytes. Новые пароли по-прежнему используют 19 MiB/t2/p1. Проверки покрывают нулевые параметры, переполнение, хвосты в полях, слишком длинную строку, короткую соль/digest и неверную конфигурацию Hash. + +Повторно выполнены все Go-тесты текущих исходников: `evidence/review-go-tests.txt`. Среди покрытых сценариев — неверный/двойной JSON и UTF-8, границы body с Content-Length и chunked, неверные UUID/курсоры, конкурентная идемпотентность, logout/expiry, недоступность session store/S3, обрыв загрузки, ACL и ошибки фиксации метаданных. Это тесты отдельных сценариев, не доказательство отсутствия всех ошибок. Race detector не запускался успешно: тестовый образ использует CGO_ENABLED=0; итоговый успешный прогон выполнен без `-race`. + +Worker: 6 тестов, включая 1×1, 1×1000, 1000×1, 256×256, отсутствие увеличения, прозрачность, EXIF, повреждённый файл и лимит пикселей ровно/выше границы (`evidence/review-worker-tests.txt`). + +После пересборки и обновления API прошли HTTPS smoke, persistence с прежней сессией/файлом, последовательный отказ каждой конкретной API-реплики и telemetry (`evidence/review-smoke.txt`, `evidence/review-persistence.txt`, `evidence/review-failover.txt`, `evidence/review-observability.txt`). Обе реплики восстановлены. После `docker compose up -d --wait api` нужно также вызвать `python3 scripts/wait-ready.py`: готовность контейнеров не означает, что LB уже завершил DNS/health checks. Первые запросы сразу после пересоздания получили временный 503; после ожидания HTTPS readiness повторные проверки прошли. + +Итоговые проверки структуры, внешнего TLS, внутренней матрицы, реальных Docker ограничений и секретов сохраняются в `evidence/review-check.txt`, `evidence/review-public-tls.txt`, `evidence/review-internal.txt`, `evidence/review-hardening.txt`, `evidence/review-secret-scan.txt`. Login rate/body limits и сессия TTL=2s также проверены на живом стенде. Полный чистый bootstrap с удалением volumes при этой повторной проверке не выполнялся, существующие данные сохранены. diff --git a/app/cmd/janitor/main.go b/app/cmd/janitor/main.go new file mode 100644 index 0000000..c632ae8 --- /dev/null +++ b/app/cmd/janitor/main.go @@ -0,0 +1,104 @@ +// janitor — очиститель объектов S3 без метаданных. Отдельный сервис со своими credentials S3: API +// не имеет права на листинг, а очиститель не имеет права читать содержимое файлов. +// +// Постоянная работа: janitor. Один проход: janitor -once. Только отчёт: janitor -once -dry-run. +// Настройки: JANITOR_GRACE_SECONDS, JANITOR_INTERVAL_SECONDS, JANITOR_MAX_DELETES, JANITOR_DRY_RUN. +package main + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "log/slog" + "os" + "os/signal" + "syscall" + "time" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/config" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/janitor" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/logging" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/objectstore" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/service" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/store/db" +) + +// passTimeout ограничивает один проход: зависший S3 не должен останавливать очиститель навсегда. +const passTimeout = 10 * time.Minute + +func main() { + once := flag.Bool("once", false, "выполнить один проход и завершиться") + dryRun := flag.Bool("dry-run", false, "только отчёт, ничего не удалять") + flag.Parse() + if err := run(*once, *dryRun); err != nil { + fmt.Fprintln(os.Stderr, "janitor:", err) + os.Exit(1) + } +} + +func run(once, dryRun bool) error { + cfg, err := config.Load() + if err != nil { + return err + } + logger, err := logging.New(cfg.Logger.Level, cfg.Env, cfg.Version) + if err != nil { + return err + } + ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM) + defer stop() + + pool, err := db.Connect(ctx, cfg.Database) + if err != nil { + return err + } + storage := db.New(pool, time.Duration(cfg.Database.QueryTimeoutMs)*time.Millisecond) + defer storage.Close() + objects, err := objectstore.NewS3(cfg.S3) + if err != nil { + return err + } + + opts := janitor.Options{ + Prefix: service.ObjectKeyPrefix, + Grace: time.Duration(cfg.Janitor.GraceSeconds) * time.Second, + MaxDeletes: cfg.Janitor.MaxDeletes, + DryRun: cfg.Janitor.DryRun || dryRun, + Now: time.Now, + Logger: logger, + } + pass := func() error { + passCtx, cancel := context.WithTimeout(ctx, passTimeout) + defer cancel() + report, err := janitor.Run(passCtx, objects, storage.Attachments, opts) + logger.Info("janitor pass", slog.Any("report", report), slog.Duration("elapsed", report.Elapsed), slog.Any("err", err)) + if once { + // Машиночитаемый итог для проверок: stdout содержит и этот объект, и строки журнала. + if line, jsonErr := json.Marshal(struct { + Report janitor.Report `json:"janitor_report"` + }{report}); jsonErr == nil { + fmt.Println(string(line)) + } + } + return err + } + if once { + return pass() + } + + // Первый проход сразу: после простоя очистителя мусор не ждёт ещё один интервал. + ticker := time.NewTicker(time.Duration(cfg.Janitor.IntervalSeconds) * time.Second) + defer ticker.Stop() + for { + // Ошибка прохода не фатальна: S3 или БД вернутся, следующий проход повторит работу. + if err := pass(); err != nil { + logger.Warn("janitor pass failed", slog.Any("err", err)) + } + select { + case <-ctx.Done(): + return nil + case <-ticker.C: + } + } +} diff --git a/app/cmd/loadgen/main.go b/app/cmd/loadgen/main.go new file mode 100644 index 0000000..c3549fc --- /dev/null +++ b/app/cmd/loadgen/main.go @@ -0,0 +1,601 @@ +// loadgen — closed-loop генератор нагрузки для экспериментов с репликами. +// +// Смесь чтения истории и записи сообщений. Неподтверждённая запись повторяется с тем же +// Idempotency-Key, как у настоящего клиента. После прогона вся история сверяется с +// подтверждёнными сообщениями. Closed-loop занижает задержки при перегрузке (coordinated +// omission), поэтому результат показывает пропускную способность, а не задержку при заданной +// интенсивности. Токены и пароли не печатает. +// +// Запуск из корня проекта при поднятом стенде: +// +// docker compose --env-file .env --profile bench run --rm -T loadgen -duration 20s -concurrency 16 +// +// Этапы: подготовка данных, прогрев, замер, сверка истории, запись результата. +// Код выхода ненулевой, если сверка нашла потери или дубли либо не смогла прочитать историю. +package main + +import ( + "bytes" + "context" + "crypto/rand" + "encoding/hex" + "encoding/json" + "flag" + "fmt" + "io" + mathrand "math/rand/v2" + "net/http" + "net/url" + "os" + "slices" + "strconv" + "sync" + "time" +) + +// options — параметры запуска из флагов командной строки. +type options struct { + baseURL string + duration time.Duration + warmup time.Duration + concurrency int + writeShare float64 + chats int + seed int + timeout time.Duration + label string + out string +} + +// actor — один клиент API: токен его сессии и его чат. Токен хранится только в памяти. +type actor struct { + token string + chatID string +} + +// confirmed — запись, на которую сервер ответил 201. После замера она обязана быть в истории: +// chat — индекс чата, id — ID сообщения, text — уникальный текст для поиска дублей. +type confirmed struct { + chat int + id string + text string +} + +// workerStats заполняется одной горутиной, поэтому без блокировок. +// Поля: задержки успешных чтений и записей; ошибки по видам (код ответа или net); +// записи, подтверждённые после повтора; запросы по репликам; успехи и ошибки по секундам; +// время каждой ошибки; подтверждённые записи. +type workerStats struct { + reads, writes []time.Duration + errors map[string]int + retried int + instances map[string]int + secOK, secErr map[int]int + errTimes []time.Duration + confirmed []confirmed +} + +// main разбирает флаги и запускает прогон. Значения по умолчанию рассчитаны на запуск в сети Docker. +func main() { + var o options + flag.StringVar(&o.baseURL, "base-url", "http://lb:8080", "адрес балансировщика") + flag.DurationVar(&o.duration, "duration", 30*time.Second, "длительность замера") + flag.DurationVar(&o.warmup, "warmup", 5*time.Second, "прогрев, не входит в замер") + flag.IntVar(&o.concurrency, "concurrency", 16, "число клиентов closed-loop") + flag.Float64Var(&o.writeShare, "write-share", 0.2, "доля записей") + flag.IntVar(&o.chats, "chats", 8, "число пар пользователь+чат") + flag.IntVar(&o.seed, "seed", 100, "начальных сообщений на чат") + flag.DurationVar(&o.timeout, "timeout", 5*time.Second, "таймаут запроса") + flag.StringVar(&o.label, "label", "", "метка прогона") + flag.StringVar(&o.out, "out", "", "файл для JSON-результата") + flag.Parse() + + if err := run(o); err != nil { + fmt.Fprintln(os.Stderr, "loadgen:", err) + os.Exit(1) + } +} + +// run выполняет прогон целиком и возвращает ошибку, если проверка истории не пройдена. +func run(o options) error { + // Один общий клиент на всех. Запас простаивающих соединений нужен, чтобы клиенты повторно + // использовали их: иначе замер включал бы постоянную установку новых соединений. + client := &http.Client{ + Timeout: o.timeout, + Transport: &http.Transport{ + MaxIdleConns: o.concurrency * 2, + MaxIdleConnsPerHost: o.concurrency * 2, + IdleConnTimeout: 30 * time.Second, + }, + } + // Подготовка до начала отсчёта: в замер не входит. + actors, err := setup(client, o) + if err != nil { + return fmt.Errorf("setup: %w", err) + } + + // Границы замера. Клиенты работают и в прогреве, но запросы до measureFrom не учитываются. + start := time.Now() + measureFrom := start.Add(o.warmup) + end := measureFrom.Add(o.duration) + // Скрипты отказов ждут эту строку, чтобы привязать действия ко времени замера. + go func() { + time.Sleep(o.warmup) + fmt.Printf("measure_start unix=%d\n", time.Now().Unix()) + }() + + // У каждого клиента своя статистика и своя горутина. Общие данные появляются только после wg.Wait. + stats := make([]*workerStats, o.concurrency) + var wg sync.WaitGroup + for i := range o.concurrency { + stats[i] = newWorkerStats() + wg.Add(1) + go func() { + defer wg.Done() + work(client, o, i, actors, measureFrom, end, stats[i]) + }() + } + wg.Wait() + + // Сверка идёт уже после нагрузки, поэтому на RPS она не влияет. + res := summarize(o, stats) + res.Verify = verify(client, o, actors, stats) + if err := writeResult(o, res); err != nil { + return err + } + // Результат записан и при неудаче: так можно разобрать, что именно пошло не так. + if res.Verify.Error != "" || res.Verify.Lost > 0 || res.Verify.DuplicateIDs > 0 || res.Verify.DuplicateTexts > 0 { + return fmt.Errorf("проверка истории не пройдена: %+v", res.Verify) + } + return nil +} + +// newWorkerStats создаёт пустую статистику клиента. +func newWorkerStats() *workerStats { + return &workerStats{ + errors: map[string]int{}, + instances: map[string]int{}, + secOK: map[int]int{}, + secErr: map[int]int{}, + } +} + +// work — цикл одного клиента до конца замера (closed-loop): следующий запрос уходит только +// после ответа на предыдущий. Клиенты равномерно распределены по чатам. +func work(client *http.Client, o options, worker int, actors []actor, from, end time.Time, st *workerStats) { + chat := worker % len(actors) + a := actors[chat] + path := "/api/v1/chats/" + a.chatID + "/messages" + // Свой генератор у каждого клиента: общий потребовал бы блокировки. + rng := mathrand.New(mathrand.NewPCG(uint64(worker), uint64(time.Now().UnixNano()))) + + // observe учитывает результат одного запроса и возвращает true, если он успешен. В замер + // входит только запрос, начатый после прогрева и завершившийся до конца замера. lat — куда + // записать задержку успешного запроса, want — ожидаемый код ответа. + observe := func(began time.Time, status int, instance string, err error, want int, lat *[]time.Duration) bool { + now := time.Now() + measured := !began.Before(from) && now.Before(end) + // Номер секунды замера: из него строится посекундная шкала. + sec := int(now.Sub(from) / time.Second) + if err == nil && status == want { + if measured { + *lat = append(*lat, now.Sub(began)) + st.instances[instance]++ + st.secOK[sec]++ + } + return true + } + if measured { + // net — ответа не было вообще (обрыв, таймаут), иначе вид ошибки — код ответа. + kind := "net" + if err == nil { + kind = strconv.Itoa(status) + } + st.errors[kind]++ + st.secErr[sec]++ + st.errTimes = append(st.errTimes, now.Sub(from)) + } + return false + } + + for seq := 0; time.Now().Before(end); seq++ { + // Чтение первой страницы истории. После ошибки короткая пауза, чтобы не долбить сервер в цикле. + if rng.Float64() >= o.writeShare { + began := time.Now() + status, inst, _, err := do(client, o, http.MethodGet, path+"?limit=50", a.token, "", nil) + if !observe(began, status, inst, err, http.StatusOK, &st.reads) { + time.Sleep(50 * time.Millisecond) + } + continue + } + // Запись: новый ключ идемпотентности и уникальный текст, по которому видны дубли. + key := randomHex(16) + text := fmt.Sprintf("w-%d-%d-%s", worker, seq, key[:8]) + // Неопределённый результат повторяется с исходным ключом и телом. + // Цикл повторов. При обрыве клиент не знает, записал ли сервер сообщение, поэтому повторяет + // с теми же ключом и текстом: сервер должен вернуть то же сообщение, а не создать новое. + for attempt := 0; time.Now().Before(end); attempt++ { + began := time.Now() + status, inst, body, err := do(client, o, http.MethodPost, path, a.token, key, map[string]string{"text": text}) + if observe(began, status, inst, err, http.StatusCreated, &st.writes) { + var m struct { + ID string `json:"id"` + } + if json.Unmarshal(body, &m) == nil { + st.confirmed = append(st.confirmed, confirmed{chat: chat, id: m.ID, text: text}) + } + // Запись подтвердилась только с повтора: это видно в результате. + if attempt > 0 { + st.retried++ + } + break + } + time.Sleep(100 * time.Millisecond) + } + } +} + +// do выполняет один HTTP-запрос с таймаутом и возвращает код, реплику из X-Instance-Id, тело +// и ошибку сети. payload кодируется в JSON; пустые token и key не добавляют заголовки. +func do(client *http.Client, o options, method, path, token, key string, payload any) (int, string, []byte, error) { + var body io.Reader + if payload != nil { + b, err := json.Marshal(payload) + if err != nil { + return 0, "", nil, err + } + body = bytes.NewReader(b) + } + ctx, cancel := context.WithTimeout(context.Background(), o.timeout) + defer cancel() + req, err := http.NewRequestWithContext(ctx, method, o.baseURL+path, body) + if err != nil { + return 0, "", nil, err + } + if payload != nil { + req.Header.Set("Content-Type", "application/json") + } + if token != "" { + req.Header.Set("Authorization", "Bearer "+token) + } + if key != "" { + req.Header.Set("Idempotency-Key", key) + } + resp, err := client.Do(req) + if err != nil { + return 0, "", nil, err + } + defer resp.Body.Close() + // Тело читается полностью: иначе соединение нельзя использовать повторно. + data, err := io.ReadAll(resp.Body) + if err != nil { + return 0, "", nil, err + } + return resp.StatusCode, resp.Header.Get("X-Instance-Id"), data, nil +} + +// setup параллельно создаёт пользователей и чаты для всех участников нагрузки. +func setup(client *http.Client, o options) ([]actor, error) { + actors := make([]actor, o.chats) + errs := make([]error, o.chats) + var wg sync.WaitGroup + for i := range o.chats { + wg.Add(1) + go func() { + defer wg.Done() + actors[i], errs[i] = setupActor(client, o) + }() + } + wg.Wait() + for _, err := range errs { + if err != nil { + return nil, err + } + } + return actors, nil +} + +// setupActor создаёт одного участника: пользователь, вход, чат и начальные сообщения. +// Имена и пароли случайные и нигде не печатаются. +func setupActor(client *http.Client, o options) (actor, error) { + username, password := "lg_"+randomHex(8), "T3st-"+randomHex(16) + status, _, body, err := do(client, o, http.MethodPost, "/api/v1/users", "", "", + map[string]string{"username": username, "display_name": "Load", "password": password}) + if err != nil || status != http.StatusCreated { + return actor{}, fmt.Errorf("create user: status %d: %v", status, err) + } + var user struct { + ID string `json:"id"` + } + if err := json.Unmarshal(body, &user); err != nil { + return actor{}, err + } + + // Вход выполняется через Basic: пользователь получает токен сессии. + req, err := http.NewRequest(http.MethodPost, o.baseURL+"/api/v1/auth/sessions", nil) + if err != nil { + return actor{}, err + } + req.SetBasicAuth(username, password) + resp, err := client.Do(req) + if err != nil { + return actor{}, fmt.Errorf("login: %w", err) + } + defer resp.Body.Close() + var session struct { + Token string `json:"token"` + } + if resp.StatusCode != http.StatusCreated { + return actor{}, fmt.Errorf("login: status %d", resp.StatusCode) + } + if err := json.NewDecoder(resp.Body).Decode(&session); err != nil { + return actor{}, err + } + + status, _, body, err = do(client, o, http.MethodPost, "/api/v1/chats", session.Token, "", + map[string]any{"title": "Load", "member_ids": []string{user.ID}}) + if err != nil || status != http.StatusCreated { + return actor{}, fmt.Errorf("create chat: status %d: %v", status, err) + } + var chat struct { + ID string `json:"id"` + } + if err := json.Unmarshal(body, &chat); err != nil { + return actor{}, err + } + + // Начальные сообщения, чтобы чтение первой страницы возвращало полноценный ответ. + for i := range o.seed { + status, _, _, err := do(client, o, http.MethodPost, "/api/v1/chats/"+chat.ID+"/messages", session.Token, + randomHex(16), map[string]string{"text": fmt.Sprintf("seed-%d", i)}) + if err != nil || status != http.StatusCreated { + return actor{}, fmt.Errorf("seed: status %d: %v", status, err) + } + } + return actor{token: session.Token, chatID: chat.ID}, nil +} + +// verifyResult — итог сверки истории с подтверждёнными записями. +type verifyResult struct { + Confirmed int `json:"confirmed"` + Lost int `json:"lost"` + DuplicateIDs int `json:"duplicate_ids"` + DuplicateTexts int `json:"duplicate_texts"` + Error string `json:"error,omitempty"` +} + +// verify читает всю историю каждого чата и сверяет её с подтверждёнными записями. +// Потеря — подтверждённого ID нет в истории. Дубль — ID или текст встретился дважды. +func verify(client *http.Client, o options, actors []actor, stats []*workerStats) verifyResult { + var res verifyResult + // Какие ID должны быть в каждом чате. + wanted := make([]map[string]bool, len(actors)) + for i := range wanted { + wanted[i] = map[string]bool{} + } + for _, st := range stats { + for _, c := range st.confirmed { + wanted[c.chat][c.id] = true + res.Confirmed++ + } + } + // История читается постранично по курсору, с запасом на временные ошибки. + for chat, a := range actors { + ids, texts := map[string]bool{}, map[string]bool{} + cursor := "" + for { + q := "?limit=100" + if cursor != "" { + q += "&cursor=" + url.QueryEscape(cursor) + } + status, _, body, err := getWithRetry(client, o, "/api/v1/chats/"+a.chatID+"/messages"+q, a.token) + if err != nil || status != http.StatusOK { + res.Error = fmt.Sprintf("read history: status %d: %v", status, err) + return res + } + var page struct { + Items []struct { + ID string `json:"id"` + Text string `json:"text"` + } `json:"items"` + NextCursor *string `json:"next_cursor"` + } + if err := json.Unmarshal(body, &page); err != nil { + res.Error = "decode history: " + err.Error() + return res + } + for _, m := range page.Items { + if ids[m.ID] { + res.DuplicateIDs++ + } + ids[m.ID] = true + if texts[m.Text] { + res.DuplicateTexts++ + } + texts[m.Text] = true + } + if page.NextCursor == nil { + break + } + cursor = *page.NextCursor + } + // Всё, что было подтверждено, должно найтись. + for id := range wanted[chat] { + if !ids[id] { + res.Lost++ + } + } + } + return res +} + +// getWithRetry повторяет чтение до 5 раз: сразу после отказа реплики сверка не должна падать +// из-за временной ошибки. +func getWithRetry(client *http.Client, o options, path, token string) (int, string, []byte, error) { + var ( + status int + inst string + body []byte + err error + ) + for range 5 { + status, inst, body, err = do(client, o, http.MethodGet, path, token, "", nil) + if err == nil && status == http.StatusOK { + break + } + time.Sleep(500 * time.Millisecond) + } + return status, inst, body, err +} + +// latency — задержки успешных запросов одного вида, в миллисекундах. +type latency struct { + Count int `json:"count"` + P50 float64 `json:"p50_ms"` + P95 float64 `json:"p95_ms"` + P99 float64 `json:"p99_ms"` +} + +// incident — эпизод ошибок: начало, длительность и количество. +type incident struct { + StartS float64 `json:"start_s"` + DurationS float64 `json:"duration_s"` + Errors int `json:"errors"` +} + +// second — одна секунда шкалы: успехи и ошибки. +type second struct { + T int `json:"t"` + OK int `json:"ok"` + Err int `json:"err"` +} + +// result — итог прогона. Он записывается в JSON и разбирается скриптами сводок. +type result struct { + Label string `json:"label"` + Concurrency int `json:"concurrency"` + WriteShare float64 `json:"write_share"` + Chats int `json:"chats"` + Seed int `json:"seed_per_chat"` + DurationS float64 `json:"duration_s"` + WarmupS float64 `json:"warmup_s"` + RPS float64 `json:"successful_rps"` + ReadRPS float64 `json:"read_rps"` + WriteRPS float64 `json:"write_rps"` + ErrorShare float64 `json:"error_share"` + Errors map[string]int `json:"errors"` + RetriedWrites int `json:"writes_confirmed_after_retry"` + Read latency `json:"read"` + Write latency `json:"write"` + Instances map[string]int `json:"requests_per_instance"` + Incidents []incident `json:"error_incidents"` + SecondsNoOK int `json:"seconds_without_success"` + Verify verifyResult `json:"verify"` + Timeline []second `json:"timeline,omitempty"` +} + +// summarize объединяет статистику всех клиентов и считает показатели замера. +func summarize(o options, stats []*workerStats) result { + res := result{ + Label: o.label, Concurrency: o.concurrency, WriteShare: o.writeShare, Chats: o.chats, Seed: o.seed, + DurationS: o.duration.Seconds(), WarmupS: o.warmup.Seconds(), + Errors: map[string]int{}, Instances: map[string]int{}, + } + var reads, writes, errTimes []time.Duration + secOK, secErr := map[int]int{}, map[int]int{} + for _, st := range stats { + reads = append(reads, st.reads...) + writes = append(writes, st.writes...) + errTimes = append(errTimes, st.errTimes...) + res.RetriedWrites += st.retried + for k, v := range st.errors { + res.Errors[k] += v + } + for k, v := range st.instances { + res.Instances[k] += v + } + for k, v := range st.secOK { + secOK[k] += v + } + for k, v := range st.secErr { + secErr[k] += v + } + } + res.Read, res.Write = percentiles(reads), percentiles(writes) + secs := o.duration.Seconds() + // RPS учитывает только успешные запросы. + res.ReadRPS = float64(len(reads)) / secs + res.WriteRPS = float64(len(writes)) / secs + res.RPS = res.ReadRPS + res.WriteRPS + if total := len(reads) + len(writes) + len(errTimes); total > 0 { + res.ErrorShare = float64(len(errTimes)) / float64(total) + } + res.Incidents = incidents(errTimes, time.Second) + // Шкала за все секунды, включая пустые: секунда без успехов — признак полной недоступности. + for t := range int(secs) { + res.Timeline = append(res.Timeline, second{T: t, OK: secOK[t], Err: secErr[t]}) + if secOK[t] == 0 { + res.SecondsNoOK++ + } + } + return res +} + +// percentiles считает p50, p95, p99 по отсортированным задержкам. Метод ближайшего ранга: +// значение берётся из данных, без интерполяции. +func percentiles(d []time.Duration) latency { + if len(d) == 0 { + return latency{} + } + slices.Sort(d) + at := func(p float64) float64 { + i := min(int(float64(len(d))*p), len(d)-1) + return float64(d[i].Microseconds()) / 1000 + } + return latency{Count: len(d), P50: at(0.50), P95: at(0.95), P99: at(0.99)} +} + +// incidents объединяет ошибки с разрывом меньше gap в один эпизод. +func incidents(times []time.Duration, gap time.Duration) []incident { + times = slices.Clone(times) + slices.Sort(times) + out := []incident{} + for i, t := range times { + if i == 0 || t-times[i-1] >= gap { + out = append(out, incident{StartS: t.Seconds()}) + } + last := &out[len(out)-1] + last.Errors++ + last.DurationS = t.Seconds() - last.StartS + } + return out +} + +// writeResult пишет полный JSON в файл, а краткую версию без шкалы печатает на экран. +func writeResult(o options, res result) error { + full, err := json.MarshalIndent(res, "", " ") + if err != nil { + return err + } + if o.out != "" { + if err := os.WriteFile(o.out, append(full, '\n'), 0o644); err != nil { + return err + } + } + res.Timeline = nil + brief, err := json.Marshal(res) + if err != nil { + return err + } + fmt.Println(string(brief)) + return nil +} + +// randomHex возвращает n случайных байт в hex. Без случайности нет смысла продолжать, поэтому panic. +func randomHex(n int) string { + b := make([]byte, n) + if _, err := rand.Read(b); err != nil { + panic(err) + } + return hex.EncodeToString(b) +} diff --git a/app/cmd/loadgen/main_test.go b/app/cmd/loadgen/main_test.go new file mode 100644 index 0000000..b6c92f4 --- /dev/null +++ b/app/cmd/loadgen/main_test.go @@ -0,0 +1,31 @@ +package main + +import ( + "testing" + "time" +) + +func TestIncidentsGroupsByGap(t *testing.T) { + got := incidents([]time.Duration{ + 5 * time.Second, + 1 * time.Second, + 1500 * time.Millisecond, + }, time.Second) + if len(got) != 2 { + t.Fatalf("incidents = %+v, want 2", got) + } + if got[0].Errors != 2 || got[0].DurationS != 0.5 || got[1].Errors != 1 || got[1].DurationS != 0 { + t.Errorf("incidents = %+v", got) + } +} + +func TestPercentiles(t *testing.T) { + d := make([]time.Duration, 100) + for i := range d { + d[i] = time.Duration(100-i) * time.Millisecond + } + got := percentiles(d) + if got.Count != 100 || got.P50 != 51 || got.P95 != 96 || got.P99 != 100 { + t.Errorf("percentiles = %+v", got) + } +} diff --git a/app/cmd/messenger/main.go b/app/cmd/messenger/main.go new file mode 100644 index 0000000..903b643 --- /dev/null +++ b/app/cmd/messenger/main.go @@ -0,0 +1,214 @@ +// messenger — сервер API мессенджера, один процесс одной реплики. Своего состояния у реплики нет: +// данные лежат в PostgreSQL, сессии в Valkey, поэтому реплик может быть несколько. +// +// Здесь только сборка: загрузка настроек, подключения, создание сервисов, запуск HTTP-сервера и +// штатное завершение по SIGTERM. Логика находится в internal. +package main + +import ( + "context" + "fmt" + "log/slog" + "os" + "os/signal" + "runtime" + "syscall" + "time" + + httpapi "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/cache" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/config" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/logging" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/objectstore" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/password" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/service" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/session" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/store" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/store/db" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/telemetry" +) + +// main запускает сервер и завершается после сигнала остановки. При ошибке запуска код выхода 1. +// os.Exit не выполняет defer, поэтому перед ним подключение к БД закрывается явно. +func main() { + // Настройки из окружения. Логгера ещё нет, поэтому ошибка идёт прямо в stderr. + cfg, err := config.Load() + if err != nil { + fmt.Fprintln(os.Stderr, err) + os.Exit(1) + } + + logger, err := logging.New(cfg.Logger.Level, cfg.Env, cfg.Version) + if err != nil { + fmt.Fprintln(os.Stderr, err) + os.Exit(1) + } + slog.SetDefault(logger) + shutdownTelemetry, err := telemetry.Init(context.Background()) + if err != nil { + logger.Error("telemetry init failed") + os.Exit(1) + } + defer shutdownTelemetry() + + // Пул подключений к PostgreSQL. Без БД реплика работать не может и завершается: Docker её перезапустит. + pool, err := db.Connect(context.Background(), cfg.Database) + if err != nil { + logger.Error("database connect failed", slog.Any("err", err)) + os.Exit(1) + } + // Хранилище с таймаутом запросов на все обращения к БД. + storage := db.New(pool, time.Duration(cfg.Database.QueryTimeoutMs)*time.Millisecond) + defer storage.Close() + + // Общее хранилище сессий в Valkey: токен, выданный одной репликой, принимают все остальные. + sessClient, err := session.Connect(context.Background(), cfg.Cache) + if err != nil { + logger.Error("session store connect failed", slog.Any("err", err)) + storage.Close() + os.Exit(1) + } + defer sessClient.Close() + sessions := session.NewValkey(sessClient) + + // Хеширование паролей. Оно тяжёлое, поэтому одновременных вычислений не больше числа ядер и не больше 4. + hasher := password.NewHasher(password.Default, min(runtime.GOMAXPROCS(0), 4)) + + auth, err := service.NewAuth(storage, sessions, hasher, time.Duration(cfg.Session.TTLSeconds)*time.Second) + if err != nil { + logger.Error("auth init failed", slog.Any("err", err)) + storage.Close() + os.Exit(1) + } + + // История сообщений по умолчанию читается прямо из БД. Кэш подключается, только если он включён, + // и заменяет собой источник: остальной код разницы не видит. + var messages store.MessageStore = storage + if cfg.HistoryCache.Mode != cache.ModeOff { + hcClient, err := cache.Connect(cfg.HistoryCache) + if err != nil { + logger.Error("history cache config failed", slog.Any("err", err)) + storage.Close() + os.Exit(1) + } + defer hcClient.Close() + hc := cache.New(storage.Messages, hcClient, cache.Options{ + Mode: cfg.HistoryCache.Mode, + Outbox: storage.Messages, + PageTTL: time.Duration(cfg.HistoryCache.PageTTLSeconds) * time.Second, + FillDelay: time.Duration(cfg.HistoryCache.FillDelayMs) * time.Millisecond, + Logger: logger, + }) + defer hc.Close() + messages = hc + } + logger.Info("history cache", slog.String("mode", cfg.HistoryCache.Mode)) + + // Клиент S3 не обращается к серверу при создании: bucket готовит сервис s3-init. + objects, err := objectstore.NewS3(cfg.S3) + if err != nil { + logger.Error("object store config failed", slog.Any("err", err)) + storage.Close() + os.Exit(1) + } + + // Сборка HTTP-сервера из готовых зависимостей. + srv := httpapi.NewServer(httpapi.Deps{ + Config: cfg, + Logger: logger, + Store: storage, + Auth: auth, + Users: service.NewUsers(storage, hasher), + Chats: service.NewChats(storage), + Messages: service.NewMessages(messages), + Attachments: service.NewAttachments(storage, objects, service.AttachmentLimits{ + MaxUploadBytes: cfg.Attachments.MaxUploadBytes, + MaxImagePixels: cfg.Attachments.MaxImagePixels, + MaxConcurrentUploads: cfg.Attachments.MaxConcurrentUploads, + }, logger), + // Readiness: реплика готова, только если доступны и БД, и Valkey. Иначе LB выведет её из + // работы. Схему БД эта проверка не проверяет. S3 сюда намеренно не входит: без него + // недоступны только вложения (503), а пользователи и текстовые сообщения продолжают работать. + // Если бы S3 входил в readiness, его отказ снял бы с балансировки все реплики сразу. + Ready: func(ctx context.Context) error { + if err := storage.Ping(ctx); err != nil { + return err + } + return sessions.Ping(ctx) + }, + }) + + // ctx отменяется при SIGTERM (docker stop) или Ctrl+C: это начало штатного завершения. + ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM) + defer stop() + + // Фоновая очистка старых ключей идемпотентности. Останавливается вместе с ctx. + go purgeIdempotencyKeys(ctx, storage, time.Duration(cfg.Idempotency.TTLSeconds)*time.Second, logger) + + // Сервер блокирует поток до остановки, поэтому запускается отдельно. Буфер 1 не даёт горутине + // зависнуть на отправке, если её уже никто не ждёт. + startErr := make(chan error, 1) + go func() { + startErr <- srv.Start() + }() + + // Ждём первое из двух событий: сервер сам завершился или пришёл сигнал остановки. + select { + case err := <-startErr: + if err != nil { + logger.Error("server failed to start", slog.Any("err", err)) + storage.Close() + os.Exit(1) + } + case <-ctx.Done(): + logger.Info("shutdown signal received") + // Drain: readiness начинает отвечать 503, но запросы ещё обслуживаются. За это время LB + // выводит реплику, поэтому новые запросы перестают приходить до закрытия порта. + srv.Drain(time.Duration(cfg.HTTP.ShutdownDrainMs) * time.Millisecond) + } + + // Предел на завершение открытых запросов. Он должен быть меньше stop_grace_period в compose.yaml, + // иначе Docker пришлёт SIGKILL раньше. + shutdownCtx, cancel := context.WithTimeout( + context.Background(), + time.Duration(cfg.HTTP.ShutdownTimeoutMs)*time.Millisecond, + ) + defer cancel() + + // Закрыть порт и дождаться открытых запросов. Если не успели за предел, это ошибка завершения. + if err := srv.Shutdown(shutdownCtx); err != nil { + logger.Error("shutdown failed", slog.Any("err", err)) + storage.Close() + os.Exit(1) + } + + // Эта строка в логе подтверждает штатное завершение: её ищет failure-detection.py. + logger.Info("server stopped cleanly") +} + +// Как часто удалять устаревшие ключи идемпотентности. +const idempotencyPurgeInterval = time.Hour + +// purgeIdempotencyKeys удаляет ключи старше ttl: сразу при запуске и затем по таймеру. Ошибка не +// опасна: очистка просто повторится позже. Удаление работает на каждой реплике, это безопасно, +// потому что удалять будет нечего после первой из них. +func purgeIdempotencyKeys(ctx context.Context, storage *db.DB, ttl time.Duration, logger *slog.Logger) { + t := time.NewTicker(idempotencyPurgeInterval) + defer t.Stop() + for { + if n, err := storage.PurgeIdempotencyKeys(ctx, ttl); err != nil { + // Ошибка из-за остановки сервера ожидаема: просто выходим. + if ctx.Err() != nil { + return + } + logger.Warn("idempotency keys purge failed", slog.Any("err", err)) + } else if n > 0 { + logger.Info("idempotency keys purged", slog.Int64("count", n)) + } + select { + case <-ctx.Done(): + return + case <-t.C: + } + } +} diff --git a/app/cmd/s3check/main.go b/app/cmd/s3check/main.go new file mode 100644 index 0000000..42ce90e --- /dev/null +++ b/app/cmd/s3check/main.go @@ -0,0 +1,226 @@ +// s3check проверяет права в S3 мимо API: анонимный доступ, ограничения ключей API и очистителя, +// закрытые служебные операции. Создаёт объект и временный bucket, в конце убирает их за собой. +// Запуск: docker compose --env-file .env run --rm s3check +package main + +import ( + "bytes" + "context" + "fmt" + "io" + "net/http" + "net/url" + "os" + "strings" + "time" + + "github.com/google/uuid" + "github.com/minio/minio-go/v7" + "github.com/minio/minio-go/v7/pkg/credentials" +) + +const publicPolicy = `{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":"*","Action":["s3:GetObject"],"Resource":["arn:aws:s3:::%s/*"]}]}` + +var failures int + +func expect(name string, allowed bool, err error) { + // Отказом считается именно ответ сервера о правах: обрыв связи не доказывает, что доступа нет. + code := minio.ToErrorResponse(err).Code + denied := err != nil && (code == "AccessDenied" || code == "InvalidAccessKeyId" || code == "SignatureDoesNotMatch") + observed := "разрешено" + switch { + case denied: + observed = "запрещено (" + code + ")" + case err != nil: + observed = "ошибка: " + err.Error() + } + ok := (allowed && err == nil) || (!allowed && denied) + verdict := "ok " + if !ok { + verdict = "FAIL" + failures++ + } + fmt.Printf("%s %-58s %s\n", verdict, name, observed) +} + +func secret(name string) string { + b, err := os.ReadFile("/run/secrets/" + name) + if err != nil { + fmt.Fprintln(os.Stderr, "s3check:", err) + os.Exit(2) + } + return strings.TrimSpace(string(b)) +} + +func client(endpoint *url.URL, region, role string) *minio.Client { + c, err := minio.New(endpoint.Host, &minio.Options{ + Creds: credentials.NewStaticV4(secret(role+"access_key_id"), secret(role+"secret_access_key"), ""), + Secure: endpoint.Scheme == "https", + Region: region, + BucketLookup: minio.BucketLookupPath, + }) + if err != nil { + fmt.Fprintln(os.Stderr, "s3check:", err) + os.Exit(2) + } + return c +} + +func put(ctx context.Context, c *minio.Client, bucket, key string) error { + body := []byte("s3check") + _, err := c.PutObject(ctx, bucket, key, bytes.NewReader(body), int64(len(body)), minio.PutObjectOptions{DisableMultipart: true}) + return err +} + +func get(ctx context.Context, c *minio.Client, bucket, key string) error { + object, err := c.GetObject(ctx, bucket, key, minio.GetObjectOptions{}) + if err != nil { + return err + } + defer object.Close() + _, err = io.ReadAll(object) + return err +} + +func list(ctx context.Context, c *minio.Client, bucket string) error { + for object := range c.ListObjects(ctx, bucket, minio.ListObjectsOptions{Recursive: true}) { + return object.Err + } + return nil +} + +// anonymous делает запрос без подписи и возвращает код ответа. +func anonymous(ctx context.Context, method, target string) (int, error) { + req, err := http.NewRequestWithContext(ctx, method, target, nil) + if err != nil { + return 0, err + } + resp, err := http.DefaultClient.Do(req) + if err != nil { + return 0, err + } + defer resp.Body.Close() + return resp.StatusCode, nil +} + +func main() { + os.Exit(run()) +} + +// run возвращает код завершения: os.Exit не выполнил бы отложенную уборку. +func run() int { + ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute) + defer cancel() + endpoint, err := url.Parse(os.Getenv("S3_ENDPOINT")) + if err != nil || endpoint.Host == "" { + fmt.Fprintln(os.Stderr, "s3check: S3_ENDPOINT is required") + return 2 + } + region, bucket := os.Getenv("S3_REGION"), os.Getenv("S3_BUCKET") + admin := client(endpoint, region, "s3_admin_") + api := client(endpoint, region, "s3_") + cleaner := client(endpoint, region, "s3_janitor_") + + // Настоящий префикс оригиналов: ключи API и очистителя ограничены им. Объект свежий, поэтому + // работающий очиститель его не тронет, а в конце проверка удаляет его сама. + probe := "originals/" + uuid.NewString() + outside := "s3check/" + uuid.NewString() + other := "s3check-" + uuid.NewString() + + fmt.Println("== Ключ подготовки (admin)") + expect("создать временный чужой bucket", true, admin.MakeBucket(ctx, other, minio.MakeBucketOptions{})) + expect("записать объект в чужой bucket", true, put(ctx, admin, other, "probe")) + defer func() { + _ = admin.RemoveObject(context.Background(), other, "probe", minio.RemoveObjectOptions{}) + _ = admin.RemoveBucket(context.Background(), other) + }() + + fmt.Println("== Ключ API: только объекты своего bucket") + expect("PUT объекта в свой bucket", true, put(ctx, api, bucket, probe)) + expect("GET объекта из своего bucket", true, get(ctx, api, bucket, probe)) + expect("LIST своего bucket", false, list(ctx, api, bucket)) + expect("PUT вне префикса originals/", false, put(ctx, api, bucket, outside)) + expect("GET из чужого bucket", false, get(ctx, api, other, "probe")) + expect("PUT в чужой bucket", false, put(ctx, api, other, "api-probe")) + expect("DELETE из чужого bucket", false, api.RemoveObject(ctx, other, "probe", minio.RemoveObjectOptions{})) + expect("создать bucket", false, api.MakeBucket(ctx, "s3check-"+uuid.NewString(), minio.MakeBucketOptions{})) + expect("удалить bucket", false, api.RemoveBucket(ctx, other)) + expect("сделать bucket публичным (policy)", false, api.SetBucketPolicy(ctx, bucket, fmt.Sprintf(publicPolicy, bucket))) + expect("прочитать policy bucket", false, func() error { _, err := api.GetBucketPolicy(ctx, bucket); return err }()) + + fmt.Println("== Ключ очистителя: листинг и удаление, без чтения содержимого") + expect("LIST своего bucket", true, list(ctx, cleaner, bucket)) + expect("GET содержимого объекта", false, get(ctx, cleaner, bucket, probe)) + expect("LIST чужого bucket", false, list(ctx, cleaner, other)) + expect("PUT вне префикса originals/", false, put(ctx, cleaner, bucket, outside)) + expect("сделать bucket публичным (policy)", false, cleaner.SetBucketPolicy(ctx, bucket, fmt.Sprintf(publicPolicy, bucket))) + expect("создать bucket", false, cleaner.MakeBucket(ctx, "s3check-"+uuid.NewString(), minio.MakeBucketOptions{})) + expect("удалить чужой bucket", false, cleaner.RemoveBucket(ctx, other)) + expect("DELETE объекта в своём bucket", true, cleaner.RemoveObject(ctx, bucket, probe, minio.RemoveObjectOptions{})) + + fmt.Println("== Политика bucket: не задана, доступ только по ключам") + policy, err := admin.GetBucketPolicy(ctx, bucket) + if err != nil && minio.ToErrorResponse(err).Code == "NoSuchBucketPolicy" { + err = nil + } + expect("прочитать политику ключом администратора", true, err) + verdict := "ok " + if policy != "" { + verdict = "FAIL" + failures++ + } + fmt.Printf("%s %-58s %d байт\n", verdict, "политика пуста", len(policy)) + + fmt.Println("== Без подписи: приватность вне API") + if err := put(ctx, admin, bucket, probe); err != nil { + expect("подготовить объект", true, err) + } + defer func() { _ = admin.RemoveObject(context.Background(), bucket, probe, minio.RemoveObjectOptions{}) }() + base := strings.TrimRight(endpoint.String(), "/") + "/" + for _, request := range []struct{ name, method, target string }{ + {"GET объекта", http.MethodGet, base + bucket + "/" + probe}, + {"HEAD объекта", http.MethodHead, base + bucket + "/" + probe}, + {"GET списка объектов", http.MethodGet, base + bucket + "/"}, + {"GET списка bucket", http.MethodGet, base}, + {"PUT объекта", http.MethodPut, base + bucket + "/" + probe + "-anon"}, + {"DELETE объекта", http.MethodDelete, base + bucket + "/" + probe}, + } { + status, err := anonymous(ctx, request.method, request.target) + verdict = "ok " + if err != nil || status != http.StatusForbidden { + verdict = "FAIL" + failures++ + } + fmt.Printf("%s %-58s HTTP %d\n", verdict, request.name, status) + } + + fmt.Println("== Служебные порты SeaweedFS из сети стенда (шлюз пропускает только 9000)") + host := endpoint.Hostname() + for _, port := range []string{"19000", "8888", "8080", "9333", "18888", "18080", "19333", "8333", "8111", "23646"} { + _, err := anonymous(ctx, http.MethodGet, "http://"+host+":"+port+"/") + verdict = "ok " + closed := "закрыт" + if err == nil { + verdict, closed = "FAIL", "ОТКРЫТ" + failures++ + } + fmt.Printf("%s порт %-53s %s\n", verdict, port, closed) + } + + // Имя настоящего сервера существует только во внутренней сети, куда входит лишь шлюз. + _, err = anonymous(ctx, http.MethodGet, "http://s3-storage:9000/") + verdict = "ok " + observed := "недоступен" + if err == nil { + verdict, observed = "FAIL", "ДОСТУПЕН" + failures++ + } + fmt.Printf("%s %-58s %s\n", verdict, "SeaweedFS напрямую, минуя шлюз (s3-storage:9000)", observed) + + if failures > 0 { + fmt.Printf("\nFAIL: %d проверок не прошли\n", failures) + return 1 + } + fmt.Println("\nPASS: права S3 ограничены, bucket приватен, служебные порты закрыты") + return 0 +} diff --git a/app/cmd/s3init/main.go b/app/cmd/s3init/main.go new file mode 100644 index 0000000..9135f73 --- /dev/null +++ b/app/cmd/s3init/main.go @@ -0,0 +1,55 @@ +// s3init — одноразовая подготовка хранилища: дожидается S3, создаёт bucket, удаляет постороннюю +// политику и проверяет, что bucket приватный. Повторный запуск безопасен: объекты не затрагиваются. Запускается сервисом s3-init до старта API. +package main + +import ( + "context" + "fmt" + "os" + "time" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/config" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/objectstore" +) + +const waitLimit = 90 * time.Second + +func main() { + if err := run(); err != nil { + fmt.Fprintln(os.Stderr, "s3init:", err) + os.Exit(1) + } + fmt.Println("s3init: bucket is ready and private") +} + +func run() error { + cfg, err := config.Load() + if err != nil { + return err + } + s3, err := objectstore.NewS3(cfg.S3) + if err != nil { + return err + } + ctx, cancel := context.WithTimeout(context.Background(), waitLimit) + defer cancel() + // Шлюз S3 может стать здоровым раньше, чем готово хранилище под ним: первые ошибки ожидаемы. + for { + err = s3.EnsureBucket(ctx) + if err == nil { + removed, err := s3.RemovePolicy(ctx) + if err != nil { + return err + } + if removed { + fmt.Println("s3init: foreign bucket policy removed") + } + return s3.CheckPrivate(ctx) + } + select { + case <-ctx.Done(): + return err + case <-time.After(time.Second): + } + } +} diff --git a/app/e2e/lb_idempotency_test.go b/app/e2e/lb_idempotency_test.go new file mode 100644 index 0000000..373ae7c --- /dev/null +++ b/app/e2e/lb_idempotency_test.go @@ -0,0 +1,228 @@ +// Package e2e — проверки против запущенного стенда через балансировщик. +// +// Запуск: E2E_BASE_URL=http://localhost:8080 go test -count=1 -v ./e2e/ +// Без E2E_BASE_URL тесты пропускаются, поэтому обычный go test ./... стенд не требует. +// Создаёт только синтетические данные, токены и пароли не печатает. +package e2e + +import ( + "bytes" + "crypto/rand" + "encoding/hex" + "encoding/json" + "fmt" + "io" + "net/http" + "net/url" + "os" + "slices" + "strings" + "sync" + "testing" + "time" +) + +const ( + rounds = 20 + workers = 16 +) + +type client struct { + t *testing.T + base string + http *http.Client + token string +} + +type result struct { + status int + instance string + body []byte +} + +func randomHex(n int) string { + b := make([]byte, n) + if _, err := rand.Read(b); err != nil { + panic(err) + } + return hex.EncodeToString(b) +} + +// do не вызывает t.Fatal: он работает и из горутин. +func (c *client) do(method, path string, headers map[string]string, payload any) (result, error) { + var body io.Reader + if payload != nil { + b, err := json.Marshal(payload) + if err != nil { + return result{}, err + } + body = bytes.NewReader(b) + } + req, err := http.NewRequest(method, c.base+path, body) + if err != nil { + return result{}, err + } + if payload != nil { + req.Header.Set("Content-Type", "application/json") + } + if c.token != "" { + req.Header.Set("Authorization", "Bearer "+c.token) + } + for k, v := range headers { + req.Header.Set(k, v) + } + resp, err := c.http.Do(req) + if err != nil { + return result{}, fmt.Errorf("%s %s: %w", method, strings.Split(path, "?")[0], err) + } + defer resp.Body.Close() + data, err := io.ReadAll(resp.Body) + if err != nil { + return result{}, err + } + return result{status: resp.StatusCode, instance: resp.Header.Get("X-Instance-Id"), body: data}, nil +} + +func (c *client) mustDo(method, path string, want int, payload any, out any) { + c.t.Helper() + res, err := c.do(method, path, nil, payload) + if err != nil { + c.t.Fatal(err) + } + if res.status != want { + c.t.Fatalf("%s %s: status = %d, want %d", method, strings.Split(path, "?")[0], res.status, want) + } + if out != nil { + if err := json.Unmarshal(res.body, out); err != nil { + c.t.Fatalf("%s %s: decode: %v", method, path, err) + } + } +} + +// bootstrap создаёт пользователя с сессией и чат с ним. +func bootstrap(t *testing.T, base string) (*client, string) { + t.Helper() + c := &client{t: t, base: strings.TrimRight(base, "/"), http: &http.Client{Timeout: 10 * time.Second}} + + username, password := "lb_"+randomHex(8), "T3st-"+randomHex(16) + var user struct { + ID string `json:"id"` + } + c.mustDo(http.MethodPost, "/api/v1/users", http.StatusCreated, map[string]string{ + "username": username, "display_name": "LB test", "password": password, + }, &user) + + req, err := http.NewRequest(http.MethodPost, c.base+"/api/v1/auth/sessions", nil) + if err != nil { + t.Fatal(err) + } + req.SetBasicAuth(username, password) + resp, err := c.http.Do(req) + if err != nil { + t.Fatal(err) + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusCreated { + t.Fatalf("login: status = %d", resp.StatusCode) + } + var session struct { + Token string `json:"token"` + } + if err := json.NewDecoder(resp.Body).Decode(&session); err != nil { + t.Fatal(err) + } + c.token = session.Token + + var chat struct { + ID string `json:"id"` + } + c.mustDo(http.MethodPost, "/api/v1/chats", http.StatusCreated, map[string]any{ + "title": "LB test", "member_ids": []string{user.ID}, + }, &chat) + return c, chat.ID +} + +// Одинаковый Idempotency-Key одновременно через разные реплики создаёт ровно одно сообщение. +func TestLBSameKeyConcurrentlyThroughReplicas(t *testing.T) { + base := os.Getenv("E2E_BASE_URL") + if base == "" { + t.Skip("E2E_BASE_URL не задан") + } + c, chatID := bootstrap(t, base) + path := "/api/v1/chats/" + chatID + "/messages" + + perInstance := map[string]int{} + var created []string + for round := range rounds { + key, text := randomHex(16), fmt.Sprintf("гонка %d", round) + results := make([]result, workers) + errs := make([]error, workers) + start := make(chan struct{}) + var wg sync.WaitGroup + for i := range workers { + wg.Add(1) + go func() { + defer wg.Done() + <-start + results[i], errs[i] = c.do(http.MethodPost, path, + map[string]string{"Idempotency-Key": key}, map[string]string{"text": text}) + }() + } + close(start) + wg.Wait() + + instances := map[string]bool{} + for i := range workers { + if errs[i] != nil { + t.Fatalf("round %d: %v", round, errs[i]) + } + if results[i].status != http.StatusCreated { + t.Fatalf("round %d: status = %d, want 201", round, results[i].status) + } + if !bytes.Equal(results[i].body, results[0].body) { + t.Fatalf("round %d: реплики вернули разные сообщения", round) + } + instances[results[i].instance] = true + perInstance[results[i].instance]++ + } + if len(instances) < 2 { + t.Fatalf("round %d обслужила одна реплика: проверьте LB", round) + } + var msg struct { + ID string `json:"id"` + } + if err := json.Unmarshal(results[0].body, &msg); err != nil { + t.Fatal(err) + } + created = append(created, msg.ID) + } + + var history []string + for cursor := ""; ; { + q := "?limit=100" + if cursor != "" { + q += "&cursor=" + url.QueryEscape(cursor) + } + var page struct { + Items []struct { + ID string `json:"id"` + } `json:"items"` + NextCursor *string `json:"next_cursor"` + } + c.mustDo(http.MethodGet, path+q, http.StatusOK, nil, &page) + for _, m := range page.Items { + history = append(history, m.ID) + } + if page.NextCursor == nil { + break + } + cursor = *page.NextCursor + } + slices.Sort(created) + slices.Sort(history) + if !slices.Equal(created, history) { + t.Fatalf("история отличается от подтверждённого: %d сообщений, ожидалось %d", len(history), len(created)) + } + t.Logf("раундов: %d, запросов в раунде: %d, запросов по репликам: %v, сообщений в истории: %d", + rounds, workers, perInstance, len(history)) +} diff --git a/app/go.mod b/app/go.mod new file mode 100644 index 0000000..4dd501e --- /dev/null +++ b/app/go.mod @@ -0,0 +1,60 @@ +module gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl + +go 1.26.0 + +require ( + github.com/google/uuid v1.6.0 + github.com/jackc/pgx/v5 v5.7.6 + github.com/labstack/echo/v4 v4.16.2 + github.com/minio/minio-go/v7 v7.0.95 + github.com/redis/go-redis/v9 v9.7.3 + go.opentelemetry.io/otel v1.38.0 + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.14.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.38.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 + go.opentelemetry.io/otel/log v0.14.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 + golang.org/x/crypto v0.57.0 + golang.org/x/sync v0.23.0 +) + +require ( + github.com/cenkalti/backoff/v5 v5.0.3 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/dustin/go-humanize v1.0.1 // indirect + github.com/go-ini/ini v1.67.0 // indirect + github.com/go-logr/logr v1.4.3 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/goccy/go-json v0.10.5 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // 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.0 // indirect + github.com/klauspost/cpuid/v2 v2.2.11 // indirect + github.com/labstack/gommon v0.5.0 // indirect + github.com/mattn/go-colorable v0.1.15 // indirect + github.com/mattn/go-isatty v0.0.22 // indirect + github.com/minio/crc64nvme v1.0.2 // indirect + github.com/minio/md5-simd v1.1.2 // indirect + github.com/philhofer/fwd v1.2.0 // indirect + github.com/rs/xid v1.6.0 // indirect + github.com/tinylib/msgp v1.3.0 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasttemplate v1.2.2 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect + go.opentelemetry.io/proto/otlp v1.7.1 // 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 +) diff --git a/app/go.sum b/app/go.sum new file mode 100644 index 0000000..8368ab8 --- /dev/null +++ b/app/go.sum @@ -0,0 +1,132 @@ +github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= +github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= +github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= +github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= +github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM= +github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +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/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= +github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +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/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/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= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.7.6 h1:rWQc5FwZSPX58r1OQmkuaNicxdmExaEz5A2DO2hUuTk= +github.com/jackc/pgx/v5 v5.7.6/go.mod h1:aruU7o91Tc2q2cFp5h4uP3f6ztExVpyVv88Xl/8Vl8M= +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.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= +github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= +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= +github.com/labstack/echo/v4 v4.16.2 h1:WFPVqfogOZGH4dTr1UCIB1sqjFIQ/k7vIk5ByL6oWjY= +github.com/labstack/echo/v4 v4.16.2/go.mod h1:V/EQaTVHYJH92QhbQe7kFQ4mjgcjxLQQUQtAN87zZdw= +github.com/labstack/gommon v0.5.0 h1:6VSQ2NOzsnEJ5W6+84E0RbcaDDmgB6NIAzWCczTEe6c= +github.com/labstack/gommon v0.5.0/go.mod h1:Rzlg7HHy1maLfzBYGg9NZcVuz1sA68HHhLjhcEllYE0= +github.com/mattn/go-colorable v0.1.15 h1:+u9SLTRGnXv73cEsnsmoZBom+dMU88B2M0aDcWy0/jY= +github.com/mattn/go-colorable v0.1.15/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= +github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4= +github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= +github.com/minio/crc64nvme v1.0.2 h1:6uO1UxGAD+kwqWWp7mBFsi5gAse66C4NXO8cmcVculg= +github.com/minio/crc64nvme v1.0.2/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg= +github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= +github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= +github.com/minio/minio-go/v7 v7.0.95 h1:ywOUPg+PebTMTzn9VDsoFJy32ZuARN9zhB+K3IYEvYU= +github.com/minio/minio-go/v7 v7.0.95/go.mod h1:wOOX3uxS334vImCNRVyIDdXX9OsXDm89ToynKgqUKlo= +github.com/philhofer/fwd v1.2.0 h1:e6DnBTl7vGY+Gz322/ASL4Gyp1FspeMvx1RNDoToZuM= +github.com/philhofer/fwd v1.2.0/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/redis/go-redis/v9 v9.7.3 h1:YpPyAayJV+XErNsatSElgRZZVCwXX9QzkKYNvO7x0wM= +github.com/redis/go-redis/v9 v9.7.3/go.mod h1:bGUrSggJ9X9GUmZpZNEOQKaANxSGgOEBRltRTZHSvrA= +github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= +github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= +github.com/tinylib/msgp v1.3.0 h1:ULuf7GPooDaIlbyvgAxBV/FI7ynli6LZ1/nVUNu+0ww= +github.com/tinylib/msgp v1.3.0/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= +github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +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/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/otlploghttp v0.14.0 h1:QQqYw3lkrzwVsoEX0w//EhH/TCnpRdEenKBOOEIMjWc= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.14.0/go.mod h1:gSVQcr17jk2ig4jqJ2DX30IdWH251JcNAecvrqTxH1s= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.38.0 h1:Oe2z/BCg5q7k4iXC3cqJxKYg0ieRiOqF0cecFYdPTwk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.38.0/go.mod h1:ZQM5lAJpOsKnYagGg/zV2krVqTtaVdYdDkhMoX6Oalg= +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/otlptracehttp v1.38.0 h1:aTL7F04bJHUlztTsNGJ2l+6he8c+y/b//eR0jjjemT4= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0/go.mod h1:kldtb7jDTeol0l3ewcmd8SDvx3EmIE7lyvqbasU3QC4= +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.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +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.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= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/app/internal/api/http/access_test.go b/app/internal/api/http/access_test.go new file mode 100644 index 0000000..b3e4597 --- /dev/null +++ b/app/internal/api/http/access_test.go @@ -0,0 +1,115 @@ +package http + +import ( + "bytes" + "io" + "net/http" + "strings" + "testing" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/dto" +) + +func TestAccess_ForeignChat(t *testing.T) { + r := newTestRig(t) + _, _, eve, chat := bootstrap(r) + base := "/api/v1/chats/" + chat.ID + + cases := []struct { + method, path string + body any + }{ + {http.MethodGet, base, nil}, + {http.MethodGet, base + "/messages?limit=10", nil}, + {http.MethodPost, base + "/messages", textMessage("вторжение")}, + } + for _, tc := range cases { + var resp *http.Response + if tc.body == nil { + resp = r.do(tc.method, tc.path, eve.ID, nil, nil) + } else { + resp = r.doJSON(tc.method, tc.path, eve.ID, tc.body) + } + if resp.StatusCode != http.StatusNotFound { + data, _ := io.ReadAll(resp.Body) + resp.Body.Close() + t.Fatalf("%s %s expected 404, got %d; body=%s", tc.method, tc.path, resp.StatusCode, string(data)) + } + e := readError(t, resp) + if e.Error.Code != CodeNotFound { + t.Fatalf("%s %s expected code %q, got %q", tc.method, tc.path, CodeNotFound, e.Error.Code) + } + } + + resp := r.do(http.MethodGet, "/api/v1/chats?limit=100", eve.ID, nil, nil) + expectStatus(t, resp, http.StatusOK) + var page dto.ChatsPageResponse + readJSON(t, resp, &page) + for _, item := range page.Items { + if item.ID == chat.ID { + t.Fatalf("чат утёк в список чужого пользователя") + } + } +} + +func TestAccess_AuthBeforeContentType(t *testing.T) { + r := newTestRig(t) + resp := r.do(http.MethodPost, "/api/v1/chats", "", + map[string]string{"Content-Type": "text/plain"}, strings.NewReader("x")) + expectStatus(t, resp, http.StatusUnauthorized) + resp.Body.Close() + + resp = r.do(http.MethodPost, "/api/v1/nope", "", nil, strings.NewReader("x")) + expectStatus(t, resp, http.StatusNotFound) + if resp.Header.Get("X-Request-Id") == "" { + t.Fatal("404 without X-Request-Id") + } + resp.Body.Close() +} + +func TestAccess_RouterErrors(t *testing.T) { + r := newTestRig(t) + alice, _, _, chat := bootstrap(r) + chatPath := "/api/v1/chats/" + chat.ID + + cases := []struct { + method, path, actor string + status int + code, message string + }{ + {http.MethodGet, "/nope", "", http.StatusNotFound, CodeNotFound, "Object not found"}, + {http.MethodGet, "/health/live/", "", http.StatusNotFound, CodeNotFound, "Object not found"}, + {http.MethodGet, "/api/v1/nope", alice.ID, http.StatusNotFound, CodeNotFound, "Object not found"}, + {http.MethodPost, "/health/live", "", http.StatusMethodNotAllowed, CodeInvalidRequest, "Method not allowed"}, + {http.MethodGet, "/api/v1/users", "", http.StatusMethodNotAllowed, CodeInvalidRequest, "Method not allowed"}, + {http.MethodPost, "/api/v1/users/me", "", http.StatusMethodNotAllowed, CodeInvalidRequest, "Method not allowed"}, + {http.MethodDelete, "/api/v1/users/me", alice.ID, http.StatusMethodNotAllowed, CodeInvalidRequest, "Method not allowed"}, + {http.MethodDelete, "/api/v1/chats", alice.ID, http.StatusMethodNotAllowed, CodeInvalidRequest, "Method not allowed"}, + {http.MethodPut, chatPath, alice.ID, http.StatusMethodNotAllowed, CodeInvalidRequest, "Method not allowed"}, + {http.MethodPatch, chatPath + "/messages", alice.ID, http.StatusMethodNotAllowed, CodeInvalidRequest, "Method not allowed"}, + } + for _, tc := range cases { + var body io.Reader + headers := map[string]string{} + if tc.method == http.MethodPost || tc.method == http.MethodPut || tc.method == http.MethodPatch { + body = bytes.NewReader([]byte(`{}`)) + headers["Content-Type"] = "application/json" + } + resp := r.do(tc.method, tc.path, tc.actor, headers, body) + if resp.StatusCode != tc.status { + data, _ := io.ReadAll(resp.Body) + resp.Body.Close() + t.Fatalf("%s %s: expected %d, got %d; body=%s", tc.method, tc.path, tc.status, resp.StatusCode, string(data)) + } + if tc.status == http.StatusMethodNotAllowed && resp.Header.Get("Allow") == "" { + t.Fatalf("%s %s: 405 без заголовка Allow", tc.method, tc.path) + } + e := readError(t, resp) + if e.Error.Code != tc.code || e.Error.Message != tc.message { + t.Fatalf("%s %s: expected %q/%q, got %q/%q", tc.method, tc.path, tc.code, tc.message, e.Error.Code, e.Error.Message) + } + if e.Error.RequestID == "" || e.Error.RequestID != resp.Header.Get("X-Request-Id") { + t.Fatalf("%s %s: request_id %q не совпадает с заголовком %q", tc.method, tc.path, e.Error.RequestID, resp.Header.Get("X-Request-Id")) + } + } +} diff --git a/app/internal/api/http/attachments.go b/app/internal/api/http/attachments.go new file mode 100644 index 0000000..c51bbfe --- /dev/null +++ b/app/internal/api/http/attachments.go @@ -0,0 +1,134 @@ +package http + +import ( + "context" + "io" + "mime" + "net/http" + "strconv" + "time" + + "github.com/labstack/echo/v4" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/dto" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/middleware" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/service" +) + +// routeUploadAttachment освобождён от общего лимита тела: свой лимит применяется в сервисе, после +// аутентификации и проверки доступа. +const routeUploadAttachment = "/api/v1/chats/:chat_id/attachments" + +// transferTimeout — предел на передачу одного файла. Общие таймауты сервера (10 с) рассчитаны на +// JSON и оборвали бы загрузку 10 МиБ на медленном канале. Предел обязателен: иначе медленный клиент +// занимал бы слот загрузки неограниченно долго. +const transferTimeout = 60 * time.Second + +type attachmentsHandler struct { + attachments service.AttachmentsService +} + +// rejectedBodyDrainLimit — сколько байт отклонённой загрузки дочитывается впустую. Клиент обычно +// сначала отправляет всё тело и только потом читает ответ: если перестать читать, он зависнет и +// вместо 413 получит обрыв. Дочитывание идёт в никуда, поэтому память не расходует, а его время +// ограничено transferTimeout. Тело больше этого предела приводит к закрытию соединения. +const rejectedBodyDrainLimit = 64 << 20 + +func extendDeadlines(c echo.Context) { + rc := http.NewResponseController(c.Response()) + deadline := time.Now().Add(transferTimeout) + // Ошибка значит, что соединение не поддерживает дедлайны: тогда действуют общие таймауты. + _ = rc.SetReadDeadline(deadline) + _ = rc.SetWriteDeadline(deadline) +} + +// uploadTransfer стоит снаружи аутентификации, поэтому покрывает и отказы 401. Небольшой ответ об +// ошибке остаётся в буфере сервера и уходит клиенту после дочитывания. +func uploadTransfer(next echo.HandlerFunc) echo.HandlerFunc { + return func(c echo.Context) error { + extendDeadlines(c) + err := next(c) + _, _ = io.CopyN(io.Discard, c.Request().Body, rejectedBodyDrainLimit) + return err + } +} + +func (h *attachmentsHandler) upload(c echo.Context) error { + req := c.Request() + // Несколько filename неоднозначны: пустое значение сервис отклонит как неверное имя. + var filename string + if values := c.QueryParams()["filename"]; len(values) == 1 { + filename = values[0] + } + att, err := h.attachments.Upload(req.Context(), service.UploadInput{ + CallerID: c.Get(middleware.AuthUserIDKey).(string), + ChatID: c.Param("chat_id"), + Filename: filename, + ContentType: req.Header.Get(echo.HeaderContentType), + ContentLength: req.ContentLength, + Body: req.Body, + }) + if err != nil { + return WriteError(c, err) + } + return c.JSON(http.StatusAccepted, toAttachmentResponse(att)) +} + +func (h *attachmentsHandler) get(c echo.Context) error { + att, err := h.attachments.Get(c.Request().Context(), c.Get(middleware.AuthUserIDKey).(string), c.Param("attachment_id")) + if err != nil { + return WriteError(c, err) + } + return c.JSON(http.StatusOK, toAttachmentResponse(att)) +} + +func (h *attachmentsHandler) content(c echo.Context) error { + extendDeadlines(c) + variant := service.VariantOriginal + if values, ok := c.QueryParams()["variant"]; ok { + variant = values[0] + } + ctx, cancel := context.WithTimeout(c.Request().Context(), transferTimeout) + defer cancel() + + att, body, err := h.attachments.Content(ctx, c.Get(middleware.AuthUserIDKey).(string), c.Param("attachment_id"), variant) + if err != nil { + return WriteError(c, err) + } + defer body.Close() + + header := c.Response().Header() + header.Set(echo.HeaderContentLength, strconv.FormatInt(att.SizeBytes, 10)) + // Файл загрузил пользователь: браузер не должен угадывать тип или показывать его как страницу. + header.Set("X-Content-Type-Options", "nosniff") + header.Set("Cache-Control", "private, no-store") + if cd := mime.FormatMediaType("attachment", map[string]string{"filename": att.Filename}); cd != "" { + header.Set(echo.HeaderContentDisposition, cd) + } else { + header.Set(echo.HeaderContentDisposition, "attachment") + } + // Обрыв после начала передачи клиент увидит как неполный ответ: длина объявлена заранее. + return c.Stream(http.StatusOK, att.ContentType, body) +} + +func toAttachmentResponse(a domain.Attachment) dto.AttachmentResponse { + variants := make([]dto.VariantResponse, 0, len(a.Variants)) + for _, v := range a.Variants { + variants = append(variants, dto.VariantResponse{Name: v.Name, ContentType: v.ContentType, SizeBytes: v.SizeBytes, Width: v.Width, Height: v.Height, SHA256: v.SHA256}) + } + return dto.AttachmentResponse{ + ID: a.ID, + ChatID: a.ChatID, + OwnerID: a.OwnerID, + Filename: a.Filename, + ContentType: a.ContentType, + SizeBytes: a.SizeBytes, + SHA256: a.SHA256, + Status: a.Status, + Variants: variants, + ErrorCode: a.ErrorCode, + CreatedAt: dto.NewTimestamp(a.CreatedAt), + UpdatedAt: dto.NewTimestamp(a.UpdatedAt), + } +} diff --git a/app/internal/api/http/attachments_test.go b/app/internal/api/http/attachments_test.go new file mode 100644 index 0000000..3898ec8 --- /dev/null +++ b/app/internal/api/http/attachments_test.go @@ -0,0 +1,546 @@ +package http + +import ( + "bytes" + "context" + "crypto/sha256" + "encoding/hex" + "errors" + "image" + "image/jpeg" + "image/png" + "io" + "log/slog" + "net/http" + "net/url" + "os" + "strings" + "testing" + + "github.com/google/uuid" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/dto" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/objectstore" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/service" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/store" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/validate" +) + +func testPNG(t *testing.T, w, h int) []byte { + t.Helper() + var b bytes.Buffer + if err := png.Encode(&b, image.NewRGBA(image.Rect(0, 0, w, h))); err != nil { + t.Fatal(err) + } + return b.Bytes() +} + +func testJPEG(t *testing.T) []byte { + t.Helper() + var b bytes.Buffer + if err := jpeg.Encode(&b, image.NewRGBA(image.Rect(0, 0, 8, 8)), nil); err != nil { + t.Fatal(err) + } + return b.Bytes() +} + +func (r *testRig) upload(actor, chatID, filename, contentType string, data []byte) *http.Response { + r.t.Helper() + return r.do(http.MethodPost, "/api/v1/chats/"+chatID+"/attachments?filename="+url.QueryEscape(filename), actor, + map[string]string{"Content-Type": contentType}, bytes.NewReader(data)) +} + +func (r *testRig) uploadOK(actor, chatID string, data []byte) dto.AttachmentResponse { + r.t.Helper() + resp := r.upload(actor, chatID, "photo.png", "image/png", data) + expectStatus(r.t, resp, http.StatusAccepted) + var att dto.AttachmentResponse + readJSON(r.t, resp, &att) + return att +} + +func TestAttachment_QueuedIsDurableAndNotDownloadable(t *testing.T) { + r := newTestRig(t) + alice, bob, eve, chat := bootstrap(r) + data := testPNG(t, 16, 16) + att := r.uploadOK(alice.ID, chat.ID, data) + + sum := sha256.Sum256(data) + if att.Status != "queued" || att.SHA256 != hex.EncodeToString(sum[:]) || att.SizeBytes != int64(len(data)) || + att.OwnerID != alice.ID || att.ChatID != chat.ID || att.ErrorCode != nil || att.Variants == nil { + t.Errorf("metadata = %+v", att) + } + + resp := r.do(http.MethodGet, "/api/v1/attachments/"+att.ID+"/content", bob.ID, nil, nil) + expectStatus(t, resp, http.StatusConflict) + resp.Body.Close() + // Queued data is already in durable staging; API has not published final objects. + stored, _, err := r.objects.Get(context.Background(), "staging/"+att.ID) + if err != nil { + t.Fatal(err) + } + defer stored.Close() + got, _ := io.ReadAll(stored) + if !bytes.Equal(got, data) { + t.Fatal("staging bytes differ") + } + + for _, suffix := range []string{"", "/content"} { + resp := r.do(http.MethodGet, "/api/v1/attachments/"+att.ID+suffix, eve.ID, nil, nil) + expectStatus(t, resp, http.StatusNotFound) + resp.Body.Close() + } +} + +func TestAttachment_ObjectKeyIsServerAssignedAndHidden(t *testing.T) { + r := newTestRig(t) + alice, _, _, chat := bootstrap(r) + resp := r.upload(alice.ID, chat.ID, "evil..name.png", "image/png", testPNG(t, 2, 2)) + expectStatus(t, resp, http.StatusAccepted) + defer resp.Body.Close() + body, _ := io.ReadAll(resp.Body) + + keys := r.objects.Keys() + if len(keys) != 1 || strings.Contains(keys[0], "evil") { + t.Fatalf("object keys = %v", keys) + } + if bytes.Contains(body, []byte(keys[0])) || bytes.Contains(body, []byte("object_key")) { + t.Errorf("response exposes object key: %s", body) + } +} + +func TestAttachment_Rejections(t *testing.T) { + r := newTestRig(t) + alice, _, eve, chat := bootstrap(r) + valid := testPNG(t, 4, 4) + oversized := append(bytes.Clone(valid), make([]byte, testMaxUploadBytes)...) + + cases := []struct { + name string + actor string + chat string + filename string + contentType string + data []byte + want int + }{ + {"outsider", eve.ID, chat.ID, "a.png", "image/png", valid, 404}, + {"outsider sees 404 before size check", eve.ID, chat.ID, "a.png", "image/png", oversized, 404}, + {"unknown chat", alice.ID, uuid.NewString(), "a.png", "image/png", valid, 404}, + {"bad chat id", alice.ID, "nope", "a.png", "image/png", valid, 400}, + {"path in filename", alice.ID, chat.ID, "../a.png", "image/png", valid, 400}, + {"backslash in filename", alice.ID, chat.ID, `a\b.png`, "image/png", valid, 400}, + {"NUL in filename", alice.ID, chat.ID, "a\x00.png", "image/png", valid, 400}, + {"empty filename", alice.ID, chat.ID, "", "image/png", valid, 400}, + {"too many bytes", alice.ID, chat.ID, "a.png", "image/png", oversized, 413}, + {"too many pixels", alice.ID, chat.ID, "a.png", "image/png", testPNG(t, 101, 100), 413}, + {"wrong declared type", alice.ID, chat.ID, "a.png", "application/json", valid, 415}, + {"no declared type", alice.ID, chat.ID, "a.png", "", valid, 415}, + {"declared jpeg, actual png", alice.ID, chat.ID, "a.jpg", "image/jpeg", valid, 415}, + {"declared png, actual jpeg", alice.ID, chat.ID, "a.png", "image/png", testJPEG(t), 415}, + {"not an image", alice.ID, chat.ID, "a.png", "image/png", []byte(""), 415}, + {"truncated", alice.ID, chat.ID, "a.png", "image/png", valid[:len(valid)/2], 415}, + {"empty body", alice.ID, chat.ID, "a.png", "image/png", nil, 415}, + } + for _, tc := range cases { + t.Run(tc.name, func(t *testing.T) { + resp := r.upload(tc.actor, tc.chat, tc.filename, tc.contentType, tc.data) + defer resp.Body.Close() + if resp.StatusCode != tc.want { + body, _ := io.ReadAll(resp.Body) + t.Fatalf("status = %d, want %d, body = %s", resp.StatusCode, tc.want, body) + } + }) + } + if keys := r.objects.Keys(); len(keys) != 0 { + t.Errorf("rejected uploads left objects: %v", keys) + } +} + +func TestAttachment_RequiresAuthentication(t *testing.T) { + r := newTestRig(t) + _, _, _, chat := bootstrap(r) + resp := r.upload("", chat.ID, "a.png", "image/png", testPNG(t, 2, 2)) + expectStatus(t, resp, http.StatusUnauthorized) + resp.Body.Close() +} + +func TestAttachment_S3UnavailableGives503AndKeepsMessagesWorking(t *testing.T) { + r := newTestRig(t) + alice, _, _, chat := bootstrap(r) + data := testPNG(t, 2, 2) + att := r.uploadOK(alice.ID, chat.ID, data) + + r.objects.Down.Store(true) + resp := r.upload(alice.ID, chat.ID, "b.png", "image/png", data) + expectStatus(t, resp, http.StatusServiceUnavailable) + if code := readError(t, resp).Error.Code; code != "unavailable" { + t.Errorf("code = %q", code) + } + resp = r.do(http.MethodGet, "/api/v1/attachments/"+att.ID+"/content", alice.ID, nil, nil) + expectStatus(t, resp, http.StatusConflict) + resp.Body.Close() + // Метаданные лежат в БД и остаются доступными. + resp = r.do(http.MethodGet, "/api/v1/attachments/"+att.ID, alice.ID, nil, nil) + expectStatus(t, resp, http.StatusOK) + resp.Body.Close() + if code, _ := r.send(alice, chat.ID, "текст без S3"); code != http.StatusCreated { + t.Errorf("message status = %d", code) + } + + r.objects.Down.Store(false) + resp = r.do(http.MethodGet, "/api/v1/attachments/"+att.ID+"/content", alice.ID, nil, nil) + expectStatus(t, resp, http.StatusConflict) + resp.Body.Close() +} + +func TestAttachment_UnknownVariant(t *testing.T) { + r := newTestRig(t) + alice, _, _, chat := bootstrap(r) + att := r.uploadOK(alice.ID, chat.ID, testPNG(t, 2, 2)) + for query, want := range map[string]int{"?variant=original": 409, "?variant=thumbnail": 409, "?variant=../x": 400, "?variant=": 400} { + resp := r.do(http.MethodGet, "/api/v1/attachments/"+att.ID+"/content"+query, alice.ID, nil, nil) + if resp.StatusCode != want { + t.Errorf("%s: status = %d, want %d", query, resp.StatusCode, want) + } + resp.Body.Close() + } +} + +func TestMessage_AttachmentRules(t *testing.T) { + r := newTestRig(t) + alice, bob, _, chat := bootstrap(r) + other := r.createChat(alice, "другой", alice.ID) + data := testPNG(t, 2, 2) + att := r.uploadOK(alice.ID, chat.ID, data) + foreign := r.uploadOK(alice.ID, other.ID, data) + path := "/api/v1/chats/" + chat.ID + "/messages" + + post := func(body string) *http.Response { + return r.do(http.MethodPost, path, bob.ID, map[string]string{"Content-Type": "application/json"}, strings.NewReader(body)) + } + cases := []struct { + name string + body string + want int + }{ + {"empty text with attachment", `{"text":"","attachment_ids":["` + att.ID + `"]}`, 201}, + {"spaces with attachment", `{"text":" ","attachment_ids":["` + att.ID + `"]}`, 201}, + {"empty attachment list is the old form", `{"text":"x","attachment_ids":[]}`, 201}, + {"empty text without attachments", `{"text":"","attachment_ids":[]}`, 400}, + {"text is still required", `{"attachment_ids":["` + att.ID + `"]}`, 400}, + {"null list", `{"text":"x","attachment_ids":null}`, 400}, + {"wrong type", `{"text":"x","attachment_ids":"` + att.ID + `"}`, 400}, + {"invalid id", `{"text":"x","attachment_ids":["nope"]}`, 400}, + {"duplicate", `{"text":"x","attachment_ids":["` + att.ID + `","` + strings.ToUpper(att.ID) + `"]}`, 400}, + {"unknown attachment", `{"text":"x","attachment_ids":["` + uuid.NewString() + `"]}`, 404}, + {"attachment of another chat", `{"text":"x","attachment_ids":["` + foreign.ID + `"]}`, 404}, + } + for _, tc := range cases { + t.Run(tc.name, func(t *testing.T) { + resp := post(tc.body) + defer resp.Body.Close() + if resp.StatusCode != tc.want { + body, _ := io.ReadAll(resp.Body) + t.Fatalf("status = %d, want %d, body = %s", resp.StatusCode, tc.want, body) + } + }) + } + + items, _ := r.listMessages(alice, chat.ID, 100) + if len(items) != 3 || len(items[0].AttachmentIDs) != 1 || items[0].AttachmentIDs[0] != att.ID { + t.Errorf("history = %+v", items) + } + if items[2].AttachmentIDs == nil { + t.Error("message without attachments must have [] rather than null") + } +} + +func TestMessage_IdempotencyCoversAttachments(t *testing.T) { + r := newTestRig(t) + alice, _, _, chat := bootstrap(r) + a := r.uploadOK(alice.ID, chat.ID, testPNG(t, 2, 2)).ID + b := r.uploadOK(alice.ID, chat.ID, testPNG(t, 3, 3)).ID + key := uuid.NewString() + + code, first := r.postKeyed(alice.ID, chat.ID, key, `{"text":"x","attachment_ids":["`+a+`","`+b+`"]}`) + if code != http.StatusCreated { + t.Fatalf("first: %d %s", code, first) + } + code, replay := r.postKeyed(alice.ID, chat.ID, key, `{"attachment_ids":["`+a+`","`+b+`"],"text":"x"}`) + if code != http.StatusCreated || !bytes.Equal(first, replay) { + t.Errorf("replay: %d %s", code, replay) + } + if code, body := r.postKeyed(alice.ID, chat.ID, key, `{"text":"x","attachment_ids":["`+b+`"]}`); code != http.StatusConflict { + t.Errorf("other attachments: %d %s", code, body) + } + // Отсутствующий attachment_ids равен пустому списку. + plain := uuid.NewString() + if code, _ := r.postKeyed(alice.ID, chat.ID, plain, `{"text":"y"}`); code != http.StatusCreated { + t.Fatalf("plain: %d", code) + } + if code, body := r.postKeyed(alice.ID, chat.ID, plain, `{"text":"y","attachment_ids":[]}`); code != http.StatusCreated { + t.Errorf("plain replay: %d %s", code, body) + } +} + +// failingMetadata имитирует отказ БД между записью в S3 и записью метаданных. +type failingMetadata struct{ *store.Memory } + +func (f failingMetadata) CreateAttachment(context.Context, domain.Attachment) (domain.Attachment, error) { + return domain.Attachment{}, domain.ErrUnavailable +} + +func TestAttachment_MetadataFailureRemovesObject(t *testing.T) { + r := newTestRig(t) + alice, _, _, chat := bootstrap(r) + objects := objectstore.NewMemory() + svc := service.NewAttachments(failingMetadata{r.memory}, objects, service.AttachmentLimits{ + MaxUploadBytes: testMaxUploadBytes, MaxImagePixels: testMaxImagePixels, MaxConcurrentUploads: 1, + }, slog.New(slog.NewTextHandler(io.Discard, nil))) + + data := testPNG(t, 2, 2) + _, err := svc.Upload(context.Background(), service.UploadInput{ + CallerID: alice.ID, ChatID: chat.ID, Filename: "a.png", ContentType: "image/png", + ContentLength: int64(len(data)), Body: bytes.NewReader(data), + }) + if !errors.Is(err, domain.ErrUnavailable) { + t.Fatalf("err = %v", err) + } + if keys := objects.Keys(); len(keys) != 0 { + t.Errorf("object left without metadata: %v", keys) + } +} + +// lostCommit имитирует потерю ответа: строка сохранилась, а INSERT вернул ошибку. +type lostCommit struct{ *store.Memory } + +func (l lostCommit) CreateAttachment(ctx context.Context, att domain.Attachment) (domain.Attachment, error) { + if _, err := l.Memory.CreateAttachment(ctx, att); err != nil { + return domain.Attachment{}, err + } + return domain.Attachment{}, domain.ErrUnavailable +} + +// metadataDown имитирует БД, недоступную и для записи, и для проверки перед компенсацией. +type metadataDown struct{ failingMetadata } + +func (metadataDown) AttachmentExists(context.Context, string) (bool, error) { + return false, domain.ErrUnavailable +} + +func uploadVia(t *testing.T, svc *service.Attachments, caller, chatID string, body io.Reader, size int64) error { + t.Helper() + _, err := svc.Upload(context.Background(), service.UploadInput{ + CallerID: caller, ChatID: chatID, Filename: "a.png", ContentType: "image/png", ContentLength: size, Body: body, + }) + return err +} + +// Строка в БД не должна остаться без файла: при потерянном ответе объект удалять нельзя. +func TestAttachment_LostCommitKeepsObject(t *testing.T) { + r := newTestRig(t) + alice, _, _, chat := bootstrap(r) + objects := objectstore.NewMemory() + svc := service.NewAttachments(lostCommit{r.memory}, objects, service.AttachmentLimits{ + MaxUploadBytes: testMaxUploadBytes, MaxImagePixels: testMaxImagePixels, MaxConcurrentUploads: 1, + }, slog.New(slog.NewTextHandler(io.Discard, nil))) + data := testPNG(t, 2, 2) + if err := uploadVia(t, svc, alice.ID, chat.ID, bytes.NewReader(data), int64(len(data))); !errors.Is(err, domain.ErrUnavailable) { + t.Fatalf("err = %v", err) + } + if keys := objects.Keys(); len(keys) != 1 { + t.Errorf("object of a committed row was deleted: %v", keys) + } +} + +// Если проверить нельзя, объект остаётся очистителю, а не удаляется вслепую. +func TestAttachment_UncheckableMetadataLeavesObjectToJanitor(t *testing.T) { + r := newTestRig(t) + alice, _, _, chat := bootstrap(r) + objects := objectstore.NewMemory() + svc := service.NewAttachments(metadataDown{failingMetadata{r.memory}}, objects, service.AttachmentLimits{ + MaxUploadBytes: testMaxUploadBytes, MaxImagePixels: testMaxImagePixels, MaxConcurrentUploads: 1, + }, slog.New(slog.NewTextHandler(io.Discard, nil))) + data := testPNG(t, 2, 2) + if err := uploadVia(t, svc, alice.ID, chat.ID, bytes.NewReader(data), int64(len(data))); !errors.Is(err, domain.ErrUnavailable) { + t.Fatalf("err = %v", err) + } + if keys := objects.Keys(); len(keys) != 1 { + t.Errorf("object deleted without a metadata check: %v", keys) + } +} + +// brokenBody отдаёт начало файла и обрывается: так выглядит отключившийся клиент. +type brokenBody struct{ data []byte } + +func (b *brokenBody) Read(p []byte) (int, error) { + if len(b.data) == 0 { + return 0, io.ErrUnexpectedEOF + } + n := copy(p, b.data) + b.data = b.data[n:] + return n, nil +} + +func spoolFiles(t *testing.T, dir string) []string { + t.Helper() + entries, err := os.ReadDir(dir) + if err != nil { + t.Fatal(err) + } + names := make([]string, 0, len(entries)) + for _, entry := range entries { + names = append(names, entry.Name()) + } + return names +} + +func TestAttachment_InterruptedUploadLeavesNothing(t *testing.T) { + dir := t.TempDir() + t.Setenv("TMPDIR", dir) + r := newTestRig(t) + alice, _, _, chat := bootstrap(r) + svc := service.NewAttachments(r.memory, r.objects, service.AttachmentLimits{ + MaxUploadBytes: testMaxUploadBytes, MaxImagePixels: testMaxImagePixels, MaxConcurrentUploads: 1, + }, slog.New(slog.NewTextHandler(io.Discard, nil))) + data := testPNG(t, 8, 8) + err := uploadVia(t, svc, alice.ID, chat.ID, &brokenBody{data: bytes.Clone(data[:len(data)/2])}, int64(len(data))) + var invalid *validate.Error + if !errors.As(err, &invalid) { + t.Fatalf("err = %v, want a client error rather than 500", err) + } + if keys := r.objects.Keys(); len(keys) != 0 { + t.Errorf("interrupted upload reached S3: %v", keys) + } + if files := spoolFiles(t, dir); len(files) != 0 { + t.Errorf("temporary files left: %v", files) + } + // Слот освобождён: следующая загрузка проходит при лимите в один файл. + if err := uploadVia(t, svc, alice.ID, chat.ID, bytes.NewReader(data), int64(len(data))); err != nil { + t.Errorf("slot was not released: %v", err) + } +} + +func TestAttachment_TemporaryFileIsRemovedWhileUploadIsRunning(t *testing.T) { + dir := t.TempDir() + t.Setenv("TMPDIR", dir) + r := newTestRig(t) + alice, _, _, chat := bootstrap(r) + svc := service.NewAttachments(r.memory, r.objects, service.AttachmentLimits{ + MaxUploadBytes: testMaxUploadBytes, MaxImagePixels: testMaxImagePixels, MaxConcurrentUploads: 1, + }, slog.New(slog.NewTextHandler(io.Discard, nil))) + blocked := &blockingReader{release: make(chan struct{}), started: make(chan struct{})} + done := make(chan error, 1) + go func() { done <- uploadVia(t, svc, alice.ID, chat.ID, blocked, -1) }() + <-blocked.started + // Файл уже открыт и убран из каталога: падение процесса в этот момент ничего не оставит. + if files := spoolFiles(t, dir); len(files) != 0 { + t.Errorf("temporary file is visible during upload: %v", files) + } + close(blocked.release) + <-done +} + +// Тело без Content-Length не должно обойти лимит размера. +func TestAttachment_ChunkedOverLimitGives413(t *testing.T) { + r := newTestRig(t) + alice, _, _, chat := bootstrap(r) + big := append(testPNG(t, 2, 2), make([]byte, testMaxUploadBytes)...) + req, err := http.NewRequest(http.MethodPost, r.server.URL+"/api/v1/chats/"+chat.ID+"/attachments?filename=a.png", io.MultiReader(bytes.NewReader(big))) + if err != nil { + t.Fatal(err) + } + req.ContentLength = -1 + req.Header.Set("Content-Type", "image/png") + r.setAuth(req, alice.ID) + resp, err := r.client.Do(req) + if err != nil { + t.Fatal(err) + } + defer resp.Body.Close() + expectStatus(t, resp, http.StatusRequestEntityTooLarge) + if keys := r.objects.Keys(); len(keys) != 0 { + t.Errorf("oversized upload reached S3: %v", keys) + } +} + +// blockingReader держит загрузку открытой, пока тест не разрешит продолжить. +type blockingReader struct { + release chan struct{} + started chan struct{} +} + +func (b *blockingReader) Read([]byte) (int, error) { + close(b.started) + <-b.release + return 0, io.EOF +} + +func TestAttachment_ConcurrentUploadLimitGives429(t *testing.T) { + r := newTestRig(t) + alice, _, _, chat := bootstrap(r) + objects := objectstore.NewMemory() + svc := service.NewAttachments(r.memory, objects, service.AttachmentLimits{ + MaxUploadBytes: testMaxUploadBytes, MaxImagePixels: testMaxImagePixels, MaxConcurrentUploads: 1, + }, slog.New(slog.NewTextHandler(io.Discard, nil))) + + blocked := &blockingReader{release: make(chan struct{}), started: make(chan struct{})} + done := make(chan error, 1) + go func() { + _, err := svc.Upload(context.Background(), service.UploadInput{ + CallerID: alice.ID, ChatID: chat.ID, Filename: "a.png", ContentType: "image/png", Body: blocked, + }) + done <- err + }() + <-blocked.started + + data := testPNG(t, 2, 2) + _, err := svc.Upload(context.Background(), service.UploadInput{ + CallerID: alice.ID, ChatID: chat.ID, Filename: "b.png", ContentType: "image/png", Body: bytes.NewReader(data), + }) + if !errors.Is(err, domain.ErrRateLimited) { + t.Errorf("second upload: %v", err) + } + close(blocked.release) + <-done +} + +// Клиент, который читает ответ только после отправки всего тела, должен получить код, а не обрыв. +func TestAttachment_RejectedBodyIsDrainedSoClientGetsStatus(t *testing.T) { + r := newTestRig(t) + alice, _, eve, chat := bootstrap(r) + big := make([]byte, 8*testMaxUploadBytes) + path := "/api/v1/chats/" + chat.ID + "/attachments?filename=a.png" + cases := []struct { + name string + actor string + want int + }{ + {"too large", alice.ID, http.StatusRequestEntityTooLarge}, + {"outsider", eve.ID, http.StatusNotFound}, + {"no session", "", http.StatusUnauthorized}, + } + for _, tc := range cases { + t.Run(tc.name, func(t *testing.T) { + for _, length := range []int64{int64(len(big)), -1} { // с Content-Length и chunked + req, err := http.NewRequest(http.MethodPost, r.server.URL+path, io.MultiReader(bytes.NewReader(big))) + if err != nil { + t.Fatal(err) + } + req.ContentLength = length + req.Header.Set("Content-Type", "image/png") + r.setAuth(req, tc.actor) + resp, err := r.client.Do(req) + if err != nil { + t.Fatalf("length %d: %v", length, err) + } + resp.Body.Close() + if resp.StatusCode != tc.want { + t.Errorf("length %d: status = %d, want %d", length, resp.StatusCode, tc.want) + } + } + }) + } +} diff --git a/app/internal/api/http/auth.go b/app/internal/api/http/auth.go new file mode 100644 index 0000000..9a3a0d1 --- /dev/null +++ b/app/internal/api/http/auth.go @@ -0,0 +1,73 @@ +package http + +import ( + "encoding/base64" + "errors" + "io" + "net/http" + "strings" + "unicode/utf8" + + "github.com/labstack/echo/v4" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/dto" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/middleware" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/service" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/validate" +) + +type authHandler struct { + auth service.AuthService +} + +func (h *authHandler) createSession(c echo.Context) error { + // Read at most one byte: chunked requests have no known Content-Length. + var first [1]byte + n, err := io.ReadFull(c.Request().Body, first[:]) + if n != 0 || (err != nil && !errors.Is(err, io.EOF)) { + return WriteError(c, &validate.Error{Field: "body", Reason: "must be empty, credentials go in Authorization: Basic"}) + } + username, password, ok := parseBasic(c.Request().Header.Get(echo.HeaderAuthorization)) + if !ok { + return middleware.Unauthorized(c, middleware.BasicChallenge, "Invalid credentials") + } + + s, err := h.auth.Login(c.Request().Context(), username, password) + if err != nil { + if errors.Is(err, domain.ErrUnauthorized) { + return middleware.Unauthorized(c, middleware.BasicChallenge, "Invalid credentials") + } + return WriteError(c, err) + } + return c.JSON(http.StatusCreated, dto.SessionResponse{ + Token: s.Token, + TokenType: "Bearer", + ExpiresAt: dto.NewTimestamp(s.ExpiresAt), + User: toUserResponse(s.User), + }) +} + +func (h *authHandler) revokeSession(c echo.Context) error { + tok := c.Get(middleware.AuthTokenKey).(string) + if err := h.auth.Logout(c.Request().Context(), tok); err != nil { + return WriteError(c, err) + } + return c.NoContent(http.StatusNoContent) +} + +func parseBasic(header string) (username, password string, ok bool) { + scheme, encoded, found := strings.Cut(header, " ") + if !found || !strings.EqualFold(scheme, "Basic") { + return "", "", false + } + raw, err := base64.StdEncoding.DecodeString(strings.TrimSpace(encoded)) + if err != nil || !utf8.Valid(raw) { + return "", "", false + } + username, password, found = strings.Cut(string(raw), ":") + if !found || username == "" || password == "" { + return "", "", false + } + return username, password, true +} diff --git a/app/internal/api/http/auth_test.go b/app/internal/api/http/auth_test.go new file mode 100644 index 0000000..c109ed5 --- /dev/null +++ b/app/internal/api/http/auth_test.go @@ -0,0 +1,242 @@ +package http + +import ( + "context" + "encoding/base64" + "io" + "net/http" + "strings" + "testing" + "time" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/dto" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/session" +) + +const ( + basicChallenge = `Basic realm="messenger", charset="UTF-8"` + bearerChallenge = `Bearer realm="messenger"` +) + +func expectUnauthorized(t *testing.T, resp *http.Response, challenge string) { + t.Helper() + defer resp.Body.Close() + if resp.StatusCode != http.StatusUnauthorized { + data, _ := io.ReadAll(resp.Body) + t.Fatalf("expected 401, got %d; body=%s", resp.StatusCode, string(data)) + } + if got := resp.Header.Get("WWW-Authenticate"); got != challenge { + t.Fatalf("WWW-Authenticate = %q, want %q", got, challenge) + } + e := readError(t, resp) + if e.Error.Code != CodeUnauthorized || e.Error.RequestID == "" { + t.Fatalf("unexpected error body: %+v", e) + } +} + +func (r *testRig) withHeaders(method, path string, headers map[string]string) *http.Response { + r.t.Helper() + return r.do(method, path, "", headers, nil) +} + +func TestAuth_LoginReturnsSession(t *testing.T) { + r := newTestRig(t) + alice := r.createUser("login_"+randomSuffix(), "Алиса") + + before := time.Now() + s := r.login(alice.Username, testPassword) + if s.TokenType != "Bearer" || len(s.Token) < 32 { + t.Fatalf("bad session: type=%q len(token)=%d", s.TokenType, len(s.Token)) + } + if s.User.ID != alice.ID || s.User.Username != alice.Username { + t.Fatalf("session user = %+v, want %s", s.User, alice.ID) + } + if strings.Contains(s.Token, alice.ID) || strings.Contains(s.Token, alice.Username) { + t.Fatal("token is derived from user identity") + } + if !s.ExpiresAt.After(before.Add(59*time.Minute)) || s.ExpiresAt.After(before.Add(61*time.Minute)) { + t.Fatalf("expires_at = %s, want ~now+1h", s.ExpiresAt) + } + + if again := r.login(alice.Username, testPassword); again.Token == s.Token { + t.Fatal("second login returned the same token") + } +} + +func TestAuth_LoginRejectsBadCredentialsUniformly(t *testing.T) { + r := newTestRig(t) + alice := r.createUser("bad_"+randomSuffix(), "Алиса") + + expectUnauthorized(t, r.basicLogin(alice.Username, "wrong-password-123"), basicChallenge) + expectUnauthorized(t, r.basicLogin("nobody_"+randomSuffix(), testPassword), basicChallenge) + + b64 := func(s string) string { return base64.StdEncoding.EncodeToString([]byte(s)) } + for _, h := range []string{ + "", + "Bearer " + b64(alice.Username+":"+testPassword), + "Basic not-base64!!!", + "Basic " + b64(alice.Username), + "Basic " + b64(alice.Username+":"), + "Basic " + b64(":"+testPassword), + "Basic " + b64(alice.Username+":\xff\xfe"), + } { + headers := map[string]string{} + if h != "" { + headers["Authorization"] = h + } + expectUnauthorized(t, r.withHeaders(http.MethodPost, "/api/v1/auth/sessions", headers), basicChallenge) + } +} + +func TestAuth_PasswordWithColonAndUnicode(t *testing.T) { + r := newTestRig(t) + username := "colon_" + randomSuffix() + pw := "пароль:с:двоеточиями🙂" + resp := r.doJSON(http.MethodPost, "/api/v1/users", "", dto.CreateUserRequest{ + Username: username, DisplayName: "Двоеточие", Password: pw, + }) + expectStatus(t, resp, http.StatusCreated) + resp.Body.Close() + + r.login(username, pw) + expectUnauthorized(t, r.basicLogin(username, "пароль"), basicChallenge) +} + +func TestAuth_LoginRejectsBody(t *testing.T) { + r := newTestRig(t) + alice := r.createUser("body_"+randomSuffix(), "Алиса") + req, _ := http.NewRequest(http.MethodPost, r.server.URL+"/api/v1/auth/sessions", + strings.NewReader(`{"username":"`+alice.Username+`"}`)) + req.Header.Set("Content-Type", "application/json") + req.SetBasicAuth(alice.Username, testPassword) + resp, err := r.client.Do(req) + if err != nil { + t.Fatal(err) + } + expectStatus(t, resp, http.StatusBadRequest) + resp.Body.Close() +} + +func TestAuth_LoginChunkedBody(t *testing.T) { + r := newTestRig(t) + alice := r.createUser("chunked_"+randomSuffix(), "Алиса") + for _, body := range []string{"", " ", `{"extra":1}`} { + t.Run(body, func(t *testing.T) { + req, err := http.NewRequest(http.MethodPost, r.server.URL+"/api/v1/auth/sessions", io.NopCloser(strings.NewReader(body))) + if err != nil { + t.Fatal(err) + } + req.TransferEncoding = []string{"chunked"} + req.SetBasicAuth(alice.Username, testPassword) + resp, err := r.client.Do(req) + if err != nil { + t.Fatal(err) + } + defer resp.Body.Close() + want := http.StatusBadRequest + if body == "" { + want = http.StatusCreated + } + expectStatus(t, resp, want) + }) + } +} + +func TestAuth_BearerRequired(t *testing.T) { + r := newTestRig(t) + alice, _, eve, _ := bootstrap(r) + + expectUnauthorized(t, r.withHeaders(http.MethodGet, "/api/v1/users/me", nil), bearerChallenge) + expectUnauthorized(t, r.withHeaders(http.MethodGet, "/api/v1/users/me", + map[string]string{"X-User-Id": alice.ID}), bearerChallenge) + basic := base64.StdEncoding.EncodeToString([]byte(alice.Username + ":" + testPassword)) + expectUnauthorized(t, r.withHeaders(http.MethodGet, "/api/v1/users/me", + map[string]string{"Authorization": "Basic " + basic}), bearerChallenge) + expectUnauthorized(t, r.withHeaders(http.MethodGet, "/api/v1/users/me", + map[string]string{"Authorization": "Bearer " + strings.Repeat("A", 43)}), bearerChallenge) + expectUnauthorized(t, r.withHeaders(http.MethodGet, "/api/v1/users/me", + map[string]string{"Authorization": "Bearer " + alice.ID}), bearerChallenge) + + resp := r.do(http.MethodGet, "/api/v1/users/me", alice.ID, map[string]string{"X-User-Id": eve.ID}, nil) + expectStatus(t, resp, http.StatusOK) + var me dto.UserResponse + readJSON(t, resp, &me) + if me.ID != alice.ID { + t.Fatalf("X-User-Id overrode bearer identity: got %s", me.ID) + } + + tok := r.tokens[alice.ID] + resp = r.withHeaders(http.MethodGet, "/api/v1/users/me", map[string]string{"Authorization": "bearer " + tok}) + expectStatus(t, resp, http.StatusOK) + resp.Body.Close() +} + +func TestAuth_Logout(t *testing.T) { + r := newTestRig(t) + alice := r.createUser("logout_"+randomSuffix(), "Алиса") + other := r.login(alice.Username, testPassword) + + resp := r.do(http.MethodDelete, "/api/v1/auth/sessions/current", alice.ID, nil, nil) + expectStatus(t, resp, http.StatusNoContent) + body, _ := io.ReadAll(resp.Body) + resp.Body.Close() + if len(body) != 0 { + t.Fatalf("204 with body %q", body) + } + + expectUnauthorized(t, r.do(http.MethodGet, "/api/v1/users/me", alice.ID, nil, nil), bearerChallenge) + expectUnauthorized(t, r.do(http.MethodDelete, "/api/v1/auth/sessions/current", alice.ID, nil, nil), bearerChallenge) + + resp = r.withHeaders(http.MethodGet, "/api/v1/users/me", map[string]string{"Authorization": "Bearer " + other.Token}) + expectStatus(t, resp, http.StatusOK) + resp.Body.Close() +} + +func TestAuth_SessionExpires(t *testing.T) { + r := newRig(t, defaultTestLimits, session.NewMemory(), 2*time.Second) + alice := r.createUser("ttl_"+randomSuffix(), "Алиса") + + resp := r.do(http.MethodGet, "/api/v1/users/me", alice.ID, nil, nil) + expectStatus(t, resp, http.StatusOK) + resp.Body.Close() + + time.Sleep(2100 * time.Millisecond) + expectUnauthorized(t, r.do(http.MethodGet, "/api/v1/users/me", alice.ID, nil, nil), bearerChallenge) +} + +type brokenSessions struct { + *session.Memory + down bool +} + +func (b *brokenSessions) Get(ctx context.Context, h []byte) (session.Session, error) { + if b.down { + return session.Session{}, domain.ErrUnavailable + } + return b.Memory.Get(ctx, h) +} + +func (b *brokenSessions) Save(ctx context.Context, h []byte, s session.Session) error { + if b.down { + return domain.ErrUnavailable + } + return b.Memory.Save(ctx, h, s) +} + +func TestAuth_SessionStoreDownIs503NotAnonymous(t *testing.T) { + store := &brokenSessions{Memory: session.NewMemory()} + r := newRig(t, defaultTestLimits, store, time.Hour) + alice := r.createUser("down_"+randomSuffix(), "Алиса") + store.down = true + + resp := r.do(http.MethodGet, "/api/v1/users/me", alice.ID, nil, nil) + expectStatus(t, resp, http.StatusServiceUnavailable) + if e := readError(t, resp); e.Error.Code != CodeUnavailable { + t.Fatalf("code = %q, want %q", e.Error.Code, CodeUnavailable) + } + + resp = r.basicLogin(alice.Username, testPassword) + expectStatus(t, resp, http.StatusServiceUnavailable) + resp.Body.Close() +} diff --git a/app/internal/api/http/chats.go b/app/internal/api/http/chats.go new file mode 100644 index 0000000..7f64886 --- /dev/null +++ b/app/internal/api/http/chats.go @@ -0,0 +1,103 @@ +package http + +import ( + "net/http" + "strconv" + + "github.com/labstack/echo/v4" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/dto" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/middleware" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/service" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/validate" +) + +type chatsHandler struct { + chats service.ChatsService +} + +func (h *chatsHandler) create(c echo.Context) error { + callerID := c.Get(middleware.AuthUserIDKey).(string) + var req dto.CreateChatRequest + if err := decodeJSON(c.Request().Body, &req); err != nil { + return WriteError(c, err) + } + + chat, err := h.chats.Create(c.Request().Context(), callerID, req.Title, req.MemberIDs) + if err != nil { + return WriteError(c, err) + } + return c.JSON(http.StatusCreated, toChatResponse(chat)) +} + +func (h *chatsHandler) get(c echo.Context) error { + callerID := c.Get(middleware.AuthUserIDKey).(string) + chatID := c.Param("chat_id") + + chat, err := h.chats.Get(c.Request().Context(), callerID, chatID) + if err != nil { + return WriteError(c, err) + } + return c.JSON(http.StatusOK, toChatResponse(chat)) +} + +func (h *chatsHandler) list(c echo.Context) error { + callerID := c.Get(middleware.AuthUserIDKey).(string) + limit, cursor, err := parsePageParams(c) + if err != nil { + return WriteError(c, err) + } + + page, err := h.chats.List(c.Request().Context(), callerID, cursor, limit) + if err != nil { + return WriteError(c, err) + } + return c.JSON(http.StatusOK, toChatsPage(page)) +} + +func toChatResponse(ch domain.Chat) dto.ChatResponse { + members := make([]string, len(ch.MemberIDs)) + copy(members, ch.MemberIDs) + return dto.ChatResponse{ + ID: ch.ID, + Title: ch.Title, + MemberIDs: members, + CreatedAt: dto.NewTimestamp(ch.CreatedAt), + } +} + +func toChatsPage(p domain.Page[domain.Chat]) dto.ChatsPageResponse { + items := make([]dto.ChatResponse, 0, len(p.Items)) + for _, ch := range p.Items { + items = append(items, toChatResponse(ch)) + } + var next *string + if p.NextCursor != "" { + s := p.NextCursor + next = &s + } + return dto.ChatsPageResponse{Items: items, NextCursor: next} +} + +func parsePageParams(c echo.Context) (int, string, error) { + q := c.QueryParams() + + limit := validate.LimitDefault + if vals, ok := q["limit"]; ok { + n, err := strconv.Atoi(vals[0]) + if err != nil { + return 0, "", &validate.Error{Field: "limit", Reason: "must be an integer"} + } + limit = n + } + + cursor := "" + if vals, ok := q["cursor"]; ok { + if vals[0] == "" { + return 0, "", &validate.Error{Field: "cursor", Reason: "must not be empty"} + } + cursor = vals[0] + } + return limit, cursor, nil +} diff --git a/app/internal/api/http/concurrency_test.go b/app/internal/api/http/concurrency_test.go new file mode 100644 index 0000000..a567cbd --- /dev/null +++ b/app/internal/api/http/concurrency_test.go @@ -0,0 +1,84 @@ +package http + +import ( + "fmt" + "net/http" + "sync" + "testing" +) + +func TestConcurrency_100MessagesFrom10Clients(t *testing.T) { + const clients = 10 + const perClient = 10 + const total = clients * perClient + + r := newTestRig(t) + users := make([]testUser, clients) + memberIDs := make([]string, clients) + for i := range users { + users[i] = r.createUser(fmt.Sprintf("race_%02d_%s", i, randomSuffix()), fmt.Sprintf("Клиент %d", i)) + memberIDs[i] = users[i].ID + } + chat := r.createChat(users[0], "Гонка", memberIDs...) + + type result struct { + id, text string + err error + } + results := make(chan result, total) + start := make(chan struct{}) + var wg sync.WaitGroup + for i, actor := range users { + wg.Add(1) + go func() { + defer wg.Done() + <-start + for j := 0; j < perClient; j++ { + text := fmt.Sprintf("race-c%02d-m%02d", i, j) + status, msg, body := r.sendRaw(actor, chat.ID, mustJSON(map[string]string{"text": text})) + if status != http.StatusCreated { + results <- result{err: fmt.Errorf("%s: status %d: %s", text, status, body)} + continue + } + results <- result{id: msg.ID, text: msg.Text} + } + }() + } + close(start) + wg.Wait() + close(results) + + sentIDs := make(map[string]string, total) + for res := range results { + if res.err != nil { + t.Fatal(res.err) + } + if _, dup := sentIDs[res.id]; dup { + t.Fatalf("сервер выдал один id %s двум сообщениям", res.id) + } + sentIDs[res.id] = res.text + } + if len(sentIDs) != total { + t.Fatalf("подтверждено %d сообщений, ожидалось %d", len(sentIDs), total) + } + + history, _ := r.listMessages(users[0], chat.ID, 100) + if len(history) != total { + t.Fatalf("в истории %d сообщений, ожидалось ровно %d", len(history), total) + } + seen := make(map[string]struct{}, total) + for i, m := range history { + if _, dup := seen[m.ID]; dup { + t.Fatalf("id %s встречается в истории дважды", m.ID) + } + seen[m.ID] = struct{}{} + if text, ok := sentIDs[m.ID]; !ok || text != m.Text { + t.Fatalf("сообщение %s (%q) в истории не совпадает с подтверждённым", m.ID, m.Text) + } + if i > 0 && !history[i-1].CreatedAt.Before(m.CreatedAt.Time) { + t.Fatalf("порядок (created_at) нарушен на индексе %d", i) + } + } + t.Logf("%d клиентов × %d сообщений = %d уникальных сообщений в истории, 0 дубликатов", + clients, perClient, total) +} diff --git a/app/internal/api/http/direct_upload.go b/app/internal/api/http/direct_upload.go new file mode 100644 index 0000000..44c3e70 --- /dev/null +++ b/app/internal/api/http/direct_upload.go @@ -0,0 +1,54 @@ +package http + +import ( + "context" + "net/http" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/middleware" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/service" + "github.com/labstack/echo/v4" +) + +// Optional extension keeps the mandatory proxy contract unchanged. +type directAttachments interface { + InitDirect(context.Context, string, string, service.DirectInput) (service.DirectUpload, error) + CompleteDirect(context.Context, string, string, string) (domain.Attachment, error) +} + +func (h *attachmentsHandler) directInit(c echo.Context) error { + svc, ok := h.attachments.(directAttachments) + if !ok { + return WriteError(c, domain.ErrUnavailable) + } + var in service.DirectInput + if err := decodeJSON(c.Request().Body, &in); err != nil { + return WriteError(c, domain.ErrInvalidArgument) + } + out, err := svc.InitDirect(c.Request().Context(), c.Get(middleware.AuthUserIDKey).(string), c.Param("chat_id"), in) + if err != nil { + return WriteError(c, err) + } + c.Response().Header().Set("Cache-Control", "no-store") + return c.JSON(http.StatusCreated, out) +} + +func (h *attachmentsHandler) directComplete(c echo.Context) error { + svc, ok := h.attachments.(directAttachments) + if !ok { + return WriteError(c, domain.ErrUnavailable) + } + var in struct { + Token string `json:"token"` + } + if err := decodeJSON(c.Request().Body, &in); err != nil { + return WriteError(c, domain.ErrInvalidArgument) + } + ctx, cancel := context.WithTimeout(c.Request().Context(), transferTimeout) + defer cancel() + att, err := svc.CompleteDirect(ctx, c.Get(middleware.AuthUserIDKey).(string), c.Param("chat_id"), in.Token) + if err != nil { + return WriteError(c, err) + } + return c.JSON(http.StatusCreated, toAttachmentResponse(att)) +} diff --git a/app/internal/api/http/dto/attachment.go b/app/internal/api/http/dto/attachment.go new file mode 100644 index 0000000..a59e9ed --- /dev/null +++ b/app/internal/api/http/dto/attachment.go @@ -0,0 +1,27 @@ +package dto + +// VariantResponse — преобразованная копия. В lab4 вариантов нет, список всегда пуст. +type VariantResponse struct { + Name string `json:"name"` + ContentType string `json:"content_type"` + SizeBytes int64 `json:"size_bytes"` + Width int `json:"width"` + Height int `json:"height"` + SHA256 string `json:"sha256"` +} + +// AttachmentResponse намеренно не содержит object key: он внутренний. +type AttachmentResponse struct { + ID string `json:"id"` + ChatID string `json:"chat_id"` + OwnerID string `json:"owner_id"` + Filename string `json:"filename"` + ContentType string `json:"content_type"` + SizeBytes int64 `json:"size_bytes"` + SHA256 string `json:"sha256"` + Status string `json:"status"` + Variants []VariantResponse `json:"variants"` + ErrorCode *string `json:"error_code"` + CreatedAt Timestamp `json:"created_at"` + UpdatedAt Timestamp `json:"updated_at"` +} diff --git a/app/internal/api/http/dto/chat.go b/app/internal/api/http/dto/chat.go new file mode 100644 index 0000000..7f7bbdd --- /dev/null +++ b/app/internal/api/http/dto/chat.go @@ -0,0 +1,18 @@ +package dto + +type CreateChatRequest struct { + Title string `json:"title"` + MemberIDs []string `json:"member_ids"` +} + +type ChatResponse struct { + ID string `json:"id"` + Title string `json:"title"` + MemberIDs []string `json:"member_ids"` + CreatedAt Timestamp `json:"created_at"` +} + +type ChatsPageResponse struct { + Items []ChatResponse `json:"items"` + NextCursor *string `json:"next_cursor"` +} diff --git a/app/internal/api/http/dto/message.go b/app/internal/api/http/dto/message.go new file mode 100644 index 0000000..bd1c268 --- /dev/null +++ b/app/internal/api/http/dto/message.go @@ -0,0 +1,37 @@ +package dto + +import ( + "encoding/json" + "errors" +) + +// AttachmentIDList — необязательное поле: отсутствие равно [], но явный null по контракту неверен. +// Обычный срез принял бы null молча, поэтому разбор свой. +type AttachmentIDList []string + +func (l *AttachmentIDList) UnmarshalJSON(data []byte) error { + if string(data) == "null" { + return errors.New("attachment_ids must be an array") + } + return json.Unmarshal(data, (*[]string)(l)) +} + +type CreateMessageRequest struct { + // Text — указатель: поле обязательно и при наличии вложений, а "" допустим только с ними. + Text *string `json:"text"` + AttachmentIDs AttachmentIDList `json:"attachment_ids"` +} + +type MessageResponse struct { + ID string `json:"id"` + ChatID string `json:"chat_id"` + SenderID string `json:"sender_id"` + Text string `json:"text"` + CreatedAt Timestamp `json:"created_at"` + AttachmentIDs []string `json:"attachment_ids"` +} + +type MessagesPageResponse struct { + Items []MessageResponse `json:"items"` + NextCursor *string `json:"next_cursor"` +} diff --git a/app/internal/api/http/dto/timestamp.go b/app/internal/api/http/dto/timestamp.go new file mode 100644 index 0000000..02a5693 --- /dev/null +++ b/app/internal/api/http/dto/timestamp.go @@ -0,0 +1,20 @@ +package dto + +import "time" + +const timestampLayout = "2006-01-02T15:04:05.000000Z" + +// Timestamp сериализуется в UTC всегда с 6 цифрами дробной части. Стандартный формат +// time.Time отбрасывает нули в конце (…17.95188Z): это корректный RFC 3339, но такое значение +// не разбирает datetime.fromisoformat в Python 3.9–3.10, на которых идут публичные тесты. +type Timestamp struct { + time.Time +} + +func NewTimestamp(t time.Time) Timestamp { + return Timestamp{Time: t} +} + +func (t Timestamp) MarshalJSON() ([]byte, error) { + return []byte(`"` + t.UTC().Format(timestampLayout) + `"`), nil +} diff --git a/app/internal/api/http/dto/timestamp_test.go b/app/internal/api/http/dto/timestamp_test.go new file mode 100644 index 0000000..7a4df0e --- /dev/null +++ b/app/internal/api/http/dto/timestamp_test.go @@ -0,0 +1,48 @@ +package dto + +import ( + "encoding/json" + "testing" + "time" +) + +func TestTimestampAlwaysHasSixFractionalDigits(t *testing.T) { + moscow := time.FixedZone("MSK", 3*60*60) + cases := []struct { + name string + in time.Time + want string + }{ + {"нули в конце", time.Date(2026, 11, 4, 9, 47, 17, 951880000, time.UTC), `"2026-11-04T09:47:17.951880Z"`}, + {"без дробной части", time.Date(2026, 11, 4, 9, 47, 17, 0, time.UTC), `"2026-11-04T09:47:17.000000Z"`}, + {"шесть цифр", time.Date(2026, 11, 4, 9, 47, 17, 123456000, time.UTC), `"2026-11-04T09:47:17.123456Z"`}, + {"наносекунды отбрасываются", time.Date(2026, 11, 4, 9, 47, 17, 123456789, time.UTC), `"2026-11-04T09:47:17.123456Z"`}, + {"приводится к UTC", time.Date(2026, 11, 4, 12, 47, 17, 500000000, moscow), `"2026-11-04T09:47:17.500000Z"`}, + } + for _, c := range cases { + t.Run(c.name, func(t *testing.T) { + got, err := json.Marshal(NewTimestamp(c.in)) + if err != nil { + t.Fatal(err) + } + if string(got) != c.want { + t.Fatalf("got %s, want %s", got, c.want) + } + }) + } +} + +func TestTimestampRoundTrip(t *testing.T) { + want := time.Date(2026, 11, 4, 9, 47, 17, 951880000, time.UTC) + data, err := json.Marshal(MessageResponse{CreatedAt: NewTimestamp(want)}) + if err != nil { + t.Fatal(err) + } + var got MessageResponse + if err := json.Unmarshal(data, &got); err != nil { + t.Fatal(err) + } + if !got.CreatedAt.Equal(want) { + t.Fatalf("got %s, want %s", got.CreatedAt, want) + } +} diff --git a/app/internal/api/http/dto/user.go b/app/internal/api/http/dto/user.go new file mode 100644 index 0000000..65905cf --- /dev/null +++ b/app/internal/api/http/dto/user.go @@ -0,0 +1,21 @@ +package dto + +type CreateUserRequest struct { + Username string `json:"username"` + DisplayName string `json:"display_name"` + Password string `json:"password"` +} + +type UserResponse struct { + ID string `json:"id"` + Username string `json:"username"` + DisplayName string `json:"display_name"` + CreatedAt Timestamp `json:"created_at"` +} + +type SessionResponse struct { + Token string `json:"token"` + TokenType string `json:"token_type"` + ExpiresAt Timestamp `json:"expires_at"` + User UserResponse `json:"user"` +} diff --git a/app/internal/api/http/errors.go b/app/internal/api/http/errors.go new file mode 100644 index 0000000..5a4dc8f --- /dev/null +++ b/app/internal/api/http/errors.go @@ -0,0 +1,83 @@ +package http + +import ( + "errors" + "net/http" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/validate" + "github.com/labstack/echo/v4" +) + +const ( + CodeInvalidRequest = "invalid_request" + CodeUnauthorized = "unauthorized" + CodeNotFound = "not_found" + CodeConflict = "conflict" + CodePayloadTooLarge = "payload_too_large" + CodeUnsupportedMedia = "unsupported_media_type" + CodeRateLimited = "rate_limited" + CodeUnavailable = "unavailable" + CodeInternalError = "internal_error" +) + +type errorBody struct { + Error errorPayload `json:"error"` +} + +type errorPayload struct { + Code string `json:"code"` + Message string `json:"message"` + RequestID string `json:"request_id"` +} + +var ( + ErrUnauthorized = errors.New("unauthorized") + ErrUnsupportedMedia = errors.New("unsupported media type") +) + +func Classify(err error) (status int, code, message string) { + switch { + case errors.Is(err, domain.ErrIdempotencyConflict): + return http.StatusConflict, CodeConflict, "Idempotency-Key was already used with a different request" + case errors.Is(err, domain.ErrNotFound): + return http.StatusNotFound, CodeNotFound, "Object not found" + case errors.Is(err, domain.ErrConflict): + return http.StatusConflict, CodeConflict, "Resource already exists" + case errors.Is(err, domain.ErrInvalidArgument): + return http.StatusBadRequest, CodeInvalidRequest, "Invalid request arguments" + case errors.Is(err, domain.ErrUnavailable): + return http.StatusServiceUnavailable, CodeUnavailable, "Service temporarily unavailable" + case errors.Is(err, domain.ErrPayloadTooLarge): + return http.StatusRequestEntityTooLarge, CodePayloadTooLarge, "Request body too large" + case errors.Is(err, domain.ErrRateLimited): + return http.StatusTooManyRequests, CodeRateLimited, "Too many concurrent requests" + case errors.Is(err, ErrUnauthorized), errors.Is(err, domain.ErrUnauthorized): + return http.StatusUnauthorized, CodeUnauthorized, "Identification required" + case errors.Is(err, domain.ErrUnsupportedMedia): + return http.StatusUnsupportedMediaType, CodeUnsupportedMedia, "Expected a valid PNG or JPEG image" + case errors.Is(err, ErrUnsupportedMedia): + return http.StatusUnsupportedMediaType, CodeUnsupportedMedia, "Expected Content-Type: application/json" + } + + var vErr *validate.Error + if errors.As(err, &vErr) { + return http.StatusBadRequest, CodeInvalidRequest, vErr.Error() + } + + return http.StatusInternalServerError, CodeInternalError, "Internal server error" +} + +func WriteError(c echo.Context, err error) error { + status, code, msg := Classify(err) + if status == http.StatusTooManyRequests { + c.Response().Header().Set("Retry-After", "1") + } + return c.JSON(status, errorBody{ + Error: errorPayload{ + Code: code, + Message: msg, + RequestID: c.Response().Header().Get(echo.HeaderXRequestID), + }, + }) +} diff --git a/app/internal/api/http/health.go b/app/internal/api/http/health.go new file mode 100644 index 0000000..ae459ea --- /dev/null +++ b/app/internal/api/http/health.go @@ -0,0 +1,24 @@ +package http + +import ( + "net/http" + + "github.com/labstack/echo/v4" +) + +type healthResponse struct { + Status string `json:"status"` +} + +func healthLive(c echo.Context) error { + return c.JSON(http.StatusOK, healthResponse{Status: "ok"}) +} + +func healthReady(isReady func() bool) echo.HandlerFunc { + return func(c echo.Context) error { + if !isReady() { + return echo.NewHTTPError(http.StatusServiceUnavailable, "Service unavailable") + } + return c.JSON(http.StatusOK, healthResponse{Status: "ok"}) + } +} diff --git a/app/internal/api/http/helpers_test.go b/app/internal/api/http/helpers_test.go new file mode 100644 index 0000000..97bffb9 --- /dev/null +++ b/app/internal/api/http/helpers_test.go @@ -0,0 +1,358 @@ +package http + +import ( + "bytes" + "encoding/json" + "fmt" + "io" + "log/slog" + "net/http" + "net/http/httptest" + "net/url" + "strings" + "sync" + "testing" + "time" + + "github.com/google/uuid" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/dto" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/config" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/objectstore" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/password" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/service" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/session" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/store" +) + +type testRig struct { + t *testing.T + server *httptest.Server + srv *Server + memory *store.Memory + objects *objectstore.Memory + sessions session.Store + client *http.Client + + mu sync.Mutex + tokens map[string]string +} + +func newTestRig(t *testing.T) *testRig { + return newTestRigWithLimits(t, config.Limits{ + MaxBodyBytes: 1 << 20, + MaxInFlight: 256, + MaxMessagesGlobal: 100000, + MaxHeapBytes: 1 << 40, + }) +} + +func newTestRigWithLimits(t *testing.T, limits config.Limits) *testRig { + t.Helper() + return newRig(t, limits, session.NewMemory(), time.Hour) +} + +const testInstanceID = "test-instance" + +var defaultTestLimits = config.Limits{ + MaxBodyBytes: 1 << 20, + MaxInFlight: 256, + MaxMessagesGlobal: 100000, + MaxHeapBytes: 1 << 40, +} + +func newRig(t *testing.T, limits config.Limits, sessions session.Store, ttl time.Duration) *testRig { + t.Helper() + cfg := &config.Config{ + Env: "test", + Version: "test", + InstanceID: testInstanceID, + HTTP: config.HTTP{ + Addr: "127.0.0.1:0", + ReadTimeoutMs: 10000, + WriteTimeoutMs: 10000, + IdleTimeoutMs: 60000, + ShutdownTimeoutMs: 1000, + }, + Limits: limits, + } + logger := slog.New(slog.NewTextHandler(io.Discard, nil)) + memory := store.NewWithLimit(limits.MaxMessagesGlobal) + hasher := password.NewHasher(testHashParams, 8) + auth, err := service.NewAuth(memory, sessions, hasher, ttl) + if err != nil { + t.Fatal(err) + } + objects := objectstore.NewMemory() + srv := NewServer(Deps{ + Config: cfg, + Logger: logger, + Store: memory, + Auth: auth, + Users: service.NewUsers(memory, hasher), + Chats: service.NewChats(memory), + Messages: service.NewMessages(memory), + Attachments: service.NewAttachments(memory, objects, service.AttachmentLimits{ + MaxUploadBytes: testMaxUploadBytes, + MaxImagePixels: testMaxImagePixels, + MaxConcurrentUploads: testMaxConcurrentUploads, + }, logger), + }) + ts := httptest.NewServer(srv.e) + t.Cleanup(ts.Close) + return &testRig{ + t: t, + server: ts, + srv: srv, + memory: memory, + objects: objects, + sessions: sessions, + client: &http.Client{Timeout: 10 * time.Second}, + tokens: make(map[string]string), + } +} + +type testUser struct { + ID string + Username string + DisplayName string +} + +type errorResp struct { + Error struct { + Code string `json:"code"` + Message string `json:"message"` + RequestID string `json:"request_id"` + } `json:"error"` +} + +func (r *testRig) do(method, path string, actorID string, headers map[string]string, body io.Reader) *http.Response { + r.t.Helper() + req, err := http.NewRequest(method, r.server.URL+path, body) + if err != nil { + r.t.Fatalf("new request %s %s: %v", method, path, err) + } + req.Header.Set("Accept", "application/json") + r.setAuth(req, actorID) + if method == http.MethodPost && strings.HasSuffix(path, "/messages") { + req.Header.Set("Idempotency-Key", uuid.NewString()) + } + for k, v := range headers { + req.Header.Set(k, v) + } + resp, err := r.client.Do(req) + if err != nil { + r.t.Fatalf("do %s %s: %v", method, path, err) + } + return resp +} + +func (r *testRig) doJSON(method, path string, actorID string, payload any) *http.Response { + r.t.Helper() + var body io.Reader + if payload != nil { + body = bytes.NewReader(mustJSON(payload)) + } + return r.do(method, path, actorID, map[string]string{"Content-Type": "application/json"}, body) +} + +func readJSON(t *testing.T, resp *http.Response, dst any) { + t.Helper() + defer resp.Body.Close() + data, err := io.ReadAll(resp.Body) + if err != nil { + t.Fatalf("read body: %v", err) + } + if len(data) == 0 { + return + } + if err := json.Unmarshal(data, dst); err != nil { + t.Fatalf("decode body (%s): %v", string(data), err) + } +} + +func readError(t *testing.T, resp *http.Response) errorResp { + t.Helper() + var e errorResp + readJSON(t, resp, &e) + return e +} + +func expectStatus(t *testing.T, resp *http.Response, want int) { + t.Helper() + if resp.StatusCode != want { + data, _ := io.ReadAll(resp.Body) + resp.Body.Close() + t.Fatalf("expected status %d, got %d; body=%s", want, resp.StatusCode, string(data)) + } +} + +const testPassword = "test-password-123" + +var testHashParams = password.Params{MemoryKiB: 64, Iterations: 1, Parallelism: 1, SaltLen: 16, KeyLen: 32} + +func (r *testRig) createUser(username, displayName string) testUser { + r.t.Helper() + resp := r.doJSON(http.MethodPost, "/api/v1/users", "", dto.CreateUserRequest{ + Username: username, + DisplayName: displayName, + Password: testPassword, + }) + expectStatus(r.t, resp, http.StatusCreated) + var u dto.UserResponse + readJSON(r.t, resp, &u) + s := r.login(username, testPassword) + r.mu.Lock() + r.tokens[u.ID] = s.Token + r.mu.Unlock() + return testUser{ID: u.ID, Username: u.Username, DisplayName: u.DisplayName} +} + +// login входит по Basic и возвращает сессию; ожидает 201. +func (r *testRig) login(username, pw string) dto.SessionResponse { + r.t.Helper() + resp := r.basicLogin(username, pw) + expectStatus(r.t, resp, http.StatusCreated) + var s dto.SessionResponse + readJSON(r.t, resp, &s) + return s +} + +func (r *testRig) basicLogin(username, pw string) *http.Response { + r.t.Helper() + req, _ := http.NewRequest(http.MethodPost, r.server.URL+"/api/v1/auth/sessions", nil) + req.SetBasicAuth(username, pw) + resp, err := r.client.Do(req) + if err != nil { + r.t.Fatalf("login: %v", err) + } + return resp +} + +func (r *testRig) setAuth(req *http.Request, actorID string) { + if actorID == "" { + return + } + r.mu.Lock() + tok, ok := r.tokens[strings.ToLower(actorID)] + r.mu.Unlock() + if !ok { + tok = "unknown-" + actorID + } + req.Header.Set("Authorization", "Bearer "+tok) +} + +func (r *testRig) createChat(owner testUser, title string, members ...string) dto.ChatResponse { + r.t.Helper() + resp := r.doJSON(http.MethodPost, "/api/v1/chats", owner.ID, dto.CreateChatRequest{ + Title: title, + MemberIDs: members, + }) + expectStatus(r.t, resp, http.StatusCreated) + var ch dto.ChatResponse + readJSON(r.t, resp, &ch) + return ch +} + +func (r *testRig) sendMessage(actor testUser, chatID, text string) (*http.Response, dto.MessageResponse) { + r.t.Helper() + resp := r.doJSON(http.MethodPost, "/api/v1/chats/"+chatID+"/messages", actor.ID, textMessage(text)) + if resp.StatusCode != http.StatusCreated { + return resp, dto.MessageResponse{} + } + var m dto.MessageResponse + readJSON(r.t, resp, &m) + return resp, m +} + +func (r *testRig) sendRaw(actor testUser, chatID string, body []byte) (int, dto.MessageResponse, []byte) { + r.t.Helper() + resp := r.do(http.MethodPost, "/api/v1/chats/"+chatID+"/messages", actor.ID, + map[string]string{"Content-Type": "application/json"}, bytes.NewReader(body)) + defer resp.Body.Close() + data, _ := io.ReadAll(resp.Body) + if resp.StatusCode != http.StatusCreated { + return resp.StatusCode, dto.MessageResponse{}, data + } + var m dto.MessageResponse + if err := json.Unmarshal(data, &m); err != nil { + r.t.Fatalf("decode message: %v", err) + } + return resp.StatusCode, m, data +} + +func (r *testRig) send(actor testUser, chatID, text string) (int, dto.MessageResponse) { + r.t.Helper() + status, msg, _ := r.sendRaw(actor, chatID, mustJSON(textMessage(text))) + return status, msg +} + +func (r *testRig) listMessages(actor testUser, chatID string, pageSize int) ([]dto.MessageResponse, int) { + r.t.Helper() + collected := []dto.MessageResponse{} + cursor := "" + for pages := 1; ; pages++ { + q := fmt.Sprintf("/api/v1/chats/%s/messages?limit=%d", chatID, pageSize) + if cursor != "" { + q += "&cursor=" + url.QueryEscape(cursor) + } + resp := r.do(http.MethodGet, q, actor.ID, nil, nil) + expectStatus(r.t, resp, http.StatusOK) + var page dto.MessagesPageResponse + readJSON(r.t, resp, &page) + collected = append(collected, page.Items...) + if page.NextCursor == nil { + return collected, pages + } + cursor = *page.NextCursor + if pages > 100_000 { + r.t.Fatalf("пагинация не сходится: next_cursor не исчезает") + } + } +} + +func bootstrap(r *testRig) (alice, bob, eve testUser, chat dto.ChatResponse) { + alice = r.createUser("own_alice_"+randomSuffix(), "Алиса") + bob = r.createUser("own_bob_"+randomSuffix(), "Боб") + eve = r.createUser("own_eve_"+randomSuffix(), "Ева") + chat = r.createChat(alice, "Контрактный тест", alice.ID, bob.ID) + return +} + +var suffixMu sync.Mutex +var suffixSeq int + +func randomSuffix() string { + suffixMu.Lock() + defer suffixMu.Unlock() + suffixSeq++ + return fmt.Sprintf("%09d_%d", time.Now().UnixNano()%1_000_000_000, suffixSeq) +} + +func mustJSON(v any) []byte { + data, err := json.Marshal(v) + if err != nil { + panic(err) + } + return data +} + +func extractErrorCode(t *testing.T, data []byte) string { + t.Helper() + var e errorResp + if err := json.Unmarshal(data, &e); err != nil { + t.Fatalf("decode error body: %v; raw=%s", err, string(data)) + } + return e.Error.Code +} + +const ( + testMaxUploadBytes = 2 << 20 + testMaxImagePixels = 10_000 + testMaxConcurrentUploads = 4 +) + +// textMessage — тело POST сообщения без вложений. +func textMessage(text string) map[string]string { + return map[string]string{"text": text} +} diff --git a/app/internal/api/http/idempotency_test.go b/app/internal/api/http/idempotency_test.go new file mode 100644 index 0000000..6745197 --- /dev/null +++ b/app/internal/api/http/idempotency_test.go @@ -0,0 +1,119 @@ +package http + +import ( + "bytes" + "io" + "net/http" + "sync" + "testing" + + "github.com/google/uuid" +) + +func (r *testRig) postKeyed(actorID, chatID, key, body string) (int, []byte) { + r.t.Helper() + resp := r.do(http.MethodPost, "/api/v1/chats/"+chatID+"/messages", actorID, + map[string]string{"Content-Type": "application/json", "Idempotency-Key": key}, + bytes.NewReader([]byte(body))) + defer resp.Body.Close() + data, err := io.ReadAll(resp.Body) + if err != nil { + r.t.Fatal(err) + } + return resp.StatusCode, data +} + +func TestIdempotency_ReplayReturnsSameBody(t *testing.T) { + r := newTestRig(t) + alice := r.createUser("alice_"+randomSuffix(), "Alice") + chat := r.createChat(alice, "replay", alice.ID) + key := uuid.NewString() + + code, first := r.postKeyed(alice.ID, chat.ID, key, `{"text":"привет"}`) + if code != http.StatusCreated { + t.Fatalf("first: status = %d, body = %s", code, first) + } + // Иное форматирование JSON — тот же запрос. + code, replay := r.postKeyed(alice.ID, chat.ID, key, "{ \"text\" : \"привет\" }") + if code != http.StatusCreated { + t.Fatalf("replay: status = %d, body = %s", code, replay) + } + if !bytes.Equal(first, replay) { + t.Errorf("replay differs:\n%s\n%s", first, replay) + } + if items, _ := r.listMessages(alice, chat.ID, 100); len(items) != 1 { + t.Errorf("messages = %d, want 1", len(items)) + } +} + +func TestIdempotency_DifferentBodyConflicts(t *testing.T) { + r := newTestRig(t) + alice := r.createUser("alice_"+randomSuffix(), "Alice") + chat := r.createChat(alice, "conflict", alice.ID) + key := uuid.NewString() + + if code, body := r.postKeyed(alice.ID, chat.ID, key, `{"text":"раз"}`); code != http.StatusCreated { + t.Fatalf("first: status = %d, body = %s", code, body) + } + if code, body := r.postKeyed(alice.ID, chat.ID, key, `{"text":"два"}`); code != http.StatusConflict { + t.Fatalf("conflict: status = %d, body = %s", code, body) + } + if items, _ := r.listMessages(alice, chat.ID, 100); len(items) != 1 { + t.Errorf("messages = %d, want 1", len(items)) + } +} + +func TestIdempotency_ScopeAndAccess(t *testing.T) { + r := newTestRig(t) + alice := r.createUser("alice_"+randomSuffix(), "Alice") + bob := r.createUser("bob_"+randomSuffix(), "Bob") + eve := r.createUser("eve_"+randomSuffix(), "Eve") + chat := r.createChat(alice, "shared", alice.ID, bob.ID) + other := r.createChat(alice, "other", alice.ID) + key := uuid.NewString() + + if code, body := r.postKeyed(alice.ID, chat.ID, key, `{"text":"от alice"}`); code != http.StatusCreated { + t.Fatalf("alice: status = %d, body = %s", code, body) + } + if code, body := r.postKeyed(bob.ID, chat.ID, key, `{"text":"от bob"}`); code != http.StatusCreated { + t.Fatalf("bob: status = %d, body = %s", code, body) + } + if code, body := r.postKeyed(alice.ID, other.ID, key, `{"text":"другой чат"}`); code != http.StatusCreated { + t.Fatalf("other chat: status = %d, body = %s", code, body) + } + if code, body := r.postKeyed(eve.ID, chat.ID, key, `{"text":"от alice"}`); code != http.StatusNotFound { + t.Fatalf("stranger: status = %d, body = %s", code, body) + } +} + +func TestIdempotency_ConcurrentCreatesOne(t *testing.T) { + r := newTestRig(t) + alice := r.createUser("alice_"+randomSuffix(), "Alice") + chat := r.createChat(alice, "race", alice.ID) + key := uuid.NewString() + + const workers = 20 + bodies := make([][]byte, workers) + codes := make([]int, workers) + var wg sync.WaitGroup + for i := range workers { + wg.Add(1) + go func() { + defer wg.Done() + codes[i], bodies[i] = r.postKeyed(alice.ID, chat.ID, key, `{"text":"гонка"}`) + }() + } + wg.Wait() + + for i := range workers { + if codes[i] != http.StatusCreated { + t.Fatalf("worker %d: status = %d, body = %s", i, codes[i], bodies[i]) + } + if !bytes.Equal(bodies[i], bodies[0]) { + t.Errorf("worker %d: body differs", i) + } + } + if items, _ := r.listMessages(alice, chat.ID, 100); len(items) != 1 { + t.Errorf("messages = %d, want 1", len(items)) + } +} diff --git a/app/internal/api/http/instance_test.go b/app/internal/api/http/instance_test.go new file mode 100644 index 0000000..bc4b23b --- /dev/null +++ b/app/internal/api/http/instance_test.go @@ -0,0 +1,121 @@ +package http + +import ( + "bytes" + "net/http" + "strings" + "testing" + "time" + + "github.com/google/uuid" +) + +func TestInstanceID_OnEveryResponse(t *testing.T) { + r := newTestRig(t) + cases := []struct { + name, method, path string + want int + }{ + {"live", http.MethodGet, "/health/live", http.StatusOK}, + {"ready", http.MethodGet, "/health/ready", http.StatusOK}, + {"unauthorized", http.MethodGet, "/api/v1/users/me", http.StatusUnauthorized}, + {"unknown route", http.MethodGet, "/api/v1/nope", http.StatusNotFound}, + {"wrong method", http.MethodPatch, "/api/v1/users", http.StatusMethodNotAllowed}, + } + for _, tc := range cases { + t.Run(tc.name, func(t *testing.T) { + resp := r.do(tc.method, tc.path, "", nil, nil) + defer resp.Body.Close() + if resp.StatusCode != tc.want { + t.Fatalf("status = %d, want %d", resp.StatusCode, tc.want) + } + if got := resp.Header.Get("X-Instance-Id"); got != testInstanceID { + t.Errorf("X-Instance-Id = %q, want %q", got, testInstanceID) + } + }) + } +} + +func TestIdempotencyKey_Validation(t *testing.T) { + r := newTestRig(t) + alice := r.createUser("alice_key", "Alice") + chat := r.createChat(alice, "keys", alice.ID) + url := r.server.URL + "/api/v1/chats/" + chat.ID + "/messages" + + post := func(setKey func(http.Header)) int { + t.Helper() + req, err := http.NewRequest(http.MethodPost, url, bytes.NewReader([]byte(`{"text":"hi"}`))) + if err != nil { + t.Fatal(err) + } + req.Header.Set("Content-Type", "application/json") + r.setAuth(req, alice.ID) + setKey(req.Header) + resp, err := r.client.Do(req) + if err != nil { + t.Fatal(err) + } + defer resp.Body.Close() + return resp.StatusCode + } + withKey := func(key string) func(http.Header) { + return func(h http.Header) { h.Set("Idempotency-Key", key) } + } + + if got := post(func(http.Header) {}); got != http.StatusBadRequest { + t.Errorf("missing key: status = %d, want 400", got) + } + for name, key := range map[string]string{ + "empty": "", + "too long": strings.Repeat("a", 129), + "space": "a b", + "unicode": "ключ", + "slash": "a/b", + } { + if got := post(withKey(key)); got != http.StatusBadRequest { + t.Errorf("%s: status = %d, want 400", name, got) + } + } + for name, key := range map[string]string{ + "all allowed chars": "aZ09._:-", + "max length": strings.Repeat("a", 128), + "uuid": uuid.NewString(), + } { + if got := post(withKey(key)); got != http.StatusCreated { + t.Errorf("%s: status = %d, want 201", name, got) + } + } +} + +func TestDrain_NotReadyButStillServing(t *testing.T) { + r := newTestRig(t) + status := func(path string) int { + t.Helper() + resp := r.do(http.MethodGet, path, "", nil, nil) + defer resp.Body.Close() + return resp.StatusCode + } + if got := status("/health/ready"); got != http.StatusOK { + t.Fatalf("ready before drain = %d", got) + } + + done := make(chan struct{}) + go func() { + defer close(done) + r.srv.Drain(500 * time.Millisecond) + }() + deadline := time.Now().Add(400 * time.Millisecond) + for status("/health/ready") != http.StatusServiceUnavailable { + if time.Now().After(deadline) { + t.Fatal("readiness did not become 503 during drain") + } + time.Sleep(5 * time.Millisecond) + } + if got := status("/health/live"); got != http.StatusOK { + t.Errorf("live during drain = %d, want 200", got) + } + if got := status("/api/v1/users/me"); got != http.StatusUnauthorized { + t.Errorf("API during drain = %d, want 401: запросы должны обслуживаться", got) + } + <-done +} diff --git a/app/internal/api/http/limits_test.go b/app/internal/api/http/limits_test.go new file mode 100644 index 0000000..d567d04 --- /dev/null +++ b/app/internal/api/http/limits_test.go @@ -0,0 +1,318 @@ +package http + +import ( + "bytes" + "context" + "encoding/json" + "fmt" + "io" + "net/http" + "strings" + "sync" + "sync/atomic" + "testing" + "time" + + "github.com/google/uuid" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/config" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/session" +) + +func TestLimits_PayloadTooLarge(t *testing.T) { + r := newTestRigWithLimits(t, config.Limits{ + MaxBodyBytes: 256, + MaxInFlight: 16, + MaxMessagesGlobal: 100, + MaxHeapBytes: 1 << 40, + }) + alice := r.createUser("a_"+randomSuffix(), "Алиса") + bob := r.createUser("b_"+randomSuffix(), "Боб") + chat := r.createChat(alice, "Деградация", alice.ID, bob.ID) + + ok, _, _ := r.sendRaw(alice, chat.ID, mustJSON(textMessage("ok"))) + if ok != http.StatusCreated { + t.Fatalf("baseline send expected 201, got %d", ok) + } + stored := r.memory.MessagesTotal() + if stored != 1 { + t.Fatalf("baseline total expected 1, got %d", stored) + } + + big := strings.Repeat("x", 512) + status, _, body := r.sendRaw(alice, chat.ID, mustJSON(textMessage(big))) + if status != http.StatusRequestEntityTooLarge { + t.Fatalf("expected 413 by content-length, got %d body=%s", status, string(body)) + } + code := extractErrorCode(t, body) + if code != CodePayloadTooLarge { + t.Fatalf("expected code %q, got %q", CodePayloadTooLarge, code) + } + + if got := r.memory.MessagesTotal(); got != stored { + t.Fatalf("после 413 store изменился: было %d, стало %d", stored, got) + } +} + +func TestLimits_PayloadBoundaries(t *testing.T) { + const limit = 256 + r := newTestRigWithLimits(t, config.Limits{ + MaxBodyBytes: limit, + MaxInFlight: 16, + MaxMessagesGlobal: 100, + MaxHeapBytes: 1 << 40, + }) + alice := r.createUser("a_"+randomSuffix(), "Алиса") + bob := r.createUser("b_"+randomSuffix(), "Боб") + chat := r.createChat(alice, "Деградация", alice.ID, bob.ID) + + exact := []byte(`{"text":"` + strings.Repeat("x", limit-len(`{"text":""}`)) + `"}`) + if len(exact) != limit { + t.Fatalf("test bug: body is %d bytes, want %d", len(exact), limit) + } + + post := func(body io.Reader) (int, []byte) { + req, _ := http.NewRequest(http.MethodPost, + r.server.URL+"/api/v1/chats/"+chat.ID+"/messages", body) + req.Header.Set("Content-Type", "application/json") + req.Header.Set("Idempotency-Key", uuid.NewString()) + r.setAuth(req, alice.ID) + resp, err := r.client.Do(req) + if err != nil { + t.Fatalf("send: %v", err) + } + defer resp.Body.Close() + data, _ := io.ReadAll(resp.Body) + return resp.StatusCode, data + } + chunked := func(b []byte) io.Reader { return io.MultiReader(bytes.NewReader(b)) } + + if status, body := post(bytes.NewReader(exact)); status != http.StatusCreated { + t.Fatalf("body ровно %d байт с Content-Length: expected 201, got %d body=%s", limit, status, body) + } + if status, body := post(chunked(exact)); status != http.StatusCreated { + t.Fatalf("body ровно %d байт без Content-Length: expected 201, got %d body=%s", limit, status, body) + } + stored := r.memory.MessagesTotal() + + over := []byte(`{"text":"` + strings.Repeat("x", limit) + `"}`) + status, body := post(chunked(over)) + if status != http.StatusRequestEntityTooLarge { + t.Fatalf("body %d байт без Content-Length: expected 413, got %d body=%s", len(over), status, body) + } + if code := extractErrorCode(t, body); code != CodePayloadTooLarge { + t.Fatalf("expected code %q, got %q", CodePayloadTooLarge, code) + } + if got := r.memory.MessagesTotal(); got != stored { + t.Fatalf("после 413 store изменился: было %d, стало %d", stored, got) + } +} + +type slowSessions struct { + *session.Memory + delay atomic.Int64 +} + +func (s *slowSessions) Get(ctx context.Context, h []byte) (session.Session, error) { + time.Sleep(time.Duration(s.delay.Load())) + return s.Memory.Get(ctx, h) +} + +func TestLimits_RateLimited(t *testing.T) { + sessions := &slowSessions{Memory: session.NewMemory()} + r := newRig(t, config.Limits{ + MaxBodyBytes: 1 << 16, + MaxInFlight: 2, + MaxMessagesGlobal: 10000, + MaxHeapBytes: 1 << 40, + }, sessions, time.Hour) + alice := r.createUser("c_"+randomSuffix(), "Алиса") + bob := r.createUser("d_"+randomSuffix(), "Боб") + chat := r.createChat(alice, "Деградация", alice.ID, bob.ID) + sessions.delay.Store(int64(20 * time.Millisecond)) + + const total = 50 + var ( + ok atomic.Int32 + throttled atomic.Int32 + errs atomic.Int32 + wg sync.WaitGroup + ) + wg.Add(total) + start := make(chan struct{}) + for i := 0; i < total; i++ { + i := i + go func() { + defer wg.Done() + <-start + client := &http.Client{Timeout: 10 * time.Second} + body, _ := json.Marshal(textMessage(fmt.Sprintf("flood-%d", i))) + req, _ := http.NewRequest(http.MethodPost, + r.server.URL+"/api/v1/chats/"+chat.ID+"/messages", + bytes.NewReader(body)) + req.Header.Set("Content-Type", "application/json") + req.Header.Set("Idempotency-Key", uuid.NewString()) + r.setAuth(req, alice.ID) + resp, err := client.Do(req) + if err != nil { + errs.Add(1) + return + } + switch resp.StatusCode { + case http.StatusCreated: + ok.Add(1) + case http.StatusTooManyRequests: + throttled.Add(1) + if resp.Header.Get("Retry-After") != "1" { + errs.Add(1) + } + default: + errs.Add(1) + } + resp.Body.Close() + }() + } + close(start) + wg.Wait() + sessions.delay.Store(0) + + if errs.Load() != 0 { + t.Fatalf("неожиданные ошибки/статусы под нагрузкой: %d", errs.Load()) + } + if throttled.Load() == 0 { + t.Fatalf("ожидался хотя бы один 429 при maxInFlight=2 и %d параллельных запросах", total) + } + if ok.Load() == 0 { + t.Fatalf("ни одного 201 — лимит не пропускает валидный трафик") + } + if int(ok.Load()+throttled.Load()) != total { + t.Fatalf("ok=%d throttled=%d не покрывают total=%d", ok.Load(), throttled.Load(), total) + } + + deadline := time.Now().Add(3 * time.Second) + for time.Now().Before(deadline) { + status, _ := r.send(alice, chat.ID, "после-пика "+randomSuffix()) + if status == http.StatusCreated { + break + } + time.Sleep(20 * time.Millisecond) + } + status, _ := r.send(alice, chat.ID, "после-пика-2 "+randomSuffix()) + if status != http.StatusCreated { + t.Fatalf("после отступления нагрузки сервис не восстановился: %d", status) + } + + collected, _ := r.listMessages(alice, chat.ID, 100) + if int32(len(collected)) < ok.Load() { + t.Fatalf("часть подтверждённых сообщений потеряна: подтверждено %d, в истории %d", + ok.Load(), len(collected)) + } + t.Logf("ok=%d throttled=%d errors=%d; history=%d", ok.Load(), throttled.Load(), errs.Load(), len(collected)) +} + +func TestLimits_MessageQuota(t *testing.T) { + const quota = 10 + r := newTestRigWithLimits(t, config.Limits{ + MaxBodyBytes: 1 << 16, + MaxInFlight: 16, + MaxMessagesGlobal: quota, + MaxHeapBytes: 1 << 40, + }) + alice := r.createUser("e_"+randomSuffix(), "Алиса") + bob := r.createUser("f_"+randomSuffix(), "Боб") + chat := r.createChat(alice, "Деградация", alice.ID, bob.ID) + + var saved []string + for i := 0; i < quota; i++ { + status, msg := r.send(alice, chat.ID, fmt.Sprintf("saved-%02d", i)) + if status != http.StatusCreated { + t.Fatalf("send %d: expected 201, got %d", i, status) + } + saved = append(saved, msg.ID) + } + + status, _, body := r.sendRaw(alice, chat.ID, mustJSON(textMessage("overflow"))) + if status != http.StatusServiceUnavailable { + t.Fatalf("expected 503 after quota exhausted, got %d body=%s", status, string(body)) + } + if code := extractErrorCode(t, body); code != CodeUnavailable { + t.Fatalf("expected code %q, got %q", CodeUnavailable, code) + } + + collected, _ := r.listMessages(alice, chat.ID, 100) + if len(collected) != quota { + t.Fatalf("после 503 история чата %d, ожидалось %d", len(collected), quota) + } + gotIDs := make(map[string]struct{}, len(collected)) + for _, m := range collected { + gotIDs[m.ID] = struct{}{} + } + for _, id := range saved { + if _, ok := gotIDs[id]; !ok { + t.Fatalf("подтверждённое сообщение %s исчезло из истории", id) + } + } + + for i := 0; i < 5; i++ { + s, _, _ := r.sendRaw(alice, chat.ID, mustJSON(textMessage("still-over"))) + if s != http.StatusServiceUnavailable { + t.Fatalf("повторный 503 ожидался, получен %d", s) + } + } + + req, _ := http.NewRequest(http.MethodGet, r.server.URL+"/health/live", nil) + resp, err := r.client.Do(req) + if err != nil { + t.Fatalf("health/live: %v", err) + } + resp.Body.Close() + if resp.StatusCode != http.StatusOK { + t.Fatalf("health/live под перегрузкой: ожидали 200, получили %d", resp.StatusCode) + } +} + +func TestLimits_NoSilentLoss(t *testing.T) { + const quota = 20 + r := newTestRigWithLimits(t, config.Limits{ + MaxBodyBytes: 1 << 16, + MaxInFlight: 8, + MaxMessagesGlobal: quota, + MaxHeapBytes: 1 << 40, + }) + alice := r.createUser("g_"+randomSuffix(), "Алиса") + bob := r.createUser("h_"+randomSuffix(), "Боб") + chat := r.createChat(alice, "Деградация", alice.ID, bob.ID) + + const attempts = quota * 3 + acked := make([]string, 0, quota) + codes := make(map[int]int) + for i := 0; i < attempts; i++ { + status, msg, _ := r.sendRaw(alice, chat.ID, mustJSON(textMessage(fmt.Sprintf("loss-%03d", i)))) + codes[status]++ + if status == http.StatusCreated { + acked = append(acked, msg.ID) + } + } + if len(acked) != quota { + t.Fatalf("ожидалось ровно %d подтверждённых записей, получено %d; codes=%v", quota, len(acked), codes) + } + if codes[http.StatusServiceUnavailable] == 0 { + t.Fatalf("ни одного 503 — лимит не сработал") + } + + collected, _ := r.listMessages(alice, chat.ID, 100) + gotIDs := make(map[string]struct{}, len(collected)) + for _, m := range collected { + gotIDs[m.ID] = struct{}{} + } + for _, id := range acked { + if _, ok := gotIDs[id]; !ok { + t.Fatalf("подтверждённое сообщение %s исчезло из истории — незаметная потеря данных", id) + } + } + if len(collected) != len(acked) { + t.Fatalf("история чата содержит %d сообщений, подтверждено %d — скрытое отличие", + len(collected), len(acked)) + } + t.Logf("codes=%v acked=%d history=%d", codes, len(acked), len(collected)) +} diff --git a/app/internal/api/http/messages.go b/app/internal/api/http/messages.go new file mode 100644 index 0000000..8012183 --- /dev/null +++ b/app/internal/api/http/messages.go @@ -0,0 +1,80 @@ +package http + +import ( + "net/http" + + "github.com/labstack/echo/v4" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/dto" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/middleware" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/service" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/validate" +) + +const headerIdempotencyKey = "Idempotency-Key" + +type messagesHandler struct { + messages service.MessagesService +} + +func (h *messagesHandler) send(c echo.Context) error { + callerID := c.Get(middleware.AuthUserIDKey).(string) + chatID := c.Param("chat_id") + + var req dto.CreateMessageRequest + if err := decodeJSON(c.Request().Body, &req); err != nil { + return WriteError(c, err) + } + + if req.Text == nil { + return WriteError(c, &validate.Error{Field: "text", Reason: "is required"}) + } + + msg, err := h.messages.Send(c.Request().Context(), callerID, chatID, c.Request().Header.Get(headerIdempotencyKey), *req.Text, req.AttachmentIDs) + if err != nil { + return WriteError(c, err) + } + return c.JSON(http.StatusCreated, toMessageResponse(msg)) +} + +func (h *messagesHandler) list(c echo.Context) error { + callerID := c.Get(middleware.AuthUserIDKey).(string) + chatID := c.Param("chat_id") + + limit, cursor, err := parsePageParams(c) + if err != nil { + return WriteError(c, err) + } + + page, err := h.messages.List(c.Request().Context(), callerID, chatID, cursor, limit) + if err != nil { + return WriteError(c, err) + } + return c.JSON(http.StatusOK, toMessagesPage(page)) +} + +func toMessageResponse(m domain.Message) dto.MessageResponse { + return dto.MessageResponse{ + ID: m.ID, + ChatID: m.ChatID, + SenderID: m.AuthorID, + Text: m.Text, + CreatedAt: dto.NewTimestamp(m.CreatedAt), + // Без вложений в JSON должен быть [], а не null. + AttachmentIDs: append([]string{}, m.AttachmentIDs...), + } +} + +func toMessagesPage(p domain.Page[domain.Message]) dto.MessagesPageResponse { + items := make([]dto.MessageResponse, 0, len(p.Items)) + for _, m := range p.Items { + items = append(items, toMessageResponse(m)) + } + var next *string + if p.NextCursor != "" { + s := p.NextCursor + next = &s + } + return dto.MessagesPageResponse{Items: items, NextCursor: next} +} diff --git a/app/internal/api/http/middleware/auth.go b/app/internal/api/http/middleware/auth.go new file mode 100644 index 0000000..c21a1ef --- /dev/null +++ b/app/internal/api/http/middleware/auth.go @@ -0,0 +1,61 @@ +package middleware + +import ( + "context" + "errors" + "net/http" + "strings" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "github.com/labstack/echo/v4" +) + +const AuthTokenKey = "auth_token" + +const ( + BearerChallenge = `Bearer realm="messenger"` + BasicChallenge = `Basic realm="messenger", charset="UTF-8"` +) + +type Authenticator interface { + Authenticate(ctx context.Context, token string) (userID string, err error) +} + +func Bearer(auth Authenticator) echo.MiddlewareFunc { + return func(next echo.HandlerFunc) echo.HandlerFunc { + return func(c echo.Context) error { + tok, ok := BearerToken(c.Request().Header.Get(echo.HeaderAuthorization)) + if !ok { + return unauthorized(c, BearerChallenge, "Bearer token required") + } + userID, err := auth.Authenticate(c.Request().Context(), tok) + if err != nil { + if errors.Is(err, domain.ErrUnauthorized) { + return unauthorized(c, BearerChallenge, "Invalid or expired session") + } + return err + } + c.Set(AuthUserIDKey, userID) + c.Set(AuthTokenKey, tok) + return next(c) + } + } +} + +func BearerToken(header string) (string, bool) { + scheme, tok, found := strings.Cut(header, " ") + if !found || !strings.EqualFold(scheme, "Bearer") { + return "", false + } + tok = strings.TrimSpace(tok) + return tok, tok != "" +} + +func unauthorized(c echo.Context, challenge, msg string) error { + c.Response().Header().Set(echo.HeaderWWWAuthenticate, challenge) + return echo.NewHTTPError(http.StatusUnauthorized, msg) +} + +func Unauthorized(c echo.Context, challenge, msg string) error { + return unauthorized(c, challenge, msg) +} diff --git a/app/internal/api/http/middleware/content_type.go b/app/internal/api/http/middleware/content_type.go new file mode 100644 index 0000000..dc6ef03 --- /dev/null +++ b/app/internal/api/http/middleware/content_type.go @@ -0,0 +1,42 @@ +package middleware + +import ( + "mime" + "net/http" + "strings" + + "github.com/labstack/echo/v4" +) + +func ContentType() echo.MiddlewareFunc { + return func(next echo.HandlerFunc) echo.HandlerFunc { + return func(c echo.Context) error { + if !methodHasBody(c.Request().Method) { + return next(c) + } + if !isApplicationJSON(c.Request().Header.Get(echo.HeaderContentType)) { + return echo.NewHTTPError(http.StatusUnsupportedMediaType, "Expected Content-Type: application/json") + } + return next(c) + } + } +} + +func methodHasBody(method string) bool { + switch method { + case http.MethodPost, http.MethodPut, http.MethodPatch: + return true + } + return false +} + +func isApplicationJSON(ct string) bool { + if ct == "" { + return false + } + mediatype, _, err := mime.ParseMediaType(ct) + if err != nil { + return false + } + return strings.EqualFold(mediatype, "application/json") +} diff --git a/app/internal/api/http/middleware/instance_id.go b/app/internal/api/http/middleware/instance_id.go new file mode 100644 index 0000000..0c6cde4 --- /dev/null +++ b/app/internal/api/http/middleware/instance_id.go @@ -0,0 +1,14 @@ +package middleware + +import "github.com/labstack/echo/v4" + +const HeaderInstanceID = "X-Instance-Id" + +func InstanceID(id string) echo.MiddlewareFunc { + return func(next echo.HandlerFunc) echo.HandlerFunc { + return func(c echo.Context) error { + c.Response().Header().Set(HeaderInstanceID, id) + return next(c) + } + } +} diff --git a/app/internal/api/http/middleware/limits.go b/app/internal/api/http/middleware/limits.go new file mode 100644 index 0000000..48ca874 --- /dev/null +++ b/app/internal/api/http/middleware/limits.go @@ -0,0 +1,112 @@ +package middleware + +import ( + "io" + "runtime" + "slices" + "sync/atomic" + "time" + + "github.com/labstack/echo/v4" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" +) + +// BodyLimit ограничивает тело запроса. Маршруты из exemptRoutes применяют собственный лимит. +func BodyLimit(maxBytes int64, exemptRoutes ...string) echo.MiddlewareFunc { + return func(next echo.HandlerFunc) echo.HandlerFunc { + return func(c echo.Context) error { + if !methodHasBody(c.Request().Method) || slices.Contains(exemptRoutes, c.Path()) { + return next(c) + } + if cl := c.Request().ContentLength; cl > maxBytes { + return domain.ErrPayloadTooLarge + } + c.Request().Body = &limitedBody{ + raw: c.Request().Body, + maxLeft: maxBytes, + } + return next(c) + } + } +} + +type limitedBody struct { + raw io.ReadCloser + maxLeft int64 +} + +func (b *limitedBody) Read(p []byte) (int, error) { + if int64(len(p)) > b.maxLeft+1 { + p = p[:b.maxLeft+1] + } + n, err := b.raw.Read(p) + b.maxLeft -= int64(n) + if b.maxLeft < 0 { + return n, domain.ErrPayloadTooLarge + } + return n, err +} + +func (b *limitedBody) Close() error { + return b.raw.Close() +} + +func InFlight(maxInFlight int) echo.MiddlewareFunc { + sem := make(chan struct{}, maxInFlight) + return func(next echo.HandlerFunc) echo.HandlerFunc { + return func(c echo.Context) error { + if isHealthPath(c.Request().URL.Path) { + return next(c) + } + select { + case sem <- struct{}{}: + defer func() { <-sem }() + return next(c) + default: + return domain.ErrRateLimited + } + } + } +} + +func MemoryGuard(maxHeapBytes uint64, poll time.Duration) echo.MiddlewareFunc { + var sample atomic.Uint64 + + readOnce := func() { + var m runtime.MemStats + runtime.ReadMemStats(&m) + if m.HeapInuse > maxHeapBytes { + runtime.GC() + runtime.ReadMemStats(&m) + } + sample.Store(m.HeapInuse) + } + readOnce() + + if poll > 0 { + go func() { + t := time.NewTicker(poll) + defer t.Stop() + for range t.C { + readOnce() + } + }() + } + + return func(next echo.HandlerFunc) echo.HandlerFunc { + return func(c echo.Context) error { + if !methodHasBody(c.Request().Method) || isHealthPath(c.Request().URL.Path) { + return next(c) + } + if sample.Load() > maxHeapBytes { + return domain.ErrUnavailable + } + return next(c) + } + } +} + +func isHealthPath(path string) bool { + return path == "/health/live" || path == "/health/ready" +} diff --git a/app/internal/api/http/middleware/logger.go b/app/internal/api/http/middleware/logger.go new file mode 100644 index 0000000..2df4e98 --- /dev/null +++ b/app/internal/api/http/middleware/logger.go @@ -0,0 +1,48 @@ +package middleware + +import ( + "log/slog" + "time" + + "github.com/labstack/echo/v4" + "go.opentelemetry.io/otel/trace" +) + +const AuthUserIDKey = "caller_id" + +func Logger(logger *slog.Logger) echo.MiddlewareFunc { + return func(next echo.HandlerFunc) echo.HandlerFunc { + return func(c echo.Context) error { + start := time.Now() + if err := next(c); err != nil { + c.Error(err) + } + status := c.Response().Status + + rid, _ := c.Get(RequestIDKey).(string) + sc := trace.SpanContextFromContext(c.Request().Context()) + + attrs := []slog.Attr{ + slog.String("request_id", rid), + slog.String("method", c.Request().Method), + slog.String("route", c.Path()), + slog.Int("status", status), + slog.Int64("duration_ms", time.Since(start).Milliseconds()), + slog.String("event", "http.request"), + slog.String("trace_id", sc.TraceID().String()), + slog.String("span_id", sc.SpanID().String()), + } + + level := slog.LevelInfo + switch { + case status >= 500: + level = slog.LevelError + case status >= 400: + level = slog.LevelWarn + } + logger.LogAttrs(c.Request().Context(), level, "http request", attrs...) + + return nil + } + } +} diff --git a/app/internal/api/http/middleware/recover.go b/app/internal/api/http/middleware/recover.go new file mode 100644 index 0000000..862313d --- /dev/null +++ b/app/internal/api/http/middleware/recover.go @@ -0,0 +1,32 @@ +package middleware + +import ( + "log/slog" + "net/http" + "runtime/debug" + + "github.com/labstack/echo/v4" +) + +func Recover(logger *slog.Logger) echo.MiddlewareFunc { + return func(next echo.HandlerFunc) echo.HandlerFunc { + return func(c echo.Context) (err error) { + defer func() { + r := recover() + if r == nil { + return + } + rid, _ := c.Get(RequestIDKey).(string) + logger.Error("panic recovered", + slog.String("request_id", rid), + slog.String("method", c.Request().Method), + slog.String("path", c.Request().URL.Path), + slog.Any("panic", r), + slog.String("stack", string(debug.Stack())), + ) + err = echo.NewHTTPError(http.StatusInternalServerError, "Internal server error") + }() + return next(c) + } + } +} diff --git a/app/internal/api/http/middleware/request_id.go b/app/internal/api/http/middleware/request_id.go new file mode 100644 index 0000000..6447646 --- /dev/null +++ b/app/internal/api/http/middleware/request_id.go @@ -0,0 +1,22 @@ +package middleware + +import ( + "github.com/google/uuid" + "github.com/labstack/echo/v4" +) + +const RequestIDKey = "request_id" + +func RequestID() echo.MiddlewareFunc { + return func(next echo.HandlerFunc) echo.HandlerFunc { + return func(c echo.Context) error { + rid := c.Request().Header.Get(echo.HeaderXRequestID) + if rid == "" { + rid = uuid.NewString() + } + c.Response().Header().Set(echo.HeaderXRequestID, rid) + c.Set(RequestIDKey, rid) + return next(c) + } + } +} diff --git a/app/internal/api/http/pagination_test.go b/app/internal/api/http/pagination_test.go new file mode 100644 index 0000000..0eaec70 --- /dev/null +++ b/app/internal/api/http/pagination_test.go @@ -0,0 +1,126 @@ +package http + +import ( + "encoding/base64" + "fmt" + "net/http" + "net/url" + "testing" +) + +func TestPagination_MultiPageWalk(t *testing.T) { + r := newTestRig(t) + alice, bob, _, chat := bootstrap(r) + + const total = 7 + var sentIDs []string + for i := 0; i < total; i++ { + actor := alice + if i%2 == 1 { + actor = bob + } + _, msg := r.sendMessage(actor, chat.ID, fmt.Sprintf("page-%02d", i)) + if msg.ID == "" { + t.Fatalf("send message %d failed", i) + } + sentIDs = append(sentIDs, msg.ID) + } + + history, pages := r.listMessages(alice, chat.ID, 3) + if pages != 3 { + t.Fatalf("ожидалось 3 страницы (3+3+1), получено %d", pages) + } + if len(history) != total { + t.Fatalf("собрано %d сообщений, ожидалось %d", len(history), total) + } + for i, m := range history { + if m.ID != sentIDs[i] { + t.Fatalf("позиция %d: ожидался %s, получен %s (повтор, пропуск или нарушен порядок)", i, sentIDs[i], m.ID) + } + } +} + +func TestPagination_ExactPageAndEmptyChat(t *testing.T) { + r := newTestRig(t) + alice, _, _, chat := bootstrap(r) + + history, pages := r.listMessages(alice, chat.ID, 5) + if len(history) != 0 || pages != 1 { + t.Fatalf("пустой чат: items=%d pages=%d", len(history), pages) + } + + for i := 0; i < 4; i++ { + r.send(alice, chat.ID, fmt.Sprintf("m%d", i)) + } + if _, pages := r.listMessages(alice, chat.ID, 4); pages != 1 { + t.Fatalf("4 сообщения при limit=4: ожидалась 1 страница, получено %d", pages) + } + if _, pages := r.listMessages(alice, chat.ID, 2); pages != 2 { + t.Fatalf("4 сообщения при limit=2: ожидалось 2 страницы, получено %d", pages) + } +} + +func TestPagination_CursorBoundToChat(t *testing.T) { + r := newTestRig(t) + alice, bob, _, chat := bootstrap(r) + other := r.createChat(alice, "Другой", alice.ID, bob.ID) + for i := 0; i < 3; i++ { + r.send(alice, chat.ID, fmt.Sprintf("m%d", i)) + } + + resp := r.do(http.MethodGet, "/api/v1/chats/"+chat.ID+"/messages?limit=1", alice.ID, nil, nil) + expectStatus(t, resp, http.StatusOK) + var page struct { + NextCursor *string `json:"next_cursor"` + } + readJSON(t, resp, &page) + if page.NextCursor == nil { + t.Fatal("ожидался next_cursor") + } + + for _, path := range []string{ + "/api/v1/chats/" + other.ID + "/messages?cursor=" + url.QueryEscape(*page.NextCursor), + "/api/v1/chats?cursor=" + url.QueryEscape(*page.NextCursor), + "/api/v1/chats/" + chat.ID + "/messages?cursor=not-a-cursor", + } { + resp := r.do(http.MethodGet, path, alice.ID, nil, nil) + expectStatus(t, resp, http.StatusBadRequest) + resp.Body.Close() + } +} + +func TestPagination_IncompleteCursor(t *testing.T) { + r := newTestRig(t) + alice, _, _, chat := bootstrap(r) + r.send(alice, chat.ID, "m0") + + enc := func(s string) string { return base64.RawURLEncoding.EncodeToString([]byte(s)) } + msgScope := `"s":"chat:` + chat.ID + `"` + chatsScope := `"s":"chats:` + alice.ID + `"` + ts := `"t":"2026-01-01T00:00:00Z"` + id := `"i":"` + chat.ID + `"` + + cases := map[string]string{ + "только scope": enc(`{` + msgScope + `}`), + "без i": enc(`{` + ts + `,` + msgScope + `}`), + "без t": enc(`{` + id + `,` + msgScope + `}`), + "i не UUID": enc(`{` + ts + `,"i":"zzz",` + msgScope + `}`), + "нулевое t": enc(`{"t":"0001-01-01T00:00:00Z",` + id + `,` + msgScope + `}`), + "лишнее поле": enc(`{` + ts + `,` + id + `,` + msgScope + `,"x":1}`), + "данные после объекта": enc(`{` + ts + `,` + id + `,` + msgScope + `}}`), + "base64 с паддингом": base64.URLEncoding.EncodeToString([]byte(`{` + ts + `,` + id + `,` + msgScope + `}`)), + "пустой объект": enc(`{}`), + "null": enc(`null`), + } + for name, cur := range cases { + resp := r.do(http.MethodGet, "/api/v1/chats/"+chat.ID+"/messages?cursor="+url.QueryEscape(cur), alice.ID, nil, nil) + if resp.StatusCode != http.StatusBadRequest { + t.Errorf("messages, %s: ожидался 400, получен %d", name, resp.StatusCode) + } + resp.Body.Close() + } + + resp := r.do(http.MethodGet, "/api/v1/chats?cursor="+url.QueryEscape(enc(`{`+chatsScope+`}`)), alice.ID, nil, nil) + expectStatus(t, resp, http.StatusBadRequest) + resp.Body.Close() +} diff --git a/app/internal/api/http/router.go b/app/internal/api/http/router.go new file mode 100644 index 0000000..e41d896 --- /dev/null +++ b/app/internal/api/http/router.go @@ -0,0 +1,37 @@ +package http + +import ( + "github.com/labstack/echo/v4" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/middleware" +) + +func registerRoutes(e *echo.Echo, d Deps, isReady func() bool) { + e.GET("/health/live", healthLive) + e.GET("/health/ready", healthReady(isReady)) + + usersH := &usersHandler{users: d.Users} + chatsH := &chatsHandler{chats: d.Chats} + messagesH := &messagesHandler{messages: d.Messages} + authH := &authHandler{auth: d.Auth} + attachmentsH := &attachmentsHandler{attachments: d.Attachments} + + auth := middleware.Bearer(d.Auth) + + jsonBody := middleware.ContentType() + + v1 := e.Group("/api/v1") + v1.POST("/users", usersH.create, jsonBody) + v1.POST("/auth/sessions", authH.createSession) + v1.DELETE("/auth/sessions/current", authH.revokeSession, auth) + v1.GET("/users/me", usersH.me, auth) + v1.POST("/chats", chatsH.create, auth, jsonBody) + v1.GET("/chats", chatsH.list, auth) + v1.GET("/chats/:chat_id", chatsH.get, auth) + v1.POST("/chats/:chat_id/messages", messagesH.send, auth, jsonBody) + v1.GET("/chats/:chat_id/messages", messagesH.list, auth) + // Тело здесь не JSON: Content-Type и размер проверяет сервис, после проверки доступа. + v1.POST("/chats/:chat_id/attachments", attachmentsH.upload, uploadTransfer, auth) + v1.GET("/attachments/:attachment_id", attachmentsH.get, auth) + v1.GET("/attachments/:attachment_id/content", attachmentsH.content, auth) +} diff --git a/app/internal/api/http/server.go b/app/internal/api/http/server.go new file mode 100644 index 0000000..5e1fefa --- /dev/null +++ b/app/internal/api/http/server.go @@ -0,0 +1,215 @@ +package http + +import ( + "context" + "crypto/tls" + "crypto/x509" + "errors" + "fmt" + "log/slog" + nethttp "net/http" + "os" + "sync/atomic" + "time" + + "github.com/labstack/echo/v4" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/middleware" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/config" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/service" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/store" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/telemetry" +) + +type Deps struct { + Config *config.Config + Logger *slog.Logger + Store store.Store + Auth service.AuthService + Users service.UsersService + Chats service.ChatsService + Messages service.MessagesService + Attachments service.AttachmentsService + + Ready func(ctx context.Context) error +} + +type Server struct { + e *echo.Echo + cfg config.HTTP + logger *slog.Logger + shutting atomic.Bool + ready func(ctx context.Context) error +} + +func NewServer(d Deps) *Server { + s := &Server{ + e: echo.New(), + cfg: d.Config.HTTP, + logger: d.Logger, + ready: d.Ready, + } + + s.e.HideBanner = true + s.e.HidePort = true + s.e.HTTPErrorHandler = s.httpErrorHandler + + s.e.Server.ReadTimeout = time.Duration(s.cfg.ReadTimeoutMs) * time.Millisecond + s.e.Server.WriteTimeout = time.Duration(s.cfg.WriteTimeoutMs) * time.Millisecond + s.e.Server.IdleTimeout = time.Duration(s.cfg.IdleTimeoutMs) * time.Millisecond + + s.e.Use(middleware.InstanceID(d.Config.InstanceID)) + s.e.Use(middleware.Recover(d.Logger)) + s.e.Use(middleware.RequestID()) + s.e.Use(telemetry.Middleware) + s.e.Use(middleware.Logger(d.Logger)) + s.e.Use(middleware.InFlight(d.Config.Limits.MaxInFlight)) + s.e.Use(middleware.BodyLimit(d.Config.Limits.MaxBodyBytes, routeUploadAttachment)) + s.e.Use(middleware.MemoryGuard(d.Config.Limits.MaxHeapBytes, 100*time.Millisecond)) + + registerRoutes(s.e, d, s.IsReady) + return s +} + +func (s *Server) Start() error { + s.logger.Info("http server starting", slog.String("addr", s.cfg.Addr)) + var err error + if os.Getenv("TLS_CERT_FILE") != "" { + ca, e := os.ReadFile(os.Getenv("TLS_CA_FILE")) + if e != nil { + return e + } + roots := x509.NewCertPool() + if !roots.AppendCertsFromPEM(ca) { + return fmt.Errorf("invalid client CA") + } + s.e.TLSServer.TLSConfig = &tls.Config{MinVersion: tls.VersionTLS12, ClientAuth: tls.RequireAndVerifyClientCert, ClientCAs: roots, + VerifyConnection: func(cs tls.ConnectionState) error { + if len(cs.VerifiedChains) == 0 { + return fmt.Errorf("unverified client") + } + for _, uri := range cs.PeerCertificates[0].URIs { + if uri.String() == "spiffe://lab7/lb" { + return nil + } + } + return fmt.Errorf("client identity denied") + }, + } + s.e.TLSServer.ReadTimeout = s.e.Server.ReadTimeout + s.e.TLSServer.WriteTimeout = s.e.Server.WriteTimeout + s.e.TLSServer.IdleTimeout = s.e.Server.IdleTimeout + cert, e := tls.LoadX509KeyPair(os.Getenv("TLS_CERT_FILE"), os.Getenv("TLS_KEY_FILE")) + if e != nil { + return e + } + s.e.TLSServer.TLSConfig.Certificates = []tls.Certificate{cert} + s.e.TLSServer.Addr = s.cfg.Addr + err = s.e.StartServer(s.e.TLSServer) + } else { + err = s.e.Start(s.cfg.Addr) + } + if errors.Is(err, nethttp.ErrServerClosed) { + return nil + } + return err +} + +// Drain переводит readiness в 503 и ждёт d, продолжая обслуживать запросы: за это время +// балансировщик выводит реплику, и новые запросы не попадают на закрытый listener. +func (s *Server) Drain(d time.Duration) { + s.shutting.Store(true) + s.logger.Info("http server draining", slog.Duration("for", d)) + time.Sleep(d) +} + +func (s *Server) Shutdown(ctx context.Context) error { + s.shutting.Store(true) + s.logger.Info("http server shutting down") + return s.e.Shutdown(ctx) +} + +func (s *Server) IsReady() bool { + if s.shutting.Load() { + return false + } + if s.ready == nil { + return true + } + ctx, cancel := context.WithTimeout(context.Background(), readyTimeout) + defer cancel() + return s.ready(ctx) == nil +} + +const readyTimeout = time.Second + +func (s *Server) Handler() nethttp.Handler { + return s.e +} + +func (s *Server) httpErrorHandler(err error, c echo.Context) { + if c.Response().Committed { + return + } + + var httpErr *echo.HTTPError + if errors.As(err, &httpErr) { + code := codeFromStatus(httpErr.Code) + msg, _ := httpErr.Message.(string) + if msg == "" || msg == nethttp.StatusText(httpErr.Code) { + msg = messageFor(httpErr.Code, code) + } + _ = c.JSON(httpErr.Code, errorBody{ + Error: errorPayload{ + Code: code, + Message: msg, + RequestID: c.Response().Header().Get(echo.HeaderXRequestID), + }, + }) + return + } + + _ = WriteError(c, err) +} + +var codesByStatus = map[int]string{ + nethttp.StatusBadRequest: CodeInvalidRequest, + nethttp.StatusUnauthorized: CodeUnauthorized, + nethttp.StatusNotFound: CodeNotFound, + nethttp.StatusMethodNotAllowed: CodeInvalidRequest, + nethttp.StatusConflict: CodeConflict, + nethttp.StatusRequestEntityTooLarge: CodePayloadTooLarge, + nethttp.StatusUnsupportedMediaType: CodeUnsupportedMedia, + nethttp.StatusTooManyRequests: CodeRateLimited, + nethttp.StatusServiceUnavailable: CodeUnavailable, +} + +func codeFromStatus(status int) string { + if c, ok := codesByStatus[status]; ok { + return c + } + return CodeInternalError +} + +var messagesByStatus = map[int]string{ + nethttp.StatusMethodNotAllowed: "Method not allowed", +} + +func messageFor(status int, code string) string { + if m, ok := messagesByStatus[status]; ok { + return m + } + return defaultMessages[code] +} + +var defaultMessages = map[string]string{ + CodeInvalidRequest: "Invalid request", + CodeUnauthorized: "Identification required", + CodeNotFound: "Object not found", + CodeConflict: "Conflict", + CodePayloadTooLarge: "Request body too large", + CodeUnsupportedMedia: "Unsupported Content-Type", + CodeRateLimited: "Too many requests", + CodeUnavailable: "Service unavailable", + CodeInternalError: "Internal server error", +} diff --git a/app/internal/api/http/users.go b/app/internal/api/http/users.go new file mode 100644 index 0000000..2533a19 --- /dev/null +++ b/app/internal/api/http/users.go @@ -0,0 +1,114 @@ +package http + +import ( + "bytes" + "encoding/json" + "errors" + "fmt" + "io" + "net/http" + "reflect" + "strings" + "unicode/utf8" + + "github.com/labstack/echo/v4" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/dto" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/middleware" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/service" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/validate" +) + +type usersHandler struct { + users service.UsersService +} + +func (h *usersHandler) create(c echo.Context) error { + var req dto.CreateUserRequest + if err := decodeJSON(c.Request().Body, &req); err != nil { + return WriteError(c, err) + } + + user, err := h.users.Register(c.Request().Context(), req.Username, req.DisplayName, req.Password) + if err != nil { + return WriteError(c, err) + } + return c.JSON(http.StatusCreated, toUserResponse(user)) +} + +func (h *usersHandler) me(c echo.Context) error { + callerID := c.Get(middleware.AuthUserIDKey).(string) + user, err := h.users.Me(c.Request().Context(), callerID) + if err != nil { + return WriteError(c, err) + } + return c.JSON(http.StatusOK, toUserResponse(user)) +} + +func toUserResponse(u domain.User) dto.UserResponse { + return dto.UserResponse{ + ID: u.ID, + Username: u.Username, + DisplayName: u.DisplayName, + CreatedAt: dto.NewTimestamp(u.CreatedAt), + } +} + +func decodeJSON(body io.Reader, dst any) error { + data, err := io.ReadAll(body) + if err != nil { + if errors.Is(err, domain.ErrPayloadTooLarge) { + return err + } + return &validate.Error{Field: "body", Reason: "cannot read body"} + } + if !utf8.Valid(data) { + return &validate.Error{Field: "body", Reason: "invalid UTF-8"} + } + dec := json.NewDecoder(bytes.NewReader(data)) + dec.DisallowUnknownFields() + if err := dec.Decode(dst); err != nil { + return &validate.Error{Field: "body", Reason: jsonErrorReason(err)} + } + if _, err := dec.Token(); !errors.Is(err, io.EOF) { + return &validate.Error{Field: "body", Reason: "unexpected data after JSON object"} + } + return checkExactKeys(data, dst) +} + +func checkExactKeys(data []byte, dst any) error { + var obj map[string]json.RawMessage + if err := json.Unmarshal(data, &obj); err != nil { + return nil + } + allowed := make(map[string]struct{}) + t := reflect.TypeOf(dst).Elem() + for i := 0; i < t.NumField(); i++ { + name, _, _ := strings.Cut(t.Field(i).Tag.Get("json"), ",") + allowed[name] = struct{}{} + } + for key := range obj { + if _, ok := allowed[key]; !ok { + return &validate.Error{Field: "body", Reason: fmt.Sprintf("unknown field %q", key)} + } + } + return nil +} + +func jsonErrorReason(err error) string { + if errors.Is(err, io.EOF) { + return "empty body" + } + var typeErr *json.UnmarshalTypeError + if errors.As(err, &typeErr) { + if typeErr.Field == "" { + return "expected a JSON object" + } + return fmt.Sprintf("field %q: invalid type", typeErr.Field) + } + if name, ok := strings.CutPrefix(err.Error(), "json: unknown field "); ok { + return "unknown field " + name + } + return "invalid JSON" +} diff --git a/app/internal/api/http/validation_test.go b/app/internal/api/http/validation_test.go new file mode 100644 index 0000000..20c047d --- /dev/null +++ b/app/internal/api/http/validation_test.go @@ -0,0 +1,230 @@ +package http + +import ( + "bytes" + "io" + "net/http" + "strings" + "testing" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/dto" +) + +func TestValidation_InvalidJSON(t *testing.T) { + r := newTestRig(t) + alice, _, _, chat := bootstrap(r) + path := "/api/v1/chats/" + chat.ID + "/messages" + + bad := [][]byte{ + []byte(`{"text":`), + []byte(`not json at all`), + []byte(`{"text": 123,}`), + []byte(``), + []byte(`{"text": "ok"}{"text":"bonus"}`), + []byte(`{"text": "ok"}}`), + []byte(`{"text": "ok"}]`), + []byte(`{"text": "ok"} }`), + []byte(`{"text": "ok"} x`), + []byte("{\"text\":\"\xff\xfe bad utf8\"}"), + } + for _, payload := range bad { + resp := r.do(http.MethodPost, path, alice.ID, + map[string]string{"Content-Type": "application/json"}, + bytes.NewReader(payload)) + if resp.StatusCode != http.StatusBadRequest { + data, _ := io.ReadAll(resp.Body) + resp.Body.Close() + t.Fatalf("payload %q: expected 400, got %d; body=%s", payload, resp.StatusCode, string(data)) + } + e := readError(t, resp) + if e.Error.Code != CodeInvalidRequest { + t.Fatalf("payload %q: expected code %q, got %q", payload, CodeInvalidRequest, e.Error.Code) + } + if e.Error.RequestID == "" { + t.Fatalf("payload %q: missing request_id in body", payload) + } + } +} + +func TestValidation_InvalidUTF8(t *testing.T) { + r := newTestRig(t) + alice, bob, _, _ := bootstrap(r) + + cases := []struct { + path, actor string + payload []byte + }{ + {"/api/v1/users", "", []byte("{\"username\":\"u_" + randomSuffix()[:8] + "\",\"display_name\":\"\xc3\x28\"}")}, + {"/api/v1/chats", alice.ID, []byte("{\"title\":\"\xe2\x82\",\"member_ids\":[\"" + alice.ID + "\",\"" + bob.ID + "\"]}")}, + } + for _, tc := range cases { + resp := r.do(http.MethodPost, tc.path, tc.actor, + map[string]string{"Content-Type": "application/json"}, + bytes.NewReader(tc.payload)) + if resp.StatusCode != http.StatusBadRequest { + data, _ := io.ReadAll(resp.Body) + resp.Body.Close() + t.Fatalf("%s %q: expected 400, got %d; body=%s", tc.path, tc.payload, resp.StatusCode, string(data)) + } + e := readError(t, resp) + if e.Error.Code != CodeInvalidRequest { + t.Fatalf("%s: expected code %q, got %q", tc.path, CodeInvalidRequest, e.Error.Code) + } + } +} + +func TestValidation_JSONKeysAreCaseSensitive(t *testing.T) { + r := newTestRig(t) + resp := r.do(http.MethodPost, "/api/v1/users", "", + map[string]string{"Content-Type": "application/json"}, + strings.NewReader(`{"USERNAME":"case_bob","Display_Name":"B"}`)) + expectStatus(t, resp, http.StatusBadRequest) + resp.Body.Close() +} + +func TestValidation_ErrorMessages(t *testing.T) { + r := newTestRig(t) + alice, bob, _, chat := bootstrap(r) + msgs := "/api/v1/chats/" + chat.ID + "/messages" + + cases := []struct { + method, path, actor, body, message string + }{ + {http.MethodPost, "/api/v1/users", "", `{"username":"ab","display_name":"x"}`, + "username: must match [a-z0-9_]{3,32}"}, + {http.MethodPost, "/api/v1/users", "", `{"username":"abc_` + randomSuffix()[:6] + `","display_name":" "}`, + "display_name: must not be empty or whitespace only"}, + {http.MethodPost, "/api/v1/users", "", `{"username":123,"display_name":"x"}`, + `body: field "username": invalid type`}, + {http.MethodPost, "/api/v1/users", "", `{"username":"abc","display_name":"x","password":"p"}`, + "password: length must be in [12, 128] code points"}, + {http.MethodPost, "/api/v1/users", "", `{"username":"abc","display_name":"x"}`, + "password: must not be empty or whitespace only"}, + {http.MethodPost, "/api/v1/users", "", `{"username":"abc","display_name":"x","password":"` + strings.Repeat("я", 129) + `"}`, + "password: length must be in [12, 128] code points"}, + {http.MethodPost, "/api/v1/users", "", `{"username":"abc","display_name":"x","password":"long-enough-pw","password_hash":"h"}`, + `body: unknown field "password_hash"`}, + {http.MethodPost, "/api/v1/users", "", `{"username":`, "body: invalid JSON"}, + {http.MethodPost, "/api/v1/users", "", ``, "body: empty body"}, + {http.MethodPost, "/api/v1/users", "", `[]`, "body: expected a JSON object"}, + {http.MethodPost, "/api/v1/users", "", `{"username":"abc","display_name":"x"} {}`, "body: unexpected data after JSON object"}, + {http.MethodPost, "/api/v1/users", "", `{"username":"abc","display_name":"x"}}`, "body: unexpected data after JSON object"}, + {http.MethodPost, "/api/v1/users", "", "{\"username\":\"abc\",\"display_name\":\"\xff\"}", + "body: invalid UTF-8"}, + {http.MethodPost, "/api/v1/chats", alice.ID, `{"title":"t","member_ids":["` + bob.ID + `"]}`, + "member_ids: must contain caller"}, + {http.MethodPost, "/api/v1/chats", alice.ID, `{"title":"t","member_ids":["` + alice.ID + `","x"]}`, + "member_ids[1]: must be a valid UUID"}, + {http.MethodPost, msgs, alice.ID, `{"text":" "}`, "text: must not be empty or whitespace only"}, + {http.MethodGet, msgs + "?limit=abc", alice.ID, "", "limit: must be an integer"}, + {http.MethodGet, msgs + "?limit=0", alice.ID, "", "limit: must be in [1, 100]"}, + {http.MethodGet, msgs + "?limit=", alice.ID, "", "limit: must be an integer"}, + {http.MethodGet, msgs + "?cursor=", alice.ID, "", "cursor: must not be empty"}, + {http.MethodGet, msgs + "?limit=10&cursor=", alice.ID, "", "cursor: must not be empty"}, + {http.MethodGet, "/api/v1/chats?limit=", alice.ID, "", "limit: must be an integer"}, + {http.MethodGet, "/api/v1/chats?cursor=", alice.ID, "", "cursor: must not be empty"}, + } + for _, tc := range cases { + headers := map[string]string{} + var body io.Reader + if tc.method == http.MethodPost { + headers["Content-Type"] = "application/json" + body = bytes.NewReader([]byte(tc.body)) + } + resp := r.do(tc.method, tc.path, tc.actor, headers, body) + if resp.StatusCode != http.StatusBadRequest { + data, _ := io.ReadAll(resp.Body) + resp.Body.Close() + t.Fatalf("%s %s %q: expected 400, got %d; body=%s", tc.method, tc.path, tc.body, resp.StatusCode, string(data)) + } + e := readError(t, resp) + if e.Error.Message != tc.message { + t.Fatalf("%s %s %q:\n want %q\n got %q", tc.method, tc.path, tc.body, tc.message, e.Error.Message) + } + } +} + +func TestValidation_EmptyMessage(t *testing.T) { + r := newTestRig(t) + alice, _, _, chat := bootstrap(r) + path := "/api/v1/chats/" + chat.ID + "/messages" + + for _, text := range []string{"", " ", "\n\t "} { + resp := r.doJSON(http.MethodPost, path, alice.ID, textMessage(text)) + if resp.StatusCode != http.StatusBadRequest { + data, _ := io.ReadAll(resp.Body) + resp.Body.Close() + t.Fatalf("text %q: expected 400, got %d; body=%s", text, resp.StatusCode, string(data)) + } + e := readError(t, resp) + if e.Error.Code != CodeInvalidRequest { + t.Fatalf("text %q: expected code %q, got %q", text, CodeInvalidRequest, e.Error.Code) + } + } +} + +func TestValidation_DuplicateUsername(t *testing.T) { + r := newTestRig(t) + username := "own_dup_" + randomSuffix() + + first := r.doJSON(http.MethodPost, "/api/v1/users", "", dto.CreateUserRequest{ + Username: username, + DisplayName: "Первый", + Password: testPassword, + }) + expectStatus(t, first, http.StatusCreated) + first.Body.Close() + + second := r.doJSON(http.MethodPost, "/api/v1/users", "", dto.CreateUserRequest{ + Username: username, + DisplayName: "Второй", + Password: testPassword, + }) + if second.StatusCode != http.StatusConflict { + data, _ := io.ReadAll(second.Body) + second.Body.Close() + t.Fatalf("second POST same username: expected 409, got %d; body=%s", second.StatusCode, string(data)) + } + e := readError(t, second) + if e.Error.Code != CodeConflict { + t.Fatalf("expected code %q, got %q", CodeConflict, e.Error.Code) + } + + third := r.doJSON(http.MethodPost, "/api/v1/users", "", dto.CreateUserRequest{ + Username: username, + DisplayName: "Первый", + Password: testPassword, + }) + if third.StatusCode != http.StatusConflict { + data, _ := io.ReadAll(third.Body) + third.Body.Close() + t.Fatalf("third POST same username/display_name: expected 409, got %d; body=%s", third.StatusCode, string(data)) + } + third.Body.Close() +} + +func TestValidation_UUIDForms(t *testing.T) { + r := newTestRig(t) + alice, bob, _, chat := bootstrap(r) + upper := strings.ToUpper(alice.ID) + + resp := r.do(http.MethodGet, "/api/v1/users/me", upper, nil, nil) + expectStatus(t, resp, http.StatusOK) + resp.Body.Close() + resp = r.do(http.MethodGet, "/api/v1/chats/"+strings.ToUpper(chat.ID), alice.ID, nil, nil) + expectStatus(t, resp, http.StatusOK) + resp.Body.Close() + + resp = r.do(http.MethodGet, "/api/v1/users/me", "{"+alice.ID+"}", nil, nil) + expectStatus(t, resp, http.StatusUnauthorized) + resp.Body.Close() + resp = r.do(http.MethodGet, "/api/v1/chats/"+strings.ReplaceAll(chat.ID, "-", ""), alice.ID, nil, nil) + expectStatus(t, resp, http.StatusBadRequest) + resp.Body.Close() + + resp = r.doJSON(http.MethodPost, "/api/v1/chats", alice.ID, map[string]any{ + "title": "dup", "member_ids": []string{alice.ID, upper, bob.ID}, + }) + expectStatus(t, resp, http.StatusBadRequest) + resp.Body.Close() +} diff --git a/app/internal/cache/history.go b/app/internal/cache/history.go new file mode 100644 index 0000000..e389e05 --- /dev/null +++ b/app/internal/cache/history.go @@ -0,0 +1,478 @@ +package cache + +import ( + "context" + "crypto/rand" + "encoding/hex" + "encoding/json" + "errors" + "fmt" + "log/slog" + "os" + "strconv" + "strings" + "sync" + "sync/atomic" + "time" + + "github.com/redis/go-redis/v9" + "golang.org/x/sync/singleflight" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/config" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/store" +) + +const ( + ModeOff = "off" + ModeNaive = "naive" + ModeSafe = "safe" +) + +type Source interface { + store.MessageStore + IsMember(ctx context.Context, chatID, userID string) (bool, error) + HistoryPage(ctx context.Context, chatID, cursor string, limit int) (domain.Page[domain.Message], error) +} + +// Outbox хранит долг инвалидации в источнике истины, чтобы он пережил +// рестарт API. Без него отложенная инвалидация живёт только в памяти. +type Outbox interface { + AddPendingInvalidation(ctx context.Context, chatID string) (int64, error) + PendingInvalidations(ctx context.Context) (map[string]int64, error) + ResolvePendingInvalidation(ctx context.Context, chatID string, gen int64) error +} + +type Options struct { + Mode string + Outbox Outbox + PageTTL time.Duration + LockTTL time.Duration + FillDelay time.Duration + Logger *slog.Logger +} + +var _ store.MessageStore = (*Messages)(nil) + +// pendingEntry — несброшенная версия чата. seq меняется при каждом новом +// сбое: повтор снимает запись, только если seq не изменился с его снимка. +// gen — поколение строки в Outbox (0 — не записана). +type pendingEntry struct { + seq uint64 + gen int64 +} + +type Messages struct { + src Source + rdb *redis.Client + opt Options + group singleflight.Group + log *slog.Logger + + downUntil atomic.Int64 + // loaded: долг инвалидации из Outbox прочитан. До этого любой чат может + // иметь устаревшую версию, поэтому все чтения идут мимо кэша. + loaded atomic.Bool + + mu sync.Mutex + pending map[string]pendingEntry + seq uint64 + stop chan struct{} + done chan struct{} +} + +const ( + memberTTL = 24 * time.Hour + versionTTL = 24 * time.Hour + breakerPause = time.Second + retryInterval = 200 * time.Millisecond + pollInterval = 5 * time.Millisecond + defaultPageTTL = 30 * time.Second + defaultLockTTL = 500 * time.Millisecond +) + +func New(src Source, rdb *redis.Client, opt Options) *Messages { + if opt.PageTTL <= 0 { + opt.PageTTL = defaultPageTTL + } + if opt.LockTTL <= 0 { + opt.LockTTL = defaultLockTTL + } + if opt.Logger == nil { + opt.Logger = slog.Default() + } + m := &Messages{ + src: src, + rdb: rdb, + opt: opt, + log: opt.Logger, + pending: make(map[string]pendingEntry), + stop: make(chan struct{}), + done: make(chan struct{}), + } + m.loaded.Store(opt.Outbox == nil || opt.Mode != ModeSafe) + go m.retryLoop() + return m +} + +func Connect(cfg config.HistoryCache) (*redis.Client, error) { + url := cfg.URL + if cfg.URLFile != "" { + b, err := os.ReadFile(cfg.URLFile) + if err != nil { + return nil, fmt.Errorf("cache: read HISTORY_CACHE_URL_FILE: %w", err) + } + url = strings.TrimSpace(string(b)) + } + if url == "" { + return nil, errors.New("cache: HISTORY_CACHE_URL_FILE or HISTORY_CACHE_URL is required unless HISTORY_CACHE=off") + } + opts, err := redis.ParseURL(url) + if err != nil { + return nil, errors.New("cache: invalid HISTORY_CACHE_URL") + } + timeout := time.Duration(cfg.TimeoutMs) * time.Millisecond + opts.PoolSize = cfg.PoolSize + opts.DialTimeout = timeout + opts.ReadTimeout = timeout + opts.WriteTimeout = timeout + opts.PoolTimeout = timeout + opts.MaxRetries = -1 // без повторов: промах кэша дешевле ожидания + return redis.NewClient(opts), nil +} + +func (m *Messages) Close() { + close(m.stop) + <-m.done +} + +func (m *Messages) AddMessage(ctx context.Context, callerID, chatID, idempotencyKey, text string, attachmentIDs []string) (domain.Message, error) { + msg, err := m.src.AddMessage(ctx, callerID, chatID, idempotencyKey, text, attachmentIDs) + if err != nil { + return msg, err + } + // Инвалидация нужна и при повторе: реплика, выполнившая COMMIT, могла упасть до + // сброса кэша, и тогда ответ 201 на повтор — первое подтверждение этого сообщения. + ictx := context.WithoutCancel(ctx) + switch m.opt.Mode { + case ModeNaive: + m.naiveInvalidate(ictx, chatID) + case ModeSafe: + if err := m.rdb.Del(ictx, verKey(chatID)).Err(); err != nil { + m.markDown(err) + m.addPending(ictx, chatID) + } + } + return msg, nil +} + +func (m *Messages) ListMessages(ctx context.Context, callerID, chatID, cursor string, limit int) (domain.Page[domain.Message], error) { + if m.opt.Mode == ModeOff || m.bypass(chatID) { + return m.src.ListMessages(ctx, callerID, chatID, cursor, limit) + } + if err := m.checkMember(ctx, chatID, callerID); err != nil { + return domain.Page[domain.Message]{}, err + } + if m.opt.Mode == ModeNaive { + return m.naiveList(ctx, chatID, cursor, limit) + } + return m.safeList(ctx, chatID, cursor, limit) +} + +func (m *Messages) checkMember(ctx context.Context, chatID, userID string) error { + key := "hc:member:" + chatID + ":" + userID + if !m.isDown() { + v, err := m.rdb.Get(ctx, key).Result() + if err == nil && v == "1" { + return nil + } + m.markDown(err) + } + ok, err := m.src.IsMember(ctx, chatID, userID) + if err != nil { + return err + } + if !ok { + // Отрицательный ответ не кэшируем. + return domain.ErrNotFound + } + if !m.isDown() { + m.markDown(m.rdb.Set(ctx, key, "1", memberTTL).Err()) + } + return nil +} + +func (m *Messages) naiveList(ctx context.Context, chatID, cursor string, limit int) (domain.Page[domain.Message], error) { + key := pageKey("hc:naive:"+chatID, cursor, limit) + if page, ok := m.getPage(ctx, key); ok { + return page, nil + } + page, err := m.src.HistoryPage(ctx, chatID, cursor, limit) + if err != nil { + return page, err + } + m.sleepFill(ctx) + if b, err := encodePage(page); err == nil { + setKey := "hc:naive:keys:" + chatID + _, err := m.rdb.TxPipelined(ctx, func(p redis.Pipeliner) error { + p.Set(ctx, key, b, m.opt.PageTTL) + p.SAdd(ctx, setKey, key) + p.Expire(ctx, setKey, m.opt.PageTTL) + return nil + }) + m.markDown(err) + } + return page, nil +} + +func (m *Messages) naiveInvalidate(ctx context.Context, chatID string) { + setKey := "hc:naive:keys:" + chatID + keys, err := m.rdb.SMembers(ctx, setKey).Result() + if err != nil { + m.markDown(err) + return + } + m.markDown(m.rdb.Del(ctx, append(keys, setKey)...).Err()) +} + +func (m *Messages) safeList(ctx context.Context, chatID, cursor string, limit int) (domain.Page[domain.Message], error) { + ver, err := m.version(ctx, chatID) + if err != nil { + m.markDown(err) + return m.src.HistoryPage(ctx, chatID, cursor, limit) + } + key := pageKey("hc:page:"+chatID+":"+ver, cursor, limit) + if page, ok := m.getPage(ctx, key); ok { + return page, nil + } + v, err, _ := m.group.Do(key, func() (any, error) { + return m.fill(context.WithoutCancel(ctx), key, chatID, cursor, limit) + }) + if err != nil { + return domain.Page[domain.Message]{}, err + } + return v.(domain.Page[domain.Message]), nil +} + +func (m *Messages) version(ctx context.Context, chatID string) (string, error) { + key := verKey(chatID) + v, err := m.rdb.Get(ctx, key).Result() + if err == nil { + return v, nil + } + if !errors.Is(err, redis.Nil) { + return "", err + } + fresh := randomVersion() + old, err := m.rdb.SetArgs(ctx, key, fresh, redis.SetArgs{Mode: "NX", Get: true, TTL: versionTTL}).Result() + if errors.Is(err, redis.Nil) { + return fresh, nil + } + if err != nil { + return "", err + } + return old, nil +} + +var unlockScript = redis.NewScript(` +if redis.call("GET", KEYS[1]) == ARGV[1] then return redis.call("DEL", KEYS[1]) end +return 0`) + +func (m *Messages) fill(ctx context.Context, key, chatID, cursor string, limit int) (domain.Page[domain.Message], error) { + lockKey := "hc:lock:" + key + token := randomVersion() + locked, err := m.rdb.SetNX(ctx, lockKey, token, m.opt.LockTTL).Result() + if err != nil { + m.markDown(err) + return m.src.HistoryPage(ctx, chatID, cursor, limit) + } + if !locked { + deadline := time.Now().Add(m.opt.LockTTL) + for time.Now().Before(deadline) { + time.Sleep(pollInterval) + if page, ok := m.getPage(ctx, key); ok { + return page, nil + } + } + return m.src.HistoryPage(ctx, chatID, cursor, limit) + } + defer unlockScript.Run(ctx, m.rdb, []string{lockKey}, token) + + page, err := m.src.HistoryPage(ctx, chatID, cursor, limit) + if err != nil { + return page, err + } + m.sleepFill(ctx) + if b, err := encodePage(page); err == nil { + m.markDown(m.rdb.Set(ctx, key, b, m.opt.PageTTL).Err()) + } + return page, nil +} + +// addPending вызывается до ответа 201: после него чат читается мимо кэша, +// пока версия не будет сброшена, в том числе после рестарта API. +func (m *Messages) addPending(ctx context.Context, chatID string) { + m.markPending(chatID, 0) + if m.opt.Outbox == nil { + m.log.Warn("history cache invalidation deferred", slog.String("chat_id", chatID)) + return + } + gen, err := m.opt.Outbox.AddPendingInvalidation(ctx, chatID) + if err != nil { + m.log.Error("history cache invalidation deferred in memory only, lost on restart", + slog.String("chat_id", chatID), slog.Any("err", err)) + return + } + m.markPending(chatID, gen) + m.log.Warn("history cache invalidation deferred", + slog.String("chat_id", chatID), slog.Int64("gen", gen)) +} + +// markPending всегда выдаёт новый seq, чтобы повтор, начатый раньше, не снял +// запись. gen не уменьшается. +func (m *Messages) markPending(chatID string, gen int64) { + m.mu.Lock() + m.seq++ + e := m.pending[chatID] + e.seq = m.seq + e.gen = max(e.gen, gen) + m.pending[chatID] = e + m.mu.Unlock() +} + +func (m *Messages) bypass(chatID string) bool { + if m.isDown() || !m.loaded.Load() { + return true + } + m.mu.Lock() + _, ok := m.pending[chatID] + m.mu.Unlock() + return ok +} + +func (m *Messages) loadPending() { + ctx, cancel := context.WithTimeout(context.Background(), time.Second) + defer cancel() + rows, err := m.opt.Outbox.PendingInvalidations(ctx) + if err != nil { + m.log.Warn("history cache: pending invalidations not loaded, bypassing", slog.Any("err", err)) + return + } + for id, gen := range rows { + m.markPending(id, gen) + } + m.loaded.Store(true) + if len(rows) > 0 { + m.log.Info("history cache: pending invalidations loaded", slog.Int("chats", len(rows))) + } +} + +func (m *Messages) retryLoop() { + defer close(m.done) + t := time.NewTicker(retryInterval) + defer t.Stop() + for { + if !m.loaded.Load() { + m.loadPending() + } + m.retryPending() + select { + case <-m.stop: + return + case <-t.C: + } + } +} + +func (m *Messages) retryPending() { + m.mu.Lock() + chats := make(map[string]pendingEntry, len(m.pending)) + for id, e := range m.pending { + chats[id] = e + } + m.mu.Unlock() + for id, e := range chats { + ctx, cancel := context.WithTimeout(context.Background(), time.Second) + err := m.rdb.Del(ctx, verKey(id)).Err() + if err == nil && e.gen > 0 { + err = m.opt.Outbox.ResolvePendingInvalidation(ctx, id, e.gen) + } + cancel() + if err != nil { + return + } + m.resolved(id, e) + } +} + +// resolved снимает запись, если после снимка e не было нового сбоя. +func (m *Messages) resolved(chatID string, e pendingEntry) { + m.mu.Lock() + if m.pending[chatID].seq == e.seq { + delete(m.pending, chatID) + } + m.mu.Unlock() +} + +func (m *Messages) isDown() bool { + return time.Now().UnixNano() < m.downUntil.Load() +} + +func (m *Messages) markDown(err error) { + if err == nil || errors.Is(err, redis.Nil) { + return + } + if !m.isDown() { + m.log.Warn("history cache unavailable, bypassing", slog.Any("err", err)) + } + m.downUntil.Store(time.Now().Add(breakerPause).UnixNano()) +} + +func (m *Messages) getPage(ctx context.Context, key string) (domain.Page[domain.Message], bool) { + b, err := m.rdb.Get(ctx, key).Bytes() + if err != nil { + m.markDown(err) + return domain.Page[domain.Message]{}, false + } + page, err := decodePage(b) + return page, err == nil +} + +func (m *Messages) sleepFill(ctx context.Context) { + if m.opt.FillDelay <= 0 { + return + } + select { + case <-time.After(m.opt.FillDelay): + case <-ctx.Done(): + } +} + +func verKey(chatID string) string { return "hc:ver:" + chatID } + +func pageKey(prefix, cursor string, limit int) string { + return prefix + ":" + strconv.Itoa(limit) + ":" + cursor +} + +func randomVersion() string { + var b [8]byte + _, _ = rand.Read(b[:]) + return hex.EncodeToString(b[:]) +} + +type cachedPage struct { + Items []domain.Message `json:"items"` + NextCursor string `json:"next_cursor"` +} + +func encodePage(p domain.Page[domain.Message]) ([]byte, error) { + return json.Marshal(cachedPage{Items: p.Items, NextCursor: p.NextCursor}) +} + +func decodePage(b []byte) (domain.Page[domain.Message], error) { + var c cachedPage + if err := json.Unmarshal(b, &c); err != nil { + return domain.Page[domain.Message]{}, err + } + return domain.Page[domain.Message]{Items: c.Items, NextCursor: c.NextCursor}, nil +} diff --git a/app/internal/cache/history_test.go b/app/internal/cache/history_test.go new file mode 100644 index 0000000..ed93d70 --- /dev/null +++ b/app/internal/cache/history_test.go @@ -0,0 +1,208 @@ +package cache + +import ( + "context" + "errors" + "fmt" + "io" + "log/slog" + "sync" + "sync/atomic" + "testing" + "time" + + "github.com/redis/go-redis/v9" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" +) + +const member = "alice" + +type fakeSource struct { + mu sync.Mutex + msgs []domain.Message + queryDelay time.Duration + pageCalls atomic.Int64 +} + +func (f *fakeSource) AddMessage(_ context.Context, callerID, chatID, _, text string, _ []string) (domain.Message, error) { + f.mu.Lock() + defer f.mu.Unlock() + m := domain.Message{ + ID: fmt.Sprintf("m%04d", len(f.msgs)), + ChatID: chatID, + AuthorID: callerID, + Text: text, + CreatedAt: time.Now().UTC(), + } + f.msgs = append(f.msgs, m) + return m, nil +} + +func (f *fakeSource) IsMember(_ context.Context, _, userID string) (bool, error) { + return userID == member, nil +} + +func (f *fakeSource) HistoryPage(context.Context, string, string, int) (domain.Page[domain.Message], error) { + f.pageCalls.Add(1) + f.mu.Lock() + snapshot := append([]domain.Message(nil), f.msgs...) + f.mu.Unlock() + time.Sleep(f.queryDelay) + return domain.Page[domain.Message]{Items: snapshot}, nil +} + +func (f *fakeSource) ListMessages(ctx context.Context, callerID, chatID, cursor string, limit int) (domain.Page[domain.Message], error) { + if ok, _ := f.IsMember(ctx, chatID, callerID); !ok { + return domain.Page[domain.Message]{}, domain.ErrNotFound + } + return f.HistoryPage(ctx, chatID, cursor, limit) +} + +func newCache(t *testing.T, c *redis.Client, mode string, src *fakeSource, fillDelay time.Duration) *Messages { + t.Helper() + m := New(src, c, Options{ + Mode: mode, + PageTTL: time.Minute, + FillDelay: fillDelay, + Logger: slog.New(slog.NewTextHandler(io.Discard, nil)), + }) + t.Cleanup(m.Close) + return m +} + +func contains(p domain.Page[domain.Message], id string) bool { + for _, m := range p.Items { + if m.ID == id { + return true + } + } + return false +} + +func TestCacheDown_Bypass(t *testing.T) { + ctx := context.Background() + dead := redis.NewClient(&redis.Options{ + Addr: "127.0.0.1:1", DialTimeout: 50 * time.Millisecond, MaxRetries: -1, + }) + t.Cleanup(func() { dead.Close() }) + src := &fakeSource{} + h := newCache(t, dead, ModeSafe, src, 0) + + msg, err := h.AddMessage(ctx, member, "chat-down", randomVersion(), "при упавшем кэше", nil) + if err != nil { + t.Fatalf("запись при упавшем кэше: %v", err) + } + page, err := h.ListMessages(ctx, member, "chat-down", "", 50) + if err != nil || !contains(page, msg.ID) { + t.Fatalf("чтение при упавшем кэше: err=%v", err) + } + if !h.bypass("chat-down") { + t.Fatal("чат с несброшенной версией должен читаться мимо кэша") + } + if _, err := h.ListMessages(ctx, "mallory", "chat-down", "", 50); !errors.Is(err, domain.ErrNotFound) { + t.Fatalf("обход кэша не должен пропускать постороннего: %v", err) + } +} + +type fakeOutbox struct { + mu sync.Mutex + rows map[string]int64 + seq int64 // как cache_invalidations_gen_seq: gen не повторяется + loadErr error +} + +func (f *fakeOutbox) AddPendingInvalidation(_ context.Context, chatID string) (int64, error) { + f.mu.Lock() + defer f.mu.Unlock() + f.seq++ + f.rows[chatID] = f.seq + return f.seq, nil +} + +func (f *fakeOutbox) PendingInvalidations(context.Context) (map[string]int64, error) { + f.mu.Lock() + defer f.mu.Unlock() + if f.loadErr != nil { + return nil, f.loadErr + } + out := make(map[string]int64, len(f.rows)) + for k, v := range f.rows { + out[k] = v + } + return out, nil +} + +func (f *fakeOutbox) ResolvePendingInvalidation(_ context.Context, chatID string, gen int64) error { + f.mu.Lock() + defer f.mu.Unlock() + if f.rows[chatID] == gen { + delete(f.rows, chatID) + } + return nil +} + +func (f *fakeOutbox) len() int { + f.mu.Lock() + defer f.mu.Unlock() + return len(f.rows) +} + +func TestBypassUntilOutboxLoaded(t *testing.T) { + outbox := &fakeOutbox{rows: map[string]int64{}, loadErr: errors.New("db down")} + h := New(&fakeSource{}, redis.NewClient(&redis.Options{Addr: "127.0.0.1:1"}), Options{ + Mode: ModeSafe, + Outbox: outbox, + Logger: slog.New(slog.NewTextHandler(io.Discard, nil)), + }) + defer h.Close() + time.Sleep(3 * retryInterval) + if !h.bypass("any") { + t.Fatal("пока долг из Outbox не прочитан, кэш не должен отдавать страницы") + } + outbox.mu.Lock() + outbox.loadErr = nil + outbox.mu.Unlock() + deadline := time.Now().Add(2 * time.Second) + for h.bypass("any") { + if time.Now().After(deadline) { + t.Fatal("после загрузки Outbox чтение через кэш не включилось") + } + time.Sleep(20 * time.Millisecond) + } +} + +// Повтор сбросил версию и снял строку Outbox, но до того, как он снял запись +// из памяти, новая запись снова не смогла сбросить версию. Запись в памяти и +// строка Outbox должны остаться, иначе ответ 201 придёт при устаревшем кэше. +func TestRetryDoesNotDropNewerFailure(t *testing.T) { + ctx := context.Background() + outbox := &fakeOutbox{rows: map[string]int64{}} + h := New(&fakeSource{}, redis.NewClient(&redis.Options{Addr: "127.0.0.1:1"}), Options{ + Mode: ModeSafe, + Outbox: outbox, + Logger: slog.New(slog.NewTextHandler(io.Discard, nil)), + }) + h.Close() // повтор ведём вручную + h.loaded.Store(true) + chat := "chat-retry-race" + + h.addPending(ctx, chat) + snap := h.pending[chat] // снимок повтора; DEL версии прошёл + if err := outbox.ResolvePendingInvalidation(ctx, chat, snap.gen); err != nil { + t.Fatal(err) + } + h.addPending(ctx, chat) // новый сбой DEL до ответа 201 + h.resolved(chat, snap) + + if !h.bypass(chat) { + t.Fatal("повтор снял запись о более новом сбое") + } + if rows, _ := outbox.PendingInvalidations(ctx); rows[chat] <= snap.gen { + t.Fatalf("строка Outbox: gen=%d, ожидался новый gen > %d", rows[chat], snap.gen) + } + h.resolved(chat, h.pending[chat]) + if h.bypass(chat) { + t.Fatal("актуальный повтор должен снять запись") + } +} diff --git a/app/internal/config/attachments.go b/app/internal/config/attachments.go new file mode 100644 index 0000000..6e815c7 --- /dev/null +++ b/app/internal/config/attachments.go @@ -0,0 +1,40 @@ +package config + +// Верхние границы из контракта: конфигурация может их уменьшить, но не превысить. +const ( + ContractMaxUploadBytes = 10 * 1024 * 1024 + ContractMaxImagePixels = 40_000_000 +) + +type S3 struct { + Endpoint string + Region string + Bucket string + AccessKeyIDFile string + SecretAccessKeyFile string + // TimeoutMs — предел на одну операцию с S3. Меньше timeout server балансировщика (15 с): + // клиент получает 503 от API, а не 504 от LB. + TimeoutMs int +} + +type Attachments struct { + MaxUploadBytes int64 + MaxImagePixels int64 + // MaxConcurrentUploads ограничивает загрузки на одну реплику и тем самым диск под временные + // файлы (не больше MaxConcurrentUploads × MaxUploadBytes); сверх него — 429. + MaxConcurrentUploads int +} + +// MinJanitorGraceSeconds covers the direct ticket lifetime (120s), complete +// timeout (60s), and an additional safety margin before orphan deletion. +const MinJanitorGraceSeconds = 300 + +// Janitor — очиститель объектов без метаданных (cmd/janitor). +type Janitor struct { + GraceSeconds int + IntervalSeconds int + // MaxDeletes — сколько объектов без строки допустимо удалить за проход. Больше — признак аварии + // (например, БД восстановлена из старой копии), и очиститель ничего не удаляет. + MaxDeletes int + DryRun bool +} diff --git a/app/internal/config/config.go b/app/internal/config/config.go new file mode 100644 index 0000000..510414e --- /dev/null +++ b/app/internal/config/config.go @@ -0,0 +1,209 @@ +package config + +import ( + "errors" + "fmt" + "os" + "regexp" + "strings" + + "github.com/google/uuid" +) + +var instanceIDPattern = regexp.MustCompile(`^[A-Za-z0-9._:-]{1,128}$`) + +type Config struct { + Env string + Version string + InstanceID string + + HTTP HTTP + Logger Logger + Limits Limits + Database Database + Cache Cache + Session Session + + S3 S3 + Attachments Attachments + Janitor Janitor + + Idempotency Idempotency + HistoryCache HistoryCache +} + +func Load() (*Config, error) { + cfg := defaults() + if err := cfg.applyEnv(os.LookupEnv); err != nil { + return nil, fmt.Errorf("config: env: %w", err) + } + if cfg.InstanceID == "" { + cfg.InstanceID = defaultInstanceID() + } + if err := cfg.validate(); err != nil { + return nil, fmt.Errorf("config: validate: %w", err) + } + return cfg, nil +} + +func defaults() *Config { + return &Config{ + Env: "lab", + Version: "dev", + HTTP: HTTP{ + Addr: "0.0.0.0:8080", + ReadTimeoutMs: 10000, + WriteTimeoutMs: 10000, + IdleTimeoutMs: 60000, + ShutdownTimeoutMs: 10000, + ShutdownDrainMs: 3000, + }, + Logger: Logger{Level: "info"}, + Limits: Limits{ + MaxBodyBytes: 64 * 1024, + MaxInFlight: 64, + MaxMessagesGlobal: 100000, + MaxHeapBytes: 256 * 1024 * 1024, + }, + Database: Database{ + MaxConns: 10, + ConnectTimeoutMs: 5000, + QueryTimeoutMs: 3000, + }, + Cache: Cache{ + PoolSize: 20, + TimeoutMs: 1000, + }, + Session: Session{Store: "valkey", TTLSeconds: 3600}, + S3: S3{ + Endpoint: "http://s3:9000", + Region: "us-east-1", + Bucket: "messenger-attachments", + TimeoutMs: 8000, + }, + Attachments: Attachments{ + MaxUploadBytes: ContractMaxUploadBytes, + MaxImagePixels: ContractMaxImagePixels, + MaxConcurrentUploads: 16, + }, + Janitor: Janitor{GraceSeconds: 3600, IntervalSeconds: 600, MaxDeletes: 1000}, + Idempotency: Idempotency{TTLSeconds: MinIdempotencyTTLSeconds}, + HistoryCache: HistoryCache{ + Mode: "off", + PageTTLSeconds: 30, + TimeoutMs: 200, + PoolSize: 20, + }, + } +} + +// Public alias deliberately does not expose Docker hostname. +func defaultInstanceID() string { return uuid.NewString() } + +func (c *Config) validate() error { + if !instanceIDPattern.MatchString(c.InstanceID) { + return fmt.Errorf("APP_INSTANCE_ID must match %s", instanceIDPattern) + } + if strings.TrimSpace(c.Env) == "" { + return errors.New("env is required") + } + if strings.TrimSpace(c.Version) == "" { + return errors.New("version is required") + } + if strings.TrimSpace(c.HTTP.Addr) == "" { + return errors.New("http.addr is required") + } + if c.HTTP.ShutdownTimeoutMs <= 0 || c.HTTP.ShutdownTimeoutMs > 10000 { + return fmt.Errorf("APP_SHUTDOWN_TIMEOUT_MS must be in (0, 10000], got %d", c.HTTP.ShutdownTimeoutMs) + } + if c.HTTP.ShutdownDrainMs < 0 || c.HTTP.ShutdownDrainMs > 10000 { + return fmt.Errorf("APP_SHUTDOWN_DRAIN_MS must be in [0, 10000], got %d", c.HTTP.ShutdownDrainMs) + } + if c.HTTP.ReadTimeoutMs <= 0 { + return fmt.Errorf("APP_READ_TIMEOUT_MS must be > 0, got %d", c.HTTP.ReadTimeoutMs) + } + if c.HTTP.WriteTimeoutMs <= 0 { + return fmt.Errorf("APP_WRITE_TIMEOUT_MS must be > 0, got %d", c.HTTP.WriteTimeoutMs) + } + if c.HTTP.IdleTimeoutMs <= 0 { + return fmt.Errorf("APP_IDLE_TIMEOUT_MS must be > 0, got %d", c.HTTP.IdleTimeoutMs) + } + + if c.Limits.MaxBodyBytes <= 0 { + return fmt.Errorf("APP_MAX_BODY_BYTES must be > 0, got %d", c.Limits.MaxBodyBytes) + } + if c.Limits.MaxInFlight <= 0 { + return fmt.Errorf("APP_MAX_INFLIGHT must be > 0, got %d", c.Limits.MaxInFlight) + } + if c.Limits.MaxMessagesGlobal <= 0 { + return fmt.Errorf("APP_MAX_MESSAGES must be > 0, got %d", c.Limits.MaxMessagesGlobal) + } + if c.Limits.MaxHeapBytes == 0 { + return errors.New("APP_MAX_HEAP_BYTES must be > 0") + } + + if c.S3.TimeoutMs <= 0 { + return fmt.Errorf("S3_TIMEOUT_MS must be > 0, got %d", c.S3.TimeoutMs) + } + if c.Attachments.MaxUploadBytes <= 0 || c.Attachments.MaxUploadBytes > ContractMaxUploadBytes { + return fmt.Errorf("MAX_UPLOAD_BYTES must be in (0, %d], got %d", ContractMaxUploadBytes, c.Attachments.MaxUploadBytes) + } + if c.Attachments.MaxImagePixels <= 0 || c.Attachments.MaxImagePixels > ContractMaxImagePixels { + return fmt.Errorf("MAX_IMAGE_PIXELS must be in (0, %d], got %d", ContractMaxImagePixels, c.Attachments.MaxImagePixels) + } + if c.Attachments.MaxConcurrentUploads <= 0 { + return fmt.Errorf("MAX_CONCURRENT_UPLOADS must be > 0, got %d", c.Attachments.MaxConcurrentUploads) + } + + if c.Janitor.GraceSeconds < MinJanitorGraceSeconds { + return fmt.Errorf("JANITOR_GRACE_SECONDS must be >= %d, got %d", MinJanitorGraceSeconds, c.Janitor.GraceSeconds) + } + if c.Janitor.IntervalSeconds <= 0 { + return fmt.Errorf("JANITOR_INTERVAL_SECONDS must be > 0, got %d", c.Janitor.IntervalSeconds) + } + if c.Janitor.MaxDeletes <= 0 { + return fmt.Errorf("JANITOR_MAX_DELETES must be > 0, got %d", c.Janitor.MaxDeletes) + } + + if c.Database.MaxConns <= 0 { + return fmt.Errorf("DB_MAX_CONNS must be > 0, got %d", c.Database.MaxConns) + } + if c.Database.ConnectTimeoutMs <= 0 { + return fmt.Errorf("DB_CONNECT_TIMEOUT_MS must be > 0, got %d", c.Database.ConnectTimeoutMs) + } + if c.Database.QueryTimeoutMs <= 0 { + return fmt.Errorf("DB_QUERY_TIMEOUT_MS must be > 0, got %d", c.Database.QueryTimeoutMs) + } + if c.Cache.PoolSize <= 0 { + return fmt.Errorf("CACHE_POOL_SIZE must be > 0, got %d", c.Cache.PoolSize) + } + if c.Cache.TimeoutMs <= 0 { + return fmt.Errorf("CACHE_TIMEOUT_MS must be > 0, got %d", c.Cache.TimeoutMs) + } + switch c.HistoryCache.Mode { + case "off", "naive", "safe": + default: + return fmt.Errorf("HISTORY_CACHE must be off|naive|safe, got %q", c.HistoryCache.Mode) + } + if c.HistoryCache.PageTTLSeconds <= 0 { + return fmt.Errorf("HISTORY_CACHE_TTL_SECONDS must be > 0, got %d", c.HistoryCache.PageTTLSeconds) + } + if c.HistoryCache.TimeoutMs <= 0 || c.HistoryCache.PoolSize <= 0 { + return errors.New("HISTORY_CACHE_TIMEOUT_MS and HISTORY_CACHE_POOL_SIZE must be > 0") + } + if c.HistoryCache.FillDelayMs < 0 || c.HistoryCache.FillDelayMs > 1000 { + return fmt.Errorf("HISTORY_CACHE_FILL_DELAY_MS must be in [0, 1000], got %d", c.HistoryCache.FillDelayMs) + } + // Реализовано одно хранилище сессий; иное значение — ошибка конфигурации, а не тихий выбор. + if c.Session.Store != "valkey" { + return fmt.Errorf("SESSION_STORE must be valkey (the only implemented session store), got %q", c.Session.Store) + } + if c.Idempotency.TTLSeconds < MinIdempotencyTTLSeconds { + return fmt.Errorf("IDEMPOTENCY_TTL_SECONDS must be >= %d, got %d", MinIdempotencyTTLSeconds, c.Idempotency.TTLSeconds) + } + if c.Session.TTLSeconds <= 0 { + return fmt.Errorf("SESSION_TTL_SECONDS must be > 0, got %d", c.Session.TTLSeconds) + } + + return nil +} diff --git a/app/internal/config/database.go b/app/internal/config/database.go new file mode 100644 index 0000000..05a0086 --- /dev/null +++ b/app/internal/config/database.go @@ -0,0 +1,13 @@ +package config + +type Database struct { + URLFile string + URL string + MaxConns int32 + ConnectTimeoutMs int + QueryTimeoutMs int + // EnableBitmapScan: по умолчанию выключено. Для чата, которого ещё нет в статистике, + // планировщик может ожидать почти пустой результат и выбрать чтение всего чата с сортировкой. + // Это гипотеза: замеров, подтверждающих выигрыш, в evidence нет. Флаг нужен для сравнения. + EnableBitmapScan bool +} diff --git a/app/internal/config/env.go b/app/internal/config/env.go new file mode 100644 index 0000000..21e91c0 --- /dev/null +++ b/app/internal/config/env.go @@ -0,0 +1,176 @@ +package config + +import ( + "fmt" + "net" + "strconv" + "strings" +) + +func (c *Config) applyEnv(lookup func(string) (string, bool)) error { + get := func(key string) (string, bool) { + v, ok := lookup(key) + v = strings.TrimSpace(v) + return v, ok && v != "" + } + + if v, ok := get("APP_ENV"); ok { + c.Env = v + } + if v, ok := get("APP_VERSION"); ok { + c.Version = v + } + if v, ok := get("APP_INSTANCE_ID"); ok { + c.InstanceID = v + } + if v, ok := get("APP_LOG_LEVEL"); ok { + c.Logger.Level = v + } + if v, ok := get("DATABASE_URL_FILE"); ok { + c.Database.URLFile = v + } + if v, ok := get("DATABASE_URL"); ok { + c.Database.URL = v + } + if v, ok := get("CACHE_URL_FILE"); ok { + c.Cache.URLFile = v + } + if v, ok := get("CACHE_URL"); ok { + c.Cache.URL = v + } + if v, ok := get("SESSION_STORE"); ok { + c.Session.Store = strings.ToLower(v) + } + if v, ok := get("S3_ENDPOINT"); ok { + c.S3.Endpoint = v + } + if v, ok := get("S3_REGION"); ok { + c.S3.Region = v + } + if v, ok := get("S3_BUCKET"); ok { + c.S3.Bucket = v + } + if v, ok := get("S3_ACCESS_KEY_ID_FILE"); ok { + c.S3.AccessKeyIDFile = v + } + if v, ok := get("S3_SECRET_ACCESS_KEY_FILE"); ok { + c.S3.SecretAccessKeyFile = v + } + if v, ok := get("HISTORY_CACHE"); ok { + c.HistoryCache.Mode = strings.ToLower(v) + } + if v, ok := get("HISTORY_CACHE_URL_FILE"); ok { + c.HistoryCache.URLFile = v + } + if v, ok := get("HISTORY_CACHE_URL"); ok { + c.HistoryCache.URL = v + } + + if v, ok := get("JANITOR_DRY_RUN"); ok { + dryRun, err := strconv.ParseBool(v) + if err != nil { + return fmt.Errorf("JANITOR_DRY_RUN: not a boolean: %q", v) + } + c.Janitor.DryRun = dryRun + } + + host, port, err := net.SplitHostPort(c.HTTP.Addr) + if err != nil { + return fmt.Errorf("default addr %q: %w", c.HTTP.Addr, err) + } + if v, ok := get("APP_HOST"); ok { + host = v + } + if v, ok := get("APP_PORT"); ok { + port = v + } + if n, err := strconv.Atoi(port); err != nil || n < 1 || n > 65535 { + return fmt.Errorf("APP_PORT must be in [1, 65535], got %q", port) + } + c.HTTP.Addr = net.JoinHostPort(host, port) + + ints := []struct { + key string + dst *int + }{ + {"APP_READ_TIMEOUT_MS", &c.HTTP.ReadTimeoutMs}, + {"APP_WRITE_TIMEOUT_MS", &c.HTTP.WriteTimeoutMs}, + {"APP_IDLE_TIMEOUT_MS", &c.HTTP.IdleTimeoutMs}, + {"APP_SHUTDOWN_TIMEOUT_MS", &c.HTTP.ShutdownTimeoutMs}, + {"APP_SHUTDOWN_DRAIN_MS", &c.HTTP.ShutdownDrainMs}, + {"APP_MAX_INFLIGHT", &c.Limits.MaxInFlight}, + {"APP_MAX_MESSAGES", &c.Limits.MaxMessagesGlobal}, + {"DB_CONNECT_TIMEOUT_MS", &c.Database.ConnectTimeoutMs}, + {"DB_QUERY_TIMEOUT_MS", &c.Database.QueryTimeoutMs}, + {"S3_TIMEOUT_MS", &c.S3.TimeoutMs}, + {"MAX_CONCURRENT_UPLOADS", &c.Attachments.MaxConcurrentUploads}, + {"JANITOR_GRACE_SECONDS", &c.Janitor.GraceSeconds}, + {"JANITOR_INTERVAL_SECONDS", &c.Janitor.IntervalSeconds}, + {"JANITOR_MAX_DELETES", &c.Janitor.MaxDeletes}, + {"CACHE_POOL_SIZE", &c.Cache.PoolSize}, + {"CACHE_TIMEOUT_MS", &c.Cache.TimeoutMs}, + {"SESSION_TTL_SECONDS", &c.Session.TTLSeconds}, + {"IDEMPOTENCY_TTL_SECONDS", &c.Idempotency.TTLSeconds}, + {"HISTORY_CACHE_TTL_SECONDS", &c.HistoryCache.PageTTLSeconds}, + {"HISTORY_CACHE_TIMEOUT_MS", &c.HistoryCache.TimeoutMs}, + {"HISTORY_CACHE_POOL_SIZE", &c.HistoryCache.PoolSize}, + {"HISTORY_CACHE_FILL_DELAY_MS", &c.HistoryCache.FillDelayMs}, + } + for _, it := range ints { + v, ok := get(it.key) + if !ok { + continue + } + n, err := strconv.Atoi(v) + if err != nil { + return fmt.Errorf("%s: not an integer: %q", it.key, v) + } + *it.dst = n + } + + if v, ok := get("APP_MAX_BODY_BYTES"); ok { + n, err := strconv.ParseInt(v, 10, 64) + if err != nil { + return fmt.Errorf("APP_MAX_BODY_BYTES: not an integer: %q", v) + } + c.Limits.MaxBodyBytes = n + } + for _, it := range []struct { + key string + dst *int64 + }{ + {"MAX_UPLOAD_BYTES", &c.Attachments.MaxUploadBytes}, + {"MAX_IMAGE_PIXELS", &c.Attachments.MaxImagePixels}, + } { + if v, ok := get(it.key); ok { + n, err := strconv.ParseInt(v, 10, 64) + if err != nil { + return fmt.Errorf("%s: not an integer: %q", it.key, v) + } + *it.dst = n + } + } + if v, ok := get("DB_MAX_CONNS"); ok { + n, err := strconv.ParseInt(v, 10, 32) + if err != nil { + return fmt.Errorf("DB_MAX_CONNS: not an integer: %q", v) + } + c.Database.MaxConns = int32(n) + } + if v, ok := get("DB_ENABLE_BITMAPSCAN"); ok { + b, err := strconv.ParseBool(v) + if err != nil { + return fmt.Errorf("DB_ENABLE_BITMAPSCAN: not a boolean: %q", v) + } + c.Database.EnableBitmapScan = b + } + if v, ok := get("APP_MAX_HEAP_BYTES"); ok { + n, err := strconv.ParseUint(v, 10, 64) + if err != nil { + return fmt.Errorf("APP_MAX_HEAP_BYTES: not a non-negative integer: %q", v) + } + c.Limits.MaxHeapBytes = n + } + + return nil +} diff --git a/app/internal/config/env_test.go b/app/internal/config/env_test.go new file mode 100644 index 0000000..4bea642 --- /dev/null +++ b/app/internal/config/env_test.go @@ -0,0 +1,85 @@ +package config + +import "testing" + +func TestLoad_Defaults(t *testing.T) { + cfg, err := Load() + if err != nil { + t.Fatal(err) + } + if cfg.HTTP.Addr != "0.0.0.0:8080" || cfg.Env != "lab" || cfg.Limits.MaxInFlight != 64 { + t.Errorf("cfg = %+v", cfg) + } +} + +func TestLoad_EnvOverridesDefaults(t *testing.T) { + t.Setenv("APP_HOST", "127.0.0.1") + t.Setenv("APP_PORT", "9090") + t.Setenv("APP_ENV", "docker") + t.Setenv("APP_MAX_INFLIGHT", "8") + t.Setenv("APP_MAX_BODY_BYTES", "2048") + + cfg, err := Load() + if err != nil { + t.Fatal(err) + } + if cfg.HTTP.Addr != "127.0.0.1:9090" { + t.Errorf("addr = %q, want 127.0.0.1:9090", cfg.HTTP.Addr) + } + if cfg.Env != "docker" { + t.Errorf("env = %q, want docker", cfg.Env) + } + if cfg.Limits.MaxInFlight != 8 || cfg.Limits.MaxBodyBytes != 2048 { + t.Errorf("limits = %+v", cfg.Limits) + } +} + +func TestLoad_PortOnlyKeepsDefaultHost(t *testing.T) { + t.Setenv("APP_PORT", "18080") + + cfg, err := Load() + if err != nil { + t.Fatal(err) + } + if cfg.HTTP.Addr != "0.0.0.0:18080" { + t.Errorf("addr = %q, want 0.0.0.0:18080", cfg.HTTP.Addr) + } +} + +func TestLoad_InstanceID(t *testing.T) { + cfg, err := Load() + if err != nil { + t.Fatal(err) + } + if cfg.InstanceID == "" { + t.Error("default instance id is empty") + } + + t.Setenv("APP_INSTANCE_ID", "api-1") + cfg, err = Load() + if err != nil { + t.Fatal(err) + } + if cfg.InstanceID != "api-1" { + t.Errorf("instance id = %q, want api-1", cfg.InstanceID) + } +} + +func TestLoad_InvalidEnvFails(t *testing.T) { + for key, val := range map[string]string{ + "APP_PORT": "http", + "APP_MAX_INFLIGHT": "many", + "APP_MAX_MESSAGES": "0", + "APP_SHUTDOWN_TIMEOUT_MS": "30000", + "APP_INSTANCE_ID": "bad id", + "APP_SHUTDOWN_DRAIN_MS": "-1", + "IDEMPOTENCY_TTL_SECONDS": "3600", + } { + t.Run(key, func(t *testing.T) { + t.Setenv(key, val) + if _, err := Load(); err == nil { + t.Errorf("%s=%q: expected error", key, val) + } + }) + } +} diff --git a/app/internal/config/history_cache.go b/app/internal/config/history_cache.go new file mode 100644 index 0000000..e28fb81 --- /dev/null +++ b/app/internal/config/history_cache.go @@ -0,0 +1,11 @@ +package config + +type HistoryCache struct { + Mode string + URLFile string + URL string + PageTTLSeconds int + TimeoutMs int + PoolSize int + FillDelayMs int +} diff --git a/app/internal/config/http.go b/app/internal/config/http.go new file mode 100644 index 0000000..3059c71 --- /dev/null +++ b/app/internal/config/http.go @@ -0,0 +1,12 @@ +package config + +type HTTP struct { + Addr string + ReadTimeoutMs int + WriteTimeoutMs int + IdleTimeoutMs int + ShutdownTimeoutMs int + // ShutdownDrainMs — сколько после SIGTERM обслуживать запросы, отвечая на readiness 503, + // чтобы балансировщик успел вывести реплику. Должно быть больше времени его обнаружения. + ShutdownDrainMs int +} diff --git a/app/internal/config/idempotency.go b/app/internal/config/idempotency.go new file mode 100644 index 0000000..32c97cc --- /dev/null +++ b/app/internal/config/idempotency.go @@ -0,0 +1,8 @@ +package config + +// MinIdempotencyTTLSeconds — контракт требует хранить результат не менее 24 часов. +const MinIdempotencyTTLSeconds = 86400 + +type Idempotency struct { + TTLSeconds int +} diff --git a/app/internal/config/limits.go b/app/internal/config/limits.go new file mode 100644 index 0000000..889fab5 --- /dev/null +++ b/app/internal/config/limits.go @@ -0,0 +1,8 @@ +package config + +type Limits struct { + MaxBodyBytes int64 + MaxInFlight int + MaxMessagesGlobal int + MaxHeapBytes uint64 +} diff --git a/app/internal/config/logger.go b/app/internal/config/logger.go new file mode 100644 index 0000000..be8e36b --- /dev/null +++ b/app/internal/config/logger.go @@ -0,0 +1,5 @@ +package config + +type Logger struct { + Level string +} diff --git a/app/internal/config/session.go b/app/internal/config/session.go new file mode 100644 index 0000000..56e0da4 --- /dev/null +++ b/app/internal/config/session.go @@ -0,0 +1,13 @@ +package config + +type Session struct { + Store string + TTLSeconds int +} + +type Cache struct { + URLFile string + URL string + PoolSize int + TimeoutMs int +} diff --git a/app/internal/domain/attachment.go b/app/internal/domain/attachment.go new file mode 100644 index 0000000..4459a9c --- /dev/null +++ b/app/internal/domain/attachment.go @@ -0,0 +1,39 @@ +package domain + +import "time" + +// Attachment states are persisted; ready requires both original and thumbnail. +const StatusReady = "ready" +const StatusQueued = "queued" + +const ( + ContentTypePNG = "image/png" + ContentTypeJPEG = "image/jpeg" +) + +type Attachment struct { + ID string + ChatID string + OwnerID string + Filename string + ContentType string + SizeBytes int64 + SHA256 string + // ObjectKey — внутренний ключ в bucket, назначает сервер. В публичный API не попадает. + ObjectKey string + Variants []Variant + ErrorCode *string + Status string + CreatedAt time.Time + UpdatedAt time.Time +} + +// Variant describes one durable derivative; storage keys stay private. +type Variant struct { + Name string `json:"name"` + ContentType string `json:"content_type"` + SizeBytes int64 `json:"size_bytes"` + Width int `json:"width"` + Height int `json:"height"` + SHA256 string `json:"sha256"` +} diff --git a/app/internal/domain/chat.go b/app/internal/domain/chat.go new file mode 100644 index 0000000..2de7174 --- /dev/null +++ b/app/internal/domain/chat.go @@ -0,0 +1,10 @@ +package domain + +import "time" + +type Chat struct { + ID string + Title string + MemberIDs []string + CreatedAt time.Time +} diff --git a/app/internal/domain/errors.go b/app/internal/domain/errors.go new file mode 100644 index 0000000..02ad86e --- /dev/null +++ b/app/internal/domain/errors.go @@ -0,0 +1,27 @@ +package domain + +import ( + "errors" + "fmt" +) + +var ( + ErrNotFound = errors.New("not found") + + ErrUnauthorized = errors.New("unauthorized") + + ErrConflict = errors.New("conflict") + + // ErrIdempotencyConflict — ключ уже использован с другим телом запроса. + ErrIdempotencyConflict = fmt.Errorf("idempotency key reused with different request: %w", ErrConflict) + + ErrInvalidArgument = errors.New("invalid argument") + + ErrUnavailable = errors.New("unavailable") + + ErrPayloadTooLarge = errors.New("payload too large") + + ErrRateLimited = errors.New("rate limited") + + ErrUnsupportedMedia = errors.New("unsupported media") +) diff --git a/app/internal/domain/message.go b/app/internal/domain/message.go new file mode 100644 index 0000000..036fd12 --- /dev/null +++ b/app/internal/domain/message.go @@ -0,0 +1,13 @@ +package domain + +import "time" + +type Message struct { + ID string + ChatID string + AuthorID string + Text string + CreatedAt time.Time + // AttachmentIDs — вложения этого чата в порядке из запроса; без вложений пусто. + AttachmentIDs []string +} diff --git a/app/internal/domain/page.go b/app/internal/domain/page.go new file mode 100644 index 0000000..494a7a4 --- /dev/null +++ b/app/internal/domain/page.go @@ -0,0 +1,67 @@ +package domain + +import ( + "encoding/base64" + "encoding/json" + "time" + + "github.com/google/uuid" +) + +type Page[T any] struct { + Items []T + NextCursor string +} + +type Cursor struct { + CreatedAt time.Time `json:"t"` + ID string `json:"i"` + Scope string `json:"s,omitempty"` +} + +func (c Cursor) IsZero() bool { + return c.ID == "" && c.CreatedAt.IsZero() +} + +func (c Cursor) Less(createdAt time.Time, id string) bool { + if c.CreatedAt.Before(createdAt) { + return true + } + if c.CreatedAt.After(createdAt) { + return false + } + return c.ID < id +} + +func EncodeCursor(c Cursor) string { + if c.IsZero() { + return "" + } + b, _ := json.Marshal(c) + return base64.RawURLEncoding.EncodeToString(b) +} + +func DecodeCursor(s string) (Cursor, error) { + if s == "" { + return Cursor{}, nil + } + raw, err := base64.RawURLEncoding.DecodeString(s) + if err != nil { + return Cursor{}, ErrInvalidArgument + } + var c Cursor + if err := json.Unmarshal(raw, &c); err != nil { + return Cursor{}, ErrInvalidArgument + } + + if c.CreatedAt.IsZero() || c.Scope == "" { + return Cursor{}, ErrInvalidArgument + } + if _, err := uuid.Parse(c.ID); err != nil || len(c.ID) != 36 { + return Cursor{}, ErrInvalidArgument + } + if EncodeCursor(c) != s { + return Cursor{}, ErrInvalidArgument + } + return c, nil +} diff --git a/app/internal/domain/session.go b/app/internal/domain/session.go new file mode 100644 index 0000000..f62cd52 --- /dev/null +++ b/app/internal/domain/session.go @@ -0,0 +1,9 @@ +package domain + +import "time" + +type Session struct { + Token string + ExpiresAt time.Time + User User +} diff --git a/app/internal/domain/user.go b/app/internal/domain/user.go new file mode 100644 index 0000000..34d5235 --- /dev/null +++ b/app/internal/domain/user.go @@ -0,0 +1,10 @@ +package domain + +import "time" + +type User struct { + ID string + Username string + DisplayName string + CreatedAt time.Time +} diff --git a/app/internal/imagecheck/imagecheck.go b/app/internal/imagecheck/imagecheck.go new file mode 100644 index 0000000..437020a --- /dev/null +++ b/app/internal/imagecheck/imagecheck.go @@ -0,0 +1,128 @@ +// Package imagecheck определяет тип изображения по содержимому и проверяет, что файл целый. +package imagecheck + +import ( + "bufio" + "bytes" + "context" + "errors" + "fmt" + "image" + "image/jpeg" + "image/png" + "io" + "time" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" +) + +var ( + // ErrUnsupported — не PNG/JPEG либо файл повреждён. + ErrUnsupported = errors.New("imagecheck: not a valid PNG or JPEG") + // ErrTooManyPixels — размеры из заголовка превышают лимит. + ErrTooManyPixels = errors.New("imagecheck: too many pixels") + // ErrBusy — очередь на декодирование не подошла за decodeWait. + ErrBusy = errors.New("imagecheck: decoder is busy") +) + +var ( + pngMagic = []byte("\x89PNG\r\n\x1a\n") + jpegMagic = []byte{0xff, 0xd8, 0xff} +) + +const ( + // decodeWait ограничивает ожидание очереди на декодирование. Вместе с записью в S3 и БД ответ + // должен уложиться в timeout server балансировщика (15 с): лучше честный 429, чем 504. + decodeWait = 5 * time.Second + // Файл читается с диска маленькими порциями; буфер убирает лишние системные вызовы. + readBuffer = 64 << 10 +) + +type format struct { + contentType string + config func(io.Reader) (image.Config, error) + decode func(io.Reader) (image.Image, error) +} + +func detect(head []byte) (format, bool) { + switch { + case bytes.HasPrefix(head, pngMagic): + return format{domain.ContentTypePNG, png.DecodeConfig, png.Decode}, true + case bytes.HasPrefix(head, jpegMagic): + return format{domain.ContentTypeJPEG, jpeg.DecodeConfig, jpeg.Decode}, true + } + return format{}, false +} + +func read(r io.ReadSeeker) (format, error) { + if _, err := r.Seek(0, io.SeekStart); err != nil { + return format{}, err + } + head := make([]byte, len(pngMagic)) + n, err := io.ReadFull(r, head) + if err != nil && !errors.Is(err, io.EOF) && !errors.Is(err, io.ErrUnexpectedEOF) { + return format{}, err + } + f, ok := detect(head[:n]) + if !ok { + return format{}, ErrUnsupported + } + if _, err := r.Seek(0, io.SeekStart); err != nil { + return format{}, err + } + return f, nil +} + +// Checker ограничивает расход памяти на проверку: размеры читаются из заголовка без распаковки, +// а полное декодирование выполняется только в пределах лимита пикселей и по одному за раз. +// Декодирование 40 Мп занимает сотни мегабайт, поэтому параллелить его нельзя. +type Checker struct { + maxPixels int64 + decoding chan struct{} +} + +func New(maxPixels int64) *Checker { + return &Checker{maxPixels: maxPixels, decoding: make(chan struct{}, 1)} +} + +// Inspect определяет истинный Content-Type по сигнатуре и проверяет размеры из заголовка. Пиксели +// не распаковываются, поэтому «бомба» и подмена типа отклоняются почти без затрат. +func (c *Checker) Inspect(r io.ReadSeeker) (string, error) { + f, err := read(r) + if err != nil { + return "", err + } + cfg, err := f.config(bufio.NewReaderSize(r, readBuffer)) + if err != nil { + return "", fmt.Errorf("%w: header", ErrUnsupported) + } + if cfg.Width <= 0 || cfg.Height <= 0 { + return "", fmt.Errorf("%w: empty image", ErrUnsupported) + } + if int64(cfg.Width) > c.maxPixels || int64(cfg.Width)*int64(cfg.Height) > c.maxPixels { + return "", ErrTooManyPixels + } + return f.contentType, nil +} + +// Decode полностью декодирует файл, уже прошедший Inspect. Результат не нужен: важно, что файл целый. +func (c *Checker) Decode(ctx context.Context, r io.ReadSeeker) error { + timer := time.NewTimer(decodeWait) + defer timer.Stop() + select { + case c.decoding <- struct{}{}: + defer func() { <-c.decoding }() + case <-timer.C: + return ErrBusy + case <-ctx.Done(): + return ctx.Err() + } + f, err := read(r) + if err != nil { + return err + } + if _, err := f.decode(bufio.NewReaderSize(r, readBuffer)); err != nil { + return fmt.Errorf("%w: body", ErrUnsupported) + } + return nil +} diff --git a/app/internal/imagecheck/imagecheck_test.go b/app/internal/imagecheck/imagecheck_test.go new file mode 100644 index 0000000..97fcc3b --- /dev/null +++ b/app/internal/imagecheck/imagecheck_test.go @@ -0,0 +1,139 @@ +package imagecheck + +import ( + "bytes" + "context" + "encoding/binary" + "errors" + "hash/crc32" + "image" + "image/color" + "image/jpeg" + "image/png" + "testing" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" +) + +func sampleImage(w, h int) image.Image { + img := image.NewRGBA(image.Rect(0, 0, w, h)) + for y := range h { + for x := range w { + img.Set(x, y, color.RGBA{uint8(x), uint8(y), 80, 255}) + } + } + return img +} + +func encodePNG(t *testing.T, w, h int) []byte { + t.Helper() + var b bytes.Buffer + if err := png.Encode(&b, sampleImage(w, h)); err != nil { + t.Fatal(err) + } + return b.Bytes() +} + +func encodeJPEG(t *testing.T, w, h int) []byte { + t.Helper() + var b bytes.Buffer + if err := jpeg.Encode(&b, sampleImage(w, h), nil); err != nil { + t.Fatal(err) + } + return b.Bytes() +} + +// pngHeaderOnly — сигнатура и IHDR с заданными размерами, без пикселей: так выглядит «бомба». +func pngHeaderOnly(w, h uint32) []byte { + var ihdr bytes.Buffer + ihdr.WriteString("IHDR") + binary.Write(&ihdr, binary.BigEndian, w) + binary.Write(&ihdr, binary.BigEndian, h) + ihdr.Write([]byte{8, 6, 0, 0, 0}) + var out bytes.Buffer + out.Write(pngMagic) + binary.Write(&out, binary.BigEndian, uint32(13)) + out.Write(ihdr.Bytes()) + binary.Write(&out, binary.BigEndian, crc32.ChecksumIEEE(ihdr.Bytes())) + return out.Bytes() +} + +// check — обе стадии проверки в том порядке, в каком их вызывает сервис. +func check(ctx context.Context, c *Checker, data []byte) (string, error) { + r := bytes.NewReader(data) + contentType, err := c.Inspect(r) + if err != nil { + return "", err + } + if err := c.Decode(ctx, r); err != nil { + return "", err + } + return contentType, nil +} + +func TestCheck(t *testing.T) { + validPNG := encodePNG(t, 20, 10) + validJPEG := encodeJPEG(t, 20, 10) + flipped := bytes.Clone(validPNG) + flipped[len(flipped)/2] ^= 0xff + + cases := []struct { + name string + data []byte + want string + wantErr error + }{ + {"png", validPNG, domain.ContentTypePNG, nil}, + {"jpeg", validJPEG, domain.ContentTypeJPEG, nil}, + {"empty", nil, "", ErrUnsupported}, + {"text", []byte(""), "", ErrUnsupported}, + {"gif", []byte("GIF89a\x01\x00\x01\x00\x00\x00\x00;"), "", ErrUnsupported}, + {"png magic only", pngMagic, "", ErrUnsupported}, + {"jpeg magic only", jpegMagic, "", ErrUnsupported}, + {"png truncated", validPNG[:len(validPNG)/2], "", ErrUnsupported}, + {"jpeg truncated", validJPEG[:len(validJPEG)/2], "", ErrUnsupported}, + {"png byte flipped", flipped, "", ErrUnsupported}, + {"png header without pixels", pngHeaderOnly(20, 10), "", ErrUnsupported}, + {"png pixel bomb", pngHeaderOnly(100000, 100000), "", ErrTooManyPixels}, + } + c := New(1000) + for _, tc := range cases { + t.Run(tc.name, func(t *testing.T) { + got, err := check(context.Background(), c, tc.data) + if !errors.Is(err, tc.wantErr) { + t.Fatalf("err = %v, want %v", err, tc.wantErr) + } + if got != tc.want { + t.Errorf("type = %q, want %q", got, tc.want) + } + }) + } +} + +func TestCheck_PixelLimitIsInclusive(t *testing.T) { + c := New(200) + if _, err := check(context.Background(), c, encodePNG(t, 20, 10)); err != nil { + t.Errorf("exactly at limit: %v", err) + } + if _, err := check(context.Background(), c, encodePNG(t, 21, 10)); !errors.Is(err, ErrTooManyPixels) { + t.Errorf("over limit: %v", err) + } +} + +func TestCheck_CancelledWhileWaitingForDecodeSlot(t *testing.T) { + c := New(1000) + c.decoding <- struct{}{} + ctx, cancel := context.WithCancel(context.Background()) + cancel() + if _, err := check(ctx, c, encodePNG(t, 2, 2)); !errors.Is(err, context.Canceled) { + t.Errorf("err = %v, want context.Canceled", err) + } +} + +func TestInspect_DoesNotNeedDecodeSlot(t *testing.T) { + c := New(1000) + c.decoding <- struct{}{} // декодер занят, но отказ по заголовку не должен его ждать + if _, err := c.Inspect(bytes.NewReader(pngHeaderOnly(100000, 100000))); !errors.Is(err, ErrTooManyPixels) { + t.Errorf("err = %v, want ErrTooManyPixels", err) + } +} diff --git a/app/internal/janitor/janitor.go b/app/internal/janitor/janitor.go new file mode 100644 index 0000000..e3b1847 --- /dev/null +++ b/app/internal/janitor/janitor.go @@ -0,0 +1,133 @@ +// Package janitor находит и удаляет объекты S3 без строки в attachments. Такие объекты появляются, +// если процесс упал между PUT и INSERT или не удалось компенсирующее удаление. +// +// Почему удаление безопасно: +// - Загрузка сначала пишет объект, потом строку, поэтому свежий объект без строки — обычное +// состояние идущей загрузки. Объекты моложе grace period не рассматриваются вовсе. +// - Порядок проверки: листинг, затем запрос в БД. Строка, появившаяся до запроса, защищает объект. +// После запроса строка появиться не может: объект старше grace, а загрузка живёт секунды. +// - Удаление начинается только после полного обхода. Ошибка БД или листинга прерывает проход без +// удалений: «не удалось проверить» никогда не означает «строки нет». +// - Слишком много кандидатов — признак аварии, а не мусора: проход отказывается что-либо удалять. +package janitor + +import ( + "context" + "errors" + "fmt" + "log/slog" + "strings" + "time" + + "github.com/google/uuid" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/objectstore" +) + +const batchSize = 500 + +// ErrTooManyOrphans — кандидатов больше MaxDeletes, ничего не удалено, нужен оператор. +var ErrTooManyOrphans = errors.New("janitor: too many orphans, nothing deleted") + +// Objects — права очистителя в S3: листинг и удаление, чтения содержимого нет. +type Objects interface { + objectstore.Lister + Delete(ctx context.Context, key string) error +} + +// Metadata отвечает, на какие ключи есть строка в БД. +type Metadata interface { + ExistingObjectKeys(ctx context.Context, keys []string) (map[string]struct{}, error) +} + +type Options struct { + Prefix string + Grace time.Duration + MaxDeletes int + DryRun bool + Now func() time.Time + Logger *slog.Logger +} + +// Report — итог прохода. Значения попадают в лог и в доказательства. +type Report struct { + Scanned int `json:"scanned"` + Fresh int `json:"fresh"` + Referenced int `json:"referenced"` + Skipped int `json:"skipped"` + Orphans int `json:"orphans"` + Deleted int `json:"deleted"` + DeleteFailed int `json:"delete_failed"` + DryRun bool `json:"dry_run"` + Elapsed time.Duration `json:"-"` +} + +// Run выполняет один проход. Повторный запуск безопасен: удалённый объект просто исчезает из обхода. +func Run(ctx context.Context, objects Objects, metadata Metadata, opts Options) (Report, error) { + started := opts.Now() + report := Report{DryRun: opts.DryRun} + var orphans, batch []string + + flush := func() error { + if len(batch) == 0 { + return nil + } + existing, err := metadata.ExistingObjectKeys(ctx, batch) + if err != nil { + return fmt.Errorf("janitor: check metadata: %w", err) + } + for _, key := range batch { + if _, ok := existing[key]; ok { + report.Referenced++ + } else { + orphans = append(orphans, key) + } + } + batch = batch[:0] + return nil + } + + err := objects.List(ctx, opts.Prefix, func(object objectstore.ObjectInfo) error { + report.Scanned++ + // Чужие ключи очиститель не создавал и не трогает. + if _, err := uuid.Parse(strings.TrimPrefix(object.Key, opts.Prefix)); err != nil { + report.Skipped++ + return nil + } + // Неизвестное время считается свежим: отсутствие сведений не повод для удаления. + if object.LastModified.IsZero() || opts.Now().Sub(object.LastModified) < opts.Grace { + report.Fresh++ + return nil + } + batch = append(batch, object.Key) + if len(batch) == batchSize { + return flush() + } + return nil + }) + if err == nil { + err = flush() + } + report.Orphans = len(orphans) + report.Elapsed = opts.Now().Sub(started) + if err != nil { + return report, err + } + if len(orphans) > opts.MaxDeletes { + return report, fmt.Errorf("%w: %d orphans, limit %d", ErrTooManyOrphans, len(orphans), opts.MaxDeletes) + } + if opts.DryRun { + return report, nil + } + for _, key := range orphans { + if err := objects.Delete(ctx, key); err != nil { + report.DeleteFailed++ + opts.Logger.Warn("orphan delete failed, will retry on the next pass", slog.String("object_key", key), slog.Any("err", err)) + continue + } + report.Deleted++ + opts.Logger.Info("orphan deleted", slog.String("object_key", key)) + } + report.Elapsed = opts.Now().Sub(started) + return report, nil +} diff --git a/app/internal/janitor/janitor_test.go b/app/internal/janitor/janitor_test.go new file mode 100644 index 0000000..140a36c --- /dev/null +++ b/app/internal/janitor/janitor_test.go @@ -0,0 +1,186 @@ +package janitor + +import ( + "context" + "errors" + "io" + "log/slog" + "testing" + "time" + + "github.com/google/uuid" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/objectstore" +) + +const prefix = "originals/" + +var now = time.Date(2026, 11, 4, 12, 0, 0, 0, time.UTC) + +type metadata struct { + keys map[string]struct{} + err error +} + +func (m *metadata) ExistingObjectKeys(_ context.Context, keys []string) (map[string]struct{}, error) { + if m.err != nil { + return nil, m.err + } + out := map[string]struct{}{} + for _, key := range keys { + if _, ok := m.keys[key]; ok { + out[key] = struct{}{} + } + } + return out, nil +} + +func options() Options { + return Options{ + Prefix: prefix, Grace: time.Hour, MaxDeletes: 100, + Now: func() time.Time { return now }, + Logger: slog.New(slog.NewTextHandler(io.Discard, nil)), + } +} + +func key() string { return prefix + uuid.NewString() } + +// rig: старый объект без строки, старый со строкой, свежий без строки, чужой старый. +type rig struct { + objects *objectstore.Memory + meta *metadata + orphan, used, fresh, foreign string +} + +func newRig() *rig { + r := &rig{objects: objectstore.NewMemory(), orphan: key(), used: key(), fresh: key(), foreign: prefix + "not-a-uuid"} + old := now.Add(-2 * time.Hour) + r.objects.PutAt(r.orphan, []byte("x"), old) + r.objects.PutAt(r.used, []byte("x"), old) + r.objects.PutAt(r.foreign, []byte("x"), old) + r.objects.PutAt(r.fresh, []byte("x"), now.Add(-time.Minute)) + r.meta = &metadata{keys: map[string]struct{}{r.used: {}}} + return r +} + +func (r *rig) has(key string) bool { + for _, k := range r.objects.Keys() { + if k == key { + return true + } + } + return false +} + +func TestRun_DeletesOnlyExpiredOrphans(t *testing.T) { + r := newRig() + report, err := Run(context.Background(), r.objects, r.meta, options()) + if err != nil { + t.Fatal(err) + } + if r.has(r.orphan) { + t.Error("expired orphan was kept") + } + if !r.has(r.used) || !r.has(r.fresh) || !r.has(r.foreign) { + t.Errorf("deleted too much: %v", r.objects.Keys()) + } + want := Report{Scanned: 4, Fresh: 1, Referenced: 1, Skipped: 1, Orphans: 1, Deleted: 1} + report.Elapsed = 0 + if report != want { + t.Errorf("report = %+v, want %+v", report, want) + } + + // Повторный проход ничего не меняет. + report, err = Run(context.Background(), r.objects, r.meta, options()) + if err != nil || report.Deleted != 0 || report.Orphans != 0 { + t.Errorf("second pass: %+v, %v", report, err) + } +} + +func TestRun_GraceBoundaryIsKept(t *testing.T) { + r := newRig() + almost := key() + r.objects.PutAt(almost, []byte("x"), now.Add(-time.Hour+time.Second)) + if _, err := Run(context.Background(), r.objects, r.meta, options()); err != nil { + t.Fatal(err) + } + if !r.has(almost) { + t.Error("object younger than grace was deleted") + } +} + +func TestRun_UnknownTimeIsTreatedAsFresh(t *testing.T) { + r := newRig() + unknown := key() + r.objects.PutAt(unknown, []byte("x"), time.Time{}) + if _, err := Run(context.Background(), r.objects, r.meta, options()); err != nil { + t.Fatal(err) + } + if !r.has(unknown) { + t.Error("object with unknown time was deleted") + } +} + +func TestRun_DryRunDeletesNothing(t *testing.T) { + r := newRig() + opts := options() + opts.DryRun = true + report, err := Run(context.Background(), r.objects, r.meta, opts) + if err != nil { + t.Fatal(err) + } + if report.Orphans != 1 || report.Deleted != 0 || !r.has(r.orphan) { + t.Errorf("report = %+v, keys = %v", report, r.objects.Keys()) + } +} + +func TestRun_MetadataFailureDeletesNothing(t *testing.T) { + r := newRig() + r.meta.err = errors.New("db down") + if _, err := Run(context.Background(), r.objects, r.meta, options()); err == nil { + t.Fatal("expected an error") + } + if !r.has(r.orphan) || !r.has(r.used) { + t.Error("objects were deleted without a metadata check") + } +} + +func TestRun_ListFailureIsReported(t *testing.T) { + r := newRig() + r.objects.Down.Store(true) + if _, err := Run(context.Background(), r.objects, r.meta, options()); err == nil { + t.Fatal("expected an error") + } +} + +// Пустая БД при полном bucket выглядит как «всё мусор». Это авария, а не повод всё удалить. +func TestRun_TooManyOrphansDeletesNothing(t *testing.T) { + r := newRig() + r.meta.keys = nil + opts := options() + opts.MaxDeletes = 1 + report, err := Run(context.Background(), r.objects, r.meta, opts) + if !errors.Is(err, ErrTooManyOrphans) { + t.Fatalf("err = %v", err) + } + if report.Deleted != 0 || !r.has(r.orphan) || !r.has(r.used) { + t.Errorf("report = %+v, keys = %v", report, r.objects.Keys()) + } +} + +func TestRun_ChecksMetadataInBatches(t *testing.T) { + objects := objectstore.NewMemory() + meta := &metadata{keys: map[string]struct{}{}} + for range batchSize + 7 { + k := key() + objects.PutAt(k, []byte("x"), now.Add(-2*time.Hour)) + meta.keys[k] = struct{}{} + } + report, err := Run(context.Background(), objects, meta, options()) + if err != nil { + t.Fatal(err) + } + if report.Referenced != batchSize+7 || report.Deleted != 0 { + t.Errorf("report = %+v", report) + } +} diff --git a/app/internal/logging/logging.go b/app/internal/logging/logging.go new file mode 100644 index 0000000..551b53b --- /dev/null +++ b/app/internal/logging/logging.go @@ -0,0 +1,51 @@ +package logging + +import ( + "fmt" + "io" + "log/slog" + "os" + "strings" +) + +func New(level, env, version string) (*slog.Logger, error) { + lvl, err := parseLevel(level) + if err != nil { + return nil, err + } + return build(os.Stdout, lvl, env, version), nil +} + +func build(w io.Writer, lvl slog.Level, env, version string) *slog.Logger { + handler := slog.NewJSONHandler(w, &slog.HandlerOptions{ + Level: lvl, + ReplaceAttr: forceUTCTime, + }) + return slog.New(handler).With( + slog.String("service", "messenger"), + slog.String("env", env), + slog.String("version", version), + ) +} + +func forceUTCTime(_ []string, a slog.Attr) slog.Attr { + if a.Value.Kind() == slog.KindTime { + a.Value = slog.TimeValue(a.Value.Time().UTC()) + } + return a +} + +func parseLevel(s string) (slog.Level, error) { + switch strings.ToLower(strings.TrimSpace(s)) { + case "", "info": + return slog.LevelInfo, nil + case "debug": + return slog.LevelDebug, nil + case "warn", "warning": + return slog.LevelWarn, nil + case "error": + return slog.LevelError, nil + default: + return 0, fmt.Errorf("logging: unknown level %q (want debug|info|warn|error)", s) + } +} diff --git a/app/internal/objectstore/memory.go b/app/internal/objectstore/memory.go new file mode 100644 index 0000000..5a90821 --- /dev/null +++ b/app/internal/objectstore/memory.go @@ -0,0 +1,117 @@ +package objectstore + +import ( + "bytes" + "context" + "fmt" + "io" + "strings" + "sync" + "sync/atomic" + "time" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" +) + +// Memory — хранилище для модульных тестов. В работающем приложении не используется. +type Memory struct { + mu sync.Mutex + objects map[string][]byte + modified map[string]time.Time + // Down имитирует недоступность S3. + Down atomic.Bool +} + +var ( + _ Store = (*Memory)(nil) + _ Lister = (*Memory)(nil) +) + +func NewMemory() *Memory { + return &Memory{objects: make(map[string][]byte), modified: make(map[string]time.Time)} +} + +func (m *Memory) check() error { + if m.Down.Load() { + return fmt.Errorf("%w: s3 down", domain.ErrUnavailable) + } + return nil +} + +func (m *Memory) Put(_ context.Context, key, _ string, body io.Reader, size int64) error { + if err := m.check(); err != nil { + return err + } + data, err := io.ReadAll(body) + if err != nil { + return fmt.Errorf("%w: s3 put: %v", domain.ErrUnavailable, err) + } + if int64(len(data)) != size { + return fmt.Errorf("%w: s3 put: got %d of %d bytes", domain.ErrUnavailable, len(data), size) + } + m.PutAt(key, data, time.Now()) + return nil +} + +// PutAt кладёт объект с заданным временем: так тест получает объект нужного возраста. +func (m *Memory) PutAt(key string, data []byte, at time.Time) { + m.mu.Lock() + defer m.mu.Unlock() + m.objects[key] = bytes.Clone(data) + m.modified[key] = at +} + +func (m *Memory) List(_ context.Context, prefix string, visit func(ObjectInfo) error) error { + if err := m.check(); err != nil { + return err + } + m.mu.Lock() + infos := make([]ObjectInfo, 0, len(m.objects)) + for key := range m.objects { + if strings.HasPrefix(key, prefix) { + infos = append(infos, ObjectInfo{Key: key, LastModified: m.modified[key]}) + } + } + m.mu.Unlock() + for _, info := range infos { + if err := visit(info); err != nil { + return err + } + } + return nil +} + +func (m *Memory) Get(_ context.Context, key string) (io.ReadCloser, int64, error) { + if err := m.check(); err != nil { + return nil, 0, err + } + m.mu.Lock() + defer m.mu.Unlock() + data, ok := m.objects[key] + if !ok { + return nil, 0, ErrNotFound + } + return io.NopCloser(bytes.NewReader(data)), int64(len(data)), nil +} + +func (m *Memory) Delete(_ context.Context, key string) error { + if err := m.check(); err != nil { + return err + } + m.mu.Lock() + defer m.mu.Unlock() + delete(m.objects, key) + delete(m.modified, key) + return nil +} + +// Keys возвращает ключи объектов для проверок в тестах. +func (m *Memory) Keys() []string { + m.mu.Lock() + defer m.mu.Unlock() + out := make([]string, 0, len(m.objects)) + for k := range m.objects { + out = append(out, k) + } + return out +} diff --git a/app/internal/objectstore/objectstore.go b/app/internal/objectstore/objectstore.go new file mode 100644 index 0000000..1432550 --- /dev/null +++ b/app/internal/objectstore/objectstore.go @@ -0,0 +1,34 @@ +// Package objectstore — хранилище байтов вложений. Интерфейс не зависит от конкретного сервера. +package objectstore + +import ( + "context" + "errors" + "io" + "time" +) + +// ErrNotFound — в bucket нет объекта. Метаданные пишутся после объекта, поэтому для существующего +// вложения это нарушение согласованности, а не обычная ошибка клиента. +var ErrNotFound = errors.New("objectstore: object not found") + +// ObjectInfo — то, что очистителю нужно знать об объекте из листинга. +type ObjectInfo struct { + Key string + LastModified time.Time +} + +type Store interface { + // Put передаёт объект потоком: size байт из body, без чтения всего файла в память. + Put(ctx context.Context, key, contentType string, body io.Reader, size int64) error + // Get возвращает поток и размер объекта. Поток обязательно закрыть. + Get(ctx context.Context, key string) (io.ReadCloser, int64, error) + Delete(ctx context.Context, key string) error +} + +// Lister обходит объекты bucket. Право на листинг есть только у очистителя, поэтому метод вынесен +// из Store: API не может и не должно перечислять объекты. +type Lister interface { + // List вызывает visit для каждого объекта с заданным префиксом. + List(ctx context.Context, prefix string, visit func(ObjectInfo) error) error +} diff --git a/app/internal/objectstore/s3.go b/app/internal/objectstore/s3.go new file mode 100644 index 0000000..e03d75d --- /dev/null +++ b/app/internal/objectstore/s3.go @@ -0,0 +1,251 @@ +package objectstore + +import ( + "context" + "crypto/hmac" + "crypto/sha256" + "errors" + "fmt" + "io" + "net/http" + "net/url" + "os" + "strings" + "time" + + "github.com/minio/minio-go/v7" + "github.com/minio/minio-go/v7/pkg/credentials" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/config" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" +) + +// S3 работает с любым S3-совместимым сервером; на стенде это SeaweedFS. +type S3 struct { + signingCreds *credentials.Credentials + region string + ticketKey []byte + client *minio.Client + core minio.Core + endpoint string + bucket string + timeout time.Duration +} + +var ( + _ Store = (*S3)(nil) + _ Lister = (*S3)(nil) +) + +// NewS3 только готовит клиента и не обращается к серверу: недоступность S3 при запуске не мешает +// реплике обслуживать пользователей и сообщения. +func NewS3(cfg config.S3) (*S3, error) { + u, err := url.Parse(cfg.Endpoint) + if err != nil || u.Host == "" || (u.Scheme != "http" && u.Scheme != "https") { + return nil, errors.New("objectstore: S3_ENDPOINT must be http(s)://host:port") + } + id, err := readSecret("S3_ACCESS_KEY_ID_FILE", cfg.AccessKeyIDFile) + if err != nil { + return nil, err + } + secret, err := readSecret("S3_SECRET_ACCESS_KEY_FILE", cfg.SecretAccessKeyFile) + if err != nil { + return nil, err + } + client, err := minio.New(u.Host, &minio.Options{ + Creds: credentials.NewStaticV4(id, secret, ""), + Secure: u.Scheme == "https", + Region: cfg.Region, + BucketLookup: minio.BucketLookupPath, + }) + if err != nil { + return nil, fmt.Errorf("objectstore: client: %w", err) + } + return &S3{ + signingCreds: credentials.NewStaticV4(id, secret, ""), + region: cfg.Region, + ticketKey: []byte(secret), + client: client, + core: minio.Core{Client: client}, + endpoint: cfg.Endpoint, + bucket: cfg.Bucket, + timeout: time.Duration(cfg.TimeoutMs) * time.Millisecond, + }, nil +} + +func readSecret(name, path string) (string, error) { + if path == "" { + return "", fmt.Errorf("objectstore: %s is required", name) + } + b, err := os.ReadFile(path) + if err != nil { + return "", fmt.Errorf("objectstore: read %s: %w", name, err) + } + v := strings.TrimSpace(string(b)) + if v == "" { + return "", fmt.Errorf("objectstore: %s is empty", name) + } + return v, nil +} + +// unavailable скрывает детали S3 от клиента: наружу уходит только 503. +func unavailable(op string, err error) error { + return fmt.Errorf("%w: s3 %s: %v", domain.ErrUnavailable, op, err) +} + +// Put отправляет объект одним запросом и не буферизует его. Multipart выключен намеренно: при обрыве +// одиночного PUT объект не появляется, а незавершённых multipart-загрузок, которые надо отдельно +// искать и отменять, просто не существует. +func (s *S3) Put(ctx context.Context, key, contentType string, body io.Reader, size int64) error { + ctx, cancel := context.WithTimeout(ctx, s.timeout) + defer cancel() + info, err := s.client.PutObject(ctx, s.bucket, key, body, size, + minio.PutObjectOptions{ContentType: contentType, DisableMultipart: true}) + if err != nil { + return unavailable("put", err) + } + if info.Size != size { + return unavailable("put", fmt.Errorf("stored %d of %d bytes", info.Size, size)) + } + return nil +} + +// List постранично обходит bucket; размер страницы задаёт сервер, в памяти одна страница. +func (s *S3) List(ctx context.Context, prefix string, visit func(ObjectInfo) error) error { + // Отмена нужна, чтобы при раннем выходе остановить горутину листинга клиента S3. + ctx, cancel := context.WithCancel(ctx) + defer cancel() + for object := range s.client.ListObjects(ctx, s.bucket, minio.ListObjectsOptions{Prefix: prefix, Recursive: true}) { + if object.Err != nil { + return unavailable("list", object.Err) + } + if err := visit(ObjectInfo{Key: object.Key, LastModified: object.LastModified}); err != nil { + return err + } + } + return ctx.Err() +} + +func (s *S3) Get(ctx context.Context, key string) (io.ReadCloser, int64, error) { + // Таймаут нужен только на получение ответа: чтение потока ограничивает родительский контекст. + ctx, cancel := context.WithCancel(ctx) + timer := time.AfterFunc(s.timeout, cancel) + body, info, _, err := s.core.GetObject(ctx, s.bucket, key, minio.GetObjectOptions{}) + timer.Stop() + if err != nil { + cancel() + if minio.ToErrorResponse(err).Code == "NoSuchKey" { + return nil, 0, ErrNotFound + } + return nil, 0, unavailable("get", err) + } + return &cancelOnClose{ReadCloser: body, cancel: cancel}, info.Size, nil +} + +type cancelOnClose struct { + io.ReadCloser + cancel context.CancelFunc +} + +func (c *cancelOnClose) Close() error { + defer c.cancel() + return c.ReadCloser.Close() +} + +func (s *S3) Delete(ctx context.Context, key string) error { + ctx, cancel := context.WithTimeout(ctx, s.timeout) + defer cancel() + if err := s.client.RemoveObject(ctx, s.bucket, key, minio.RemoveObjectOptions{}); err != nil { + return unavailable("delete", err) + } + return nil +} + +// EnsureBucket создаёт bucket, если его нет. Повторный запуск ничего не меняет и не трогает объекты. +func (s *S3) EnsureBucket(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("objectstore: bucket exists: %w", err) + } + if exists { + return nil + } + err = s.client.MakeBucket(ctx, s.bucket, minio.MakeBucketOptions{}) + if err != nil && minio.ToErrorResponse(err).Code != "BucketAlreadyOwnedByYou" { + return fmt.Errorf("objectstore: make bucket: %w", err) + } + return nil +} + +// RemovePolicy удаляет политику bucket, если она есть, и сообщает, была ли она. Доступ на стенде +// определяют только ключи, поэтому любая политика — чужеродное изменение, а не настройка. +func (s *S3) RemovePolicy(ctx context.Context) (bool, error) { + ctx, cancel := context.WithTimeout(ctx, s.timeout) + defer cancel() + policy, err := s.client.GetBucketPolicy(ctx, s.bucket) + if err != nil && minio.ToErrorResponse(err).Code != "NoSuchBucketPolicy" { + return false, fmt.Errorf("objectstore: get policy: %w", err) + } + if policy == "" { + return false, nil + } + if err := s.client.SetBucketPolicy(ctx, s.bucket, ""); err != nil { + return false, fmt.Errorf("objectstore: remove policy: %w", err) + } + return true, nil +} + +// CheckPrivate делает запрос без подписи и ожидает отказ. Политику bucket никто не задаёт, поэтому +// приватность — поведение по умолчанию, а эта проверка не даёт запустить стенд, если это не так. +func (s *S3) CheckPrivate(ctx context.Context) error { + ctx, cancel := context.WithTimeout(ctx, s.timeout) + defer cancel() + req, err := http.NewRequestWithContext(ctx, http.MethodGet, strings.TrimRight(s.endpoint, "/")+"/"+s.bucket+"/", nil) + if err != nil { + return err + } + resp, err := http.DefaultClient.Do(req) + if err != nil { + return fmt.Errorf("objectstore: anonymous probe: %w", err) + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusForbidden && resp.StatusCode != http.StatusUnauthorized { + return fmt.Errorf("objectstore: anonymous listing returned %d, bucket is not private", resp.StatusCode) + } + return nil +} + +// UploadMAC uses a separate domain from S3 request signatures. Shared credentials +// allow init and complete to run on different replicas without pending DB rows. +func (s *S3) UploadMAC(data []byte) []byte { + h := hmac.New(sha256.New, s.ticketKey) + h.Write([]byte("lab4-upload-ticket-v1\x00")) + h.Write(data) + return h.Sum(nil) +} + +func (s *S3) PresignUpload(ctx context.Context, key, contentType string, size int64) (string, error) { + endpoint := os.Getenv("S3_PUBLIC_ENDPOINT") + if endpoint == "" { + endpoint = s.endpoint + } + u, err := url.Parse(endpoint) + if err != nil || u.Host == "" || (u.Scheme != "http" && u.Scheme != "https") { + return "", domain.ErrUnavailable + } + // Presign with the public Host from the outset: rewriting a signed URL breaks SigV4. + client, err := minio.New(u.Host, &minio.Options{Creds: s.signingCreds, Secure: u.Scheme == "https", Region: s.region, BucketLookup: minio.BucketLookupPath}) + if err != nil { + return "", unavailable("presign", err) + } + headers := http.Header{} + headers.Set("Content-Type", contentType) + headers.Set("Content-Length", fmt.Sprint(size)) + signed, err := client.PresignHeader(ctx, http.MethodPut, s.bucket, key, 60*time.Second, nil, headers) + if err != nil { + return "", unavailable("presign", err) + } + return signed.String(), nil +} diff --git a/app/internal/password/benchmark_test.go b/app/internal/password/benchmark_test.go new file mode 100644 index 0000000..7d0bfa7 --- /dev/null +++ b/app/internal/password/benchmark_test.go @@ -0,0 +1,16 @@ +package password + +import ( + "context" + "testing" +) + +func BenchmarkDefaultHash(b *testing.B) { + h := NewHasher(Default, 1) + b.ReportAllocs() + for i := 0; i < b.N; i++ { + if _, err := h.Hash(context.Background(), "synthetic-benchmark-password"); err != nil { + b.Fatal(err) + } + } +} diff --git a/app/internal/password/password.go b/app/internal/password/password.go new file mode 100644 index 0000000..1d41840 --- /dev/null +++ b/app/internal/password/password.go @@ -0,0 +1,143 @@ +package password + +import ( + "context" + "crypto/rand" + "crypto/subtle" + "encoding/base64" + "errors" + "fmt" + "strconv" + "strings" + + "golang.org/x/crypto/argon2" +) + +type Params struct { + MemoryKiB uint32 + Iterations uint32 + Parallelism uint8 + SaltLen uint32 + KeyLen uint32 +} + +var Default = Params{ + MemoryKiB: 19 * 1024, + Iterations: 2, + Parallelism: 1, + SaltLen: 16, + KeyLen: 32, +} + +var ErrMalformedHash = errors.New("password: malformed hash") + +var b64 = base64.RawStdEncoding + +type Hasher struct { + params Params + slots chan struct{} +} + +func NewHasher(p Params, maxConcurrent int) *Hasher { + if maxConcurrent <= 0 { + maxConcurrent = 1 + } + return &Hasher{params: p, slots: make(chan struct{}, maxConcurrent)} +} + +func (h *Hasher) acquire(ctx context.Context) error { + select { + case h.slots <- struct{}{}: + return nil + case <-ctx.Done(): + return ctx.Err() + } +} + +func (h *Hasher) release() { <-h.slots } + +// Hash возвращает PHC-строку Argon2id со случайной солью. +func (h *Hasher) Hash(ctx context.Context, plain string) (string, error) { + if !validParams(h.params) { + return "", ErrMalformedHash + } + salt := make([]byte, h.params.SaltLen) + if _, err := rand.Read(salt); err != nil { + return "", fmt.Errorf("password: rand: %w", err) + } + if err := h.acquire(ctx); err != nil { + return "", err + } + defer h.release() + + p := h.params + key := argon2.IDKey([]byte(plain), salt, p.Iterations, p.MemoryKiB, p.Parallelism, p.KeyLen) + return fmt.Sprintf("$argon2id$v=%d$m=%d,t=%d,p=%d$%s$%s", + argon2.Version, p.MemoryKiB, p.Iterations, p.Parallelism, + b64.EncodeToString(salt), b64.EncodeToString(key)), nil +} + +func (h *Hasher) Verify(ctx context.Context, plain, encoded string) (bool, error) { + p, salt, want, err := decode(encoded) + if err != nil { + return false, err + } + if err := h.acquire(ctx); err != nil { + return false, err + } + defer h.release() + + got := argon2.IDKey([]byte(plain), salt, p.Iterations, p.MemoryKiB, p.Parallelism, uint32(len(want))) + return subtle.ConstantTimeCompare(got, want) == 1, nil +} + +func decode(encoded string) (Params, []byte, []byte, error) { + if len(encoded) > 1024 { + return Params{}, nil, nil, ErrMalformedHash + } + parts := strings.Split(encoded, "$") + if len(parts) != 6 || parts[0] != "" || parts[1] != "argon2id" { + return Params{}, nil, nil, ErrMalformedHash + } + if parts[2] != "v=19" { + return Params{}, nil, nil, ErrMalformedHash + } + fields := strings.Split(parts[3], ",") + if len(fields) != 3 { + return Params{}, nil, nil, ErrMalformedHash + } + values := [3]uint64{} + for i, prefix := range []string{"m=", "t=", "p="} { + value, ok := strings.CutPrefix(fields[i], prefix) + if !ok || value == "" || strings.Trim(value, "0123456789") != "" { + return Params{}, nil, nil, ErrMalformedHash + } + n, err := strconv.ParseUint(value, 10, 32) + if err != nil || (i == 2 && n > 255) { + return Params{}, nil, nil, ErrMalformedHash + } + values[i] = n + } + p := Params{MemoryKiB: uint32(values[0]), Iterations: uint32(values[1]), Parallelism: uint8(values[2])} + salt, err := b64.DecodeString(parts[4]) + if err != nil { + return Params{}, nil, nil, ErrMalformedHash + } + key, err := b64.DecodeString(parts[5]) + if err != nil { + return Params{}, nil, nil, ErrMalformedHash + } + p.SaltLen, p.KeyLen = uint32(len(salt)), uint32(len(key)) + if !validParams(p) { + return Params{}, nil, nil, ErrMalformedHash + } + return p, salt, key, nil +} + +// Bound work before invoking Argon2, including for damaged stored hashes. +func validParams(p Params) bool { + return p.Parallelism >= 1 && p.Parallelism <= 16 && + p.MemoryKiB >= 8*uint32(p.Parallelism) && p.MemoryKiB <= 64*1024 && + p.Iterations >= 1 && p.Iterations <= 10 && + p.SaltLen >= 8 && p.SaltLen <= 64 && p.KeyLen >= 16 && p.KeyLen <= 64 +} diff --git a/app/internal/password/password_test.go b/app/internal/password/password_test.go new file mode 100644 index 0000000..a88be30 --- /dev/null +++ b/app/internal/password/password_test.go @@ -0,0 +1,111 @@ +package password + +import ( + "context" + "errors" + "strings" + "testing" +) + +var testParams = Params{MemoryKiB: 64, Iterations: 1, Parallelism: 1, SaltLen: 16, KeyLen: 32} + +func TestHashVerify(t *testing.T) { + h := NewHasher(testParams, 2) + ctx := context.Background() + + pw := "пароль:с-двоеточием-и-юникодом" + encoded, err := h.Hash(ctx, pw) + if err != nil { + t.Fatal(err) + } + if !strings.HasPrefix(encoded, "$argon2id$v=19$m=64,t=1,p=1$") { + t.Errorf("unexpected format %q", encoded) + } + if strings.Contains(encoded, pw) { + t.Error("hash contains plaintext") + } + + ok, err := h.Verify(ctx, pw, encoded) + if err != nil || !ok { + t.Errorf("Verify(correct) = %v, %v", ok, err) + } + ok, err = h.Verify(ctx, pw+"x", encoded) + if err != nil || ok { + t.Errorf("Verify(wrong) = %v, %v", ok, err) + } +} + +func TestHash_RandomSalt(t *testing.T) { + h := NewHasher(testParams, 1) + a, _ := h.Hash(context.Background(), "same-password-123") + b, _ := h.Hash(context.Background(), "same-password-123") + if a == b { + t.Error("two hashes of the same password are equal: salt is not random") + } +} + +func TestVerify_UsesParamsFromHash(t *testing.T) { + old := NewHasher(testParams, 1) + encoded, _ := old.Hash(context.Background(), "long-enough-password") + + stronger := testParams + stronger.Iterations = 3 + ok, err := NewHasher(stronger, 1).Verify(context.Background(), "long-enough-password", encoded) + if err != nil || !ok { + t.Errorf("old hash must verify after params change: %v, %v", ok, err) + } +} + +func TestVerify_Malformed(t *testing.T) { + h := NewHasher(testParams, 1) + for _, s := range []string{"", "!", "$argon2i$v=19$m=64,t=1,p=1$AAAA$AAAA", "$argon2id$v=19$m=64$AAAA$AAAA"} { + if _, err := h.Verify(context.Background(), "x", s); !errors.Is(err, ErrMalformedHash) { + t.Errorf("Verify(%q) err = %v, want ErrMalformedHash", s, err) + } + } +} + +func TestHash_RespectsContextWhenBusy(t *testing.T) { + h := NewHasher(testParams, 1) + h.slots <- struct{}{} // единственный слот занят + ctx, cancel := context.WithCancel(context.Background()) + cancel() + if _, err := h.Hash(ctx, "long-enough-password"); !errors.Is(err, context.Canceled) { + t.Errorf("err = %v, want context.Canceled", err) + } +} + +func TestVerifyRejectsUnsafeOrNonCanonicalHash(t *testing.T) { + h := NewHasher(testParams, 1) + valid, err := h.Hash(context.Background(), "test-password") + if err != nil { + t.Fatal(err) + } + for _, bad := range []string{ + strings.Replace(valid, "v=19", "v=19junk", 1), + strings.Replace(valid, "p=1", "p=1junk", 1), + strings.Replace(valid, "p=1", "p=0", 1), + strings.Replace(valid, "p=1", "p=256", 1), + strings.Replace(valid, "t=1", "t=0", 1), + strings.Replace(valid, "t=1", "t=4294967295", 1), + strings.Replace(valid, "m=64", "m=0", 1), + strings.Replace(valid, "m=64", "m=4294967295", 1), + strings.Replace(valid, "m=64", "m=+64", 1), + valid + strings.Repeat("A", 1024), + "$argon2id$v=19$m=64,t=1,p=1$YQ$YQ", + } { + t.Run(bad[:min(len(bad), 100)], func(t *testing.T) { + if ok, err := h.Verify(context.Background(), "test-password", bad); ok || !errors.Is(err, ErrMalformedHash) { + t.Fatalf("Verify = %v, %v; want malformed hash", ok, err) + } + }) + } +} + +func TestHashRejectsInvalidParams(t *testing.T) { + for _, p := range []Params{{}, {MemoryKiB: 64, Iterations: 1, Parallelism: 0, SaltLen: 16, KeyLen: 32}} { + if _, err := NewHasher(p, 1).Hash(context.Background(), "test-password"); !errors.Is(err, ErrMalformedHash) { + t.Fatalf("Hash invalid params: %v", err) + } + } +} diff --git a/app/internal/service/attachments.go b/app/internal/service/attachments.go new file mode 100644 index 0000000..ad5708f --- /dev/null +++ b/app/internal/service/attachments.go @@ -0,0 +1,290 @@ +package service + +import ( + "context" + "crypto/sha256" + "encoding/hex" + "errors" + "fmt" + "io" + "log/slog" + "mime" + "os" + "time" + + "github.com/google/uuid" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/imagecheck" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/objectstore" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/store" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/validate" +) + +var _ AttachmentsService = (*Attachments)(nil) + +// ObjectKeyPrefix — префикс ключей оригиналов. Очиститель обходит только его. +const ObjectKeyPrefix = "originals/" + +// Предел на компенсирующее удаление объекта, когда запись метаданных не удалась. +const compensationTimeout = 5 * time.Second + +type AttachmentLimits struct { + MaxUploadBytes int64 + MaxImagePixels int64 + MaxConcurrentUploads int +} + +type attachmentRepo interface { + store.ChatStore + store.AttachmentStore +} + +type Attachments struct { + repo attachmentRepo + objects objectstore.Store + limits AttachmentLimits + checker *imagecheck.Checker + // uploads — слоты загрузок. Вместе с лимитом размера они ограничивают диск реплики под временные + // файлы; память на одну загрузку от размера файла не зависит. + uploads chan struct{} + logger *slog.Logger +} + +func NewAttachments(repo attachmentRepo, objects objectstore.Store, limits AttachmentLimits, logger *slog.Logger) *Attachments { + return &Attachments{ + repo: repo, + objects: objects, + limits: limits, + checker: imagecheck.New(limits.MaxImagePixels), + uploads: make(chan struct{}, limits.MaxConcurrentUploads), + logger: logger, + } +} + +// Upload выполняет проверки от дешёвых к дорогим: доступ, параметры, заявленный размер и только +// потом чтение тела. Тело идёт потоком во временный файл, из него в декодер и в S3, поэтому в памяти +// файл целиком не лежит. Порядок записи: сначала объект, затем метаданные, поэтому строка в БД +// ссылается на устойчивый staging; 202 означает сохранённый оригинал и намерение обработки. +func (a *Attachments) Upload(ctx context.Context, in UploadInput) (domain.Attachment, error) { + chatID, err := validate.CanonicalUUID("chat_id", in.ChatID) + if err != nil { + return domain.Attachment{}, err + } + if _, err := a.repo.ChatByID(ctx, in.CallerID, chatID); err != nil { + return domain.Attachment{}, err + } + if err := validate.Filename(in.Filename); err != nil { + return domain.Attachment{}, err + } + declared, err := parseImageType(in.ContentType) + if err != nil { + return domain.Attachment{}, err + } + if in.ContentLength > a.limits.MaxUploadBytes { + return domain.Attachment{}, domain.ErrPayloadTooLarge + } + + select { + case a.uploads <- struct{}{}: + defer func() { <-a.uploads }() + default: + return domain.Attachment{}, domain.ErrRateLimited + } + + spool, size, sum, err := a.spoolBody(in.Body) + if err != nil { + return domain.Attachment{}, err + } + defer spool.Close() + + if err := a.checkImage(ctx, spool, declared); err != nil { + return domain.Attachment{}, err + } + if _, err := spool.Seek(0, io.SeekStart); err != nil { + return domain.Attachment{}, fmt.Errorf("%w: spool: %v", domain.ErrUnavailable, err) + } + + id := uuid.NewString() + att := domain.Attachment{ + ID: id, + ChatID: chatID, + OwnerID: in.CallerID, + Filename: in.Filename, + ContentType: declared, + SizeBytes: size, + SHA256: sum, + ObjectKey: "staging/" + id, + Status: domain.StatusQueued, + } + if err := a.objects.Put(ctx, att.ObjectKey, att.ContentType, spool, size); err != nil { + // Объект мог успеть сохраниться. Удалять его здесь бессмысленно: при недоступном S3 удаление + // тоже не пройдёт, а клиент лишние секунды ждал бы ответа. Его уберёт очиститель. + a.logger.Warn("attachment object put failed", slog.Any("err", err)) + return domain.Attachment{}, err + } + saved, err := a.repo.CreateAttachment(ctx, att) + if err != nil { + a.compensate(ctx, att) + return domain.Attachment{}, err + } + return saved, nil +} + +// checkImage сравнивает заявленный тип с настоящим до декодирования: подмена типа не тратит память. +func (a *Attachments) checkImage(ctx context.Context, file io.ReadSeeker, declared string) error { + detected, err := a.checker.Inspect(file) + if err == nil && detected != declared { + return domain.ErrUnsupportedMedia + } + if err == nil { + err = a.checker.Decode(ctx, file) + } + switch { + case err == nil: + return nil + case errors.Is(err, imagecheck.ErrTooManyPixels): + return domain.ErrPayloadTooLarge + case errors.Is(err, imagecheck.ErrUnsupported): + return domain.ErrUnsupportedMedia + case errors.Is(err, imagecheck.ErrBusy): + return domain.ErrRateLimited + } + return fmt.Errorf("%w: image check: %v", domain.ErrUnavailable, err) +} + +// compensate убирает объект, для которого метаданные не сохранились. Контекст отвязан от запроса: +// клиент мог уже отключиться. Удалять можно, только убедившись, что строки нет: ошибка INSERT не +// доказывает отсутствие записи (COMMIT мог пройти, а ответ потеряться), и удаление оставило бы +// подтверждённую строку без файла. Если проверить нельзя, объект остаётся очистителю: он удаляет +// только объекты без строки и только после grace period (cmd/janitor). +func (a *Attachments) compensate(ctx context.Context, att domain.Attachment) { + ctx, cancel := context.WithTimeout(context.WithoutCancel(ctx), compensationTimeout) + defer cancel() + exists, err := a.repo.AttachmentExists(ctx, att.ID) + if err != nil { + a.logger.Warn("orphan check failed, object is left to the janitor", slog.String("object_key", att.ObjectKey), slog.Any("err", err)) + return + } + if exists { + a.logger.Warn("metadata write reported an error but the row exists, object is kept", slog.String("attachment_id", att.ID)) + return + } + if err := a.objects.Delete(ctx, att.ObjectKey); err != nil { + a.logger.Warn("compensating delete failed, object is left to the janitor", slog.String("object_key", att.ObjectKey), slog.Any("err", err)) + } +} + +// spoolBody пишет тело во временный файл и считает SHA-256 на лету. Файл удаляется из каталога сразу +// после создания: данные живут, пока он открыт, поэтому при любом завершении, даже kill -9, на диске +// ничего не остаётся и отдельная уборка не нужна. Это не хранилище: 202 вернётся только после S3 и PostgreSQL. +func (a *Attachments) spoolBody(body io.Reader) (*os.File, int64, string, error) { + file, err := os.CreateTemp("", "upload-*") + if err != nil { + return nil, 0, "", fmt.Errorf("%w: spool: %v", domain.ErrUnavailable, err) + } + if err := os.Remove(file.Name()); err != nil { + file.Close() + return nil, 0, "", fmt.Errorf("%w: spool: %v", domain.ErrUnavailable, err) + } + + hash := sha256.New() + source := &errorTrackingReader{r: body} + // LimitReader на байт больше лимита: так отличается файл ровно на границе от файла больше неё. + n, err := io.Copy(io.MultiWriter(file, hash), io.LimitReader(source, a.limits.MaxUploadBytes+1)) + switch { + case source.err != nil: + file.Close() + // Клиент оборвал передачу или не уложился в таймаут. Отвечать чаще всего уже некому. + return nil, 0, "", &validate.Error{Field: "body", Reason: "cannot read body"} + case err != nil: + file.Close() + return nil, 0, "", fmt.Errorf("%w: spool: %v", domain.ErrUnavailable, err) + case n > a.limits.MaxUploadBytes: + file.Close() + return nil, 0, "", domain.ErrPayloadTooLarge + } + return file, n, hex.EncodeToString(hash.Sum(nil)), nil +} + +// errorTrackingReader отделяет ошибку чтения от клиента (400) от ошибки записи на диск (503). +type errorTrackingReader struct { + r io.Reader + err error +} + +func (e *errorTrackingReader) Read(p []byte) (int, error) { + n, err := e.r.Read(p) + if err != nil && !errors.Is(err, io.EOF) { + e.err = err + } + return n, err +} + +func parseImageType(header string) (string, error) { + mediaType, _, err := mime.ParseMediaType(header) + if err != nil { + return "", domain.ErrUnsupportedMedia + } + switch mediaType { + case domain.ContentTypePNG, domain.ContentTypeJPEG: + return mediaType, nil + } + return "", domain.ErrUnsupportedMedia +} + +func (a *Attachments) Get(ctx context.Context, callerID, attachmentID string) (domain.Attachment, error) { + id, err := validate.CanonicalUUID("attachment_id", attachmentID) + if err != nil { + return domain.Attachment{}, err + } + return a.repo.AttachmentForMember(ctx, callerID, id) +} + +func (a *Attachments) Content(ctx context.Context, callerID, attachmentID, variant string) (domain.Attachment, io.ReadCloser, error) { + if err := validateVariantName(variant); err != nil { + return domain.Attachment{}, nil, err + } + att, err := a.Get(ctx, callerID, attachmentID) + if err != nil { + return domain.Attachment{}, nil, err + } + if att.Status != domain.StatusReady { + return domain.Attachment{}, nil, domain.ErrConflict + } + if variant != VariantOriginal { + found := false + for _, v := range att.Variants { + if v.Name == variant { + att.ObjectKey = "variants/" + att.ID + "/v1/" + variant + att.ContentType, att.SizeBytes, att.SHA256 = v.ContentType, v.SizeBytes, v.SHA256 + found = true + break + } + } + if !found { + return domain.Attachment{}, nil, domain.ErrNotFound + } + } + body, size, err := a.objects.Get(ctx, att.ObjectKey) + if err != nil { + if errors.Is(err, objectstore.ErrNotFound) { + return domain.Attachment{}, nil, fmt.Errorf("attachment %s: object missing in bucket", att.ID) + } + a.logger.Warn("attachment object get failed", slog.Any("err", err)) + return domain.Attachment{}, nil, err + } + if size != att.SizeBytes { + body.Close() + return domain.Attachment{}, nil, fmt.Errorf("attachment %s: object size %d differs from metadata %d", att.ID, size, att.SizeBytes) + } + return att, body, nil +} + +func validateVariantName(variant string) error { + switch variant { + case VariantOriginal, "thumbnail", "crop", "optimized": + return nil + } + return &validate.Error{Field: "variant", Reason: "unknown variant"} +} diff --git a/app/internal/service/auth.go b/app/internal/service/auth.go new file mode 100644 index 0000000..770735e --- /dev/null +++ b/app/internal/service/auth.go @@ -0,0 +1,101 @@ +package service + +import ( + "context" + "errors" + "fmt" + "time" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/password" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/session" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/store" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/token" +) + +var ( + _ AuthService = (*Auth)(nil) +) + +type Auth struct { + users store.UserStore + sessions session.Store + hasher *password.Hasher + ttl time.Duration + now func() time.Time + + dummyHash string +} + +func NewAuth(users store.UserStore, sessions session.Store, hasher *password.Hasher, ttl time.Duration) (*Auth, error) { + dummy, err := hasher.Hash(context.Background(), "dummy-password-for-timing") + if err != nil { + return nil, fmt.Errorf("auth: dummy hash: %w", err) + } + return &Auth{ + users: users, + sessions: sessions, + hasher: hasher, + ttl: ttl, + now: time.Now, + dummyHash: dummy, + }, nil +} + +func (a *Auth) Login(ctx context.Context, username, plainPassword string) (domain.Session, error) { + user, hash, err := a.users.CredentialsByUsername(ctx, username) + switch { + case errors.Is(err, domain.ErrNotFound): + _, _ = a.hasher.Verify(ctx, plainPassword, a.dummyHash) + return domain.Session{}, domain.ErrUnauthorized + case err != nil: + return domain.Session{}, err + } + + ok, err := a.hasher.Verify(ctx, plainPassword, hash) + if err != nil { + if errors.Is(err, password.ErrMalformedHash) { + return domain.Session{}, domain.ErrUnauthorized + } + return domain.Session{}, err + } + if !ok { + return domain.Session{}, domain.ErrUnauthorized + } + + plain, tokenHash, err := token.New() + if err != nil { + return domain.Session{}, err + } + expiresAt := a.now().Add(a.ttl).UTC().Truncate(time.Second) + if err := a.sessions.Save(ctx, tokenHash, session.Session{UserID: user.ID, ExpiresAt: expiresAt}); err != nil { + return domain.Session{}, err + } + return domain.Session{Token: plain, ExpiresAt: expiresAt, User: user}, nil +} + +func (a *Auth) Authenticate(ctx context.Context, plainToken string) (string, error) { + tokenHash, err := token.Parse(plainToken) + if err != nil { + return "", domain.ErrUnauthorized + } + s, err := a.sessions.Get(ctx, tokenHash) + if errors.Is(err, session.ErrNotFound) { + return "", domain.ErrUnauthorized + } + if err != nil { + return "", err + } + if !a.now().Before(s.ExpiresAt) { + return "", domain.ErrUnauthorized + } + return s.UserID, nil +} + +func (a *Auth) Logout(ctx context.Context, plainToken string) error { + tokenHash, err := token.Parse(plainToken) + if err != nil { + return domain.ErrUnauthorized + } + return a.sessions.Delete(ctx, tokenHash) +} diff --git a/app/internal/service/chats.go b/app/internal/service/chats.go new file mode 100644 index 0000000..b3db00c --- /dev/null +++ b/app/internal/service/chats.go @@ -0,0 +1,47 @@ +package service + +import ( + "context" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/store" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/validate" +) + +var ( + _ ChatsService = (*Chats)(nil) +) + +type Chats struct { + store store.ChatStore +} + +func NewChats(s store.ChatStore) *Chats { + return &Chats{store: s} +} + +func (c *Chats) Create(ctx context.Context, callerID, title string, memberIDs []string) (domain.Chat, error) { + if err := validate.ChatTitle(title); err != nil { + return domain.Chat{}, err + } + memberIDs, err := validate.MemberIDs(memberIDs, callerID) + if err != nil { + return domain.Chat{}, err + } + return c.store.CreateChat(ctx, callerID, title, memberIDs) +} + +func (c *Chats) Get(ctx context.Context, callerID, chatID string) (domain.Chat, error) { + chatID, err := validate.CanonicalUUID("chat_id", chatID) + if err != nil { + return domain.Chat{}, err + } + return c.store.ChatByID(ctx, callerID, chatID) +} + +func (c *Chats) List(ctx context.Context, callerID, cursor string, limit int) (domain.Page[domain.Chat], error) { + if err := validate.Limit(limit); err != nil { + return domain.Page[domain.Chat]{}, err + } + return c.store.ListChats(ctx, callerID, cursor, limit) +} diff --git a/app/internal/service/direct_upload.go b/app/internal/service/direct_upload.go new file mode 100644 index 0000000..028c5ab --- /dev/null +++ b/app/internal/service/direct_upload.go @@ -0,0 +1,177 @@ +package service + +import ( + "context" + "crypto/hmac" + "encoding/base64" + "encoding/hex" + "encoding/json" + "errors" + "io" + "strings" + "time" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/objectstore" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/validate" + "github.com/google/uuid" +) + +// A ticket is authenticated, not encrypted. No user-supplied object key is accepted. +// Staging keys share the janitor's UUID namespace; they never have metadata. +type directSigner interface { + UploadMAC([]byte) []byte + PresignUpload(context.Context, string, string, int64) (string, error) +} + +type DirectInput struct { + Filename string `json:"filename"` + ContentType string `json:"content_type"` + SizeBytes int64 `json:"size_bytes"` + SHA256 string `json:"sha256"` +} + +type directTicket struct { + Input DirectInput + ID string + Staging string + Owner string + Chat string + Expires int64 +} + +type DirectUpload struct { + URL string `json:"url"` + Token string `json:"token"` + ExpiresIn int `json:"expires_in"` + Headers map[string]string `json:"headers"` +} + +func (a *Attachments) InitDirect(ctx context.Context, caller, chat string, in DirectInput) (DirectUpload, error) { + chat, err := validate.CanonicalUUID("chat_id", chat) + if err != nil { + return DirectUpload{}, err + } + if _, err = a.repo.ChatByID(ctx, caller, chat); err != nil { + return DirectUpload{}, err + } + if err = validate.Filename(in.Filename); err != nil { + return DirectUpload{}, err + } + if in.ContentType != domain.ContentTypePNG && in.ContentType != domain.ContentTypeJPEG { + return DirectUpload{}, domain.ErrUnsupportedMedia + } + in.ContentType, err = parseImageType(in.ContentType) + if err != nil { + return DirectUpload{}, err + } + if in.SizeBytes > a.limits.MaxUploadBytes { + return DirectUpload{}, domain.ErrPayloadTooLarge + } + sum, err := hex.DecodeString(in.SHA256) + if in.SizeBytes <= 0 || err != nil || len(sum) != 32 { + return DirectUpload{}, domain.ErrInvalidArgument + } + in.SHA256 = strings.ToLower(in.SHA256) + signer, ok := a.objects.(directSigner) + if !ok { + return DirectUpload{}, domain.ErrUnavailable + } + ticket := directTicket{Input: in, ID: uuid.NewString(), Staging: ObjectKeyPrefix + uuid.NewString(), Owner: caller, Chat: chat, Expires: time.Now().Add(2 * time.Minute).Unix()} + data, err := json.Marshal(ticket) + if err != nil { + return DirectUpload{}, err + } + url, err := signer.PresignUpload(ctx, ticket.Staging, in.ContentType, in.SizeBytes) + if err != nil { + return DirectUpload{}, err + } + token := base64.RawURLEncoding.EncodeToString(data) + "." + base64.RawURLEncoding.EncodeToString(signer.UploadMAC(data)) + return DirectUpload{URL: url, Token: token, ExpiresIn: 60, Headers: map[string]string{"Content-Type": in.ContentType}}, nil +} + +func (a *Attachments) CompleteDirect(ctx context.Context, caller, chat, token string) (domain.Attachment, error) { + signer, ok := a.objects.(directSigner) + if !ok { + return domain.Attachment{}, domain.ErrUnavailable + } + parts := strings.Split(token, ".") + if len(parts) != 2 || len(token) > 4096 { + return domain.Attachment{}, domain.ErrInvalidArgument + } + data, err := base64.RawURLEncoding.DecodeString(parts[0]) + if err != nil { + return domain.Attachment{}, domain.ErrInvalidArgument + } + mac, err := base64.RawURLEncoding.DecodeString(parts[1]) + if err != nil || !hmac.Equal(mac, signer.UploadMAC(data)) { + return domain.Attachment{}, domain.ErrInvalidArgument + } + var t directTicket + if json.Unmarshal(data, &t) != nil { + return domain.Attachment{}, domain.ErrInvalidArgument + } + if t.Owner != caller || t.Chat != chat { + return domain.Attachment{}, domain.ErrNotFound + } + if _, err := a.repo.ChatByID(ctx, caller, chat); err != nil { + return domain.Attachment{}, err + } + // Retry is idempotent, including a retry after an uncertain database COMMIT. + if att, err := a.repo.AttachmentForMember(ctx, caller, t.ID); err == nil { + return att, nil + } else if !errors.Is(err, domain.ErrNotFound) { + return domain.Attachment{}, err + } + if time.Now().Unix() >= t.Expires { + return domain.Attachment{}, domain.ErrConflict + } + select { + case a.uploads <- struct{}{}: + defer func() { <-a.uploads }() + default: + return domain.Attachment{}, domain.ErrRateLimited + } + body, size, err := a.objects.Get(ctx, t.Staging) + if errors.Is(err, objectstore.ErrNotFound) { + return domain.Attachment{}, domain.ErrConflict + } + if err != nil { + return domain.Attachment{}, err + } + defer body.Close() + if size != t.Input.SizeBytes { + return domain.Attachment{}, domain.ErrInvalidArgument + } + file, actual, sum, err := a.spoolBody(body) + if err != nil { + return domain.Attachment{}, err + } + defer file.Close() + if actual != size || sum != t.Input.SHA256 { + return domain.Attachment{}, domain.ErrInvalidArgument + } + if err = a.checkImage(ctx, file, t.Input.ContentType); err != nil { + return domain.Attachment{}, err + } + if _, err = file.Seek(0, io.SeekStart); err != nil { + return domain.Attachment{}, domain.ErrUnavailable + } + // A unique permanent key per attempt prevents a concurrent failed attempt from + // deleting an object saved by another complete. Clients can write only staging. + att := domain.Attachment{ID: t.ID, ChatID: chat, OwnerID: caller, Filename: t.Input.Filename, ContentType: t.Input.ContentType, SizeBytes: size, SHA256: sum, ObjectKey: ObjectKeyPrefix + uuid.NewString(), Status: domain.StatusReady} + if err = a.objects.Put(ctx, att.ObjectKey, att.ContentType, file, size); err != nil { + return domain.Attachment{}, err + } + saved, err := a.repo.CreateAttachment(ctx, att) + if err != nil { + // Leave unreferenced keys to the janitor: an uncertain COMMIT must not delete data. + if existing, lookup := a.repo.AttachmentForMember(ctx, caller, t.ID); lookup == nil { + return existing, nil + } + return domain.Attachment{}, err + } + // Keep staging until expiry/grace: deleting while its PUT URL is valid allows + // recreation anyway. The janitor reclaims abandoned and completed staging alike. + return saved, nil +} diff --git a/app/internal/service/direct_upload_test.go b/app/internal/service/direct_upload_test.go new file mode 100644 index 0000000..134e40b --- /dev/null +++ b/app/internal/service/direct_upload_test.go @@ -0,0 +1,87 @@ +package service + +import ( + "bytes" + "context" + "crypto/sha256" + "encoding/base64" + "encoding/hex" + "encoding/json" + "errors" + "io" + "log/slog" + "testing" + "time" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/janitor" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/objectstore" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/store" +) + +type signedMemory struct{ *objectstore.Memory } + +func (s signedMemory) UploadMAC(b []byte) []byte { + h := sha256.Sum256(append([]byte("test-key"), b...)) + return h[:] +} +func (s signedMemory) PresignUpload(_ context.Context, key, _ string, _ int64) (string, error) { + return key, nil +} + +func TestDirectSizeExpiryAndCleanup(t *testing.T) { + ctx := context.Background() + repo := store.New() + alice, err := repo.CreateUser(ctx, "alice", "Alice", "hash") + if err != nil { + t.Fatal(err) + } + chat, err := repo.CreateChat(ctx, alice.ID, "chat", []string{alice.ID}) + if err != nil { + t.Fatal(err) + } + objects := signedMemory{objectstore.NewMemory()} + logger := slog.New(slog.NewTextHandler(io.Discard, nil)) + svc := NewAttachments(repo, objects, AttachmentLimits{MaxUploadBytes: 1024, MaxImagePixels: 100, MaxConcurrentUploads: 2}, logger) + data := []byte("1234") + sum := sha256.Sum256(data) + u, err := svc.InitDirect(ctx, alice.ID, chat.ID, DirectInput{Filename: "x.png", ContentType: "image/png", SizeBytes: 4, SHA256: hex.EncodeToString(sum[:])}) + if err != nil { + t.Fatal(err) + } + objects.PutAt(u.URL, data[:3], time.Now()) + if _, err = svc.CompleteDirect(ctx, alice.ID, chat.ID, u.Token); !errors.Is(err, domain.ErrInvalidArgument) { + t.Fatalf("wrong size: %v", err) + } + // Expire a correctly authenticated ticket without sleeping in a unit test. + encoded := bytes.Split([]byte(u.Token), []byte("."))[0] + raw, _ := base64.RawURLEncoding.DecodeString(string(encoded)) + var ticket directTicket + if err = json.Unmarshal(raw, &ticket); err != nil { + t.Fatal(err) + } + ticket.Expires = time.Now().Add(-time.Second).Unix() + raw, _ = json.Marshal(ticket) + token := base64.RawURLEncoding.EncodeToString(raw) + "." + base64.RawURLEncoding.EncodeToString(objects.UploadMAC(raw)) + if _, err = svc.CompleteDirect(ctx, alice.ID, chat.ID, token); !errors.Is(err, domain.ErrConflict) { + t.Fatalf("expired: %v", err) + } + future := time.Now().Add(6 * time.Minute) + report, err := janitor.Run(ctx, objects, noMetadata{}, janitor.Options{Prefix: ObjectKeyPrefix, Grace: 5 * time.Minute, MaxDeletes: 100, Now: func() time.Time { return future }, Logger: logger}) + if err != nil || report.Deleted != 1 { + t.Fatalf("cleanup: %+v %v", report, err) + } + if _, _, err = objects.Get(ctx, u.URL); !errors.Is(err, objectstore.ErrNotFound) { + t.Fatalf("abandoned staging remains: %v", err) + } + report, err = janitor.Run(ctx, objects, noMetadata{}, janitor.Options{Prefix: ObjectKeyPrefix, Grace: 5 * time.Minute, MaxDeletes: 100, Now: func() time.Time { return future }, Logger: logger}) + if err != nil || report.Deleted != 0 { + t.Fatalf("repeat cleanup: %+v %v", report, err) + } +} + +type noMetadata struct{} + +func (noMetadata) ExistingObjectKeys(context.Context, []string) (map[string]struct{}, error) { + return map[string]struct{}{}, nil +} diff --git a/app/internal/service/messages.go b/app/internal/service/messages.go new file mode 100644 index 0000000..3d4c5bd --- /dev/null +++ b/app/internal/service/messages.go @@ -0,0 +1,50 @@ +package service + +import ( + "context" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/store" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/validate" +) + +var ( + _ MessagesService = (*Messages)(nil) +) + +type Messages struct { + store store.MessageStore +} + +func NewMessages(s store.MessageStore) *Messages { + return &Messages{store: s} +} + +func (m *Messages) Send(ctx context.Context, callerID, chatID, idempotencyKey, text string, attachmentIDs []string) (domain.Message, error) { + chatID, err := validate.CanonicalUUID("chat_id", chatID) + if err != nil { + return domain.Message{}, err + } + if err := validate.IdempotencyKey(idempotencyKey); err != nil { + return domain.Message{}, err + } + ids, err := validate.AttachmentIDs(attachmentIDs) + if err != nil { + return domain.Message{}, err + } + if err := validate.MessageText(text, len(ids) > 0); err != nil { + return domain.Message{}, err + } + return m.store.AddMessage(ctx, callerID, chatID, idempotencyKey, text, ids) +} + +func (m *Messages) List(ctx context.Context, callerID, chatID, cursor string, limit int) (domain.Page[domain.Message], error) { + chatID, err := validate.CanonicalUUID("chat_id", chatID) + if err != nil { + return domain.Page[domain.Message]{}, err + } + if err := validate.Limit(limit); err != nil { + return domain.Page[domain.Message]{}, err + } + return m.store.ListMessages(ctx, callerID, chatID, cursor, limit) +} diff --git a/app/internal/service/service.go b/app/internal/service/service.go new file mode 100644 index 0000000..cc65ada --- /dev/null +++ b/app/internal/service/service.go @@ -0,0 +1,50 @@ +package service + +import ( + "context" + "io" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" +) + +type UsersService interface { + Register(ctx context.Context, username, displayName, password string) (domain.User, error) + Me(ctx context.Context, callerID string) (domain.User, error) +} + +type ChatsService interface { + Create(ctx context.Context, callerID, title string, memberIDs []string) (domain.Chat, error) + Get(ctx context.Context, callerID, chatID string) (domain.Chat, error) + List(ctx context.Context, callerID, cursor string, limit int) (domain.Page[domain.Chat], error) +} + +type MessagesService interface { + Send(ctx context.Context, callerID, chatID, idempotencyKey, text string, attachmentIDs []string) (domain.Message, error) + List(ctx context.Context, callerID, chatID, cursor string, limit int) (domain.Page[domain.Message], error) +} + +// VariantOriginal — вариант содержимого по умолчанию. +const VariantOriginal = "original" + +// UploadInput — параметры загрузки файла. Body читается не дальше лимита размера. +type UploadInput struct { + CallerID string + ChatID string + Filename string + ContentType string + ContentLength int64 + Body io.Reader +} + +type AttachmentsService interface { + Upload(ctx context.Context, in UploadInput) (domain.Attachment, error) + Get(ctx context.Context, callerID, attachmentID string) (domain.Attachment, error) + // Content возвращает метаданные и поток байтов. Поток обязательно закрыть. + Content(ctx context.Context, callerID, attachmentID, variant string) (domain.Attachment, io.ReadCloser, error) +} + +type AuthService interface { + Login(ctx context.Context, username, password string) (domain.Session, error) + Authenticate(ctx context.Context, token string) (userID string, err error) + Logout(ctx context.Context, token string) error +} diff --git a/app/internal/service/users.go b/app/internal/service/users.go new file mode 100644 index 0000000..297938c --- /dev/null +++ b/app/internal/service/users.go @@ -0,0 +1,44 @@ +package service + +import ( + "context" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/password" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/store" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/validate" +) + +var ( + _ UsersService = (*Users)(nil) +) + +type Users struct { + store store.UserStore + hasher *password.Hasher +} + +func NewUsers(s store.UserStore, h *password.Hasher) *Users { + return &Users{store: s, hasher: h} +} + +func (u *Users) Register(ctx context.Context, username, displayName, plainPassword string) (domain.User, error) { + if err := validate.Username(username); err != nil { + return domain.User{}, err + } + if err := validate.DisplayName(displayName); err != nil { + return domain.User{}, err + } + if err := validate.Password(plainPassword); err != nil { + return domain.User{}, err + } + hash, err := u.hasher.Hash(ctx, plainPassword) + if err != nil { + return domain.User{}, err + } + return u.store.CreateUser(ctx, username, displayName, hash) +} + +func (u *Users) Me(ctx context.Context, callerID string) (domain.User, error) { + return u.store.UserByID(ctx, callerID) +} diff --git a/app/internal/session/memory.go b/app/internal/session/memory.go new file mode 100644 index 0000000..b6896df --- /dev/null +++ b/app/internal/session/memory.go @@ -0,0 +1,49 @@ +package session + +import ( + "context" + "sync" + "time" +) + +var _ Store = (*Memory)(nil) + +type Memory struct { + mu sync.Mutex + sessions map[string]Session + now func() time.Time +} + +func NewMemory() *Memory { + return &Memory{sessions: make(map[string]Session), now: time.Now} +} + +func (m *Memory) Save(_ context.Context, tokenHash []byte, s Session) error { + m.mu.Lock() + defer m.mu.Unlock() + m.sessions[string(tokenHash)] = s + return nil +} + +func (m *Memory) Get(_ context.Context, tokenHash []byte) (Session, error) { + m.mu.Lock() + defer m.mu.Unlock() + s, ok := m.sessions[string(tokenHash)] + if !ok { + return Session{}, ErrNotFound + } + if !m.now().Before(s.ExpiresAt) { + delete(m.sessions, string(tokenHash)) + return Session{}, ErrNotFound + } + return s, nil +} + +func (m *Memory) Delete(_ context.Context, tokenHash []byte) error { + m.mu.Lock() + defer m.mu.Unlock() + delete(m.sessions, string(tokenHash)) + return nil +} + +func (m *Memory) Ping(context.Context) error { return nil } diff --git a/app/internal/session/session.go b/app/internal/session/session.go new file mode 100644 index 0000000..7e3047c --- /dev/null +++ b/app/internal/session/session.go @@ -0,0 +1,21 @@ +package session + +import ( + "context" + "errors" + "time" +) + +type Session struct { + UserID string `json:"user_id"` + ExpiresAt time.Time `json:"expires_at"` +} + +var ErrNotFound = errors.New("session: not found") + +type Store interface { + Save(ctx context.Context, tokenHash []byte, s Session) error + Get(ctx context.Context, tokenHash []byte) (Session, error) + Delete(ctx context.Context, tokenHash []byte) error + Ping(ctx context.Context) error +} diff --git a/app/internal/session/valkey.go b/app/internal/session/valkey.go new file mode 100644 index 0000000..9deddbd --- /dev/null +++ b/app/internal/session/valkey.go @@ -0,0 +1,120 @@ +package session + +import ( + "context" + "encoding/hex" + "encoding/json" + "errors" + "fmt" + "os" + "strings" + "time" + + "github.com/redis/go-redis/v9" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/config" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" +) + +var _ Store = (*Valkey)(nil) + +const keyPrefix = "session:" + +type Valkey struct { + client *redis.Client +} + +func NewValkey(client *redis.Client) *Valkey { + return &Valkey{client: client} +} + +func Connect(ctx context.Context, cfg config.Cache) (*redis.Client, error) { + url, err := urlFrom(cfg) + if err != nil { + return nil, err + } + opts, err := redis.ParseURL(url) + if err != nil { + return nil, errors.New("session: invalid CACHE_URL") + } + timeout := time.Duration(cfg.TimeoutMs) * time.Millisecond + opts.PoolSize = cfg.PoolSize + opts.DialTimeout = timeout + opts.ReadTimeout = timeout + opts.WriteTimeout = timeout + opts.PoolTimeout = timeout + opts.MaxRetries = 1 + + client := redis.NewClient(opts) + pingCtx, cancel := context.WithTimeout(ctx, timeout) + defer cancel() + if err := client.Ping(pingCtx).Err(); err != nil { + _ = client.Close() + return nil, fmt.Errorf("session: ping: %w", err) + } + return client, nil +} + +func urlFrom(cfg config.Cache) (string, error) { + if cfg.URLFile != "" { + b, err := os.ReadFile(cfg.URLFile) + if err != nil { + return "", fmt.Errorf("session: read CACHE_URL_FILE: %w", err) + } + return strings.TrimSpace(string(b)), nil + } + if cfg.URL != "" { + return cfg.URL, nil + } + return "", errors.New("session: CACHE_URL_FILE or CACHE_URL is required") +} + +func key(tokenHash []byte) string { + return keyPrefix + hex.EncodeToString(tokenHash) +} + +func (v *Valkey) Save(ctx context.Context, tokenHash []byte, s Session) error { + val, err := json.Marshal(s) + if err != nil { + return err + } + // NX: 256-битный токен не совпадёт, но перезаписать чужую сессию нельзя даже теоретически. + err = v.client.SetArgs(ctx, key(tokenHash), val, redis.SetArgs{ + Mode: "NX", + ExpireAt: s.ExpiresAt, + }).Err() + if errors.Is(err, redis.Nil) { + return fmt.Errorf("session: token collision") + } + return unavailable(err) +} + +func (v *Valkey) Get(ctx context.Context, tokenHash []byte) (Session, error) { + val, err := v.client.Get(ctx, key(tokenHash)).Bytes() + if errors.Is(err, redis.Nil) { + return Session{}, ErrNotFound + } + if err != nil { + return Session{}, unavailable(err) + } + var s Session + if err := json.Unmarshal(val, &s); err != nil { + return Session{}, fmt.Errorf("session: corrupt value: %w", err) + } + return s, nil +} + +func (v *Valkey) Delete(ctx context.Context, tokenHash []byte) error { + return unavailable(v.client.Del(ctx, key(tokenHash)).Err()) +} + +func (v *Valkey) Ping(ctx context.Context) error { + return unavailable(v.client.Ping(ctx).Err()) +} + +func unavailable(err error) error { + if err == nil { + return nil + } + return fmt.Errorf("%w: session store: %v", domain.ErrUnavailable, err) +} diff --git a/app/internal/store/db/attachments.go b/app/internal/store/db/attachments.go new file mode 100644 index 0000000..22a702c --- /dev/null +++ b/app/internal/store/db/attachments.go @@ -0,0 +1,117 @@ +package db + +import ( + "context" + "encoding/json" + "go.opentelemetry.io/otel" + "go.opentelemetry.io/otel/propagation" + "go.opentelemetry.io/otel/trace" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" +) + +type Attachments struct { + conn +} + +// CreateAttachment сохраняет метаданные. FK на chat_members не даёт записать вложение постороннего. +func (a *Attachments) CreateAttachment(ctx context.Context, att domain.Attachment) (domain.Attachment, error) { + ctx, cancel := a.withTimeout(ctx) + defer cancel() + + ctx, span := otel.Tracer("messenger").Start(ctx, "attachment.enqueue", trace.WithSpanKind(trace.SpanKindProducer)) + defer span.End() + carrier := propagation.MapCarrier{} + otel.GetTextMapPropagator().Inject(ctx, carrier) + tx, err := a.pool.Begin(ctx) + if err != nil { + return domain.Attachment{}, mapErr(err) + } + defer tx.Rollback(ctx) + if _, err = tx.Exec(ctx, "SELECT set_config('messenger.traceparent',$1,true), set_config('messenger.tracestate',$2,true)", carrier.Get("traceparent"), carrier.Get("tracestate")); err != nil { + return domain.Attachment{}, mapErr(err) + } + err = tx.QueryRow(ctx, ` + INSERT INTO attachments (id, chat_id, owner_id, filename, content_type, size_bytes, sha256, object_key, status) + VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) + RETURNING created_at, updated_at`, + att.ID, att.ChatID, att.OwnerID, att.Filename, att.ContentType, att.SizeBytes, att.SHA256, att.ObjectKey, att.Status, + ).Scan(&att.CreatedAt, &att.UpdatedAt) + if isFKViolation(err) { + return domain.Attachment{}, domain.ErrNotFound + } + if err != nil { + return domain.Attachment{}, mapErr(err) + } + if err := tx.Commit(ctx); err != nil { + return domain.Attachment{}, mapErr(err) + } + att.CreatedAt = att.CreatedAt.UTC() + att.UpdatedAt = att.UpdatedAt.UTC() + return att, nil +} + +// AttachmentForMember возвращает вложение, только если вызывающий состоит в его чате: для +// постороннего результат неотличим от отсутствующего объекта. +func (a *Attachments) AttachmentForMember(ctx context.Context, callerID, attachmentID string) (domain.Attachment, error) { + ctx, cancel := a.withTimeout(ctx) + defer cancel() + + var att domain.Attachment + var variants []byte + err := a.pool.QueryRow(ctx, ` + SELECT a.id::text, a.chat_id::text, a.owner_id::text, a.filename, a.content_type, a.size_bytes, + a.sha256, a.object_key, a.status, a.created_at, a.updated_at, a.variants, a.error_code + FROM attachments a + JOIN chat_members cm ON cm.chat_id = a.chat_id AND cm.user_id = $2 + WHERE a.id = $1`, + attachmentID, callerID, + ).Scan(&att.ID, &att.ChatID, &att.OwnerID, &att.Filename, &att.ContentType, &att.SizeBytes, + &att.SHA256, &att.ObjectKey, &att.Status, &att.CreatedAt, &att.UpdatedAt, &variants, &att.ErrorCode) + if err != nil { + return domain.Attachment{}, mapErr(err) + } + att.CreatedAt = att.CreatedAt.UTC() + att.UpdatedAt = att.UpdatedAt.UTC() + if err := json.Unmarshal(variants, &att.Variants); err != nil { + return domain.Attachment{}, err + } + return att, nil +} + +// AttachmentExists отвечает без учёта доступа: вызывается только сервером при компенсации. +func (a *Attachments) AttachmentExists(ctx context.Context, attachmentID string) (bool, error) { + ctx, cancel := a.withTimeout(ctx) + defer cancel() + + var exists bool + err := a.pool.QueryRow(ctx, `SELECT EXISTS (SELECT 1 FROM attachments WHERE id = $1)`, attachmentID).Scan(&exists) + if err != nil { + return false, mapErr(err) + } + return exists, nil +} + +// ExistingObjectKeys возвращает те ключи из списка, на которые есть строка. Нужен очистителю. +func (a *Attachments) ExistingObjectKeys(ctx context.Context, keys []string) (map[string]struct{}, error) { + ctx, cancel := a.withTimeout(ctx) + defer cancel() + + rows, err := a.pool.Query(ctx, `SELECT object_key FROM attachments WHERE object_key = ANY($1)`, keys) + if err != nil { + return nil, mapErr(err) + } + defer rows.Close() + existing := make(map[string]struct{}, len(keys)) + for rows.Next() { + var key string + if err := rows.Scan(&key); err != nil { + return nil, mapErr(err) + } + existing[key] = struct{}{} + } + if err := rows.Err(); err != nil { + return nil, mapErr(err) + } + return existing, nil +} diff --git a/app/internal/store/db/chats.go b/app/internal/store/db/chats.go new file mode 100644 index 0000000..104ef5f --- /dev/null +++ b/app/internal/store/db/chats.go @@ -0,0 +1,165 @@ +package db + +import ( + "context" + "strings" + "time" + + "github.com/jackc/pgx/v5" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" +) + +type Chats struct { + conn +} + +func (c *Chats) CreateChat(ctx context.Context, callerID, title string, memberIDs []string) (domain.Chat, error) { + if strings.TrimSpace(title) == "" { + return domain.Chat{}, domain.ErrInvalidArgument + } + if len(memberIDs) == 0 || len(memberIDs) > 100 { + return domain.Chat{}, domain.ErrInvalidArgument + } + seen := make(map[string]struct{}, len(memberIDs)) + callerInMembers := false + for _, id := range memberIDs { + if _, dup := seen[id]; dup { + return domain.Chat{}, domain.ErrInvalidArgument + } + seen[id] = struct{}{} + if id == callerID { + callerInMembers = true + } + } + if !callerInMembers { + return domain.Chat{}, domain.ErrInvalidArgument + } + + ctx, cancel := c.withTimeout(ctx) + defer cancel() + + tx, err := c.pool.Begin(ctx) + if err != nil { + return domain.Chat{}, mapErr(err) + } + defer tx.Rollback(ctx) + + chat := domain.Chat{Title: title} + err = tx.QueryRow(ctx, ` + INSERT INTO chats (title) + VALUES ($1) + RETURNING id::text, created_at`, + encodeText(title), + ).Scan(&chat.ID, &chat.CreatedAt) + if err != nil { + return domain.Chat{}, mapErr(err) + } + + _, err = tx.Exec(ctx, ` + INSERT INTO chat_members (chat_id, user_id) + SELECT $1, unnest($2::uuid[])`, + chat.ID, memberIDs, + ) + if err != nil { + return domain.Chat{}, mapErr(err) + } + + if err := tx.Commit(ctx); err != nil { + return domain.Chat{}, mapErr(err) + } + + chat.MemberIDs = append([]string(nil), memberIDs...) + chat.CreatedAt = chat.CreatedAt.UTC() + return chat, nil +} + +func (c *Chats) ChatByID(ctx context.Context, callerID, chatID string) (domain.Chat, error) { + ctx, cancel := c.withTimeout(ctx) + defer cancel() + + chat := domain.Chat{} + err := c.pool.QueryRow(ctx, ` + SELECT c.id::text, c.title, c.created_at, + (SELECT array_agg(m.user_id::text ORDER BY m.user_id) + FROM chat_members m WHERE m.chat_id = c.id) + FROM chats c + JOIN chat_members me ON me.chat_id = c.id AND me.user_id = $2 + WHERE c.id = $1`, + chatID, callerID, + ).Scan(&chat.ID, &chat.Title, &chat.CreatedAt, &chat.MemberIDs) + if err != nil { + err = mapErr(err) + if err == domain.ErrInvalidArgument { + return domain.Chat{}, domain.ErrNotFound + } + return domain.Chat{}, err + } + chat.Title = decodeText(chat.Title) + chat.CreatedAt = chat.CreatedAt.UTC() + return chat, nil +} + +func (c *Chats) ListChats(ctx context.Context, callerID, cursor string, limit int) (domain.Page[domain.Chat], error) { + if limit <= 0 || limit > 100 { + return domain.Page[domain.Chat]{}, domain.ErrInvalidArgument + } + cur, err := domain.DecodeCursor(cursor) + if err != nil { + return domain.Page[domain.Chat]{}, err + } + scope := "chats:" + callerID + if cursor != "" && cur.Scope != scope { + return domain.Page[domain.Chat]{}, domain.ErrInvalidArgument + } + afterTime, afterID := cursorArgs(cur) + + ctx, cancel := c.withTimeout(ctx) + defer cancel() + + rows, err := c.pool.Query(ctx, ` + SELECT c.id::text, c.title, c.created_at, + (SELECT array_agg(m.user_id::text ORDER BY m.user_id) + FROM chat_members m WHERE m.chat_id = c.id) + FROM chat_members me + JOIN chats c ON c.id = me.chat_id + WHERE me.user_id = $1 + AND ($2::timestamptz IS NULL OR (c.created_at, c.id) > ($2, $3::uuid)) + ORDER BY c.created_at, c.id + LIMIT $4`, + callerID, afterTime, afterID, limit+1, + ) + if err != nil { + return domain.Page[domain.Chat]{}, mapErr(err) + } + out, err := pgx.CollectRows(rows, func(r pgx.CollectableRow) (domain.Chat, error) { + var ch domain.Chat + err := r.Scan(&ch.ID, &ch.Title, &ch.CreatedAt, &ch.MemberIDs) + ch.Title = decodeText(ch.Title) + ch.CreatedAt = ch.CreatedAt.UTC() + return ch, err + }) + if err != nil { + return domain.Page[domain.Chat]{}, mapErr(err) + } + + page := domain.Page[domain.Chat]{} + if len(out) > limit { + last := out[limit-1] + page.NextCursor = domain.EncodeCursor(domain.Cursor{ + CreatedAt: last.CreatedAt, + ID: last.ID, + Scope: scope, + }) + out = out[:limit] + } + page.Items = out + return page, nil +} + +func cursorArgs(c domain.Cursor) (*time.Time, *string) { + if c.IsZero() { + return nil, nil + } + return &c.CreatedAt, &c.ID +} diff --git a/app/internal/store/db/db.go b/app/internal/store/db/db.go new file mode 100644 index 0000000..5ec0228 --- /dev/null +++ b/app/internal/store/db/db.go @@ -0,0 +1,143 @@ +package db + +import ( + "context" + "errors" + "fmt" + "os" + "strings" + "time" + + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgconn" + "github.com/jackc/pgx/v5/pgxpool" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/config" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/store" + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/telemetry" +) + +var _ store.Store = (*DB)(nil) + +type DB struct { + *Users + *Chats + *Messages + *Attachments + + pool *pgxpool.Pool +} + +func New(pool *pgxpool.Pool, queryTimeout time.Duration) *DB { + c := conn{pool: pool, timeout: queryTimeout} + return &DB{ + Users: &Users{conn: c}, + Chats: &Chats{conn: c}, + Messages: &Messages{conn: c}, + Attachments: &Attachments{conn: c}, + pool: pool, + } +} + +func Connect(ctx context.Context, cfg config.Database) (*pgxpool.Pool, error) { + dsn, err := dsnFrom(cfg) + if err != nil { + return nil, err + } + pcfg, err := pgxpool.ParseConfig(dsn) + if err != nil { + return nil, errors.New("db: invalid DSN") + } + tracer := &telemetry.DBTracer{} + pcfg.ConnConfig.Tracer = tracer + pcfg.MaxConns = cfg.MaxConns + pcfg.ConnConfig.ConnectTimeout = time.Duration(cfg.ConnectTimeoutMs) * time.Millisecond + if !cfg.EnableBitmapScan { + pcfg.ConnConfig.RuntimeParams["enable_bitmapscan"] = "off" + } + + pool, err := pgxpool.NewWithConfig(ctx, pcfg) + if err != nil { + return nil, fmt.Errorf("db: pool: %w", err) + } + + pingCtx, cancel := context.WithTimeout(ctx, pcfg.ConnConfig.ConnectTimeout) + defer cancel() + if err := pool.Ping(pingCtx); err != nil { + pool.Close() + return nil, fmt.Errorf("db: ping: %w", err) + } + if err := telemetry.WatchPool(pool, tracer); err != nil { + pool.Close() + return nil, err + } + return pool, nil +} + +func dsnFrom(cfg config.Database) (string, error) { + if cfg.URLFile != "" { + b, err := os.ReadFile(cfg.URLFile) + if err != nil { + return "", fmt.Errorf("db: read DATABASE_URL_FILE: %w", err) + } + return strings.TrimSpace(string(b)), nil + } + if cfg.URL != "" { + return cfg.URL, nil + } + return "", errors.New("db: DATABASE_URL_FILE or DATABASE_URL is required") +} + +func (d *DB) Ping(ctx context.Context) error { + return d.pool.Ping(ctx) +} + +func (d *DB) Close() { + d.pool.Close() +} + +type conn struct { + pool *pgxpool.Pool + timeout time.Duration +} + +func (c conn) withTimeout(parent context.Context) (context.Context, context.CancelFunc) { + return context.WithTimeout(parent, c.timeout) +} + +const ( + codeUniqueViolation = "23505" + codeForeignKeyViolation = "23503" + codeCheckViolation = "23514" + codeInvalidTextRepr = "22P02" +) + +func mapErr(err error) error { + if err == nil { + return nil + } + if errors.Is(err, pgx.ErrNoRows) { + return domain.ErrNotFound + } + var pgErr *pgconn.PgError + if errors.As(err, &pgErr) { + switch pgErr.Code { + case codeUniqueViolation: + return domain.ErrConflict + case codeForeignKeyViolation, codeCheckViolation, codeInvalidTextRepr: + return domain.ErrInvalidArgument + } + switch pgErr.Code[:2] { + case "08", "53", "57": + return fmt.Errorf("%w: db: %s", domain.ErrUnavailable, pgErr.Code) + } + return fmt.Errorf("db: %s: %w", pgErr.Code, err) + } + return fmt.Errorf("%w: db: %v", domain.ErrUnavailable, err) +} + +func isFKViolation(err error) bool { + var pgErr *pgconn.PgError + return errors.As(err, &pgErr) && pgErr.Code == codeForeignKeyViolation +} diff --git a/app/internal/store/db/db_test.go b/app/internal/store/db/db_test.go new file mode 100644 index 0000000..5fe65db --- /dev/null +++ b/app/internal/store/db/db_test.go @@ -0,0 +1,46 @@ +package db + +import ( + "context" + "errors" + "fmt" + "testing" + + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgconn" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" +) + +func TestMapErr(t *testing.T) { + pg := func(code string) error { return &pgconn.PgError{Code: code} } + cases := []struct { + name string + err error + want error + }{ + {"no rows", pgx.ErrNoRows, domain.ErrNotFound}, + {"unique", pg("23505"), domain.ErrConflict}, + {"fk", pg("23503"), domain.ErrInvalidArgument}, + {"check", pg("23514"), domain.ErrInvalidArgument}, + {"bad uuid text", pg("22P02"), domain.ErrInvalidArgument}, + {"admin shutdown (postgres stop)", pg("57P01"), domain.ErrUnavailable}, + {"cannot connect now (starting up)", pg("57P03"), domain.ErrUnavailable}, + {"connection failure", pg("08006"), domain.ErrUnavailable}, + {"too many connections", pg("53300"), domain.ErrUnavailable}, + {"timeout", fmt.Errorf("query: %w", context.DeadlineExceeded), domain.ErrUnavailable}, + {"dial refused", errors.New("dial tcp: connection refused"), domain.ErrUnavailable}, + } + for _, tc := range cases { + if got := mapErr(tc.err); !errors.Is(got, tc.want) { + t.Errorf("%s: mapErr = %v, want %v", tc.name, got, tc.want) + } + } + + if got := mapErr(pg("42601")); errors.Is(got, domain.ErrUnavailable) || errors.Is(got, domain.ErrInvalidArgument) { + t.Errorf("syntax error mapped to %v", got) + } + if mapErr(nil) != nil { + t.Error("mapErr(nil) != nil") + } +} diff --git a/app/internal/store/db/invalidations.go b/app/internal/store/db/invalidations.go new file mode 100644 index 0000000..3bcaf7f --- /dev/null +++ b/app/internal/store/db/invalidations.go @@ -0,0 +1,59 @@ +package db + +import ( + "context" + + "github.com/jackc/pgx/v5" +) + +func (m *Messages) AddPendingInvalidation(ctx context.Context, chatID string) (int64, error) { + ctx, cancel := m.withTimeout(ctx) + defer cancel() + + var gen int64 + err := m.pool.QueryRow(ctx, ` + INSERT INTO cache_invalidations (chat_id) VALUES ($1) + ON CONFLICT (chat_id) DO UPDATE + SET gen = nextval('cache_invalidations_gen_seq'), updated_at = now() + RETURNING gen`, + chatID, + ).Scan(&gen) + if err != nil { + return 0, mapErr(err) + } + return gen, nil +} + +func (m *Messages) PendingInvalidations(ctx context.Context) (map[string]int64, error) { + ctx, cancel := m.withTimeout(ctx) + defer cancel() + + rows, err := m.pool.Query(ctx, `SELECT chat_id::text, gen FROM cache_invalidations`) + if err != nil { + return nil, mapErr(err) + } + out := map[string]int64{} + var ( + id string + gen int64 + ) + _, err = pgx.ForEachRow(rows, []any{&id, &gen}, func() error { + out[id] = gen + return nil + }) + if err != nil { + return nil, mapErr(err) + } + return out, nil +} + +func (m *Messages) ResolvePendingInvalidation(ctx context.Context, chatID string, gen int64) error { + ctx, cancel := m.withTimeout(ctx) + defer cancel() + + _, err := m.pool.Exec(ctx, + `DELETE FROM cache_invalidations WHERE chat_id = $1 AND gen = $2`, + chatID, gen, + ) + return mapErr(err) +} diff --git a/app/internal/store/db/messages.go b/app/internal/store/db/messages.go new file mode 100644 index 0000000..8353dec --- /dev/null +++ b/app/internal/store/db/messages.go @@ -0,0 +1,218 @@ +package db + +import ( + "context" + "errors" + "slices" + "strings" + "time" + + "github.com/jackc/pgx/v5" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" +) + +type Messages struct { + conn +} + +func (m *Messages) AddMessage(ctx context.Context, callerID, chatID, idempotencyKey, text string, attachmentIDs []string) (domain.Message, error) { + if strings.TrimSpace(text) == "" && len(attachmentIDs) == 0 { + return domain.Message{}, domain.ErrInvalidArgument + } + + ctx, cancel := m.withTimeout(ctx) + defer cancel() + + tx, err := m.pool.Begin(ctx) + if err != nil { + return domain.Message{}, mapErr(err) + } + defer tx.Rollback(ctx) + + msg := domain.Message{ChatID: chatID, AuthorID: callerID, Text: text, AttachmentIDs: attachmentIDs} + err = tx.QueryRow(ctx, ` + INSERT INTO message_idempotency_keys (user_id, chat_id, key, message_id) + VALUES ($1, $2, $3, gen_random_uuid()) + ON CONFLICT (user_id, chat_id, key) DO NOTHING + RETURNING message_id::text`, + callerID, chatID, idempotencyKey, + ).Scan(&msg.ID) + switch { + case errors.Is(err, pgx.ErrNoRows): + return replayMessage(ctx, tx, callerID, chatID, idempotencyKey, text, attachmentIDs) + case isFKViolation(err): + return domain.Message{}, domain.ErrNotFound + case err != nil: + return domain.Message{}, mapErr(err) + } + + err = tx.QueryRow(ctx, ` + INSERT INTO messages (id, chat_id, sender_id, text) + VALUES ($1, $2, $3, $4) + RETURNING created_at`, + msg.ID, chatID, callerID, encodeText(text), + ).Scan(&msg.CreatedAt) + if err != nil { + return domain.Message{}, mapErr(err) + } + // Составной FK сам отклоняет вложение другого чата и неизвестное вложение. Та же транзакция: + // при ошибке не останется ни сообщения, ни ключа идемпотентности. + if len(attachmentIDs) > 0 { + var failed bool + err = tx.QueryRow(ctx, `SELECT EXISTS (SELECT 1 FROM attachments WHERE chat_id=$1 AND id::text=ANY($2) AND status='failed')`, chatID, attachmentIDs).Scan(&failed) + if err != nil { + return domain.Message{}, mapErr(err) + } + if failed { + return domain.Message{}, domain.ErrConflict + } + + _, err = tx.Exec(ctx, ` + INSERT INTO message_attachments (message_id, chat_id, attachment_id, position) + SELECT $1, $2, t.id::uuid, t.ord::int + FROM unnest($3::text[]) WITH ORDINALITY AS t(id, ord)`, + msg.ID, chatID, attachmentIDs, + ) + if isFKViolation(err) { + return domain.Message{}, domain.ErrNotFound + } + if err != nil { + return domain.Message{}, mapErr(err) + } + } + if err := tx.Commit(ctx); err != nil { + return domain.Message{}, mapErr(err) + } + msg.CreatedAt = msg.CreatedAt.UTC() + return msg, nil +} + +func replayMessage(ctx context.Context, tx pgx.Tx, callerID, chatID, idempotencyKey, text string, attachmentIDs []string) (domain.Message, error) { + msg := domain.Message{ChatID: chatID, AuthorID: callerID} + err := tx.QueryRow(ctx, ` + SELECT m.id::text, m.text, m.created_at, COALESCE((SELECT array_agg(ma.attachment_id::text ORDER BY ma.position) FROM message_attachments ma WHERE ma.message_id = m.id), ARRAY[]::text[]) + FROM message_idempotency_keys k + JOIN messages m ON m.id = k.message_id + WHERE k.user_id = $1 AND k.chat_id = $2 AND k.key = $3`, + callerID, chatID, idempotencyKey, + ).Scan(&msg.ID, &msg.Text, &msg.CreatedAt, &msg.AttachmentIDs) + if errors.Is(err, pgx.ErrNoRows) { + return domain.Message{}, domain.ErrUnavailable + } + if err != nil { + return domain.Message{}, mapErr(err) + } + msg.Text = decodeText(msg.Text) + if msg.Text != text || !slices.Equal(msg.AttachmentIDs, attachmentIDs) { + return domain.Message{}, domain.ErrIdempotencyConflict + } + msg.CreatedAt = msg.CreatedAt.UTC() + return msg, nil +} + +func (m *Messages) PurgeIdempotencyKeys(ctx context.Context, ttl time.Duration) (int64, error) { + ctx, cancel := m.withTimeout(ctx) + defer cancel() + + tag, err := m.pool.Exec(ctx, + `DELETE FROM message_idempotency_keys WHERE created_at < now() - make_interval(secs => $1)`, + ttl.Seconds(), + ) + if err != nil { + return 0, mapErr(err) + } + return tag.RowsAffected(), nil +} + +func (m *Messages) ListMessages(ctx context.Context, callerID, chatID, cursor string, limit int) (domain.Page[domain.Message], error) { + member, err := m.IsMember(ctx, chatID, callerID) + if err != nil { + return domain.Page[domain.Message]{}, err + } + if !member { + return domain.Page[domain.Message]{}, domain.ErrNotFound + } + return m.HistoryPage(ctx, chatID, cursor, limit) +} + +func (m *Messages) IsMember(ctx context.Context, chatID, userID string) (bool, error) { + ctx, cancel := m.withTimeout(ctx) + defer cancel() + + var member bool + err := m.pool.QueryRow(ctx, + `SELECT EXISTS (SELECT 1 FROM chat_members WHERE chat_id = $1 AND user_id = $2)`, + chatID, userID, + ).Scan(&member) + if err != nil { + return false, mapErr(err) + } + return member, nil +} + +func (m *Messages) HistoryPage(ctx context.Context, chatID, cursor string, limit int) (domain.Page[domain.Message], error) { + if limit <= 0 || limit > 100 { + return domain.Page[domain.Message]{}, domain.ErrInvalidArgument + } + cur, err := domain.DecodeCursor(cursor) + if err != nil { + return domain.Page[domain.Message]{}, err + } + scope := "chat:" + chatID + if cursor != "" && cur.Scope != scope { + return domain.Page[domain.Message]{}, domain.ErrInvalidArgument + } + ctx, cancel := m.withTimeout(ctx) + defer cancel() + + var rows pgx.Rows + if cur.IsZero() { + rows, err = m.pool.Query(ctx, ` + SELECT m.id::text, m.chat_id::text, m.sender_id::text, m.text, m.created_at, + COALESCE((SELECT array_agg(ma.attachment_id::text ORDER BY ma.position) FROM message_attachments ma WHERE ma.message_id = m.id), ARRAY[]::text[]) + FROM messages m + WHERE m.chat_id = $1 + ORDER BY m.created_at, m.id + LIMIT $2`, + chatID, limit+1, + ) + } else { + rows, err = m.pool.Query(ctx, ` + SELECT m.id::text, m.chat_id::text, m.sender_id::text, m.text, m.created_at, + COALESCE((SELECT array_agg(ma.attachment_id::text ORDER BY ma.position) FROM message_attachments ma WHERE ma.message_id = m.id), ARRAY[]::text[]) + FROM messages m + WHERE m.chat_id = $1 + AND (m.created_at, m.id) > ($2, $3::uuid) + ORDER BY m.created_at, m.id + LIMIT $4`, + chatID, cur.CreatedAt, cur.ID, limit+1, + ) + } + if err != nil { + return domain.Page[domain.Message]{}, mapErr(err) + } + out, err := pgx.CollectRows(rows, func(r pgx.CollectableRow) (domain.Message, error) { + var msg domain.Message + err := r.Scan(&msg.ID, &msg.ChatID, &msg.AuthorID, &msg.Text, &msg.CreatedAt, &msg.AttachmentIDs) + msg.Text = decodeText(msg.Text) + msg.CreatedAt = msg.CreatedAt.UTC() + return msg, err + }) + if err != nil { + return domain.Page[domain.Message]{}, mapErr(err) + } + + page := domain.Page[domain.Message]{} + if len(out) > limit { + last := out[limit-1] + page.NextCursor = domain.EncodeCursor(domain.Cursor{ + CreatedAt: last.CreatedAt, + ID: last.ID, + Scope: scope, + }) + out = out[:limit] + } + page.Items = out + return page, nil +} diff --git a/app/internal/store/db/text.go b/app/internal/store/db/text.go new file mode 100644 index 0000000..4c9e30f --- /dev/null +++ b/app/internal/store/db/text.go @@ -0,0 +1,22 @@ +package db + +import "strings" + +var ( + textEncoder = strings.NewReplacer(`\`, `\\`, "\x00", `\0`) + textDecoder = strings.NewReplacer(`\\`, `\`, `\0`, "\x00") +) + +func encodeText(s string) string { + if !strings.ContainsAny(s, "\\\x00") { + return s + } + return textEncoder.Replace(s) +} + +func decodeText(s string) string { + if !strings.Contains(s, `\`) { + return s + } + return textDecoder.Replace(s) +} diff --git a/app/internal/store/db/text_test.go b/app/internal/store/db/text_test.go new file mode 100644 index 0000000..a957c8d --- /dev/null +++ b/app/internal/store/db/text_test.go @@ -0,0 +1,18 @@ +package db + +import "testing" + +func TestTextEscapeRoundTrip(t *testing.T) { + cases := []string{"", "plain", "\x00", "a\x00b", `\`, `\0`, `\\0`, "\\\x00", "\x00\\0\x00", "привет\x00мир"} + for _, s := range cases { + enc := encodeText(s) + for i := 0; i < len(enc); i++ { + if enc[i] == 0 { + t.Fatalf("encodeText(%q) = %q содержит NUL", s, enc) + } + } + if got := decodeText(enc); got != s { + t.Fatalf("decodeText(encodeText(%q)) = %q", s, got) + } + } +} diff --git a/app/internal/store/db/users.go b/app/internal/store/db/users.go new file mode 100644 index 0000000..3ab1beb --- /dev/null +++ b/app/internal/store/db/users.go @@ -0,0 +1,89 @@ +package db + +import ( + "context" + "strings" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" +) + +type Users struct { + conn +} + +func (u *Users) CreateUser(ctx context.Context, username, displayName, passwordHash string) (domain.User, error) { + if strings.TrimSpace(username) == "" || strings.TrimSpace(displayName) == "" || passwordHash == "" { + return domain.User{}, domain.ErrInvalidArgument + } + + ctx, cancel := u.withTimeout(ctx) + defer cancel() + + user := domain.User{Username: username, DisplayName: displayName} + err := u.pool.QueryRow(ctx, ` + INSERT INTO users (username, display_name, password_hash) + VALUES ($1, $2, $3) + RETURNING id::text, created_at`, + username, encodeText(displayName), passwordHash, + ).Scan(&user.ID, &user.CreatedAt) + if err != nil { + return domain.User{}, mapErr(err) + } + user.CreatedAt = user.CreatedAt.UTC() + return user, nil +} + +func (u *Users) UserByID(ctx context.Context, id string) (domain.User, error) { + ctx, cancel := u.withTimeout(ctx) + defer cancel() + + user := domain.User{} + err := u.pool.QueryRow(ctx, ` + SELECT id::text, username, display_name, created_at + FROM users + WHERE id = $1`, + id, + ).Scan(&user.ID, &user.Username, &user.DisplayName, &user.CreatedAt) + if err != nil { + err = mapErr(err) + if err == domain.ErrInvalidArgument { + return domain.User{}, domain.ErrNotFound + } + return domain.User{}, err + } + user.DisplayName = decodeText(user.DisplayName) + user.CreatedAt = user.CreatedAt.UTC() + return user, nil +} + +func (u *Users) CredentialsByUsername(ctx context.Context, username string) (domain.User, string, error) { + ctx, cancel := u.withTimeout(ctx) + defer cancel() + + user := domain.User{} + var hash string + err := u.pool.QueryRow(ctx, ` + SELECT id::text, username, display_name, created_at, password_hash + FROM users + WHERE username = $1`, + encodeText(username), + ).Scan(&user.ID, &user.Username, &user.DisplayName, &user.CreatedAt, &hash) + if err != nil { + return domain.User{}, "", mapErr(err) + } + user.DisplayName = decodeText(user.DisplayName) + user.CreatedAt = user.CreatedAt.UTC() + return user, hash, nil +} + +func (u *Users) UsernameExists(ctx context.Context, username string) bool { + ctx, cancel := u.withTimeout(ctx) + defer cancel() + + var exists bool + err := u.pool.QueryRow(ctx, + `SELECT EXISTS (SELECT 1 FROM users WHERE username = $1)`, + encodeText(username), + ).Scan(&exists) + return err == nil && exists +} diff --git a/app/internal/store/memory.go b/app/internal/store/memory.go new file mode 100644 index 0000000..9249118 --- /dev/null +++ b/app/internal/store/memory.go @@ -0,0 +1,368 @@ +package store + +import ( + "context" + "slices" + "strings" + "sync" + "time" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" + "github.com/google/uuid" +) + +var _ Store = (*Memory)(nil) + +type Memory struct { + mu sync.RWMutex + + users map[string]domain.User + byName map[string]string + hashes map[string]string + + chats map[string]*chatBucket + chatOrder []string + + lastTime time.Time + + idempotency map[string]domain.Message + + attachments map[string]domain.Attachment + + maxMessages int + messagesTotal int +} + +type chatBucket struct { + chat domain.Chat + members map[string]struct{} + messages []domain.Message +} + +func New() *Memory { + return NewWithLimit(0) +} + +func NewWithLimit(maxMessages int) *Memory { + return &Memory{ + users: make(map[string]domain.User), + byName: make(map[string]string), + hashes: make(map[string]string), + chats: make(map[string]*chatBucket), + idempotency: make(map[string]domain.Message), + attachments: make(map[string]domain.Attachment), + maxMessages: maxMessages, + } +} + +func (m *Memory) MessagesTotal() int { + m.mu.RLock() + defer m.mu.RUnlock() + return m.messagesTotal +} + +func (m *Memory) now() time.Time { + t := time.Now().UTC() + if !t.After(m.lastTime) { + t = m.lastTime.Add(time.Nanosecond) + } + m.lastTime = t + return t +} + +func (m *Memory) CreateUser(_ context.Context, username, displayName, passwordHash string) (domain.User, error) { + if strings.TrimSpace(username) == "" || strings.TrimSpace(displayName) == "" { + return domain.User{}, domain.ErrInvalidArgument + } + + m.mu.Lock() + defer m.mu.Unlock() + + if _, taken := m.byName[username]; taken { + return domain.User{}, domain.ErrConflict + } + + u := domain.User{ + ID: uuid.NewString(), + Username: username, + DisplayName: displayName, + CreatedAt: m.now(), + } + m.users[u.ID] = u + m.byName[username] = u.ID + m.hashes[u.ID] = passwordHash + return u, nil +} + +func (m *Memory) UserByID(_ context.Context, id string) (domain.User, error) { + m.mu.RLock() + defer m.mu.RUnlock() + u, ok := m.users[id] + if !ok { + return domain.User{}, domain.ErrNotFound + } + return u, nil +} + +func (m *Memory) CredentialsByUsername(_ context.Context, username string) (domain.User, string, error) { + m.mu.RLock() + defer m.mu.RUnlock() + id, ok := m.byName[username] + if !ok { + return domain.User{}, "", domain.ErrNotFound + } + return m.users[id], m.hashes[id], nil +} + +func (m *Memory) UsernameExists(_ context.Context, username string) bool { + m.mu.RLock() + defer m.mu.RUnlock() + _, taken := m.byName[username] + return taken +} + +func (m *Memory) CreateChat(_ context.Context, callerID, title string, memberIDs []string) (domain.Chat, error) { + if strings.TrimSpace(title) == "" { + return domain.Chat{}, domain.ErrInvalidArgument + } + if len(memberIDs) == 0 || len(memberIDs) > 100 { + return domain.Chat{}, domain.ErrInvalidArgument + } + + seen := make(map[string]struct{}, len(memberIDs)) + callerInMembers := false + for _, id := range memberIDs { + if _, dup := seen[id]; dup { + return domain.Chat{}, domain.ErrInvalidArgument + } + seen[id] = struct{}{} + if id == callerID { + callerInMembers = true + } + } + if !callerInMembers { + return domain.Chat{}, domain.ErrInvalidArgument + } + + m.mu.Lock() + defer m.mu.Unlock() + + for _, id := range memberIDs { + if _, ok := m.users[id]; !ok { + return domain.Chat{}, domain.ErrInvalidArgument + } + } + + members := append([]string(nil), memberIDs...) + + chat := domain.Chat{ + ID: uuid.NewString(), + Title: title, + MemberIDs: members, + CreatedAt: m.now(), + } + m.chats[chat.ID] = &chatBucket{ + chat: chat, + members: seen, + } + m.chatOrder = append(m.chatOrder, chat.ID) + return cloneChat(chat), nil +} + +func (m *Memory) ChatByID(_ context.Context, callerID, chatID string) (domain.Chat, error) { + m.mu.RLock() + defer m.mu.RUnlock() + + b, ok := m.chats[chatID] + if !ok { + return domain.Chat{}, domain.ErrNotFound + } + if _, member := b.members[callerID]; !member { + return domain.Chat{}, domain.ErrNotFound + } + return cloneChat(b.chat), nil +} + +func (m *Memory) ListChats(_ context.Context, callerID, cursor string, limit int) (domain.Page[domain.Chat], error) { + if limit <= 0 || limit > 100 { + return domain.Page[domain.Chat]{}, domain.ErrInvalidArgument + } + c, err := domain.DecodeCursor(cursor) + if err != nil { + return domain.Page[domain.Chat]{}, err + } + if cursor != "" && c.Scope != "chats:"+callerID { + return domain.Page[domain.Chat]{}, domain.ErrInvalidArgument + } + + m.mu.RLock() + defer m.mu.RUnlock() + + out := make([]domain.Chat, 0, limit+1) + for _, id := range m.chatOrder { + b := m.chats[id] + if _, member := b.members[callerID]; !member { + continue + } + if !c.Less(b.chat.CreatedAt, b.chat.ID) { + continue + } + out = append(out, cloneChat(b.chat)) + if len(out) > limit { + break + } + } + + page := domain.Page[domain.Chat]{} + if len(out) > limit { + last := out[limit-1] + page.NextCursor = domain.EncodeCursor(domain.Cursor{ + CreatedAt: last.CreatedAt, + ID: last.ID, + Scope: "chats:" + callerID, + }) + out = out[:limit] + } + page.Items = out + return page, nil +} + +func (m *Memory) AddMessage(_ context.Context, callerID, chatID, idempotencyKey, text string, attachmentIDs []string) (domain.Message, error) { + if strings.TrimSpace(text) == "" && len(attachmentIDs) == 0 { + return domain.Message{}, domain.ErrInvalidArgument + } + + m.mu.Lock() + defer m.mu.Unlock() + + b, ok := m.chats[chatID] + if !ok { + return domain.Message{}, domain.ErrNotFound + } + if _, member := b.members[callerID]; !member { + return domain.Message{}, domain.ErrNotFound + } + + idemKey := callerID + "\x00" + chatID + "\x00" + idempotencyKey + if prev, ok := m.idempotency[idemKey]; ok { + if prev.Text != text || !slices.Equal(prev.AttachmentIDs, attachmentIDs) { + return domain.Message{}, domain.ErrIdempotencyConflict + } + return prev, nil + } + + if m.maxMessages > 0 && m.messagesTotal >= m.maxMessages { + return domain.Message{}, domain.ErrUnavailable + } + + for _, id := range attachmentIDs { + if att, ok := m.attachments[id]; !ok || att.ChatID != chatID { + return domain.Message{}, domain.ErrNotFound + } + } + + msg := domain.Message{ + ID: uuid.NewString(), + ChatID: chatID, + AuthorID: callerID, + Text: text, + CreatedAt: m.now(), + AttachmentIDs: attachmentIDs, + } + b.messages = append(b.messages, msg) + m.idempotency[idemKey] = msg + m.messagesTotal++ + return msg, nil +} + +func (m *Memory) ListMessages(_ context.Context, callerID, chatID, cursor string, limit int) (domain.Page[domain.Message], error) { + if limit <= 0 || limit > 100 { + return domain.Page[domain.Message]{}, domain.ErrInvalidArgument + } + c, err := domain.DecodeCursor(cursor) + if err != nil { + return domain.Page[domain.Message]{}, err + } + + if cursor != "" && c.Scope != "chat:"+chatID { + return domain.Page[domain.Message]{}, domain.ErrInvalidArgument + } + + m.mu.RLock() + defer m.mu.RUnlock() + + b, ok := m.chats[chatID] + if !ok { + return domain.Page[domain.Message]{}, domain.ErrNotFound + } + if _, member := b.members[callerID]; !member { + return domain.Page[domain.Message]{}, domain.ErrNotFound + } + + start := 0 + for ; start < len(b.messages); start++ { + if c.Less(b.messages[start].CreatedAt, b.messages[start].ID) { + break + } + } + + end := start + limit + hasMore := end < len(b.messages) + if end > len(b.messages) { + end = len(b.messages) + } + + out := make([]domain.Message, end-start) + copy(out, b.messages[start:end]) + + page := domain.Page[domain.Message]{Items: out} + if hasMore && len(out) > 0 { + last := out[len(out)-1] + page.NextCursor = domain.EncodeCursor(domain.Cursor{ + CreatedAt: last.CreatedAt, + ID: last.ID, + Scope: "chat:" + chatID, + }) + } + return page, nil +} + +func (m *Memory) CreateAttachment(_ context.Context, att domain.Attachment) (domain.Attachment, error) { + m.mu.Lock() + defer m.mu.Unlock() + if b, ok := m.chats[att.ChatID]; !ok { + return domain.Attachment{}, domain.ErrNotFound + } else if _, member := b.members[att.OwnerID]; !member { + return domain.Attachment{}, domain.ErrNotFound + } + att.CreatedAt = m.now() + att.UpdatedAt = att.CreatedAt + m.attachments[att.ID] = att + return att, nil +} + +func (m *Memory) AttachmentForMember(_ context.Context, callerID, attachmentID string) (domain.Attachment, error) { + m.mu.RLock() + defer m.mu.RUnlock() + att, ok := m.attachments[attachmentID] + if !ok { + return domain.Attachment{}, domain.ErrNotFound + } + if _, member := m.chats[att.ChatID].members[callerID]; !member { + return domain.Attachment{}, domain.ErrNotFound + } + return att, nil +} + +func (m *Memory) AttachmentExists(_ context.Context, attachmentID string) (bool, error) { + m.mu.RLock() + defer m.mu.RUnlock() + _, ok := m.attachments[attachmentID] + return ok, nil +} + +func cloneChat(c domain.Chat) domain.Chat { + out := c + out.MemberIDs = append([]string(nil), c.MemberIDs...) + return out +} diff --git a/app/internal/store/store.go b/app/internal/store/store.go new file mode 100644 index 0000000..727f949 --- /dev/null +++ b/app/internal/store/store.go @@ -0,0 +1,43 @@ +package store + +import ( + "context" + + "gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain" +) + +type UserStore interface { + CreateUser(ctx context.Context, username, displayName, passwordHash string) (domain.User, error) + UserByID(ctx context.Context, id string) (domain.User, error) + CredentialsByUsername(ctx context.Context, username string) (domain.User, string, error) + UsernameExists(ctx context.Context, username string) bool +} + +type ChatStore interface { + CreateChat(ctx context.Context, callerID, title string, memberIDs []string) (domain.Chat, error) + ChatByID(ctx context.Context, callerID, chatID string) (domain.Chat, error) + ListChats(ctx context.Context, callerID, cursor string, limit int) (domain.Page[domain.Chat], error) +} + +type MessageStore interface { + // AddMessage идемпотентен по (callerID, chatID, idempotencyKey): повтор с тем же + // text и attachmentIDs возвращает исходное сообщение, с другими — domain.ErrIdempotencyConflict. + // Вложение не из этого чата или неизвестное — domain.ErrNotFound. + AddMessage(ctx context.Context, callerID, chatID, idempotencyKey, text string, attachmentIDs []string) (domain.Message, error) + ListMessages(ctx context.Context, callerID, chatID, cursor string, limit int) (domain.Page[domain.Message], error) +} + +type AttachmentStore interface { + CreateAttachment(ctx context.Context, att domain.Attachment) (domain.Attachment, error) + // AttachmentForMember для постороннего возвращает domain.ErrNotFound. + AttachmentForMember(ctx context.Context, callerID, attachmentID string) (domain.Attachment, error) + // AttachmentExists нужен компенсации: ошибка INSERT не доказывает, что строки нет. + AttachmentExists(ctx context.Context, attachmentID string) (bool, error) +} + +type Store interface { + UserStore + ChatStore + MessageStore + AttachmentStore +} diff --git a/app/internal/telemetry/database.go b/app/internal/telemetry/database.go new file mode 100644 index 0000000..e1f4948 --- /dev/null +++ b/app/internal/telemetry/database.go @@ -0,0 +1,98 @@ +package telemetry + +import ( + "context" + "os" + "runtime" + "strconv" + "strings" + "sync/atomic" + "syscall" + + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgxpool" + "go.opentelemetry.io/otel" + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/codes" + "go.opentelemetry.io/otel/metric" + "go.opentelemetry.io/otel/trace" +) + +// No SQL, parameters, DSN or exception messages are recorded. +type DBTracer struct{ Waiting atomic.Int64 } + +func (t *DBTracer) TraceQueryStart(ctx context.Context, _ *pgx.Conn, d pgx.TraceQueryStartData) context.Context { + op := "query" + fields := strings.Fields(d.SQL) + if len(fields) > 0 { + switch strings.ToUpper(fields[0]) { + case "SELECT", "INSERT", "UPDATE", "DELETE", "BEGIN", "COMMIT", "ROLLBACK": + op = strings.ToUpper(fields[0]) + } + } + ctx, _ = otel.Tracer("messenger").Start(ctx, "db."+op, trace.WithSpanKind(trace.SpanKindClient), trace.WithAttributes(attribute.String("db.system.name", "postgresql"))) + return ctx +} +func (t *DBTracer) TraceQueryEnd(ctx context.Context, _ *pgx.Conn, d pgx.TraceQueryEndData) { + s := trace.SpanFromContext(ctx) + defer s.End() + if d.Err != nil && d.Err != pgx.ErrNoRows { + s.SetStatus(codes.Error, "database query failed") + s.SetAttributes(attribute.String("error.type", "database_error")) + } +} +func (t *DBTracer) TraceAcquireStart(ctx context.Context, _ *pgxpool.Pool, _ pgxpool.TraceAcquireStartData) context.Context { + t.Waiting.Add(1) + return ctx +} +func (t *DBTracer) TraceAcquireEnd(_ context.Context, _ *pgxpool.Pool, _ pgxpool.TraceAcquireEndData) { + t.Waiting.Add(-1) +} + +func WatchPool(pool *pgxpool.Pool, tracer *DBTracer) error { + meter := otel.Meter("messenger") + used, err := meter.Int64ObservableGauge("db_pool_used") + if err != nil { + return err + } + waiting, err := meter.Int64ObservableGauge("db_pool_waiting") + if err != nil { + return err + } + capacity, err := meter.Int64ObservableGauge("db_pool_capacity") + if err != nil { + return err + } + cpu, err := meter.Float64ObservableCounter("process_cpu", metric.WithUnit("s")) + if err != nil { + return err + } + ram, err := meter.Int64ObservableGauge("process_memory", metric.WithUnit("By")) + if err != nil { + return err + } + _, err = meter.RegisterCallback(func(_ context.Context, o metric.Observer) error { + st := pool.Stat() + o.ObserveInt64(used, int64(st.AcquiredConns())) + o.ObserveInt64(waiting, tracer.Waiting.Load()) + o.ObserveInt64(capacity, int64(st.MaxConns())) + var usage syscall.Rusage + if syscall.Getrusage(syscall.RUSAGE_SELF, &usage) == nil { + o.ObserveFloat64(cpu, float64(usage.Utime.Sec+usage.Stime.Sec)+float64(usage.Utime.Usec+usage.Stime.Usec)/1e6) + } + var mem runtime.MemStats + runtime.ReadMemStats(&mem) + rss := int64(mem.Sys) + if data, e := os.ReadFile("/proc/self/statm"); e == nil { + f := strings.Fields(string(data)) + if len(f) > 1 { + if pages, e := strconv.ParseInt(f[1], 10, 64); e == nil { + rss = pages * int64(os.Getpagesize()) + } + } + } + o.ObserveInt64(ram, rss) + return nil + }, used, waiting, capacity, cpu, ram) + return err +} diff --git a/app/internal/telemetry/telemetry.go b/app/internal/telemetry/telemetry.go new file mode 100644 index 0000000..a3bf74c --- /dev/null +++ b/app/internal/telemetry/telemetry.go @@ -0,0 +1,122 @@ +// Package telemetry exports only an explicit allowlist of technical request data. +package telemetry + +import ( + "context" + "fmt" + "os" + "strconv" + "time" + + "github.com/labstack/echo/v4" + "go.opentelemetry.io/otel" + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/codes" + "go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp" + "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp" + "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp" + otellog "go.opentelemetry.io/otel/log" + "go.opentelemetry.io/otel/metric" + "go.opentelemetry.io/otel/propagation" + sdklog "go.opentelemetry.io/otel/sdk/log" + sdkmetric "go.opentelemetry.io/otel/sdk/metric" + "go.opentelemetry.io/otel/sdk/resource" + sdktrace "go.opentelemetry.io/otel/sdk/trace" + "go.opentelemetry.io/otel/trace" +) + +var requests metric.Int64Counter +var duration metric.Float64Histogram +var logs otellog.Logger + +func Init(ctx context.Context) (func(), error) { + if os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT") == "" || os.Getenv("OTEL_SDK_DISABLED") == "true" { + return func() {}, nil + } + host, _ := os.Hostname() + res := resource.NewWithAttributes("", attribute.String("service.name", "messenger-api"), attribute.String("service.version", "lab6-1"), attribute.String("service.instance.id", host), attribute.String("deployment.environment.name", "lab")) + te, err := otlptracehttp.New(ctx) + if err != nil { + return nil, err + } + ratio := 1.0 + if raw := os.Getenv("OTEL_TRACES_SAMPLER_ARG"); raw != "" { + var err error + ratio, err = strconv.ParseFloat(raw, 64) + if err != nil || ratio < 0 || ratio > 1 { + return nil, fmt.Errorf("invalid sampler ratio") + } + } + tp := sdktrace.NewTracerProvider(sdktrace.WithSampler(sdktrace.ParentBased(sdktrace.TraceIDRatioBased(ratio))), sdktrace.WithResource(res), sdktrace.WithBatcher(te, sdktrace.WithMaxQueueSize(1024), sdktrace.WithExportTimeout(3*time.Second))) + me, err := otlpmetrichttp.New(ctx) + if err != nil { + return nil, err + } + mp := sdkmetric.NewMeterProvider(sdkmetric.WithResource(res), sdkmetric.WithReader(sdkmetric.NewPeriodicReader(me, sdkmetric.WithInterval(5*time.Second), sdkmetric.WithTimeout(3*time.Second)))) + le, err := otlploghttp.New(ctx) + if err != nil { + return nil, err + } + lp := sdklog.NewLoggerProvider(sdklog.WithResource(res), sdklog.WithProcessor(sdklog.NewBatchProcessor(le, sdklog.WithMaxQueueSize(1024), sdklog.WithExportTimeout(3*time.Second)))) + logs = lp.Logger("messenger") + otel.SetTracerProvider(tp) + otel.SetMeterProvider(mp) + otel.SetTextMapPropagator(propagation.TraceContext{}) + meter := mp.Meter("messenger") + requests, err = meter.Int64Counter("api_requests") + if err != nil { + return nil, err + } + duration, err = meter.Float64Histogram("api_duration", metric.WithUnit("s"), metric.WithExplicitBucketBoundaries(.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10)) + if err != nil { + return nil, err + } + return func() { + c, cancel := context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() + _ = tp.Shutdown(c) + _ = mp.Shutdown(c) + _ = lp.Shutdown(c) + }, nil +} + +func Middleware(next echo.HandlerFunc) echo.HandlerFunc { + return func(c echo.Context) error { + if requests == nil { + return next(c) + } + route := c.Path() + if route == "" { + route = "unmatched" + } + ctx := otel.GetTextMapPropagator().Extract(c.Request().Context(), propagation.HeaderCarrier(c.Request().Header)) + ctx, span := otel.Tracer("messenger").Start(ctx, c.Request().Method+" "+route, trace.WithSpanKind(trace.SpanKindServer)) + defer span.End() + c.SetRequest(c.Request().WithContext(ctx)) + c.Response().Header().Set("X-Trace-Id", span.SpanContext().TraceID().String()) + start := time.Now() + if err := next(c); err != nil { + c.Error(err) + } + status := c.Response().Status + attrs := []attribute.KeyValue{attribute.String("method", c.Request().Method), attribute.String("route", route), attribute.String("status_class", fmt.Sprintf("%dxx", status/100))} + requests.Add(ctx, 1, metric.WithAttributes(attrs...)) + duration.Record(ctx, time.Since(start).Seconds(), metric.WithAttributes(attrs...)) + span.SetAttributes(append(attrs, attribute.Int("http.response.status_code", status))...) + if status >= 500 { + span.SetStatus(codes.Error, "server error") + } + sc := span.SpanContext() + c.Response().Header().Set("X-Trace-Id", sc.TraceID().String()) + var rec otellog.Record + rec.SetTimestamp(time.Now()) + rec.SetBody(otellog.StringValue("http.request")) + rec.SetSeverity(otellog.SeverityInfo) + if status >= 500 { + rec.SetSeverity(otellog.SeverityError) + } + rec.AddAttributes(otellog.String("event", "http.request"), otellog.String("route", route), otellog.String("method", c.Request().Method), otellog.Int("status", status), otellog.String("request_id", c.Response().Header().Get("X-Request-Id")), otellog.String("trace_id", sc.TraceID().String()), otellog.String("span_id", sc.SpanID().String())) + logs.Emit(ctx, rec) + return nil + } +} diff --git a/app/internal/token/token.go b/app/internal/token/token.go new file mode 100644 index 0000000..877c8db --- /dev/null +++ b/app/internal/token/token.go @@ -0,0 +1,42 @@ +package token + +import ( + "crypto/rand" + "crypto/sha256" + "encoding/base64" + "errors" + "fmt" +) + +const Bytes = 32 + +var encoding = base64.RawURLEncoding + +var EncodedLen = encoding.EncodedLen(Bytes) + +var ErrMalformed = errors.New("token: malformed") + +func New() (plain string, hash []byte, err error) { + buf := make([]byte, Bytes) + if _, err := rand.Read(buf); err != nil { + return "", nil, fmt.Errorf("token: rand: %w", err) + } + plain = encoding.EncodeToString(buf) + return plain, Hash(plain), nil +} + +func Hash(plain string) []byte { + sum := sha256.Sum256([]byte(plain)) + return sum[:] +} + +func Parse(plain string) ([]byte, error) { + if len(plain) != EncodedLen { + return nil, ErrMalformed + } + raw, err := encoding.DecodeString(plain) + if err != nil || len(raw) != Bytes { + return nil, ErrMalformed + } + return Hash(plain), nil +} diff --git a/app/internal/token/token_test.go b/app/internal/token/token_test.go new file mode 100644 index 0000000..ea6d8b2 --- /dev/null +++ b/app/internal/token/token_test.go @@ -0,0 +1,65 @@ +package token + +import ( + "bytes" + "errors" + "testing" +) + +func TestNew_FormatAndHash(t *testing.T) { + plain, hash, err := New() + if err != nil { + t.Fatal(err) + } + if len(plain) != EncodedLen || len(plain) < 32 { + t.Errorf("len(token) = %d, want %d", len(plain), EncodedLen) + } + if len(hash) != 32 { + t.Errorf("len(hash) = %d, want 32", len(hash)) + } + if !bytes.Equal(hash, Hash(plain)) { + t.Error("hash from New differs from Hash(token)") + } +} + +func TestNew_Unique(t *testing.T) { + seen := make(map[string]struct{}, 1000) + for i := 0; i < 1000; i++ { + plain, _, err := New() + if err != nil { + t.Fatal(err) + } + if _, ok := seen[plain]; ok { + t.Fatalf("duplicate token %q", plain) + } + seen[plain] = struct{}{} + } +} + +func TestParse(t *testing.T) { + plain, hash, err := New() + if err != nil { + t.Fatal(err) + } + got, err := Parse(plain) + if err != nil { + t.Fatal(err) + } + if !bytes.Equal(got, hash) { + t.Error("Parse hash differs from New hash") + } + + bad := []string{ + "", + "short", + plain[:EncodedLen-1], + plain + "A", + "+" + plain[1:], + "00000000-0000-0000-0000-000000000000", + } + for _, s := range bad { + if _, err := Parse(s); !errors.Is(err, ErrMalformed) { + t.Errorf("Parse(%q) err = %v, want ErrMalformed", s, err) + } + } +} diff --git a/app/internal/validate/attachment.go b/app/internal/validate/attachment.go new file mode 100644 index 0000000..05e880f --- /dev/null +++ b/app/internal/validate/attachment.go @@ -0,0 +1,70 @@ +package validate + +import ( + "fmt" + "strings" + "unicode" + "unicode/utf8" +) + +const ( + FilenameMinLen = 1 + FilenameMaxLen = 255 + + AttachmentIDsMax = 10 +) + +// Filename проверяет отображаемое имя. Оно нигде не используется как путь, но попадает в заголовки +// и к другим клиентам, поэтому разделители и невидимые управляющие символы запрещены. +func Filename(s string) error { + if !utf8.ValidString(s) { + return newError("filename", "must be valid UTF-8") + } + if !notOnlyWhitespace(s) { + return newError("filename", "must not be empty or whitespace only") + } + if !codePointsBetween(s, FilenameMinLen, FilenameMaxLen) { + return newError("filename", fmt.Sprintf("length must be in [%d, %d] code points", FilenameMinLen, FilenameMaxLen)) + } + if s == "." || s == ".." { + return newError("filename", "must not be a path component") + } + if strings.ContainsFunc(s, unsafeFilenameRune) { + return newError("filename", "must not contain path separators or control characters") + } + return nil +} + +func unsafeFilenameRune(r rune) bool { + switch { + case r == '/', r == '\\', unicode.IsControl(r): + return true + case r == '
', r == '
': + return true + case r >= '‪' && r <= '‮', r >= '⁦' && r <= '⁩': + // Символы смены направления текста позволяют выдать evil.exe за безобидное имя. + return true + } + return false +} + +// AttachmentIDs приводит ID к каноничному виду с сохранением порядка. +func AttachmentIDs(ids []string) ([]string, error) { + if len(ids) > AttachmentIDsMax { + return nil, newError("attachment_ids", fmt.Sprintf("count must be at most %d", AttachmentIDsMax)) + } + out := make([]string, 0, len(ids)) + seen := make(map[string]struct{}, len(ids)) + for i, raw := range ids { + id, err := CanonicalUUID(fmt.Sprintf("attachment_ids[%d]", i), raw) + if err != nil { + return nil, err + } + if _, dup := seen[id]; dup { + return nil, newError("attachment_ids", "must not contain duplicates") + } + seen[id] = struct{}{} + out = append(out, id) + } + return out, nil +} diff --git a/app/internal/validate/attachment_test.go b/app/internal/validate/attachment_test.go new file mode 100644 index 0000000..3dd42f5 --- /dev/null +++ b/app/internal/validate/attachment_test.go @@ -0,0 +1,39 @@ +package validate + +import ( + "strings" + "testing" +) + +func TestFilename(t *testing.T) { + valid := []string{"photo.png", "фото отпуска.jpeg", "a", strings.Repeat("я", 255), "👋.png", "..hidden.png"} + for _, s := range valid { + if err := Filename(s); err != nil { + t.Errorf("Filename(%q) = %v", s, err) + } + } + invalid := []string{"", " ", ".", "..", "../etc/passwd", `a\b.png`, "a/b.png", "a\x00.png", "a\nb.png", "a\x7f.png", + "\xff.png", "evil‮gnp.exe", "a
b", strings.Repeat("я", 256)} + for _, s := range invalid { + if err := Filename(s); err == nil { + t.Errorf("Filename(%q) accepted", s) + } + } +} + +func TestAttachmentIDs(t *testing.T) { + const a = "11111111-1111-4111-8111-111111111111" + got, err := AttachmentIDs([]string{strings.ToUpper(a)}) + if err != nil || got[0] != a { + t.Errorf("canonical form: %v, %v", got, err) + } + if _, err := AttachmentIDs([]string{a, strings.ToUpper(a)}); err == nil { + t.Error("duplicates accepted after canonicalization") + } + if _, err := AttachmentIDs([]string{"not-a-uuid"}); err == nil { + t.Error("invalid UUID accepted") + } + if _, err := AttachmentIDs(make([]string, AttachmentIDsMax+1)); err == nil { + t.Error("too many IDs accepted") + } +} diff --git a/app/internal/validate/chat.go b/app/internal/validate/chat.go new file mode 100644 index 0000000..62bf3f6 --- /dev/null +++ b/app/internal/validate/chat.go @@ -0,0 +1,42 @@ +package validate + +import "fmt" + +func ChatTitle(s string) error { + if !notOnlyWhitespace(s) { + return newError("title", "must not be empty or whitespace only") + } + if !codePointsBetween(s, ChatTitleMinLen, ChatTitleMaxLen) { + return newError("title", fmt.Sprintf("length must be in [%d, %d] code points", ChatTitleMinLen, ChatTitleMaxLen)) + } + return nil +} + +func MemberIDs(ids []string, callerID string) ([]string, error) { + if len(ids) < MemberIDsMin || len(ids) > MemberIDsMax { + return nil, newError("member_ids", fmt.Sprintf("count must be in [%d, %d]", MemberIDsMin, MemberIDsMax)) + } + + out := make([]string, 0, len(ids)) + seen := make(map[string]struct{}, len(ids)) + callerIn := false + for i, raw := range ids { + id, err := CanonicalUUID(fmt.Sprintf("member_ids[%d]", i), raw) + if err != nil { + return nil, err + } + if _, dup := seen[id]; dup { + return nil, newError("member_ids", "must not contain duplicates") + } + seen[id] = struct{}{} + if id == callerID { + callerIn = true + } + out = append(out, id) + } + + if !callerIn { + return nil, newError("member_ids", "must contain caller") + } + return out, nil +} diff --git a/app/internal/validate/idempotency.go b/app/internal/validate/idempotency.go new file mode 100644 index 0000000..68411a1 --- /dev/null +++ b/app/internal/validate/idempotency.go @@ -0,0 +1,12 @@ +package validate + +import "regexp" + +var idempotencyKeyPattern = regexp.MustCompile(`^[A-Za-z0-9._:-]{1,128}$`) + +func IdempotencyKey(s string) error { + if !idempotencyKeyPattern.MatchString(s) { + return newError("Idempotency-Key", "must match [A-Za-z0-9._:-]{1,128}") + } + return nil +} diff --git a/app/internal/validate/message.go b/app/internal/validate/message.go new file mode 100644 index 0000000..2ec37d9 --- /dev/null +++ b/app/internal/validate/message.go @@ -0,0 +1,14 @@ +package validate + +import "fmt" + +// MessageText: пустой или пробельный текст допустим, только если у сообщения есть вложения. +func MessageText(s string, hasAttachments bool) error { + if !hasAttachments && !notOnlyWhitespace(s) { + return newError("text", "must not be empty or whitespace only") + } + if !codePointsBetween(s, 0, MessageTextMaxLen) { + return newError("text", fmt.Sprintf("length must be at most %d code points", MessageTextMaxLen)) + } + return nil +} diff --git a/app/internal/validate/rules.go b/app/internal/validate/rules.go new file mode 100644 index 0000000..05792a9 --- /dev/null +++ b/app/internal/validate/rules.go @@ -0,0 +1,80 @@ +package validate + +import ( + "fmt" + "regexp" + "strings" + "unicode/utf8" + + "github.com/google/uuid" +) + +const ( + UsernameMinLen = 3 + UsernameMaxLen = 32 + + DisplayNameMinLen = 1 + DisplayNameMaxLen = 100 + + PasswordMinLen = 12 + PasswordMaxLen = 128 + + ChatTitleMinLen = 1 + ChatTitleMaxLen = 100 + + MessageTextMaxLen = 4000 + + MemberIDsMin = 1 + MemberIDsMax = 100 + + LimitMin = 1 + LimitMax = 100 + LimitDefault = 50 +) + +var usernamePattern = regexp.MustCompile(`^[a-z0-9_]{3,32}$`) + +func CanonicalUUID(field, s string) (string, error) { + if len(s) != 36 { + return "", newError(field, "must be a valid UUID") + } + u, err := uuid.Parse(s) + if err != nil { + return "", newError(field, "must be a valid UUID") + } + return u.String(), nil +} + +func Limit(n int) error { + if n < LimitMin || n > LimitMax { + return newError("limit", fmt.Sprintf("must be in [%d, %d]", LimitMin, LimitMax)) + } + return nil +} + +func codePointsBetween(s string, min, max int) bool { + n := utf8.RuneCountInString(s) + return n >= min && n <= max +} + +func notOnlyWhitespace(s string) bool { + return strings.TrimSpace(s) != "" +} + +type Error struct { + Field string + Reason string +} + +func (e *Error) Error() string { + return e.Field + ": " + e.Reason +} + +func (e *Error) Is(target error) bool { + _, ok := target.(*Error) + return ok +} + +func newError(field, reason string) *Error { + return &Error{Field: field, Reason: reason} +} diff --git a/app/internal/validate/user.go b/app/internal/validate/user.go new file mode 100644 index 0000000..cf97468 --- /dev/null +++ b/app/internal/validate/user.go @@ -0,0 +1,30 @@ +package validate + +import "fmt" + +func Username(s string) error { + if !usernamePattern.MatchString(s) { + return newError("username", fmt.Sprintf("must match [a-z0-9_]{%d,%d}", UsernameMinLen, UsernameMaxLen)) + } + return nil +} + +func DisplayName(s string) error { + if !notOnlyWhitespace(s) { + return newError("display_name", "must not be empty or whitespace only") + } + if !codePointsBetween(s, DisplayNameMinLen, DisplayNameMaxLen) { + return newError("display_name", fmt.Sprintf("length must be in [%d, %d] code points", DisplayNameMinLen, DisplayNameMaxLen)) + } + return nil +} + +func Password(s string) error { + if !notOnlyWhitespace(s) { + return newError("password", "must not be empty or whitespace only") + } + if !codePointsBetween(s, PasswordMinLen, PasswordMaxLen) { + return newError("password", fmt.Sprintf("length must be in [%d, %d] code points", PasswordMinLen, PasswordMaxLen)) + } + return nil +} diff --git a/compose.yaml b/compose.yaml new file mode 100644 index 0000000..2c51c9d --- /dev/null +++ b/compose.yaml @@ -0,0 +1,793 @@ +{ + "name": "mtusi-lab7", + "services": { + "postgres": { + "image": "postgres:17.6-alpine", + "restart": "unless-stopped", + "deploy": { + "resources": { + "limits": { + "memory": "256M", + "cpus": "0.5" + } + } + }, + "environment": { + "POSTGRES_USER": "messenger", + "POSTGRES_DB": "messenger", + "POSTGRES_PASSWORD_FILE": "/run/secrets/postgres_password" + }, + "command": [ + "sh", + "-ec", + "cp /tls/service.key /tmp/postgres.key; chown postgres:postgres /tmp/postgres.key; chmod 600 /tmp/postgres.key; exec docker-entrypoint.sh postgres -c ssl=on -c ssl_cert_file=/tls/service.crt -c ssl_key_file=/tmp/postgres.key -c hba_file=/etc/pg_hba.conf" + ], + "volumes": [ + "./secrets/ca.crt:/tls/ca.crt:ro", + "./secrets/postgres/service.crt:/tls/service.crt:ro", + "./secrets/postgres/service.key:/tls/service.key:ro", + "pgdata:/var/lib/postgresql/data", + "./secrets/postgres_password:/run/secrets/postgres_password:ro", + "./secrets/roles.sql:/docker-entrypoint-initdb.d/roles.sql:ro", + "./infra/security/pg_hba.conf:/etc/pg_hba.conf:ro" + ], + "healthcheck": { + "test": [ + "CMD", + "pg_isready", + "-U", + "messenger" + ], + "interval": "3s", + "timeout": "2s", + "retries": 30 + } + }, + "valkey": { + "image": "valkey/valkey:8.1.3-alpine", + "restart": "unless-stopped", + "deploy": { + "resources": { + "limits": { + "memory": "256M", + "cpus": "0.5" + } + } + }, + "command": [ + "valkey-server", + "/etc/valkey.conf" + ], + "volumes": [ + "./secrets/ca.crt:/tls/ca.crt:ro", + "./secrets/valkey/service.crt:/tls/service.crt:ro", + "./secrets/valkey/service.key:/tls/service.key:ro", + "valkeydata:/data", + "./secrets/valkey.conf:/etc/valkey.conf:ro" + ] + }, + "broker": { + "image": "valkey/valkey:8.1.3-alpine", + "restart": "unless-stopped", + "deploy": { + "resources": { + "limits": { + "memory": "256M", + "cpus": "0.5" + } + } + }, + "command": [ + "valkey-server", + "/etc/valkey.conf" + ], + "volumes": [ + "./secrets/ca.crt:/tls/ca.crt:ro", + "./secrets/broker/service.crt:/tls/service.crt:ro", + "./secrets/broker/service.key:/tls/service.key:ro", + "brokerdata:/data", + "./secrets/broker.conf:/etc/valkey.conf:ro" + ] + }, + "s3": { + "image": "chrislusf/seaweedfs:4.00", + "restart": "unless-stopped", + "deploy": { + "resources": { + "limits": { + "memory": "256M", + "cpus": "0.5" + } + } + }, + "entrypoint": [ + "weed" + ], + "command": [ + "server", + "-dir=/data", + "-ip=127.0.0.1", + "-ip.bind=127.0.0.1", + "-master.volumeSizeLimitMB=1024", + "-volume.max=16", + "-volume.preStopSeconds=0", + "-filer", + "-s3", + "-s3.ip.bind=127.0.0.1", + "-s3.port=9000", + "-s3.config=/run/secrets/s3_config" + ], + "volumes": [ + "s3data:/data", + "./secrets/s3_config:/run/secrets/s3_config:ro", + "./infra/seaweedfs/master.toml:/etc/seaweedfs/master.toml:ro" + ], + "networks": { + "s3-private": { + "aliases": [ + "s3-storage" + ] + } + } + }, + "openbao": { + "image": "ghcr.io/openbao/openbao:2.7.1", + "restart": "unless-stopped", + "deploy": { + "resources": { + "limits": { + "memory": "256M", + "cpus": "0.5" + } + } + }, + "command": [ + "server", + "-config=/bao/config/config.hcl" + ], + "environment": { + "SKIP_SETCAP": "true" + }, + "volumes": [ + "./secrets/ca.crt:/tls/ca.crt:ro", + "./secrets/openbao/service.crt:/tls/service.crt:ro", + "./secrets/openbao/service.key:/tls/service.key:ro", + "baodata:/openbao/file", + "./infra/openbao/config.hcl:/bao/config/config.hcl:ro" + ], + "ports": [ + "127.0.0.1:18200:8200" + ], + "depends_on": { + "bao-volume-init": { + "condition": "service_completed_successfully" + } + } + }, + "migrate": { + "build": { + "context": ".", + "target": "migrate" + }, + "environment": { + "DATABASE_URL_FILE": "/run/secrets/database_url" + }, + "volumes": [ + "./secrets/database_url:/run/secrets/database_url:ro", + "./secrets/ca.crt:/tls/ca.crt:ro" + ], + "depends_on": { + "postgres": { + "condition": "service_healthy" + } + }, + "deploy": { + "resources": { + "limits": { + "memory": "256M", + "cpus": "0.5" + } + } + } + }, + "s3-init": { + "build": { + "context": ".", + "target": "s3init" + }, + "environment": { + "S3_ENDPOINT": "https://s3:9443", + "S3_REGION": "us-east-1", + "S3_BUCKET": "messenger-attachments", + "S3_ACCESS_KEY_ID_FILE": "/run/secrets/id", + "S3_SECRET_ACCESS_KEY_FILE": "/run/secrets/key", + "SSL_CERT_FILE": "/tls/ca.crt" + }, + "volumes": [ + "./secrets/ca.crt:/tls/ca.crt:ro", + "./secrets/s3_admin_access_key_id:/run/secrets/id:ro", + "./secrets/s3_admin_secret_access_key:/run/secrets/key:ro" + ], + "depends_on": [ + "s3-gateway" + ], + "deploy": { + "resources": { + "limits": { + "memory": "256M", + "cpus": "0.5" + } + } + } + }, + "api": { + "build": { + "context": ".", + "target": "api" + }, + "env_file": ".env", + "environment": { + "BAO_ROLE": "api", + "GOMEMLIMIT": "800MiB", + "APP_MAX_HEAP_BYTES": "805306368" + }, + "volumes": [ + "./secrets/ca.crt:/tls/ca.crt:ro", + "./secrets/api/service.crt:/tls/service.crt:ro", + "./secrets/api/service.key:/tls/service.key:ro", + "./infra/security/runtime.py:/runtime.py:ro" + ], + "tmpfs": [ + "/run/app-secrets:uid=65534,gid=65534,mode=0700", + "/tmp:size=128m,mode=1777" + ], + "user": "65534:65534", + "cap_drop": [ + "ALL" + ], + "security_opt": [ + "no-new-privileges:true" + ], + "read_only": true, + "deploy": { + "resources": { + "limits": { + "memory": "1G", + "cpus": "1.0" + } + }, + "replicas": 2 + }, + "depends_on": { + "migrate": { + "condition": "service_completed_successfully" + }, + "s3-init": { + "condition": "service_completed_successfully" + } + }, + "restart": "unless-stopped", + "entrypoint": [ + "python3", + "/runtime.py", + "launch", + "/app/messenger" + ], + "stop_grace_period": "15s", + "healthcheck": { + "disable": true + } + }, + "worker": { + "build": { + "context": ".", + "dockerfile": "worker/Dockerfile" + }, + "env_file": ".env", + "environment": { + "BAO_ROLE": "worker" + }, + "volumes": [ + "./secrets/ca.crt:/tls/ca.crt:ro", + "./secrets/worker/service.crt:/tls/service.crt:ro", + "./secrets/worker/service.key:/tls/service.key:ro", + "./infra/security/runtime.py:/runtime.py:ro" + ], + "tmpfs": [ + "/run/app-secrets:uid=65534,gid=65534,mode=0700", + "/tmp:size=128m,mode=1777" + ], + "user": "65534:65534", + "cap_drop": [ + "ALL" + ], + "security_opt": [ + "no-new-privileges:true" + ], + "read_only": true, + "deploy": { + "resources": { + "limits": { + "memory": "1G", + "cpus": "1.0" + } + } + }, + "depends_on": { + "migrate": { + "condition": "service_completed_successfully" + }, + "s3-init": { + "condition": "service_completed_successfully" + } + }, + "restart": "unless-stopped", + "entrypoint": [ + "python", + "/runtime.py", + "launch", + "python", + "-u", + "main.py" + ], + "stop_grace_period": "15s" + }, + "dispatcher": { + "build": { + "context": ".", + "dockerfile": "worker/Dockerfile" + }, + "env_file": ".env", + "environment": { + "BAO_ROLE": "dispatcher" + }, + "volumes": [ + "./secrets/ca.crt:/tls/ca.crt:ro", + "./secrets/dispatcher/service.crt:/tls/service.crt:ro", + "./secrets/dispatcher/service.key:/tls/service.key:ro", + "./infra/security/runtime.py:/runtime.py:ro" + ], + "tmpfs": [ + "/run/app-secrets:uid=65534,gid=65534,mode=0700", + "/tmp:size=128m,mode=1777" + ], + "user": "65534:65534", + "cap_drop": [ + "ALL" + ], + "security_opt": [ + "no-new-privileges:true" + ], + "read_only": true, + "deploy": { + "resources": { + "limits": { + "memory": "1G", + "cpus": "1.0" + } + } + }, + "depends_on": { + "migrate": { + "condition": "service_completed_successfully" + }, + "s3-init": { + "condition": "service_completed_successfully" + } + }, + "restart": "unless-stopped", + "entrypoint": [ + "python", + "/runtime.py", + "launch", + "python", + "-u", + "main.py", + "dispatch" + ], + "stop_grace_period": "15s" + }, + "lb": { + "image": "haproxy:3.2.9-alpine", + "restart": "unless-stopped", + "deploy": { + "resources": { + "limits": { + "memory": "256M", + "cpus": "0.5" + } + } + }, + "volumes": [ + "./infra/haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro", + "./secrets/ca.crt:/tls/ca.crt:ro", + "./secrets/lb/service.pem:/tls/lb.pem:ro" + ], + "ports": [ + "127.0.0.1:8443:8443" + ], + "depends_on": [ + "api" + ] + }, + "otel-collector": { + "image": "otel/opentelemetry-collector-contrib:0.137.0", + "restart": "unless-stopped", + "deploy": { + "resources": { + "limits": { + "memory": "256M", + "cpus": "0.5" + } + } + }, + "command": [ + "--config=/etc/config.yaml" + ], + "volumes": [ + "./infra/otel/collector.yaml:/etc/config.yaml:ro", + "./secrets/ca.crt:/tls/ca.crt:ro", + "./secrets/otel-collector/service.crt:/tls/service.crt:ro", + "./secrets/otel-collector/service.key:/tls/service.key:ro" + ] + }, + "loki": { + "image": "grafana/loki:3.5.5", + "restart": "unless-stopped", + "deploy": { + "resources": { + "limits": { + "memory": "256M", + "cpus": "0.5" + } + } + }, + "command": [ + "-config.file=/etc/config.yaml" + ], + "volumes": [ + "./infra/otel/loki.yaml:/etc/config.yaml:ro", + "./secrets/ca.crt:/tls/ca.crt:ro", + "lokidata:/loki" + ] + }, + "tempo": { + "image": "grafana/tempo:2.8.2", + "restart": "unless-stopped", + "deploy": { + "resources": { + "limits": { + "memory": "256M", + "cpus": "0.5" + } + } + }, + "command": [ + "-config.file=/etc/config.yaml" + ], + "volumes": [ + "./infra/otel/tempo.yaml:/etc/config.yaml:ro", + "./secrets/ca.crt:/tls/ca.crt:ro", + "tempodata:/var/tempo" + ], + "user": "0:0" + }, + "prometheus": { + "image": "prom/prometheus:v3.5.0", + "restart": "unless-stopped", + "deploy": { + "resources": { + "limits": { + "memory": "256M", + "cpus": "0.5" + } + } + }, + "command": [ + "--config.file=/etc/config.yaml", + "--web.listen-address=127.0.0.1:9090", + "--storage.tsdb.retention.time=3d" + ], + "volumes": [ + "./infra/otel/prometheus.yaml:/etc/config.yaml:ro", + "./secrets/ca.crt:/tls/ca.crt:ro", + "prometheusdata:/prometheus", + "./secrets/prometheus/service.crt:/tls/service.crt:ro", + "./secrets/prometheus/service.key:/tls/service.key:ro" + ] + }, + "grafana": { + "image": "grafana/grafana:12.2.0", + "restart": "unless-stopped", + "deploy": { + "resources": { + "limits": { + "memory": "256M", + "cpus": "0.5" + } + } + }, + "environment": { + "GF_SERVER_HTTP_ADDR": "127.0.0.1", + "GF_AUTH_ANONYMOUS_ENABLED": "true", + "GF_AUTH_ANONYMOUS_ORG_ROLE": "Viewer", + "GF_AUTH_DISABLE_LOGIN_FORM": "true", + "GF_ANALYTICS_REPORTING_ENABLED": "false", + "SSL_CERT_FILE": "/tls/ca.crt" + }, + "volumes": [ + "grafanadata:/var/lib/grafana", + "./infra/grafana/provisioning:/etc/grafana/provisioning:ro", + "./infra/grafana/dashboards:/var/lib/grafana/dashboards:ro", + "./secrets/ca.crt:/tls/ca.crt:ro", + "./secrets/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/sources.yaml:ro" + ], + "ports": [ + "127.0.0.1:13007:3443" + ] + }, + "s3-tls": { + "build": "./infra/security", + "network_mode": "service:s3", + "volumes": [ + "./secrets/ca.crt:/tls/ca.crt:ro", + "./secrets/s3/service.crt:/tls/service.crt:ro", + "./secrets/s3/service.key:/tls/service.key:ro" + ], + "command": [ + "9443:9000" + ], + "depends_on": [ + "s3" + ], + "restart": "unless-stopped", + "cap_drop": [ + "ALL" + ], + "security_opt": [ + "no-new-privileges:true" + ], + "read_only": true, + "deploy": { + "resources": { + "limits": { + "memory": "64M", + "cpus": "0.25" + } + } + } + }, + "otel-collector-tls": { + "build": "./infra/security", + "network_mode": "service:otel-collector", + "volumes": [ + "./secrets/ca.crt:/tls/ca.crt:ro", + "./secrets/otel-collector/service.crt:/tls/service.crt:ro", + "./secrets/otel-collector/service.key:/tls/service.key:ro" + ], + "command": [ + "4438:4318", + "8899:8889", + "8898:8888" + ], + "depends_on": [ + "otel-collector" + ], + "restart": "unless-stopped", + "cap_drop": [ + "ALL" + ], + "security_opt": [ + "no-new-privileges:true" + ], + "read_only": true, + "deploy": { + "resources": { + "limits": { + "memory": "64M", + "cpus": "0.25" + } + } + }, + "environment": { + "TLS_ALLOWED_IDS": "spiffe://lab7/api,spiffe://lab7/worker,spiffe://lab7/dispatcher,spiffe://lab7/prometheus" + } + }, + "loki-tls": { + "build": "./infra/security", + "network_mode": "service:loki", + "volumes": [ + "./secrets/ca.crt:/tls/ca.crt:ro", + "./secrets/loki/service.crt:/tls/service.crt:ro", + "./secrets/loki/service.key:/tls/service.key:ro" + ], + "command": [ + "3443:3100" + ], + "depends_on": [ + "loki" + ], + "restart": "unless-stopped", + "cap_drop": [ + "ALL" + ], + "security_opt": [ + "no-new-privileges:true" + ], + "read_only": true, + "deploy": { + "resources": { + "limits": { + "memory": "64M", + "cpus": "0.25" + } + } + }, + "environment": { + "TLS_ALLOWED_IDS": "spiffe://lab7/otel-collector,spiffe://lab7/grafana" + } + }, + "tempo-tls": { + "build": "./infra/security", + "network_mode": "service:tempo", + "volumes": [ + "./secrets/ca.crt:/tls/ca.crt:ro", + "./secrets/tempo/service.crt:/tls/service.crt:ro", + "./secrets/tempo/service.key:/tls/service.key:ro" + ], + "command": [ + "3443:3200", + "4438:4318" + ], + "depends_on": [ + "tempo" + ], + "restart": "unless-stopped", + "cap_drop": [ + "ALL" + ], + "security_opt": [ + "no-new-privileges:true" + ], + "read_only": true, + "deploy": { + "resources": { + "limits": { + "memory": "64M", + "cpus": "0.25" + } + } + }, + "environment": { + "TLS_ALLOWED_IDS": "spiffe://lab7/otel-collector,spiffe://lab7/grafana" + } + }, + "prometheus-tls": { + "build": "./infra/security", + "network_mode": "service:prometheus", + "volumes": [ + "./secrets/ca.crt:/tls/ca.crt:ro", + "./secrets/prometheus/service.crt:/tls/service.crt:ro", + "./secrets/prometheus/service.key:/tls/service.key:ro" + ], + "command": [ + "9443:9090" + ], + "depends_on": [ + "prometheus" + ], + "restart": "unless-stopped", + "cap_drop": [ + "ALL" + ], + "security_opt": [ + "no-new-privileges:true" + ], + "read_only": true, + "deploy": { + "resources": { + "limits": { + "memory": "64M", + "cpus": "0.25" + } + } + }, + "environment": { + "TLS_ALLOWED_IDS": "spiffe://lab7/grafana" + } + }, + "grafana-tls": { + "build": "./infra/security", + "network_mode": "service:grafana", + "volumes": [ + "./secrets/ca.crt:/tls/ca.crt:ro", + "./secrets/grafana/service.crt:/tls/service.crt:ro", + "./secrets/grafana/service.key:/tls/service.key:ro" + ], + "command": [ + "3443:3000" + ], + "depends_on": [ + "grafana" + ], + "restart": "unless-stopped", + "cap_drop": [ + "ALL" + ], + "security_opt": [ + "no-new-privileges:true" + ], + "read_only": true, + "deploy": { + "resources": { + "limits": { + "memory": "64M", + "cpus": "0.25" + } + } + } + }, + "s3-gateway": { + "image": "haproxy:3.2.9-alpine", + "volumes": [ + "./infra/s3-gateway/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro" + ], + "networks": { + "default": { + "aliases": [ + "s3" + ] + }, + "s3-private": {} + }, + "depends_on": [ + "s3-tls" + ], + "restart": "unless-stopped", + "deploy": { + "resources": { + "limits": { + "cpus": "0.25", + "memory": "64M" + } + } + } + }, + "bao-volume-init": { + "image": "ghcr.io/openbao/openbao:2.7.1", + "user": "0:0", + "entrypoint": [ + "sh", + "-ec", + "chown 100:1000 /openbao/file" + ], + "volumes": [ + "baodata:/openbao/file" + ], + "deploy": { + "resources": { + "limits": { + "cpus": "0.25", + "memory": "64M" + } + } + } + } + }, + "volumes": { + "pgdata": {}, + "valkeydata": {}, + "brokerdata": {}, + "s3data": {}, + "baodata": {}, + "lokidata": {}, + "tempodata": {}, + "prometheusdata": {}, + "grafanadata": {} + }, + "networks": { + "s3-private": { + "internal": true + } + } +} diff --git a/contracts/trust-matrix.md b/contracts/trust-matrix.md index 0c2a977..cfd7d50 100644 --- a/contracts/trust-matrix.md +++ b/contracts/trust-matrix.md @@ -1,37 +1,29 @@ -# Матрица доверия — заполнить в решении lab7 +# Матрица доверия: реализация на 3 -Это обязательная матрица покрытия. Для каждой строки укажите реальный порт, endpoint, CA, service identity, проверку SAN/ACL, срок жизни credentials и команду положительного/отрицательного теста. TLS шифрует и подтверждает сервер; mTLS также проверяет клиента. При доверенном CA всё равно нужно ограничивать разрешённую identity. Plaintext hop допустим только внутри закрытого локального transport/proxy boundary, без опубликованного обхода; границу и rationale нужно доказать. +Единый локальный CA: `secrets/ca.crt`, проверяется SAN hostname. CA key хранится только у оператора в `operator/pki`. Leaf сертификаты действуют 30 дней; service identities — URI `spiffe://lab7/`. Полный негативный аудит: `sh scripts/check-internal.sh`. Внешний аудит: `make test-security CA_FILE="$PWD/secrets/ca.crt"`. -| Связь | Минимум на 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 | +| Связь | Endpoint / identity / разрешение | Проверка и конфиг | +| --- | --- | --- | +| Клиент → LB | HTTPS localhost:8443; SAN localhost/127.0.0.1; Basic только login, дальше Bearer | public-tls.txt, smoke.txt; HAProxy | +| LB → все API | TLS api:8080; обязательный client cert, цепочка CA и точный URI `spiffe://lab7/lb`; server SAN api | internal-security.txt: 2 адреса; нет cert / чужой CA / wrong-role того же CA → TLS отказ. server.go | +| API/worker/dispatcher → PostgreSQL | postgres:5432, native TLS verify-full; отдельные SQL роли api/worker/dispatcher | pg_hba запрещает hostnossl; migration 11: API business DML, worker attachments/jobs, dispatcher jobs; DDL и users для worker запрещены | +| API/worker → S3 | HTTPS s3:9443; разные SigV4 identities | API: Write staging, Read originals/variants; worker: Read staging, Write originals/variants; List/Admin запрещены. bootstrap.py | +| Dispatcher/worker → broker | rediss broker:6379; producer dispatcher: XADD, consumer worker: XGROUP/XREADGROUP/XAUTOCLAIM/XACK | только stream attachment-jobs-v1; default user off. API намерение пишет в SQL outbox, прямого broker connection не имеет | +| API/worker/dispatcher → Collector | HTTPS otel-collector:4438; mTLS и URI allowlist; отдельные клиентские identities | runtime.py, compose TLS_ALLOWED_IDS; OTLP client certificate/key env; plaintext receiver только loopback | +| Collector → Loki/Tempo | HTTPS loki:3443/otlp, tempo:4438; mTLS identity otel-collector | allowlist sidecar: collector/grafana; exporter tls cert/key/CA | +| Prometheus → Collector scrape | HTTPS otel-collector:8899 (app metrics), :8898 (collector); mTLS prometheus | prometheus.yaml cert/key/CA; loopback :8889/:8888 закрыт | +| Grafana → datasources | HTTPS prometheus:9443, loki:3443, tempo:3443; mTLS grafana | локально генерируемый provisioning с client key в secrets; в Git только шаблон без ключей | +| API/worker/dispatcher → OpenBao | HTTPS openbao:8200; cert auth с привязкой leaf и URI; KV path только собственной роли | политики infra/openbao/*.hcl; TTL 5m/max10m, после чтения токен revoke-self; токен не передаётся приложению | +| Оператор → OpenBao | HTTPS localhost:18200, root token только operator/bao-init.json | init 3 shares/threshold2, ручной operator unseal; root никогда не монтируется в сервисы | +| Оператор → Grafana | HTTPS localhost:13007; анонимный Viewer, локальный административный просмотр | нет опубликованных backend telemetry ports; для удалённого доступа нужен отдельный auth ingress | +| Оператор → S3 admin | s3-init через HTTPS и отдельный admin credential | только одноразовый bucket bootstrap; admin key не монтируется в API/worker | +| API → session Valkey | rediss valkey:6379, ACL api: GET/SET/DEL/PING только session:* | AOF appendfsync always; default user off; token в ключе — SHA-256, не Bearer | +| Репликация | PostgreSQL/S3/broker без репликации; OpenBao Raft — один узел | Raft cluster port 8201 использует встроенный TLS; дополнительного межузлового трафика нет | -Нет выбранного компонента — отметьте N/A с причиной, а не оставляйте пустую строку. Внутренний публичный health listener, если нужен, минимален и изолирован; через него нельзя обращаться к бизнес-API без mTLS. Отдельно задокументируйте scrape/health/bootstrap каналы: они тоже не должны создавать обход. +TLS proxy завершает TLS и передаёт plaintext **только на 127.0.0.1 в том же network namespace**. Backend receiver не слушает адрес контейнерной сети. S3 дополнительно помещён в internal s3-private: общий gateway передаёт только TLS :9443 без расшифровки; служебный gRPC SeaweedFS недоступен из сети API. Полный список закрытых портов проверяется internal.py. Прокси не создают plaintext fallback. -## Обязательные отрицательные проверки +Collector принимает только identities api/worker/dispatcher/prometheus; backends — collector/grafana, Prometheus — grafana. Это учебная сервисная граница: Grafana имеет read API и техническую возможность обратиться к ingest API Loki/Tempo. Разделение read/write HTTP методов и multi-tenant telemetry не заявлены. Свободный доступ произвольного контейнера общего CA к ingest запрещён. -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. Покажите новое подключение, иначе тест отзыва может ничего не проверить. +Health: публичный health проходит по тому же TLS→mTLS пути; открытого API health listener нет. PostgreSQL pg_isready — только локальная проверка процесса, end-to-end readiness API дополнительно проверяет зависимости. Compose без healthcheck не доказывает готовность, поэтому start.sh ждёт проверенный HTTPS /health/ready. -## 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. +Bootstrap trust: оператор заранее создаёт CA и leaf-файлы, монтирует только выбранные файлы в каждый сервис. Root CA и unseal material находятся в каталоге 0700 вне Git/образов. Service bootstrap получает свой KV в tmpfs 0700 с файлами 0600; при unavailable/sealed Bao новый процесс завершается, без fallback. На 3 KV credentials статические: TTL токена не отзывает уже полученный пароль БД/S3. Перезапуск API переаутентифицируется по своему ограниченному leaf. diff --git a/evidence/README.md b/evidence/README.md index 8df7001..b081cbf 100644 --- a/evidence/README.md +++ b/evidence/README.md @@ -1,5 +1,18 @@ -# Доказательства +# Реальные результаты проверки lab7 -Храните небольшие обезличенные результаты: команды и stdout проверок, JSON/CSV агрегатов нагрузки, EXPLAIN, dashboard JSON, текст разбора отказа. Укажите дату, commit, аппаратные лимиты и профиль нагрузки. +Все данные синтетические. Credentials, Authorization и private keys не записываются. Основной отчёт: ../REPORT.md. -Не добавляйте .env, session tokens, cookies, приватные ключи, credentials, реальные сообщения, raw dumps и signed URLs. Для скриншотов скрывайте секреты. Большие логи/бинарные traces сохраняйте отдельно по правилам преподавателя; одного скриншота без методики недостаточно. +- `check.txt`, `go-tests.txt`: структура контракта/синтаксис и тесты Go приложения. +- `smoke.txt`, `public-tls.txt`: публичный API через проверенный HTTPS и отказ недоверенного CA. +- `internal-security.txt`: обе API реплики, CA/identity deny, вся TLS matrix, plaintext bypass deny, Bao/SQL/S3/broker least privilege. +- `external-security.txt`: 429+Retry-After, корреляция request_id ошибки, body limit413. +- `session-expiry.txt`: временный реальный API с TTL2s, токен работает до expiry, затем401; temporary container удалён. +- `persistence.txt`, `persistence-containers.txt`: успешный restart всех stores и сохранность предыдущей сессии/данных/bytes; безопасные before/after timestamps. +- `failover-1.txt`, `failover-2.txt`: публичные 15s сценарии отказа; `failover-each.txt` дополнительно доказывает отказ двух разных конкретных контейнеров и их восстановление. +- `hardening.txt`: actual Docker inspection non-root app/worker, limits, caps/readonly/ports. +- `observability.txt`, `telemetry.json`: реальные matching API/worker log/trace и4 SDK metrics после restart. +- `argon2-benchmark.txt`: три замера fixed defaults19MiB/t2/p1, CPU1/RAM1GiB. +- `load.json`, `load.txt`, `runtime.txt`, `resources.txt`: отдельная 30s HTTPS нагрузка, concurrency4, контекст VM и моментальный snapshot ресурсов. Другие lab контейнеры на host не останавливались, поэтому они тоже видны в snapshot. +- `secret-scan.txt`: publishable files не содержат фактических сгенерированных credentials/root/unseal или private keys. + +Остальные build/start logs сохранены для диагностики. Ранние попытки могут содержать ошибки, исправленные перед итоговыми проверками: DockerHub timeout, занятый Grafana3000 (заменён на13007), OpenBao file backend/permissions (заменён на Raft с volume owner initializer). Они не служат доказательствами PASS. diff --git a/evidence/api-build.txt b/evidence/api-build.txt new file mode 100644 index 0000000..15762e0 --- /dev/null +++ b/evidence/api-build.txt @@ -0,0 +1,83 @@ + Image mtusi-lab7-s3-tls Building + Image mtusi-lab7-migrate Building + Image mtusi-lab7-api Building + Image mtusi-lab7-s3-init Building +#1 [internal] load local bake definitions +#1 reading from stdin 1.98kB done +#1 DONE 0.0s + +#2 [internal] load build definition from Dockerfile +#2 transferring dockerfile: 6.11kB done +#2 DONE 0.0s + +#3 resolve image config for docker-image://docker.io/docker/dockerfile:1.7 +#3 DONE 0.3s + +#4 docker-image://docker.io/docker/dockerfile:1.7@sha256:a57df69d0ea827fb7266491f2813635de6f17269be881f696fbfdf2d83dda33e +#4 CACHED + +#5 [internal] load metadata for docker.io/library/golang:1.26.10-alpine3.24 +#5 DONE 0.0s + +#6 [internal] load metadata for docker.io/library/alpine:3.24.3 +#6 DONE 2.0s + +#7 [internal] load .dockerignore +#7 transferring context: 205B done +#7 DONE 0.0s + +#8 [builder 1/10] FROM docker.io/library/golang:1.26.10-alpine3.24 +#8 DONE 0.0s + +#9 [api 1/4] FROM docker.io/library/alpine:3.24.3@sha256:be2656061b536c1883c4034790e21d0a09c5aaaf51968b89368a3c0371ea2c9a +#9 DONE 0.0s + +#10 [internal] load build context +#10 transferring context: 6.60kB done +#10 DONE 0.0s + +#11 [builder 6/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/messenger ./cmd/messenger +#11 CACHED + +#12 [api 2/4] RUN apk add --no-cache ca-certificates python3 && addgroup -S app && adduser -S -G app -H app +#12 CACHED + +#13 [builder 9/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/janitor ./cmd/janitor +#13 CACHED + +#14 [builder 5/10] COPY app/ ./ +#14 CACHED + +#15 [builder 10/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/s3check ./cmd/s3check +#15 CACHED + +#16 [builder 3/10] COPY app/go.mod app/go.sum ./ +#16 CACHED + +#17 [builder 7/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/loadgen ./cmd/loadgen +#17 CACHED + +#18 [builder 8/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/s3init ./cmd/s3init +#18 CACHED + +#19 [builder 4/10] RUN go mod download +#19 CACHED + +#20 [api 3/4] WORKDIR /app +#20 CACHED + +#21 [builder 2/10] WORKDIR /src +#21 CACHED + +#22 [api 4/4] COPY --from=builder /out/messenger /app/messenger +#22 CACHED + +#23 exporting to image +#23 exporting layers done +#23 writing image sha256:60024dd1a09a14d82a899e2c93b58ca878087f7d0d8d3abac828c948073ce857 done +#23 naming to docker.io/library/mtusi-lab7-api done +#23 DONE 0.0s + +#24 resolving provenance for metadata file +#24 DONE 0.0s + Image mtusi-lab7-api Built diff --git a/evidence/app-restart.txt b/evidence/app-restart.txt new file mode 100644 index 0000000..092bdf9 --- /dev/null +++ b/evidence/app-restart.txt @@ -0,0 +1,8 @@ + Container mtusi-lab7-worker-1 Restarting + Container mtusi-lab7-api-1 Restarting + Container mtusi-lab7-api-2 Restarting + Container mtusi-lab7-dispatcher-1 Restarting + Container mtusi-lab7-api-1 Started + Container mtusi-lab7-worker-1 Started + Container mtusi-lab7-dispatcher-1 Started + Container mtusi-lab7-api-2 Started diff --git a/evidence/argon2-benchmark.txt b/evidence/argon2-benchmark.txt new file mode 100644 index 0000000..a98a00b --- /dev/null +++ b/evidence/argon2-benchmark.txt @@ -0,0 +1,8 @@ +goos: linux +goarch: arm64 +pkg: gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/password +BenchmarkDefaultHash-2 200 17831994 ns/op 19925726 B/op 32 allocs/op +BenchmarkDefaultHash-2 198 17773268 ns/op 19925706 B/op 32 allocs/op +BenchmarkDefaultHash-2 202 17817134 ns/op 19925739 B/op 33 allocs/op +PASS +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/password 16.131s diff --git a/evidence/bao-recreate.txt b/evidence/bao-recreate.txt new file mode 100644 index 0000000..239e81b --- /dev/null +++ b/evidence/bao-recreate.txt @@ -0,0 +1,10 @@ + Container mtusi-lab7-bao-volume-init-1 Creating + Container mtusi-lab7-bao-volume-init-1 Created + Container mtusi-lab7-openbao-1 Recreate + Container mtusi-lab7-openbao-1 Recreated + Container mtusi-lab7-bao-volume-init-1 Starting + Container mtusi-lab7-bao-volume-init-1 Started + Container mtusi-lab7-bao-volume-init-1 Waiting + Container mtusi-lab7-bao-volume-init-1 Exited + Container mtusi-lab7-openbao-1 Starting + Container mtusi-lab7-openbao-1 Started diff --git a/evidence/bao-start.txt b/evidence/bao-start.txt new file mode 100644 index 0000000..4762087 --- /dev/null +++ b/evidence/bao-start.txt @@ -0,0 +1,128 @@ + Image ghcr.io/openbao/openbao:2.7.1 Pulling + a9986cd6f37d Pulling fs layer + 087ad16c32a3 Pulling fs layer + 2fd12311ced1 Pulling fs layer + 722a749714e9 Pulling fs layer + b5dc67959819 Pulling fs layer + 79e1023ff1ff Pulling fs layer + 9b8f4f0bc0a4 Pulling fs layer + 8fa892af5a09 Pulling fs layer + 79e1023ff1ff Waiting + 722a749714e9 Waiting + b5dc67959819 Waiting + 9b8f4f0bc0a4 Waiting + 8fa892af5a09 Waiting + a9986cd6f37d Downloading [> ] 49.15kB/4.188MB + 087ad16c32a3 Downloading [============> ] 1.378kB/5.385kB + 087ad16c32a3 Downloading [==================================================>] 5.385kB/5.385kB + 087ad16c32a3 Verifying Checksum + 087ad16c32a3 Download complete + a9986cd6f37d Downloading [========> ] 681.8kB/4.188MB + a9986cd6f37d Downloading [=======================> ] 1.978MB/4.188MB + a9986cd6f37d Downloading [=====================================> ] 3.139MB/4.188MB + a9986cd6f37d Verifying Checksum + a9986cd6f37d Download complete + a9986cd6f37d Extracting [> ] 65.54kB/4.188MB + a9986cd6f37d Extracting [==================================================>] 4.188MB/4.188MB + a9986cd6f37d Extracting [==================================================>] 4.188MB/4.188MB + a9986cd6f37d Pull complete + 087ad16c32a3 Extracting [==================================================>] 5.385kB/5.385kB + 087ad16c32a3 Extracting [==================================================>] 5.385kB/5.385kB + 087ad16c32a3 Pull complete + 2fd12311ced1 Downloading [==================================================>] 949B/949B + 2fd12311ced1 Verifying Checksum + 2fd12311ced1 Download complete + 2fd12311ced1 Extracting [==================================================>] 949B/949B + 2fd12311ced1 Extracting [==================================================>] 949B/949B + 2fd12311ced1 Pull complete + b5dc67959819 Downloading [> ] 530.6kB/69.77MB + b5dc67959819 Downloading [=> ] 1.594MB/69.77MB + b5dc67959819 Downloading [==> ] 3.2MB/69.77MB + b5dc67959819 Downloading [===> ] 4.806MB/69.77MB + b5dc67959819 Downloading [====> ] 6.942MB/69.77MB + b5dc67959819 Downloading [======> ] 8.536MB/69.77MB + b5dc67959819 Downloading [======> ] 9.617MB/69.77MB + b5dc67959819 Downloading [========> ] 11.23MB/69.77MB + b5dc67959819 Downloading [=========> ] 12.84MB/69.77MB + b5dc67959819 Downloading [==========> ] 14.45MB/69.77MB + b5dc67959819 Downloading [===========> ] 15.52MB/69.77MB + b5dc67959819 Downloading [============> ] 17.13MB/69.77MB + b5dc67959819 Downloading [=============> ] 18.73MB/69.77MB + b5dc67959819 Downloading [==============> ] 19.8MB/69.77MB + b5dc67959819 Downloading [===============> ] 21.95MB/69.77MB + 79e1023ff1ff Downloading [==================================================>] 144B/144B + 79e1023ff1ff Download complete + b5dc67959819 Downloading [================> ] 23.01MB/69.77MB + b5dc67959819 Downloading [================> ] 23.54MB/69.77MB + b5dc67959819 Downloading [==================> ] 25.67MB/69.77MB + b5dc67959819 Downloading [==================> ] 26.19MB/69.77MB + b5dc67959819 Downloading [===================> ] 27.78MB/69.77MB + b5dc67959819 Downloading [====================> ] 28.86MB/69.77MB + b5dc67959819 Downloading [=====================> ] 29.91MB/69.77MB + b5dc67959819 Downloading [======================> ] 30.98MB/69.77MB + b5dc67959819 Downloading [======================> ] 32.05MB/69.77MB + b5dc67959819 Downloading [=======================> ] 33.11MB/69.77MB + b5dc67959819 Downloading [========================> ] 34.73MB/69.77MB + b5dc67959819 Downloading [==========================> ] 36.33MB/69.77MB + b5dc67959819 Downloading [==========================> ] 37.39MB/69.77MB + b5dc67959819 Downloading [===========================> ] 38.45MB/69.77MB + b5dc67959819 Downloading [============================> ] 40.04MB/69.77MB + b5dc67959819 Downloading [=============================> ] 41.65MB/69.77MB + b5dc67959819 Downloading [==============================> ] 43.26MB/69.77MB + b5dc67959819 Downloading [===============================> ] 44.32MB/69.77MB + b5dc67959819 Downloading [================================> ] 45.92MB/69.77MB + b5dc67959819 Downloading [==================================> ] 47.52MB/69.77MB + b5dc67959819 Downloading [==================================> ] 48.58MB/69.77MB + b5dc67959819 Downloading [====================================> ] 50.71MB/69.77MB + b5dc67959819 Downloading [=====================================> ] 52.31MB/69.77MB + b5dc67959819 Downloading [======================================> ] 53.92MB/69.77MB + b5dc67959819 Downloading [=======================================> ] 54.98MB/69.77MB + b5dc67959819 Downloading [========================================> ] 56.57MB/69.77MB + b5dc67959819 Downloading [=========================================> ] 58.17MB/69.77MB + b5dc67959819 Downloading [==========================================> ] 58.7MB/69.77MB + b5dc67959819 Downloading [===========================================> ] 60.29MB/69.77MB + b5dc67959819 Downloading [===========================================> ] 61.35MB/69.77MB + b5dc67959819 Downloading [=============================================> ] 62.95MB/69.77MB + b5dc67959819 Downloading [=============================================> ] 64.02MB/69.77MB + b5dc67959819 Downloading [===============================================> ] 65.63MB/69.77MB + b5dc67959819 Downloading [===============================================> ] 66.71MB/69.77MB + b5dc67959819 Downloading [================================================> ] 68.33MB/69.77MB + b5dc67959819 Downloading [=================================================> ] 69.41MB/69.77MB + b5dc67959819 Verifying Checksum + b5dc67959819 Download complete + 8fa892af5a09 Downloading [========================================> ] 1.378kB/1.685kB + 8fa892af5a09 Downloading [==================================================>] 1.685kB/1.685kB + 8fa892af5a09 Verifying Checksum + 8fa892af5a09 Download complete + 9b8f4f0bc0a4 Downloading [==================================================>] 156B/156B + 9b8f4f0bc0a4 Verifying Checksum + 9b8f4f0bc0a4 Download complete + 722a749714e9 Downloading 539.4kB + 722a749714e9 Download complete + 722a749714e9 Extracting 557.1kB + 722a749714e9 Extracting 562.3kB + 722a749714e9 Pull complete + b5dc67959819 Extracting [> ] 557.1kB/69.77MB + b5dc67959819 Extracting [========> ] 12.26MB/69.77MB + b5dc67959819 Extracting [===============> ] 21.17MB/69.77MB + b5dc67959819 Extracting [=====================> ] 30.08MB/69.77MB + b5dc67959819 Extracting [===========================> ] 38.44MB/69.77MB + b5dc67959819 Extracting [==============================================> ] 64.62MB/69.77MB + b5dc67959819 Extracting [==================================================>] 69.77MB/69.77MB + b5dc67959819 Pull complete + 79e1023ff1ff Extracting [==================================================>] 144B/144B + 79e1023ff1ff Extracting [==================================================>] 144B/144B + 79e1023ff1ff Pull complete + 9b8f4f0bc0a4 Extracting [==================================================>] 156B/156B + 9b8f4f0bc0a4 Extracting [==================================================>] 156B/156B + 9b8f4f0bc0a4 Pull complete + 8fa892af5a09 Extracting [==================================================>] 1.685kB/1.685kB + 8fa892af5a09 Extracting [==================================================>] 1.685kB/1.685kB + 8fa892af5a09 Pull complete + Image ghcr.io/openbao/openbao:2.7.1 Pulled + Volume mtusi-lab7_baodata Creating + Volume mtusi-lab7_baodata Created + Container mtusi-lab7-openbao-1 Creating + Container mtusi-lab7-openbao-1 Created + Container mtusi-lab7-openbao-1 Starting + Container mtusi-lab7-openbao-1 Started diff --git a/evidence/build.txt b/evidence/build.txt new file mode 100644 index 0000000..63624e5 --- /dev/null +++ b/evidence/build.txt @@ -0,0 +1,370 @@ + Image mtusi-lab7-tempo-tls Building + Image mtusi-lab7-s3-init Building + Image mtusi-lab7-otel-collector-tls Building + Image mtusi-lab7-loki-tls Building + Image mtusi-lab7-worker Building + Image mtusi-lab7-prometheus-tls Building + Image mtusi-lab7-dispatcher Building + Image mtusi-lab7-grafana-tls Building + Image mtusi-lab7-migrate Building + Image mtusi-lab7-api Building + Image mtusi-lab7-s3-tls Building +#1 [internal] load local bake definitions +#1 reading from stdin 5.56kB done +#1 DONE 0.0s + +#2 [worker internal] load build definition from Dockerfile +#2 transferring dockerfile: 245B done +#2 DONE 0.0s + +#3 [tempo-tls internal] load build definition from Dockerfile +#3 transferring dockerfile: 153B done +#3 DONE 0.0s + +#4 [s3-init internal] load build definition from Dockerfile +#4 transferring dockerfile: 6.11kB done +#4 DONE 0.0s + +#5 [loki-tls internal] load metadata for docker.io/library/python:3.13.9-alpine3.22 +#5 ... + +#6 [api] resolve image config for docker-image://docker.io/docker/dockerfile:1.7 +#6 DONE 1.2s + +#7 [api] docker-image://docker.io/docker/dockerfile:1.7@sha256:a57df69d0ea827fb7266491f2813635de6f17269be881f696fbfdf2d83dda33e +#7 CACHED + +#8 [dispatcher internal] load metadata for docker.io/library/python:3.13.9-slim +#8 DONE 1.2s + +#9 [dispatcher internal] load .dockerignore +#9 transferring context: 205B done +#9 DONE 0.0s + +#10 [dispatcher 1/5] FROM docker.io/library/python:3.13.9-slim@sha256:326df678c20c78d465db501563f3492d17c42a4afe33a1f2bf5406a1d56b0e86 +#10 DONE 0.0s + +#11 [dispatcher internal] load build context +#11 transferring context: 20.24kB done +#11 DONE 0.0s + +#12 [worker 3/5] COPY worker/requirements.txt . +#12 CACHED + +#13 [worker 2/5] WORKDIR /app +#13 CACHED + +#14 [worker 4/5] RUN pip install --no-cache-dir -r requirements.txt +#14 CACHED + +#15 [worker 5/5] COPY worker/main.py worker/telemetry.py ./ +#15 DONE 0.0s + +#16 [api internal] load build definition from Dockerfile +#16 transferring dockerfile: 6.11kB done +#16 DONE 0.0s + +#17 [migrate internal] load build definition from Dockerfile +#17 transferring dockerfile: 6.11kB done +#17 DONE 0.0s + +#18 [s3-init internal] load build definition from Dockerfile +#18 transferring dockerfile: 6.11kB done +#18 DONE 0.0s + +#19 [migrate internal] load metadata for docker.io/library/golang:1.26.10-alpine3.24 +#19 DONE 0.0s + +#20 [worker] exporting to image +#20 exporting layers done +#20 writing image sha256:646af759340748f17112bd5e8abf26c80c507cdfc809df7313194f2d1d882fe0 done +#20 naming to docker.io/library/mtusi-lab7-worker done +#20 DONE 0.0s + +#21 [dispatcher] exporting to image +#21 exporting layers done +#21 writing image sha256:156b1941c7de003c64eeeeb0dce1bd831e58e9b7040d742ae21ee915cd1f0351 done +#21 naming to docker.io/library/mtusi-lab7-dispatcher done +#21 DONE 0.0s + +#22 [worker] resolving provenance for metadata file +#22 DONE 0.0s + +#23 [dispatcher] resolving provenance for metadata file +#23 DONE 0.0s + +#24 [migrate internal] load metadata for docker.io/library/alpine:3.24.3 +#24 ... + +#5 [loki-tls internal] load metadata for docker.io/library/python:3.13.9-alpine3.22 +#5 DONE 2.0s + +#25 [tempo-tls internal] load .dockerignore +#25 transferring context: 2B done +#25 DONE 0.0s + +#26 [grafana-tls internal] load build context +#26 transferring context: 3.38kB done +#26 DONE 0.0s + +#27 [grafana-tls 1/2] FROM docker.io/library/python:3.13.9-alpine3.22@sha256:e5fa639e49b85986c4481e28faa2564b45aa8021413f31026c3856e5911618b1 +#27 resolve docker.io/library/python:3.13.9-alpine3.22@sha256:e5fa639e49b85986c4481e28faa2564b45aa8021413f31026c3856e5911618b1 done +#27 sha256:052cb92092122a08c5f6bc22c9983b9bab843e9790a99e69e867e460d7346571 5.20kB / 5.20kB done +#27 sha256:71263fa570a63eb3dfff44620561237a401f3196cb998cefa48b23c32c0f4abf 0B / 459.01kB 0.3s +#27 sha256:69e82d8615442035e9072f7ebebbfdc82f06194b454d313168e5ff21f02bcb14 0B / 12.39MB 0.3s +#27 sha256:a365b55c38e78952efffd43d7cd4a850e08c2651eee738ae437bb5e8599df70f 0B / 248B 0.3s +#27 sha256:e5fa639e49b85986c4481e28faa2564b45aa8021413f31026c3856e5911618b1 10.29kB / 10.29kB done +#27 sha256:07e9547c0152615145df9d44c1e6ac36bc8c22240e717fa5944877775769d3da 1.74kB / 1.74kB done +#27 ... + +#24 [migrate internal] load metadata for docker.io/library/alpine:3.24.3 +#24 DONE 1.1s + +#28 [migrate internal] load .dockerignore +#28 transferring context: 205B done +#28 DONE 0.0s + +#29 [s3-init internal] load .dockerignore +#29 transferring context: 205B done +#29 DONE 0.0s + +#30 [api internal] load .dockerignore +#30 transferring context: 205B done +#30 DONE 0.0s + +#31 [migrate builder 1/10] FROM docker.io/library/golang:1.26.10-alpine3.24 +#31 DONE 0.0s + +#32 [migrate api 1/4] FROM docker.io/library/alpine:3.24.3@sha256:be2656061b536c1883c4034790e21d0a09c5aaaf51968b89368a3c0371ea2c9a +#32 CACHED + +#33 [migrate internal] load build context +#33 transferring context: 16.68kB done +#33 DONE 0.0s + +#27 [grafana-tls 1/2] FROM docker.io/library/python:3.13.9-alpine3.22@sha256:e5fa639e49b85986c4481e28faa2564b45aa8021413f31026c3856e5911618b1 +#27 sha256:71263fa570a63eb3dfff44620561237a401f3196cb998cefa48b23c32c0f4abf 459.01kB / 459.01kB 0.3s done +#27 sha256:a365b55c38e78952efffd43d7cd4a850e08c2651eee738ae437bb5e8599df70f 248B / 248B 0.3s done +#27 extracting sha256:71263fa570a63eb3dfff44620561237a401f3196cb998cefa48b23c32c0f4abf +#27 ... + +#34 [api internal] load build context +#34 transferring context: 365.23kB 0.0s done +#34 DONE 0.0s + +#35 [s3-init internal] load build context +#35 transferring context: 365.23kB 0.0s done +#35 DONE 0.0s + +#36 [migrate goose-builder 2/2] RUN CGO_ENABLED=0 go install -trimpath -ldflags="-s -w" -tags='no_clickhouse no_libsql no_mssql no_mysql no_sqlite3 no_vertica no_ydb' github.com/pressly/goose/v3/cmd/goose@v3.26.0 +#36 CACHED + +#37 [migrate migrate 2/3] COPY --from=goose-builder /go/bin/goose /usr/local/bin/goose +#37 CACHED + +#38 [api builder 2/10] WORKDIR /src +#38 CACHED + +#39 [api builder 3/10] COPY app/go.mod app/go.sum ./ +#39 CACHED + +#40 [s3-init builder 4/10] RUN go mod download +#40 CACHED + +#41 [migrate migrate 3/3] COPY migrations /migrations +#41 DONE 0.0s + +#42 [s3-init builder 5/10] COPY app/ ./ +#42 DONE 0.0s + +#43 [migrate] exporting to image +#43 exporting layers 0.0s done +#43 writing image sha256:5e7936855def30cca4cae9d2349fba90d47233d89c716152e804b014f912065d done +#43 naming to docker.io/library/mtusi-lab7-migrate done +#43 DONE 0.0s + +#44 [migrate] resolving provenance for metadata file +#44 DONE 0.0s + +#27 [grafana-tls 1/2] FROM docker.io/library/python:3.13.9-alpine3.22@sha256:e5fa639e49b85986c4481e28faa2564b45aa8021413f31026c3856e5911618b1 +#27 sha256:69e82d8615442035e9072f7ebebbfdc82f06194b454d313168e5ff21f02bcb14 1.05MB / 12.39MB 0.5s +#27 extracting sha256:71263fa570a63eb3dfff44620561237a401f3196cb998cefa48b23c32c0f4abf 0.1s done +#27 sha256:69e82d8615442035e9072f7ebebbfdc82f06194b454d313168e5ff21f02bcb14 3.15MB / 12.39MB 0.7s +#27 sha256:69e82d8615442035e9072f7ebebbfdc82f06194b454d313168e5ff21f02bcb14 4.19MB / 12.39MB 0.8s +#27 sha256:69e82d8615442035e9072f7ebebbfdc82f06194b454d313168e5ff21f02bcb14 6.29MB / 12.39MB 1.0s +#27 sha256:69e82d8615442035e9072f7ebebbfdc82f06194b454d313168e5ff21f02bcb14 7.34MB / 12.39MB 1.1s +#27 sha256:69e82d8615442035e9072f7ebebbfdc82f06194b454d313168e5ff21f02bcb14 9.44MB / 12.39MB 1.3s +#27 sha256:69e82d8615442035e9072f7ebebbfdc82f06194b454d313168e5ff21f02bcb14 11.53MB / 12.39MB 1.5s +#27 sha256:69e82d8615442035e9072f7ebebbfdc82f06194b454d313168e5ff21f02bcb14 12.39MB / 12.39MB 1.5s done +#27 extracting sha256:69e82d8615442035e9072f7ebebbfdc82f06194b454d313168e5ff21f02bcb14 +#27 sha256:69e82d8615442035e9072f7ebebbfdc82f06194b454d313168e5ff21f02bcb14 12.39MB / 12.39MB 1.5s done +#27 extracting sha256:69e82d8615442035e9072f7ebebbfdc82f06194b454d313168e5ff21f02bcb14 0.6s done +#27 extracting sha256:a365b55c38e78952efffd43d7cd4a850e08c2651eee738ae437bb5e8599df70f done +#27 DONE 2.2s + +#45 [s3-tls 2/2] COPY runtime.py /runtime.py +#45 DONE 0.2s + +#46 [grafana-tls] exporting to image +#46 exporting layers 0.1s done +#46 writing image sha256:829e4071360f70c2cebadd4fe2d5a7fbc45be5ee735c12ae0f1d6631589a6699 done +#46 naming to docker.io/library/mtusi-lab7-grafana-tls 0.0s done +#46 DONE 0.1s + +#47 [otel-collector-tls] exporting to image +#47 exporting layers 0.1s done +#47 writing image sha256:649b6882890c1408eae2f2ad6e9e0fa36520be78cbc3474c58d3e5f22409b7b9 done +#47 naming to docker.io/library/mtusi-lab7-otel-collector-tls 0.0s done +#47 DONE 0.1s + +#48 [loki-tls] exporting to image +#48 exporting layers 0.1s done +#48 writing image sha256:87d3c86a10ca61c7ce35814b2231f2b45cc55074954cb531663b8dc583dc9e41 0.0s done +#48 naming to docker.io/library/mtusi-lab7-loki-tls 0.0s done +#48 DONE 0.1s + +#49 [tempo-tls] exporting to image +#49 exporting layers 0.1s done +#49 writing image sha256:9fa0fd3e4c7319b219b621bc0ae760770fa1e33742ca68424da7390f12331f1c done +#49 naming to docker.io/library/mtusi-lab7-tempo-tls 0.0s done +#49 DONE 0.2s + +#50 [prometheus-tls] exporting to image +#50 exporting layers 0.1s done +#50 writing image sha256:32dfabeb1a4fd3002b43d1266dbfd65cb04a68457a78a7ec06a1fef585bcea8d 0.1s done +#50 naming to docker.io/library/mtusi-lab7-prometheus-tls 0.0s done +#50 DONE 0.2s + +#51 [s3-tls] exporting to image +#51 exporting layers 0.1s done +#51 writing image sha256:88b89df08370a6b034074dcf27da5d9300afbfbcd07a494a1eaa7ee14b8ecc98 0.0s done +#51 naming to docker.io/library/mtusi-lab7-s3-tls 0.0s done +#51 DONE 0.2s + +#52 [otel-collector-tls] resolving provenance for metadata file +#52 DONE 0.1s + +#53 [grafana-tls] resolving provenance for metadata file +#53 DONE 0.1s + +#54 [s3-tls] resolving provenance for metadata file +#54 DONE 0.1s + +#55 [tempo-tls] resolving provenance for metadata file +#55 DONE 0.0s + +#56 [loki-tls] resolving provenance for metadata file +#56 DONE 0.1s + +#57 [prometheus-tls] resolving provenance for metadata file +#57 DONE 0.0s + +#58 [s3-init builder 6/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/messenger ./cmd/messenger +#58 ... + +#59 [api api 2/4] RUN apk add --no-cache ca-certificates python3 && addgroup -S app && adduser -S -G app -H app +#59 6.511 ( 1/18) Installing ca-certificates (20261020-r0) +#59 6.827 ( 2/18) Installing libexpat (2.10.0-r0) +#59 6.870 ( 3/18) Installing libbz2 (1.0.8-r6) +#59 6.905 ( 4/18) Installing libffi (3.5.2-r1) +#59 6.936 ( 5/18) Installing gdbm (1.26-r0) +#59 7.013 ( 6/18) Installing xz-libs (5.8.4-r0) +#59 7.065 ( 7/18) Installing libgcc (15.2.0-r5) +#59 7.263 ( 8/18) Installing libstdc++ (15.2.0-r5) +#59 7.484 ( 9/18) Installing mpdecimal (4.0.1-r0) +#59 7.524 (10/18) Installing ncurses-terminfo-base (6.6_p20260516-r0) +#59 7.556 (11/18) Installing libncursesw (6.6_p20260516-r0) +#59 7.713 (12/18) Installing libpanelw (6.6_p20260516-r0) +#59 7.745 (13/18) Installing readline (8.3.3-r1) +#59 7.787 (14/18) Installing sqlite-libs (3.53.4-r0) +#59 7.891 (15/18) Installing python3 (3.14.10-r1) +#59 8.653 (16/18) Installing python3-pycache-pyc0 (3.14.10-r1) +#59 9.085 (17/18) Installing pyc (3.14.10-r1) +#59 9.085 (18/18) Installing python3-pyc (3.14.10-r1) +#59 9.085 Executing busybox-1.37.0-r31.trigger +#59 9.089 Executing ca-certificates-20261020-r0.trigger +#59 9.111 OK: 50.8 MiB in 34 packages +#59 DONE 9.4s + +#58 [s3-init builder 6/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/messenger ./cmd/messenger +#58 ... + +#60 [api api 3/4] WORKDIR /app +#60 DONE 0.0s + +#58 [s3-init builder 6/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/messenger ./cmd/messenger +#58 DONE 10.2s + +#61 [api builder 7/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/loadgen ./cmd/loadgen +#61 DONE 0.3s + +#62 [s3-init builder 8/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/s3init ./cmd/s3init +#62 DONE 0.4s + +#63 [api builder 9/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/janitor ./cmd/janitor +#63 DONE 0.6s + +#64 [api builder 10/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/s3check ./cmd/s3check +#64 DONE 0.3s + +#65 [s3-init builder 9/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/janitor ./cmd/janitor +#65 CACHED + +#38 [s3-init builder 2/10] WORKDIR /src +#38 CACHED + +#66 [s3-init builder 3/10] COPY app/go.mod app/go.sum ./ +#66 CACHED + +#67 [s3-init builder 5/10] COPY app/ ./ +#67 CACHED + +#68 [s3-init builder 7/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/loadgen ./cmd/loadgen +#68 CACHED + +#69 [s3-init builder 4/10] RUN go mod download +#69 CACHED + +#70 [s3-init builder 6/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/messenger ./cmd/messenger +#70 CACHED + +#71 [s3-init builder 8/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/s3init ./cmd/s3init +#71 CACHED + +#72 [s3-init builder 10/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/s3check ./cmd/s3check +#72 CACHED + +#73 [s3-init s3init 2/2] COPY --from=builder /out/s3init /usr/local/bin/s3init +#73 DONE 0.0s + +#74 [api api 4/4] COPY --from=builder /out/messenger /app/messenger +#74 DONE 0.1s + +#75 [s3-init] exporting to image +#75 exporting layers 0.0s done +#75 writing image sha256:682f85e614d52b59d4135c6c09b6e58d06b8ef7e27b1361cc56f287ea991ecd1 done +#75 naming to docker.io/library/mtusi-lab7-s3-init done +#75 DONE 0.1s + +#76 [s3-init] resolving provenance for metadata file +#76 DONE 0.0s + +#77 [api] exporting to image +#77 exporting layers 0.1s done +#77 writing image sha256:eb47500c0f9636437d8e554977852e9cea343fc60e3732578b89328b32874cb7 done +#77 naming to docker.io/library/mtusi-lab7-api done +#77 DONE 0.1s + +#78 [api] resolving provenance for metadata file +#78 DONE 0.0s + Image mtusi-lab7-s3-init Built + Image mtusi-lab7-s3-tls Built + Image mtusi-lab7-tempo-tls Built + Image mtusi-lab7-api Built + Image mtusi-lab7-dispatcher Built + Image mtusi-lab7-loki-tls Built + Image mtusi-lab7-prometheus-tls Built + Image mtusi-lab7-grafana-tls Built + Image mtusi-lab7-migrate Built + Image mtusi-lab7-worker Built + Image mtusi-lab7-otel-collector-tls Built diff --git a/evidence/check.txt b/evidence/check.txt new file mode 100644 index 0000000..9a55330 --- /dev/null +++ b/evidence/check.txt @@ -0,0 +1,2 @@ +python3 scripts/check_contract.py +PASS: offline skeleton structure, local refs and Python syntax; application NOT tested. diff --git a/evidence/dependencies.txt b/evidence/dependencies.txt new file mode 100644 index 0000000..bc81634 --- /dev/null +++ b/evidence/dependencies.txt @@ -0,0 +1,54 @@ + Network mtusi-lab7_default Creating + Network mtusi-lab7_default Created + Volume mtusi-lab7_prometheusdata Creating + Volume mtusi-lab7_prometheusdata Created + Volume mtusi-lab7_s3data Creating + Volume mtusi-lab7_s3data Created + Volume mtusi-lab7_tempodata Creating + Volume mtusi-lab7_tempodata Created + Volume mtusi-lab7_valkeydata Creating + Volume mtusi-lab7_valkeydata Created + Volume mtusi-lab7_lokidata Creating + Volume mtusi-lab7_lokidata Created + Volume mtusi-lab7_grafanadata Creating + Volume mtusi-lab7_grafanadata Created + Volume mtusi-lab7_pgdata Creating + Volume mtusi-lab7_pgdata Created + Volume mtusi-lab7_brokerdata Creating + Volume mtusi-lab7_brokerdata Created + Container mtusi-lab7-grafana-1 Creating + Container mtusi-lab7-loki-1 Creating + Container mtusi-lab7-postgres-1 Creating + Container mtusi-lab7-s3-1 Creating + Container mtusi-lab7-otel-collector-1 Creating + Container mtusi-lab7-valkey-1 Creating + Container mtusi-lab7-prometheus-1 Creating + Container mtusi-lab7-broker-1 Creating + Container mtusi-lab7-tempo-1 Creating + Container mtusi-lab7-prometheus-1 Created + Container mtusi-lab7-otel-collector-1 Created + Container mtusi-lab7-tempo-1 Created + Container mtusi-lab7-postgres-1 Created + Container mtusi-lab7-loki-1 Created + Container mtusi-lab7-grafana-1 Created + Container mtusi-lab7-s3-1 Created + Container mtusi-lab7-broker-1 Created + Container mtusi-lab7-valkey-1 Created + Container mtusi-lab7-valkey-1 Starting + Container mtusi-lab7-loki-1 Starting + Container mtusi-lab7-otel-collector-1 Starting + Container mtusi-lab7-grafana-1 Starting + Container mtusi-lab7-broker-1 Starting + Container mtusi-lab7-s3-1 Starting + Container mtusi-lab7-prometheus-1 Starting + Container mtusi-lab7-postgres-1 Starting + Container mtusi-lab7-tempo-1 Starting + Container mtusi-lab7-otel-collector-1 Started + Container mtusi-lab7-prometheus-1 Started + Container mtusi-lab7-loki-1 Started + Container mtusi-lab7-broker-1 Started + Container mtusi-lab7-postgres-1 Started + Container mtusi-lab7-tempo-1 Started + Container mtusi-lab7-s3-1 Started + Container mtusi-lab7-valkey-1 Started +Error response from daemon: failed to set up container networking: driver failed programming external connectivity on endpoint mtusi-lab7-grafana-1 (aee6db172b062c6596d29714050a403955179257b91d78e95ba5d6738944eb0c): Bind for 127.0.0.1:3000 failed: port is already allocated diff --git a/evidence/external-security.txt b/evidence/external-security.txt new file mode 100644 index 0000000..581edd8 --- /dev/null +++ b/evidence/external-security.txt @@ -0,0 +1,2 @@ +PASS login rate limit: 429 with Retry-After +PASS JSON request size limit: 413 diff --git a/evidence/failover-1.txt b/evidence/failover-1.txt new file mode 100644 index 0000000..eaec7b3 --- /dev/null +++ b/evidence/failover-1.txt @@ -0,0 +1,4 @@ +python3 tests/resilience.py --mode failover --action-script "scripts/stop-one.sh" --base-url "https://localhost:8443" --ca-file "/Users/relationskatie/Downloads/mtusi2026lab7/secrets/ca.crt" +Executing explicit failover hook; hook output suppressed to avoid leaking secrets. +{"observed_instances_before": 2, "successful_writes": 128, "failed_attempts": 0, "first_recovery_seconds": 3.591} +PASS: failover preserved confirmed data and existing session. Hook scope needs operator evidence. diff --git a/evidence/failover-2.txt b/evidence/failover-2.txt new file mode 100644 index 0000000..8eb00c6 --- /dev/null +++ b/evidence/failover-2.txt @@ -0,0 +1,4 @@ +python3 tests/resilience.py --mode failover --action-script "scripts/stop-one.sh" --base-url "https://localhost:8443" --ca-file "/Users/relationskatie/Downloads/mtusi2026lab7/secrets/ca.crt" +Executing explicit failover hook; hook output suppressed to avoid leaking secrets. +{"observed_instances_before": 2, "successful_writes": 128, "failed_attempts": 0, "first_recovery_seconds": 3.421} +PASS: failover preserved confirmed data and existing session. Hook scope needs operator evidence. diff --git a/evidence/failover-each.txt b/evidence/failover-each.txt new file mode 100644 index 0000000..cab8bb9 --- /dev/null +++ b/evidence/failover-each.txt @@ -0,0 +1,3 @@ +PASS stopped /mtusi-lab7-api-1 confirmed data/session preserved; recovery_seconds 3.367 +PASS stopped /mtusi-lab7-api-2 confirmed data/session preserved; recovery_seconds 3.39 +PASS both distinct API containers stopped in sequence and restored diff --git a/evidence/failover-stopped.txt b/evidence/failover-stopped.txt new file mode 100644 index 0000000..01eaf7a --- /dev/null +++ b/evidence/failover-stopped.txt @@ -0,0 +1,6 @@ +/mtusi-lab7-api-1 +/mtusi-lab7-api-1 +/mtusi-lab7-api-1 +/mtusi-lab7-api-2 +/mtusi-lab7-api-1 +/mtusi-lab7-api-2 diff --git a/evidence/final-build.txt b/evidence/final-build.txt new file mode 100644 index 0000000..43646bb --- /dev/null +++ b/evidence/final-build.txt @@ -0,0 +1,308 @@ + Image mtusi-lab7-s3-init Building + Image mtusi-lab7-otel-collector-tls Building + Image mtusi-lab7-worker Building + Image mtusi-lab7-dispatcher Building + Image mtusi-lab7-prometheus-tls Building + Image mtusi-lab7-grafana-tls Building + Image mtusi-lab7-api Building + Image mtusi-lab7-s3-tls Building + Image mtusi-lab7-migrate Building + Image mtusi-lab7-tempo-tls Building + Image mtusi-lab7-loki-tls Building +#1 [internal] load local bake definitions +#1 reading from stdin 5.56kB done +#1 DONE 0.0s + +#2 [s3-tls internal] load build definition from Dockerfile +#2 transferring dockerfile: 153B done +#2 DONE 0.0s + +#3 [dispatcher internal] load build definition from Dockerfile +#3 transferring dockerfile: 245B done +#3 DONE 0.0s + +#4 [api internal] load build definition from Dockerfile +#4 transferring dockerfile: 6.11kB done +#4 DONE 0.0s + +#5 [grafana-tls internal] load metadata for docker.io/library/python:3.13.9-alpine3.22 +#5 DONE 1.0s + +#6 [grafana-tls internal] load .dockerignore +#6 transferring context: 2B done +#6 DONE 0.0s + +#7 [otel-collector-tls internal] load build context +#7 transferring context: 4.12kB done +#7 DONE 0.0s + +#8 [s3-tls 1/2] FROM docker.io/library/python:3.13.9-alpine3.22@sha256:e5fa639e49b85986c4481e28faa2564b45aa8021413f31026c3856e5911618b1 +#8 CACHED + +#9 [grafana-tls 2/2] COPY runtime.py /runtime.py +#9 DONE 0.0s + +#10 [loki-tls] exporting to image +#10 exporting layers done +#10 writing image sha256:18d7f8c00d7591dda73d7e26e4a01ab91c440f5ecaefa56c156963a1782c8d76 done +#10 naming to docker.io/library/mtusi-lab7-loki-tls done +#10 DONE 0.0s + +#11 [prometheus-tls] exporting to image +#11 exporting layers done +#11 writing image sha256:5a879e11437b0a1911cdea05138c0f5fb820b4c3fbf663460e35f1e15a9164f3 done +#11 naming to docker.io/library/mtusi-lab7-prometheus-tls done +#11 DONE 0.0s + +#12 [grafana-tls] exporting to image +#12 exporting layers done +#12 writing image sha256:39e5b8d28162256ce731fb6a98a117659dd7e2387b1e20eaa8cedee1ac724c8e done +#12 naming to docker.io/library/mtusi-lab7-grafana-tls 0.0s done +#12 DONE 0.0s + +#13 [s3-tls] exporting to image +#13 exporting layers done +#13 writing image sha256:94bcb6411db3e58e5fdcc4d1bf333497970934ced241584230d8f179460457b0 done +#13 naming to docker.io/library/mtusi-lab7-s3-tls done +#13 DONE 0.0s + +#14 [tempo-tls] exporting to image +#14 exporting layers done +#14 writing image sha256:10d2dd8b06a5be49deb21708ecc82bc76f7bb51b12352cf5bb6cc8af2aeec5be done +#14 naming to docker.io/library/mtusi-lab7-tempo-tls done +#14 DONE 0.0s + +#15 [otel-collector-tls] exporting to image +#15 exporting layers done +#15 writing image sha256:28a7184acd6a99c1d0c3f75a2bb20b924394994c94966602a80d46048b4f4a1e done +#15 naming to docker.io/library/mtusi-lab7-otel-collector-tls done +#15 DONE 0.0s + +#16 [worker internal] load metadata for docker.io/library/python:3.13.9-slim +#16 DONE 1.2s + +#17 [dispatcher internal] load .dockerignore +#17 transferring context: 205B done +#17 DONE 0.0s + +#18 [dispatcher 1/5] FROM docker.io/library/python:3.13.9-slim@sha256:326df678c20c78d465db501563f3492d17c42a4afe33a1f2bf5406a1d56b0e86 +#18 DONE 0.0s + +#19 [dispatcher internal] load build context +#19 transferring context: 20.24kB done +#19 DONE 0.0s + +#20 [dispatcher 4/5] RUN pip install --no-cache-dir -r requirements.txt +#20 CACHED + +#21 [dispatcher 2/5] WORKDIR /app +#21 CACHED + +#22 [dispatcher 3/5] COPY worker/requirements.txt . +#22 CACHED + +#23 [dispatcher 5/5] COPY worker/main.py worker/telemetry.py ./ +#23 CACHED + +#24 [worker] exporting to image +#24 exporting layers done +#24 writing image sha256:646af759340748f17112bd5e8abf26c80c507cdfc809df7313194f2d1d882fe0 done +#24 naming to docker.io/library/mtusi-lab7-worker done +#24 DONE 0.0s + +#25 [dispatcher] exporting to image +#25 exporting layers done +#25 writing image sha256:156b1941c7de003c64eeeeb0dce1bd831e58e9b7040d742ae21ee915cd1f0351 done +#25 naming to docker.io/library/mtusi-lab7-dispatcher done +#25 DONE 0.0s + +#26 [loki-tls] resolving provenance for metadata file +#26 DONE 0.1s + +#27 [prometheus-tls] resolving provenance for metadata file +#27 DONE 0.1s + +#28 [tempo-tls] resolving provenance for metadata file +#28 DONE 0.0s + +#29 [s3-tls] resolving provenance for metadata file +#29 DONE 0.0s + +#30 [dispatcher] resolving provenance for metadata file +#30 DONE 0.0s + +#31 [worker] resolving provenance for metadata file +#31 DONE 0.0s + +#32 [grafana-tls] resolving provenance for metadata file +#32 DONE 0.0s + +#33 [otel-collector-tls] resolving provenance for metadata file +#33 DONE 0.1s + +#34 [s3-init] resolve image config for docker-image://docker.io/docker/dockerfile:1.7 +#34 DONE 1.4s + +#35 [api] docker-image://docker.io/docker/dockerfile:1.7@sha256:a57df69d0ea827fb7266491f2813635de6f17269be881f696fbfdf2d83dda33e +#35 CACHED + +#36 [s3-init internal] load build definition from Dockerfile +#36 transferring dockerfile: 6.11kB done +#36 DONE 0.0s + +#37 [api internal] load build definition from Dockerfile +#37 transferring dockerfile: 6.11kB done +#37 DONE 0.0s + +#38 [migrate internal] load build definition from Dockerfile +#38 transferring dockerfile: 6.11kB done +#38 DONE 0.0s + +#39 [api internal] load metadata for docker.io/library/golang:1.26.10-alpine3.24 +#39 DONE 0.0s + +#40 [api internal] load metadata for docker.io/library/alpine:3.24.3 +#40 DONE 1.2s + +#41 [migrate internal] load .dockerignore +#41 transferring context: 205B done +#41 DONE 0.0s + +#42 [s3-init internal] load .dockerignore +#42 transferring context: 205B done +#42 DONE 0.0s + +#43 [api internal] load .dockerignore +#43 transferring context: 205B done +#43 DONE 0.0s + +#44 [migrate builder 1/10] FROM docker.io/library/golang:1.26.10-alpine3.24 +#44 DONE 0.0s + +#45 [migrate api 1/4] FROM docker.io/library/alpine:3.24.3@sha256:be2656061b536c1883c4034790e21d0a09c5aaaf51968b89368a3c0371ea2c9a +#45 DONE 0.0s + +#46 [migrate internal] load build context +#46 transferring context: 714B done +#46 DONE 0.0s + +#47 [s3-init internal] load build context +#47 transferring context: 6.94kB done +#47 DONE 0.0s + +#48 [migrate migrate 2/3] COPY --from=goose-builder /go/bin/goose /usr/local/bin/goose +#48 CACHED + +#49 [migrate goose-builder 2/2] RUN CGO_ENABLED=0 go install -trimpath -ldflags="-s -w" -tags='no_clickhouse no_libsql no_mssql no_mysql no_sqlite3 no_vertica no_ydb' github.com/pressly/goose/v3/cmd/goose@v3.26.0 +#49 CACHED + +#50 [migrate migrate 3/3] COPY migrations /migrations +#50 CACHED + +#51 [api internal] load build context +#51 transferring context: 365.74kB 0.0s done +#51 DONE 0.0s + +#52 [migrate] exporting to image +#52 exporting layers done +#52 writing image sha256:5029f398f8f660439658cf21dd630285bc75c52e163feb3f5f52a6e0bccf3d49 done +#52 naming to docker.io/library/mtusi-lab7-migrate done +#52 DONE 0.0s + +#53 [s3-init builder 2/10] WORKDIR /src +#53 CACHED + +#54 [s3-init builder 3/10] COPY app/go.mod app/go.sum ./ +#54 CACHED + +#55 [api builder 4/10] RUN go mod download +#55 CACHED + +#56 [migrate] resolving provenance for metadata file +#56 DONE 0.0s + +#57 [s3-init builder 5/10] COPY app/ ./ +#57 DONE 0.0s + +#58 [s3-init builder 6/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/messenger ./cmd/messenger +#58 DONE 11.2s + +#59 [api builder 7/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/loadgen ./cmd/loadgen +#59 DONE 0.4s + +#60 [s3-init builder 8/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/s3init ./cmd/s3init +#60 DONE 0.6s + +#61 [s3-init builder 9/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/janitor ./cmd/janitor +#61 DONE 0.9s + +#62 [s3-init builder 10/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/s3check ./cmd/s3check +#62 DONE 0.4s + +#63 [s3-init s3init 2/2] COPY --from=builder /out/s3init /usr/local/bin/s3init +#63 CACHED + +#64 [s3-init] exporting to image +#64 exporting layers done +#64 writing image sha256:682f85e614d52b59d4135c6c09b6e58d06b8ef7e27b1361cc56f287ea991ecd1 done +#64 naming to docker.io/library/mtusi-lab7-s3-init done +#64 DONE 0.0s + +#65 [api api 2/4] RUN apk add --no-cache ca-certificates python3 && addgroup -S app && adduser -S -G app -H app +#65 CACHED + +#66 [api builder 5/10] COPY app/ ./ +#66 CACHED + +#67 [api builder 3/10] COPY app/go.mod app/go.sum ./ +#67 CACHED + +#68 [api builder 9/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/janitor ./cmd/janitor +#68 CACHED + +#69 [api builder 10/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/s3check ./cmd/s3check +#69 CACHED + +#70 [api builder 7/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/loadgen ./cmd/loadgen +#70 CACHED + +#71 [api builder 4/10] RUN go mod download +#71 CACHED + +#53 [api builder 2/10] WORKDIR /src +#53 CACHED + +#72 [api builder 6/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/messenger ./cmd/messenger +#72 CACHED + +#73 [api builder 8/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/s3init ./cmd/s3init +#73 CACHED + +#74 [api api 3/4] WORKDIR /app +#74 CACHED + +#75 [api api 4/4] COPY --from=builder /out/messenger /app/messenger +#75 CACHED + +#76 [api] exporting to image +#76 exporting layers done +#76 writing image sha256:60024dd1a09a14d82a899e2c93b58ca878087f7d0d8d3abac828c948073ce857 done +#76 naming to docker.io/library/mtusi-lab7-api done +#76 DONE 0.0s + +#77 [s3-init] resolving provenance for metadata file +#77 DONE 0.0s + +#78 [api] resolving provenance for metadata file +#78 DONE 0.0s + Image mtusi-lab7-s3-init Built + Image mtusi-lab7-prometheus-tls Built + Image mtusi-lab7-s3-tls Built + Image mtusi-lab7-grafana-tls Built + Image mtusi-lab7-otel-collector-tls Built + Image mtusi-lab7-migrate Built + Image mtusi-lab7-tempo-tls Built + Image mtusi-lab7-dispatcher Built + Image mtusi-lab7-worker Built + Image mtusi-lab7-api Built + Image mtusi-lab7-loki-tls Built diff --git a/evidence/final-start.txt b/evidence/final-start.txt new file mode 100644 index 0000000..3f0dc0b --- /dev/null +++ b/evidence/final-start.txt @@ -0,0 +1,133 @@ + Container mtusi-lab7-s3-1 Running + Container mtusi-lab7-loki-1 Running + Container mtusi-lab7-postgres-1 Running + Container mtusi-lab7-otel-collector-1 Recreate + Container mtusi-lab7-broker-1 Running + Container mtusi-lab7-tempo-1 Running + Container mtusi-lab7-grafana-1 Recreate + Container mtusi-lab7-loki-tls-1 Recreate + Container mtusi-lab7-valkey-1 Running + Container mtusi-lab7-tempo-tls-1 Recreate + Container mtusi-lab7-prometheus-1 Recreate + Container mtusi-lab7-openbao-1 Running + Container mtusi-lab7-s3-tls-1 Recreate + Container mtusi-lab7-otel-collector-1 Recreated + Container mtusi-lab7-otel-collector-tls-1 Recreate + Container mtusi-lab7-prometheus-1 Recreated + Container mtusi-lab7-prometheus-tls-1 Recreate + Container mtusi-lab7-grafana-1 Recreated + Container mtusi-lab7-grafana-tls-1 Recreate + Container mtusi-lab7-tempo-tls-1 Recreated + Container mtusi-lab7-s3-tls-1 Recreated + Container mtusi-lab7-s3-gateway-1 Running + Container mtusi-lab7-worker-1 Recreate + Container mtusi-lab7-api-2 Recreate + Container mtusi-lab7-api-1 Recreate + Container mtusi-lab7-dispatcher-1 Recreate + Container mtusi-lab7-loki-tls-1 Recreated + Container mtusi-lab7-otel-collector-tls-1 Recreated + Container mtusi-lab7-prometheus-tls-1 Recreated + Container mtusi-lab7-grafana-tls-1 Recreated + Container mtusi-lab7-dispatcher-1 Recreated + Container mtusi-lab7-worker-1 Recreated + Container mtusi-lab7-api-1 Recreated + Container mtusi-lab7-api-2 Recreated + Container mtusi-lab7-lb-1 Running + Container mtusi-lab7-otel-collector-1 Starting + Container mtusi-lab7-loki-tls-1 Starting + Container mtusi-lab7-tempo-tls-1 Starting + Container mtusi-lab7-postgres-1 Waiting + Container mtusi-lab7-prometheus-1 Starting + Container mtusi-lab7-s3-tls-1 Starting + Container mtusi-lab7-grafana-1 Starting + Container mtusi-lab7-bao-volume-init-1 Starting + Container mtusi-lab7-s3-tls-1 Started + Container mtusi-lab7-s3-init-1 Starting + Container mtusi-lab7-tempo-tls-1 Started + Container mtusi-lab7-loki-tls-1 Started + Container mtusi-lab7-bao-volume-init-1 Started + Container mtusi-lab7-bao-volume-init-1 Waiting + Container mtusi-lab7-grafana-1 Started + Container mtusi-lab7-grafana-tls-1 Starting + Container mtusi-lab7-otel-collector-1 Started + Container mtusi-lab7-otel-collector-tls-1 Starting + Container mtusi-lab7-prometheus-1 Started + Container mtusi-lab7-prometheus-tls-1 Starting + Container mtusi-lab7-s3-init-1 Started + Container mtusi-lab7-prometheus-tls-1 Started + Container mtusi-lab7-otel-collector-tls-1 Started + Container mtusi-lab7-grafana-tls-1 Started + Container mtusi-lab7-postgres-1 Healthy + Container mtusi-lab7-migrate-1 Starting + Container mtusi-lab7-bao-volume-init-1 Exited + Container mtusi-lab7-migrate-1 Started + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-s3-init-1 Waiting + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-s3-init-1 Waiting + Container mtusi-lab7-s3-init-1 Waiting + Container mtusi-lab7-migrate-1 Exited + Container mtusi-lab7-migrate-1 Exited + Container mtusi-lab7-migrate-1 Exited + Container mtusi-lab7-s3-init-1 Exited + Container mtusi-lab7-dispatcher-1 Starting + Container mtusi-lab7-s3-init-1 Exited + Container mtusi-lab7-s3-init-1 Exited + Container mtusi-lab7-worker-1 Starting + Container mtusi-lab7-api-2 Starting + Container mtusi-lab7-api-2 Started + Container mtusi-lab7-api-1 Starting + Container mtusi-lab7-worker-1 Started + Container mtusi-lab7-dispatcher-1 Started + Container mtusi-lab7-api-1 Started + Container mtusi-lab7-otel-collector-1 Waiting + Container mtusi-lab7-postgres-1 Waiting + Container mtusi-lab7-lb-1 Waiting + Container mtusi-lab7-valkey-1 Waiting + Container mtusi-lab7-dispatcher-1 Waiting + Container mtusi-lab7-tempo-tls-1 Waiting + Container mtusi-lab7-grafana-1 Waiting + Container mtusi-lab7-s3-init-1 Waiting + Container mtusi-lab7-s3-1 Waiting + Container mtusi-lab7-broker-1 Waiting + Container mtusi-lab7-prometheus-tls-1 Waiting + Container mtusi-lab7-openbao-1 Waiting + Container mtusi-lab7-loki-1 Waiting + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-s3-gateway-1 Waiting + Container mtusi-lab7-grafana-tls-1 Waiting + Container mtusi-lab7-bao-volume-init-1 Waiting + Container mtusi-lab7-otel-collector-tls-1 Waiting + Container mtusi-lab7-tempo-1 Waiting + Container mtusi-lab7-api-2 Waiting + Container mtusi-lab7-api-1 Waiting + Container mtusi-lab7-loki-tls-1 Waiting + Container mtusi-lab7-s3-tls-1 Waiting + Container mtusi-lab7-prometheus-1 Waiting + Container mtusi-lab7-worker-1 Waiting + Container mtusi-lab7-dispatcher-1 Healthy + Container mtusi-lab7-grafana-tls-1 Healthy + Container mtusi-lab7-prometheus-tls-1 Healthy + Container mtusi-lab7-s3-tls-1 Healthy + Container mtusi-lab7-otel-collector-tls-1 Healthy + Container mtusi-lab7-broker-1 Healthy + Container mtusi-lab7-migrate-1 Exited + Container mtusi-lab7-s3-gateway-1 Healthy + Container mtusi-lab7-openbao-1 Healthy + Container mtusi-lab7-postgres-1 Healthy + Container mtusi-lab7-lb-1 Healthy + Container mtusi-lab7-loki-tls-1 Healthy + Container mtusi-lab7-prometheus-1 Healthy + Container mtusi-lab7-s3-1 Healthy + Container mtusi-lab7-otel-collector-1 Healthy + Container mtusi-lab7-valkey-1 Healthy + Container mtusi-lab7-loki-1 Healthy + Container mtusi-lab7-api-2 Healthy + Container mtusi-lab7-api-1 Healthy + Container mtusi-lab7-tempo-tls-1 Healthy + Container mtusi-lab7-s3-init-1 Exited + Container mtusi-lab7-bao-volume-init-1 Exited + Container mtusi-lab7-tempo-1 Healthy + Container mtusi-lab7-grafana-1 Healthy + Container mtusi-lab7-worker-1 Healthy diff --git a/evidence/gateways.txt b/evidence/gateways.txt new file mode 100644 index 0000000..65424ed --- /dev/null +++ b/evidence/gateways.txt @@ -0,0 +1,33 @@ + Network mtusi-lab7_s3-private Creating + Network mtusi-lab7_s3-private Created + Container mtusi-lab7-grafana-1 Running + Container mtusi-lab7-postgres-1 Running + Container mtusi-lab7-s3-1 Recreate + Container mtusi-lab7-grafana-tls-1 Running + Container mtusi-lab7-s3-1 Recreated + Container mtusi-lab7-s3-tls-1 Recreate + Container mtusi-lab7-s3-tls-1 Recreated + Container mtusi-lab7-s3-gateway-1 Creating + Container mtusi-lab7-s3-gateway-1 Created + Container mtusi-lab7-postgres-1 Waiting + Container mtusi-lab7-s3-1 Starting + Container mtusi-lab7-s3-1 Started + Container mtusi-lab7-s3-tls-1 Starting + Container mtusi-lab7-s3-tls-1 Started + Container mtusi-lab7-s3-gateway-1 Starting + Container mtusi-lab7-s3-gateway-1 Started + Container mtusi-lab7-postgres-1 Healthy + Container mtusi-lab7-migrate-1 Starting + Container mtusi-lab7-migrate-1 Started + Container mtusi-lab7-grafana-1 Waiting + Container mtusi-lab7-s3-tls-1 Waiting + Container mtusi-lab7-s3-1 Waiting + Container mtusi-lab7-grafana-tls-1 Waiting + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-s3-gateway-1 Waiting + Container mtusi-lab7-postgres-1 Waiting + Container mtusi-lab7-s3-tls-1 Healthy + Container mtusi-lab7-grafana-tls-1 Healthy + Container mtusi-lab7-s3-gateway-1 Healthy + Container mtusi-lab7-grafana-1 Healthy +container mtusi-lab7-migrate-1 exited (0) diff --git a/evidence/go-tests.txt b/evidence/go-tests.txt new file mode 100644 index 0000000..a26e955 --- /dev/null +++ b/evidence/go-tests.txt @@ -0,0 +1,24 @@ +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/cmd/janitor [no test files] +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/cmd/loadgen 0.001s +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/cmd/messenger [no test files] +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/cmd/s3check [no test files] +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/cmd/s3init [no test files] +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/e2e 0.002s +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http 2.861s +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/dto 0.001s +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/middleware [no test files] +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/cache 0.819s +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/config 0.002s +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain [no test files] +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/imagecheck 0.002s +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/janitor 0.002s +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/logging [no test files] +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/objectstore [no test files] +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/password 0.002s +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/service 0.002s +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/session [no test files] +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/store [no test files] +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/store/db 0.003s +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/telemetry [no test files] +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/token 0.001s +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/validate 0.001s diff --git a/evidence/hardening.txt b/evidence/hardening.txt new file mode 100644 index 0000000..caba8e9 --- /dev/null +++ b/evidence/hardening.txt @@ -0,0 +1,22 @@ +PASS hardening/resource/port checks: api +PASS hardening/resource/port checks: api +PASS hardening/resource/port checks: broker +PASS hardening/resource/port checks: dispatcher +PASS hardening/resource/port checks: grafana +PASS hardening/resource/port checks: grafana-tls +PASS hardening/resource/port checks: lb +PASS hardening/resource/port checks: loki +PASS hardening/resource/port checks: loki-tls +PASS hardening/resource/port checks: openbao +PASS hardening/resource/port checks: otel-collector +PASS hardening/resource/port checks: otel-collector-tls +PASS hardening/resource/port checks: postgres +PASS hardening/resource/port checks: prometheus +PASS hardening/resource/port checks: prometheus-tls +PASS hardening/resource/port checks: s3 +PASS hardening/resource/port checks: s3-gateway +PASS hardening/resource/port checks: s3-tls +PASS hardening/resource/port checks: tempo +PASS hardening/resource/port checks: tempo-tls +PASS hardening/resource/port checks: valkey +PASS hardening/resource/port checks: worker diff --git a/evidence/internal-security.txt b/evidence/internal-security.txt new file mode 100644 index 0000000..403fd5e --- /dev/null +++ b/evidence/internal-security.txt @@ -0,0 +1,30 @@ +PASS API replica: LB accepted; absent cert, foreign CA, same-CA wrong SAN rejected +PASS API replica: LB accepted; absent cert, foreign CA, same-CA wrong SAN rejected +PASS verified TLS + hostname rejection: valkey:6379 +PASS verified TLS + hostname rejection: broker:6379 +PASS verified TLS + hostname rejection: s3:9443 +PASS verified TLS + hostname rejection: otel-collector:4438 +PASS verified TLS + hostname rejection: otel-collector:8899 +PASS verified TLS + hostname rejection: otel-collector:8898 +PASS verified TLS + hostname rejection: loki:3443 +PASS verified TLS + hostname rejection: tempo:3443 +PASS verified TLS + hostname rejection: tempo:4438 +PASS verified TLS + hostname rejection: prometheus:9443 +PASS verified TLS + hostname rejection: grafana:3443 +PASS verified TLS + hostname rejection: openbao:8200 +PASS telemetry otel-collector: authorized HTTP works; no-cert/foreign/wrong-URI rejected +PASS telemetry loki: authorized HTTP works; no-cert/foreign/wrong-URI rejected +PASS telemetry tempo: authorized HTTP works; no-cert/foreign/wrong-URI rejected +PASS telemetry prometheus: authorized HTTP works; no-cert/foreign/wrong-URI rejected +PASS all declared loopback plaintext hops inaccessible from app network +PASS Bao api: cert auth, TTL, own read, cross-role/admin deny, revoked token deny +PASS Bao worker: cert auth, TTL, own read, cross-role/admin deny, revoked token deny +PASS Bao dispatcher: cert auth, TTL, own read, cross-role/admin deny, revoked token deny +PASS Bao wrong identity cannot authenticate as API +PASS DB api: TLS verified and least-privilege DDL/password isolation +PASS DB worker: TLS verified and least-privilege DDL/password isolation +PASS DB dispatcher: TLS verified and least-privilege DDL/password isolation +PASS broker worker: TLS auth + unrelated command/key denied +PASS broker dispatcher: TLS auth + unrelated command/key denied +PASS S3 api: bucket listing denied +PASS S3 worker: bucket listing denied diff --git a/evidence/load.json b/evidence/load.json new file mode 100644 index 0000000..e619aad --- /dev/null +++ b/evidence/load.json @@ -0,0 +1,17 @@ +{ + "lab": 7, + "workload": "closed-loop POST messages; no automatic retries", + "requested_duration_seconds": 30.0, + "elapsed_seconds": 30.012, + "concurrency": 4, + "successful_requests": 6962, + "failed_requests": 0, + "error_ratio": 0.0, + "successful_rps": 231.974, + "successful_latency_ms": { + "p50": 6.973, + "p95": 69.041, + "p99": 73.826 + }, + "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." +} diff --git a/evidence/load.txt b/evidence/load.txt new file mode 100644 index 0000000..e619aad --- /dev/null +++ b/evidence/load.txt @@ -0,0 +1,17 @@ +{ + "lab": 7, + "workload": "closed-loop POST messages; no automatic retries", + "requested_duration_seconds": 30.0, + "elapsed_seconds": 30.012, + "concurrency": 4, + "successful_requests": 6962, + "failed_requests": 0, + "error_ratio": 0.0, + "successful_rps": 231.974, + "successful_latency_ms": { + "p50": 6.973, + "p95": 69.041, + "p99": 73.826 + }, + "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." +} diff --git a/evidence/observability.txt b/evidence/observability.txt new file mode 100644 index 0000000..7f21362 --- /dev/null +++ b/evidence/observability.txt @@ -0,0 +1 @@ +PASS: API trace + matching log, worker consumer trace + matching log, four real SDK metrics; evidence/telemetry.json diff --git a/evidence/persistence-containers.txt b/evidence/persistence-containers.txt new file mode 100644 index 0000000..7a14bcf --- /dev/null +++ b/evidence/persistence-containers.txt @@ -0,0 +1,44 @@ +/mtusi-lab7-api-1 2026-11-13T09:36:20.707402174Z +/mtusi-lab7-api-2 2026-11-13T09:36:20.892240966Z +/mtusi-lab7-broker-1 2026-11-13T09:14:48.052877381Z +/mtusi-lab7-dispatcher-1 2026-11-13T09:15:05.796772334Z +/mtusi-lab7-grafana-1 2026-11-13T09:14:47.868661464Z +/mtusi-lab7-grafana-tls-1 2026-11-13T09:14:50.549316674Z +/mtusi-lab7-lb-1 2026-11-13T09:15:06.183139167Z +/mtusi-lab7-loki-1 2026-11-13T09:14:48.341805131Z +/mtusi-lab7-loki-tls-1 2026-11-13T09:14:50.548955007Z +/mtusi-lab7-openbao-1 2026-11-13T09:14:48.810502257Z +/mtusi-lab7-otel-collector-1 2026-11-13T09:14:47.996487631Z +/mtusi-lab7-otel-collector-tls-1 2026-11-13T09:14:50.548476799Z +/mtusi-lab7-postgres-1 2026-11-13T09:14:48.161905215Z +/mtusi-lab7-prometheus-1 2026-11-13T09:14:47.732158256Z +/mtusi-lab7-prometheus-tls-1 2026-11-13T09:14:50.502321882Z +/mtusi-lab7-s3-1 2026-11-13T09:14:48.868084882Z +/mtusi-lab7-s3-gateway-1 2026-11-13T09:14:50.740010174Z +/mtusi-lab7-s3-tls-1 2026-11-13T09:14:50.548143966Z +/mtusi-lab7-tempo-1 2026-11-13T09:14:48.098276423Z +/mtusi-lab7-tempo-tls-1 2026-11-13T09:14:50.547721341Z +/mtusi-lab7-valkey-1 2026-11-13T09:14:47.945684131Z +/mtusi-lab7-worker-1 2026-11-13T09:15:05.797558917Z +/mtusi-lab7-api-1 2026-11-13T09:37:27.026123344Z +/mtusi-lab7-api-2 2026-11-13T09:37:27.311258094Z +/mtusi-lab7-broker-1 2026-11-13T09:37:02.298447638Z +/mtusi-lab7-dispatcher-1 2026-11-13T09:37:27.027079094Z +/mtusi-lab7-grafana-1 2026-11-13T09:37:02.181841305Z +/mtusi-lab7-grafana-tls-1 2026-11-13T09:37:04.814604875Z +/mtusi-lab7-lb-1 2026-11-13T09:37:27.528453052Z +/mtusi-lab7-loki-1 2026-11-13T09:37:02.570923221Z +/mtusi-lab7-loki-tls-1 2026-11-13T09:37:04.816396833Z +/mtusi-lab7-openbao-1 2026-11-13T09:37:03.117026597Z +/mtusi-lab7-otel-collector-1 2026-11-13T09:37:01.996105846Z +/mtusi-lab7-otel-collector-tls-1 2026-11-13T09:37:04.815472Z +/mtusi-lab7-postgres-1 2026-11-13T09:37:02.265804138Z +/mtusi-lab7-prometheus-1 2026-11-13T09:37:02.048192013Z +/mtusi-lab7-prometheus-tls-1 2026-11-13T09:37:04.751158041Z +/mtusi-lab7-s3-1 2026-11-13T09:37:03.169013555Z +/mtusi-lab7-s3-gateway-1 2026-11-13T09:37:05.017255875Z +/mtusi-lab7-s3-tls-1 2026-11-13T09:37:04.813515125Z +/mtusi-lab7-tempo-1 2026-11-13T09:37:02.341813096Z +/mtusi-lab7-tempo-tls-1 2026-11-13T09:37:04.816320125Z +/mtusi-lab7-valkey-1 2026-11-13T09:37:02.215125805Z +/mtusi-lab7-worker-1 2026-11-13T09:37:26.976801885Z diff --git a/evidence/persistence.txt b/evidence/persistence.txt new file mode 100644 index 0000000..6d57a20 --- /dev/null +++ b/evidence/persistence.txt @@ -0,0 +1,3 @@ +python3 tests/resilience.py --mode persistence --action-script "scripts/restart.sh" --base-url "https://localhost:8443" --ca-file "/Users/relationskatie/Downloads/mtusi2026lab7/secrets/ca.crt" +Executing explicit persistence hook; hook output suppressed to avoid leaking secrets. +PASS: persistence preserved confirmed data and existing session. Hook scope needs operator evidence. diff --git a/evidence/public-tls.txt b/evidence/public-tls.txt new file mode 100644 index 0000000..45d5f61 --- /dev/null +++ b/evidence/public-tls.txt @@ -0,0 +1,2 @@ +python3 tests/security.py --base-url "https://localhost:8443" --ca-file "/Users/relationskatie/Downloads/mtusi2026lab7/secrets/ca.crt" +PASS: trusted HTTPS works; untrusted CA rejected. This does NOT verify internal mTLS, OpenBao or hardening. diff --git a/evidence/rebuild.txt b/evidence/rebuild.txt new file mode 100644 index 0000000..a6241df --- /dev/null +++ b/evidence/rebuild.txt @@ -0,0 +1,315 @@ + Image mtusi-lab7-s3-init Building + Image mtusi-lab7-worker Building + Image mtusi-lab7-dispatcher Building + Image mtusi-lab7-s3-tls Building + Image mtusi-lab7-otel-collector-tls Building + Image mtusi-lab7-loki-tls Building + Image mtusi-lab7-tempo-tls Building + Image mtusi-lab7-migrate Building + Image mtusi-lab7-api Building + Image mtusi-lab7-grafana-tls Building + Image mtusi-lab7-prometheus-tls Building +#1 [internal] load local bake definitions +#1 reading from stdin 5.56kB done +#1 DONE 0.0s + +#2 [worker internal] load build definition from Dockerfile +#2 transferring dockerfile: 245B done +#2 DONE 0.0s + +#3 [migrate internal] load build definition from Dockerfile +#3 transferring dockerfile: 6.11kB done +#3 DONE 0.0s + +#4 [loki-tls internal] load build definition from Dockerfile +#4 transferring dockerfile: 153B done +#4 DONE 0.0s + +#5 [loki-tls internal] load metadata for docker.io/library/python:3.13.9-alpine3.22 +#5 ... + +#6 [migrate] resolve image config for docker-image://docker.io/docker/dockerfile:1.7 +#6 DONE 0.6s + +#7 [api] docker-image://docker.io/docker/dockerfile:1.7@sha256:a57df69d0ea827fb7266491f2813635de6f17269be881f696fbfdf2d83dda33e +#7 CACHED + +#8 [migrate internal] load build definition from Dockerfile +#8 transferring dockerfile: 6.11kB done +#8 DONE 0.0s + +#9 [worker internal] load metadata for docker.io/library/python:3.13.9-slim +#9 DONE 0.7s + +#10 [api internal] load build definition from Dockerfile +#10 transferring dockerfile: 6.11kB done +#10 DONE 0.0s + +#11 [s3-init internal] load build definition from Dockerfile +#11 transferring dockerfile: 6.11kB done +#11 DONE 0.0s + +#12 [api internal] load metadata for docker.io/library/golang:1.26.10-alpine3.24 +#12 DONE 0.0s + +#13 [dispatcher internal] load .dockerignore +#13 transferring context: 205B done +#13 DONE 0.0s + +#14 [dispatcher 1/5] FROM docker.io/library/python:3.13.9-slim@sha256:326df678c20c78d465db501563f3492d17c42a4afe33a1f2bf5406a1d56b0e86 +#14 DONE 0.0s + +#15 [dispatcher internal] load build context +#15 transferring context: 20.24kB done +#15 DONE 0.0s + +#16 [worker 2/5] WORKDIR /app +#16 CACHED + +#17 [worker 3/5] COPY worker/requirements.txt . +#17 CACHED + +#18 [worker 4/5] RUN pip install --no-cache-dir -r requirements.txt +#18 CACHED + +#19 [worker 5/5] COPY worker/main.py worker/telemetry.py ./ +#19 CACHED + +#20 [dispatcher] exporting to image +#20 exporting layers done +#20 writing image sha256:156b1941c7de003c64eeeeb0dce1bd831e58e9b7040d742ae21ee915cd1f0351 done +#20 naming to docker.io/library/mtusi-lab7-dispatcher done +#20 DONE 0.0s + +#21 [worker] exporting to image +#21 exporting layers done +#21 writing image sha256:646af759340748f17112bd5e8abf26c80c507cdfc809df7313194f2d1d882fe0 0.0s done +#21 naming to docker.io/library/mtusi-lab7-worker done +#21 DONE 0.0s + +#22 [dispatcher] resolving provenance for metadata file +#22 DONE 0.0s + +#23 [worker] resolving provenance for metadata file +#23 DONE 0.0s + +#5 [tempo-tls internal] load metadata for docker.io/library/python:3.13.9-alpine3.22 +#5 DONE 0.9s + +#24 [loki-tls internal] load .dockerignore +#24 transferring context: 2B done +#24 DONE 0.0s + +#25 [grafana-tls internal] load build context +#25 transferring context: 3.59kB done +#25 DONE 0.0s + +#26 [loki-tls 1/2] FROM docker.io/library/python:3.13.9-alpine3.22@sha256:e5fa639e49b85986c4481e28faa2564b45aa8021413f31026c3856e5911618b1 +#26 CACHED + +#27 [prometheus-tls 2/2] COPY runtime.py /runtime.py +#27 DONE 0.0s + +#28 [s3-tls] exporting to image +#28 exporting layers done +#28 writing image sha256:2ce5a9cd447cb6336a85b7fc443d2defe376a9be72ecb3a98ddd363a7bf01ac3 done +#28 naming to docker.io/library/mtusi-lab7-s3-tls done +#28 DONE 0.0s + +#29 [prometheus-tls] exporting to image +#29 exporting layers done +#29 writing image sha256:d53a90d548e90a5f635d7412ceafcea30acb406b731c77b62926c47066e38369 done +#29 naming to docker.io/library/mtusi-lab7-prometheus-tls 0.0s done +#29 DONE 0.0s + +#30 [otel-collector-tls] exporting to image +#30 exporting layers done +#30 writing image sha256:95551976066589425f884111ae6fc921f3e2702e835213f28abc0e479829b2a8 done +#30 naming to docker.io/library/mtusi-lab7-otel-collector-tls 0.0s done +#30 DONE 0.0s + +#31 [tempo-tls] exporting to image +#31 exporting layers done +#31 writing image sha256:4dccea4d0d87a7ed30300593f70c221e17320790d2536815e8272f0ca5b429d0 done +#31 naming to docker.io/library/mtusi-lab7-tempo-tls 0.0s done +#31 DONE 0.0s + +#32 [loki-tls] exporting to image +#32 exporting layers done +#32 writing image sha256:97b06919b99bd66a6ebb911ac0eb302118f9133d1226378fa5bd94554645d110 done +#32 naming to docker.io/library/mtusi-lab7-loki-tls done +#32 DONE 0.0s + +#33 [grafana-tls] exporting to image +#33 exporting layers done +#33 writing image sha256:2e4fe0a7fd4a7bcbf9e1bfebcbab69d2277cc8c9a980fa48692421c5eb437b6f done +#33 naming to docker.io/library/mtusi-lab7-grafana-tls done +#33 DONE 0.0s + +#34 [s3-tls] resolving provenance for metadata file +#34 DONE 0.0s + +#35 [prometheus-tls] resolving provenance for metadata file +#35 DONE 0.0s + +#36 [tempo-tls] resolving provenance for metadata file +#36 DONE 0.0s + +#37 [loki-tls] resolving provenance for metadata file +#37 DONE 0.0s + +#38 [otel-collector-tls] resolving provenance for metadata file +#38 DONE 0.0s + +#39 [grafana-tls] resolving provenance for metadata file +#39 DONE 0.0s + +#40 [api internal] load metadata for docker.io/library/alpine:3.24.3 +#40 DONE 2.0s + +#41 [s3-init internal] load .dockerignore +#41 transferring context: 205B done +#41 DONE 0.0s + +#42 [migrate internal] load .dockerignore +#42 transferring context: 205B done +#42 DONE 0.0s + +#43 [api internal] load .dockerignore +#43 transferring context: 205B done +#43 DONE 0.0s + +#44 [s3-init builder 1/10] FROM docker.io/library/golang:1.26.10-alpine3.24 +#44 DONE 0.0s + +#45 [s3-init api 1/4] FROM docker.io/library/alpine:3.24.3@sha256:be2656061b536c1883c4034790e21d0a09c5aaaf51968b89368a3c0371ea2c9a +#45 DONE 0.0s + +#46 [migrate internal] load build context +#46 transferring context: 1.45kB done +#46 DONE 0.0s + +#47 [migrate goose-builder 2/2] RUN CGO_ENABLED=0 go install -trimpath -ldflags="-s -w" -tags='no_clickhouse no_libsql no_mssql no_mysql no_sqlite3 no_vertica no_ydb' github.com/pressly/goose/v3/cmd/goose@v3.26.0 +#47 CACHED + +#48 [migrate migrate 2/3] COPY --from=goose-builder /go/bin/goose /usr/local/bin/goose +#48 CACHED + +#49 [s3-init internal] load build context +#49 transferring context: 12.76kB done +#49 DONE 0.0s + +#50 [api internal] load build context +#50 transferring context: 365.39kB 0.0s done +#50 DONE 0.0s + +#51 [s3-init builder 2/10] WORKDIR /src +#51 CACHED + +#52 [s3-init builder 3/10] COPY app/go.mod app/go.sum ./ +#52 CACHED + +#53 [api builder 4/10] RUN go mod download +#53 CACHED + +#54 [migrate migrate 3/3] COPY migrations /migrations +#54 DONE 0.0s + +#55 [api builder 5/10] COPY app/ ./ +#55 DONE 0.0s + +#56 [migrate] exporting to image +#56 exporting layers 0.0s done +#56 writing image sha256:5029f398f8f660439658cf21dd630285bc75c52e163feb3f5f52a6e0bccf3d49 done +#56 naming to docker.io/library/mtusi-lab7-migrate done +#56 DONE 0.0s + +#57 [api builder 6/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/messenger ./cmd/messenger +#57 ... + +#58 [migrate] resolving provenance for metadata file +#58 DONE 0.0s + +#57 [api builder 6/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/messenger ./cmd/messenger +#57 DONE 10.1s + +#59 [s3-init builder 7/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/loadgen ./cmd/loadgen +#59 DONE 0.3s + +#60 [api builder 8/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/s3init ./cmd/s3init +#60 DONE 0.3s + +#61 [api builder 9/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/janitor ./cmd/janitor +#61 DONE 0.6s + +#62 [api builder 10/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/s3check ./cmd/s3check +#62 DONE 0.3s + +#63 [api api 2/4] RUN apk add --no-cache ca-certificates python3 && addgroup -S app && adduser -S -G app -H app +#63 CACHED + +#64 [api api 3/4] WORKDIR /app +#64 CACHED + +#65 [api builder 8/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/s3init ./cmd/s3init +#65 CACHED + +#66 [api builder 6/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/messenger ./cmd/messenger +#66 CACHED + +#67 [api builder 4/10] RUN go mod download +#67 CACHED + +#68 [api builder 7/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/loadgen ./cmd/loadgen +#68 CACHED + +#51 [api builder 2/10] WORKDIR /src +#51 CACHED + +#69 [api builder 10/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/s3check ./cmd/s3check +#69 CACHED + +#70 [api builder 9/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/janitor ./cmd/janitor +#70 CACHED + +#71 [api builder 3/10] COPY app/go.mod app/go.sum ./ +#71 CACHED + +#72 [api builder 5/10] COPY app/ ./ +#72 CACHED + +#73 [s3-init s3init 2/2] COPY --from=builder /out/s3init /usr/local/bin/s3init +#73 CACHED + +#74 [s3-init] exporting to image +#74 exporting layers done +#74 writing image sha256:682f85e614d52b59d4135c6c09b6e58d06b8ef7e27b1361cc56f287ea991ecd1 done +#74 naming to docker.io/library/mtusi-lab7-s3-init done +#74 DONE 0.0s + +#75 [api api 4/4] COPY --from=builder /out/messenger /app/messenger +#75 DONE 0.0s + +#76 [s3-init] resolving provenance for metadata file +#76 DONE 0.0s + +#77 [api] exporting to image +#77 exporting layers 0.0s done +#77 writing image sha256:60024dd1a09a14d82a899e2c93b58ca878087f7d0d8d3abac828c948073ce857 done +#77 naming to docker.io/library/mtusi-lab7-api +#77 naming to docker.io/library/mtusi-lab7-api done +#77 DONE 0.0s + +#78 [api] resolving provenance for metadata file +#78 DONE 0.0s + Image mtusi-lab7-migrate Built + Image mtusi-lab7-tempo-tls Built + Image mtusi-lab7-api Built + Image mtusi-lab7-otel-collector-tls Built + Image mtusi-lab7-s3-init Built + Image mtusi-lab7-s3-tls Built + Image mtusi-lab7-worker Built + Image mtusi-lab7-grafana-tls Built + Image mtusi-lab7-dispatcher Built + Image mtusi-lab7-loki-tls Built + Image mtusi-lab7-prometheus-tls Built diff --git a/evidence/recover-sidecars.txt b/evidence/recover-sidecars.txt new file mode 100644 index 0000000..6f52525 --- /dev/null +++ b/evidence/recover-sidecars.txt @@ -0,0 +1,133 @@ + Container mtusi-lab7-otel-collector-1 Running + Container mtusi-lab7-s3-1 Running + Container mtusi-lab7-loki-1 Running + Container mtusi-lab7-tempo-1 Running + Container mtusi-lab7-prometheus-1 Running + Container mtusi-lab7-loki-tls-1 Recreate + Container mtusi-lab7-otel-collector-tls-1 Recreate + Container mtusi-lab7-s3-tls-1 Recreate + Container mtusi-lab7-prometheus-tls-1 Recreate + Container mtusi-lab7-grafana-1 Running + Container mtusi-lab7-tempo-tls-1 Recreate + Container mtusi-lab7-grafana-tls-1 Recreate + Container mtusi-lab7-loki-tls-1 Recreated + Container mtusi-lab7-prometheus-tls-1 Recreated + Container mtusi-lab7-tempo-tls-1 Recreated + Container mtusi-lab7-otel-collector-tls-1 Recreated + Container mtusi-lab7-s3-tls-1 Recreated + Container mtusi-lab7-s3-gateway-1 Recreate + Container mtusi-lab7-grafana-tls-1 Recreated + Container mtusi-lab7-s3-gateway-1 Recreated + Container mtusi-lab7-otel-collector-tls-1 Starting + Container mtusi-lab7-prometheus-tls-1 Starting + Container mtusi-lab7-tempo-tls-1 Starting + Container mtusi-lab7-s3-tls-1 Starting + Container mtusi-lab7-grafana-tls-1 Starting + Container mtusi-lab7-loki-tls-1 Starting + Container mtusi-lab7-grafana-tls-1 Started + Container mtusi-lab7-otel-collector-tls-1 Started + Container mtusi-lab7-tempo-tls-1 Started + Container mtusi-lab7-loki-tls-1 Started + Container mtusi-lab7-s3-tls-1 Started + Container mtusi-lab7-s3-gateway-1 Starting + Container mtusi-lab7-prometheus-tls-1 Started + Container mtusi-lab7-s3-gateway-1 Started + Container mtusi-lab7-prometheus-1 Running + Container mtusi-lab7-broker-1 Running + Container mtusi-lab7-valkey-1 Running + Container mtusi-lab7-otel-collector-1 Running + Container mtusi-lab7-postgres-1 Running + Container mtusi-lab7-loki-1 Running + Container mtusi-lab7-otel-collector-tls-1 Running + Container mtusi-lab7-grafana-1 Running + Container mtusi-lab7-openbao-1 Running + Container mtusi-lab7-loki-tls-1 Running + Container mtusi-lab7-prometheus-tls-1 Running + Container mtusi-lab7-tempo-1 Running + Container mtusi-lab7-s3-1 Running + Container mtusi-lab7-tempo-tls-1 Running + Container mtusi-lab7-grafana-tls-1 Running + Container mtusi-lab7-s3-tls-1 Running + Container mtusi-lab7-s3-gateway-1 Running + Container mtusi-lab7-postgres-1 Waiting + Container mtusi-lab7-bao-volume-init-1 Starting + Container mtusi-lab7-s3-init-1 Starting + Container mtusi-lab7-bao-volume-init-1 Started + Container mtusi-lab7-bao-volume-init-1 Waiting + Container mtusi-lab7-s3-init-1 Started + Container mtusi-lab7-postgres-1 Healthy + Container mtusi-lab7-migrate-1 Starting + Container mtusi-lab7-migrate-1 Started + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-s3-init-1 Waiting + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-s3-init-1 Waiting + Container mtusi-lab7-s3-init-1 Waiting + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-bao-volume-init-1 Exited + Container mtusi-lab7-migrate-1 Exited + Container mtusi-lab7-migrate-1 Exited + Container mtusi-lab7-migrate-1 Exited + Container mtusi-lab7-s3-init-1 Exited + Container mtusi-lab7-dispatcher-1 Starting + Container mtusi-lab7-s3-init-1 Exited + Container mtusi-lab7-worker-1 Starting + Container mtusi-lab7-s3-init-1 Exited + Container mtusi-lab7-api-2 Starting + Container mtusi-lab7-worker-1 Started + Container mtusi-lab7-api-2 Started + Container mtusi-lab7-api-1 Starting + Container mtusi-lab7-dispatcher-1 Started + Container mtusi-lab7-api-1 Started + Container mtusi-lab7-lb-1 Starting + Container mtusi-lab7-lb-1 Started + Container mtusi-lab7-lb-1 Waiting + Container mtusi-lab7-prometheus-1 Waiting + Container mtusi-lab7-openbao-1 Waiting + Container mtusi-lab7-loki-1 Waiting + Container mtusi-lab7-dispatcher-1 Waiting + Container mtusi-lab7-s3-init-1 Waiting + Container mtusi-lab7-postgres-1 Waiting + Container mtusi-lab7-tempo-tls-1 Waiting + Container mtusi-lab7-s3-1 Waiting + Container mtusi-lab7-otel-collector-1 Waiting + Container mtusi-lab7-bao-volume-init-1 Waiting + Container mtusi-lab7-s3-gateway-1 Waiting + Container mtusi-lab7-worker-1 Waiting + Container mtusi-lab7-broker-1 Waiting + Container mtusi-lab7-grafana-1 Waiting + Container mtusi-lab7-tempo-1 Waiting + Container mtusi-lab7-otel-collector-tls-1 Waiting + Container mtusi-lab7-grafana-tls-1 Waiting + Container mtusi-lab7-s3-tls-1 Waiting + Container mtusi-lab7-valkey-1 Waiting + Container mtusi-lab7-loki-tls-1 Waiting + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-prometheus-tls-1 Waiting + Container mtusi-lab7-api-2 Waiting + Container mtusi-lab7-api-1 Waiting + Container mtusi-lab7-s3-init-1 Exited + Container mtusi-lab7-worker-1 Healthy + Container mtusi-lab7-lb-1 Healthy + Container mtusi-lab7-tempo-tls-1 Healthy + Container mtusi-lab7-migrate-1 Exited + Container mtusi-lab7-otel-collector-1 Healthy + Container mtusi-lab7-loki-1 Healthy + Container mtusi-lab7-valkey-1 Healthy + Container mtusi-lab7-openbao-1 Healthy + Container mtusi-lab7-dispatcher-1 Healthy + Container mtusi-lab7-loki-tls-1 Healthy + Container mtusi-lab7-s3-gateway-1 Healthy + Container mtusi-lab7-s3-1 Healthy + Container mtusi-lab7-prometheus-tls-1 Healthy + Container mtusi-lab7-api-2 Healthy + Container mtusi-lab7-api-1 Healthy + Container mtusi-lab7-tempo-1 Healthy + Container mtusi-lab7-grafana-tls-1 Healthy + Container mtusi-lab7-otel-collector-tls-1 Healthy + Container mtusi-lab7-postgres-1 Healthy + Container mtusi-lab7-grafana-1 Healthy + Container mtusi-lab7-prometheus-1 Healthy + Container mtusi-lab7-bao-volume-init-1 Exited + Container mtusi-lab7-broker-1 Healthy + Container mtusi-lab7-s3-tls-1 Healthy diff --git a/evidence/resources.txt b/evidence/resources.txt new file mode 100644 index 0000000..5529d34 --- /dev/null +++ b/evidence/resources.txt @@ -0,0 +1,42 @@ +mtusi-lab7-s3-gateway-1 CPU=0.00% memory=13.08MiB / 64MiB +mtusi-lab7-prometheus-tls-1 CPU=0.00% memory=17.19MiB / 64MiB +mtusi-lab7-tempo-tls-1 CPU=0.00% memory=18.24MiB / 64MiB +mtusi-lab7-loki-tls-1 CPU=0.13% memory=17.52MiB / 64MiB +mtusi-lab7-grafana-tls-1 CPU=0.00% memory=17.17MiB / 64MiB +mtusi-lab7-s3-tls-1 CPU=0.00% memory=17.19MiB / 64MiB +mtusi-lab7-otel-collector-tls-1 CPU=0.29% memory=21.61MiB / 64MiB +mtusi-lab7-worker-1 CPU=0.03% memory=65.36MiB / 1GiB +mtusi-lab7-dispatcher-1 CPU=0.31% memory=49.39MiB / 1GiB +mtusi-lab7-api-2 CPU=0.72% memory=13.92MiB / 1GiB +mtusi-lab7-api-1 CPU=0.56% memory=17.11MiB / 1GiB +mtusi-lab7-grafana-1 CPU=0.26% memory=92.87MiB / 256MiB +mtusi-lab7-prometheus-1 CPU=0.07% memory=30.32MiB / 256MiB +mtusi-lab7-otel-collector-1 CPU=0.58% memory=64.9MiB / 256MiB +mtusi-lab7-lb-1 CPU=0.46% memory=85.86MiB / 256MiB +mtusi-lab7-postgres-1 CPU=0.36% memory=49.96MiB / 256MiB +mtusi-lab7-broker-1 CPU=0.19% memory=11.55MiB / 256MiB +mtusi-lab7-valkey-1 CPU=0.31% memory=12.39MiB / 256MiB +mtusi-lab7-tempo-1 CPU=0.31% memory=245.4MiB / 256MiB +mtusi-lab7-s3-1 CPU=0.19% memory=123.7MiB / 256MiB +mtusi-lab7-loki-1 CPU=1.39% memory=110.9MiB / 256MiB +mtusi-lab7-openbao-1 CPU=0.70% memory=53.94MiB / 256MiB +mtusi-lab6-api-1 CPU=0.65% memory=36.02MiB / 1GiB +mtusi-lab6-api-2 CPU=0.49% memory=25.03MiB / 1GiB +mtusi-lab6-dispatcher-1 CPU=0.44% memory=46.65MiB / 7.652GiB +mtusi-lab6-worker-1 CPU=0.19% memory=64.76MiB / 1GiB +mtusi-lab6-grafana-1 CPU=0.42% memory=103.1MiB / 7.652GiB +mtusi-lab6-prometheus-1 CPU=0.22% memory=48.54MiB / 7.652GiB +mtusi-lab6-otel-collector-1 CPU=1.49% memory=76.89MiB / 256MiB +mtusi-lab6-lb-1 CPU=0.14% memory=103.1MiB / 256MiB +mtusi-lab6-broker-1 CPU=1.29% memory=11.23MiB / 7.652GiB +mtusi-lab6-s3-1 CPU=0.71% memory=230.3MiB / 1GiB +mtusi-lab6-postgres-1 CPU=0.34% memory=35.94MiB / 1GiB +mtusi-lab6-valkey-1 CPU=0.25% memory=11.54MiB / 256MiB +mtusi-lab6-s3-gateway-1 CPU=0.85% memory=43.61MiB / 64MiB +mtusi-lab6-loki-1 CPU=0.99% memory=137MiB / 7.652GiB +mtusi-lab6-tempo-1 CPU=1.39% memory=416.9MiB / 7.652GiB +mtusi-lab3-api-6 CPU=0.30% memory=38.76MiB / 512MiB +mtusi-lab3-api-5 CPU=0.24% memory=43.86MiB / 512MiB +mtusi-lab3-lb-1 CPU=0.10% memory=106.7MiB / 256MiB +mtusi-lab3-postgres-1 CPU=0.03% memory=195.4MiB / 1GiB +mtusi-lab3-valkey-1 CPU=0.26% memory=12.11MiB / 256MiB diff --git a/evidence/restore.txt b/evidence/restore.txt new file mode 100644 index 0000000..720a8d3 --- /dev/null +++ b/evidence/restore.txt @@ -0,0 +1,95 @@ + Container mtusi-lab7-s3-1 Running + Container mtusi-lab7-broker-1 Running + Container mtusi-lab7-tempo-1 Running + Container mtusi-lab7-valkey-1 Running + Container mtusi-lab7-otel-collector-1 Running + Container mtusi-lab7-loki-1 Running + Container mtusi-lab7-grafana-1 Running + Container mtusi-lab7-postgres-1 Running + Container mtusi-lab7-openbao-1 Running + Container mtusi-lab7-grafana-tls-1 Running + Container mtusi-lab7-s3-tls-1 Running + Container mtusi-lab7-tempo-tls-1 Running + Container mtusi-lab7-otel-collector-tls-1 Running + Container mtusi-lab7-loki-tls-1 Running + Container mtusi-lab7-s3-gateway-1 Running + Container mtusi-lab7-prometheus-1 Running + Container mtusi-lab7-prometheus-tls-1 Running + Container mtusi-lab7-dispatcher-1 Running + Container mtusi-lab7-worker-1 Running + Container mtusi-lab7-api-2 Running + Container mtusi-lab7-lb-1 Running + Container mtusi-lab7-postgres-1 Waiting + Container mtusi-lab7-bao-volume-init-1 Starting + Container mtusi-lab7-s3-init-1 Starting + Container mtusi-lab7-s3-init-1 Started + Container mtusi-lab7-bao-volume-init-1 Started + Container mtusi-lab7-bao-volume-init-1 Waiting + Container mtusi-lab7-postgres-1 Healthy + Container mtusi-lab7-migrate-1 Starting + Container mtusi-lab7-migrate-1 Started + Container mtusi-lab7-s3-init-1 Waiting + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-s3-init-1 Waiting + Container mtusi-lab7-s3-init-1 Waiting + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-bao-volume-init-1 Exited + Container mtusi-lab7-migrate-1 Exited + Container mtusi-lab7-s3-init-1 Exited + Container mtusi-lab7-s3-init-1 Exited + Container mtusi-lab7-s3-init-1 Exited + Container mtusi-lab7-migrate-1 Exited + Container mtusi-lab7-api-1 Starting + Container mtusi-lab7-migrate-1 Exited + Container mtusi-lab7-api-1 Started + Container mtusi-lab7-otel-collector-1 Waiting + Container mtusi-lab7-grafana-1 Waiting + Container mtusi-lab7-broker-1 Waiting + Container mtusi-lab7-api-2 Waiting + Container mtusi-lab7-api-1 Waiting + Container mtusi-lab7-s3-gateway-1 Waiting + Container mtusi-lab7-s3-1 Waiting + Container mtusi-lab7-loki-tls-1 Waiting + Container mtusi-lab7-prometheus-1 Waiting + Container mtusi-lab7-loki-1 Waiting + Container mtusi-lab7-worker-1 Waiting + Container mtusi-lab7-s3-tls-1 Waiting + Container mtusi-lab7-bao-volume-init-1 Waiting + Container mtusi-lab7-otel-collector-tls-1 Waiting + Container mtusi-lab7-postgres-1 Waiting + Container mtusi-lab7-s3-init-1 Waiting + Container mtusi-lab7-tempo-tls-1 Waiting + Container mtusi-lab7-grafana-tls-1 Waiting + Container mtusi-lab7-openbao-1 Waiting + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-valkey-1 Waiting + Container mtusi-lab7-tempo-1 Waiting + Container mtusi-lab7-dispatcher-1 Waiting + Container mtusi-lab7-lb-1 Waiting + Container mtusi-lab7-prometheus-tls-1 Waiting + Container mtusi-lab7-migrate-1 Exited + Container mtusi-lab7-prometheus-1 Healthy + Container mtusi-lab7-s3-tls-1 Healthy + Container mtusi-lab7-loki-tls-1 Healthy + Container mtusi-lab7-dispatcher-1 Healthy + Container mtusi-lab7-grafana-tls-1 Healthy + Container mtusi-lab7-broker-1 Healthy + Container mtusi-lab7-otel-collector-1 Healthy + Container mtusi-lab7-s3-init-1 Exited + Container mtusi-lab7-tempo-1 Healthy + Container mtusi-lab7-bao-volume-init-1 Exited + Container mtusi-lab7-tempo-tls-1 Healthy + Container mtusi-lab7-prometheus-tls-1 Healthy + Container mtusi-lab7-loki-1 Healthy + Container mtusi-lab7-otel-collector-tls-1 Healthy + Container mtusi-lab7-worker-1 Healthy + Container mtusi-lab7-s3-gateway-1 Healthy + Container mtusi-lab7-grafana-1 Healthy + Container mtusi-lab7-valkey-1 Healthy + Container mtusi-lab7-api-2 Healthy + Container mtusi-lab7-api-1 Healthy + Container mtusi-lab7-postgres-1 Healthy + Container mtusi-lab7-s3-1 Healthy + Container mtusi-lab7-lb-1 Healthy + Container mtusi-lab7-openbao-1 Healthy diff --git a/evidence/review-build.txt b/evidence/review-build.txt new file mode 100644 index 0000000..f08ae91 --- /dev/null +++ b/evidence/review-build.txt @@ -0,0 +1,84 @@ + Image mtusi-lab7-api Building + Image mtusi-lab7-s3-tls Building + Image mtusi-lab7-migrate Building + Image mtusi-lab7-s3-init Building +#1 [internal] load local bake definitions +#1 reading from stdin 1.98kB done +#1 DONE 0.0s + +#2 [internal] load build definition from Dockerfile +#2 transferring dockerfile: 6.11kB done +#2 DONE 0.0s + +#3 resolve image config for docker-image://docker.io/docker/dockerfile:1.7 +#3 DONE 1.1s + +#4 docker-image://docker.io/docker/dockerfile:1.7@sha256:a57df69d0ea827fb7266491f2813635de6f17269be881f696fbfdf2d83dda33e +#4 CACHED + +#5 [internal] load metadata for docker.io/library/golang:1.26.10-alpine3.24 +#5 DONE 0.0s + +#6 [internal] load metadata for docker.io/library/alpine:3.24.3 +#6 DONE 0.7s + +#7 [internal] load .dockerignore +#7 transferring context: 205B done +#7 DONE 0.0s + +#8 [builder 1/10] FROM docker.io/library/golang:1.26.10-alpine3.24 +#8 DONE 0.0s + +#9 [api 1/4] FROM docker.io/library/alpine:3.24.3@sha256:be2656061b536c1883c4034790e21d0a09c5aaaf51968b89368a3c0371ea2c9a +#9 DONE 0.0s + +#10 [internal] load build context +#10 transferring context: 20.46kB done +#10 DONE 0.0s + +#11 [builder 2/10] WORKDIR /src +#11 CACHED + +#12 [builder 3/10] COPY app/go.mod app/go.sum ./ +#12 CACHED + +#13 [builder 4/10] RUN go mod download +#13 CACHED + +#14 [builder 5/10] COPY app/ ./ +#14 DONE 0.0s + +#15 [builder 6/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/messenger ./cmd/messenger +#15 DONE 12.3s + +#16 [builder 7/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/loadgen ./cmd/loadgen +#16 DONE 0.5s + +#17 [builder 8/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/s3init ./cmd/s3init +#17 DONE 0.5s + +#18 [builder 9/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/janitor ./cmd/janitor +#18 DONE 0.8s + +#19 [builder 10/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/s3check ./cmd/s3check +#19 DONE 0.5s + +#20 [api 2/4] RUN apk add --no-cache ca-certificates python3 && addgroup -S app && adduser -S -G app -H app +#20 CACHED + +#21 [api 3/4] WORKDIR /app +#21 CACHED + +#22 [api 4/4] COPY --from=builder /out/messenger /app/messenger +#22 DONE 0.0s + +#23 exporting to image +#23 exporting layers 0.0s done +#23 writing image sha256:958c149f7c122dddb12cff41bffd2ff627df92ce79827f94b86b8e0d6fc83e44 done +#23 naming to docker.io/library/mtusi-lab7-api +#23 naming to docker.io/library/mtusi-lab7-api done +#23 DONE 0.0s + +#24 resolving provenance for metadata file +#24 DONE 0.0s + Image mtusi-lab7-api Built diff --git a/evidence/review-check.txt b/evidence/review-check.txt new file mode 100644 index 0000000..9a55330 --- /dev/null +++ b/evidence/review-check.txt @@ -0,0 +1,2 @@ +python3 scripts/check_contract.py +PASS: offline skeleton structure, local refs and Python syntax; application NOT tested. diff --git a/evidence/review-failover.txt b/evidence/review-failover.txt new file mode 100644 index 0000000..c134940 --- /dev/null +++ b/evidence/review-failover.txt @@ -0,0 +1,3 @@ +PASS stopped /mtusi-lab7-api-1 confirmed data/session preserved; recovery_seconds 3.323 +PASS stopped /mtusi-lab7-api-2 confirmed data/session preserved; recovery_seconds 3.386 +PASS both distinct API containers stopped in sequence and restored diff --git a/evidence/review-go-tests.txt b/evidence/review-go-tests.txt new file mode 100644 index 0000000..9b7dd5e --- /dev/null +++ b/evidence/review-go-tests.txt @@ -0,0 +1,24 @@ +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/cmd/janitor [no test files] +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/cmd/loadgen 0.002s +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/cmd/messenger [no test files] +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/cmd/s3check [no test files] +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/cmd/s3init [no test files] +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/e2e 0.001s +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http 2.873s +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/dto 0.001s +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/api/http/middleware [no test files] +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/cache 0.626s +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/config 0.004s +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/domain [no test files] +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/imagecheck 0.003s +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/janitor 0.002s +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/logging [no test files] +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/objectstore [no test files] +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/password 0.002s +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/service 0.002s +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/session [no test files] +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/store [no test files] +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/store/db 0.002s +? gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/telemetry [no test files] +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/token 0.001s +ok gitflic.ru/project/relationskatie/mtusi2026lab1-ashchkl/internal/validate 0.002s diff --git a/evidence/review-hardening.txt b/evidence/review-hardening.txt new file mode 100644 index 0000000..caba8e9 --- /dev/null +++ b/evidence/review-hardening.txt @@ -0,0 +1,22 @@ +PASS hardening/resource/port checks: api +PASS hardening/resource/port checks: api +PASS hardening/resource/port checks: broker +PASS hardening/resource/port checks: dispatcher +PASS hardening/resource/port checks: grafana +PASS hardening/resource/port checks: grafana-tls +PASS hardening/resource/port checks: lb +PASS hardening/resource/port checks: loki +PASS hardening/resource/port checks: loki-tls +PASS hardening/resource/port checks: openbao +PASS hardening/resource/port checks: otel-collector +PASS hardening/resource/port checks: otel-collector-tls +PASS hardening/resource/port checks: postgres +PASS hardening/resource/port checks: prometheus +PASS hardening/resource/port checks: prometheus-tls +PASS hardening/resource/port checks: s3 +PASS hardening/resource/port checks: s3-gateway +PASS hardening/resource/port checks: s3-tls +PASS hardening/resource/port checks: tempo +PASS hardening/resource/port checks: tempo-tls +PASS hardening/resource/port checks: valkey +PASS hardening/resource/port checks: worker diff --git a/evidence/review-internal.txt b/evidence/review-internal.txt new file mode 100644 index 0000000..403fd5e --- /dev/null +++ b/evidence/review-internal.txt @@ -0,0 +1,30 @@ +PASS API replica: LB accepted; absent cert, foreign CA, same-CA wrong SAN rejected +PASS API replica: LB accepted; absent cert, foreign CA, same-CA wrong SAN rejected +PASS verified TLS + hostname rejection: valkey:6379 +PASS verified TLS + hostname rejection: broker:6379 +PASS verified TLS + hostname rejection: s3:9443 +PASS verified TLS + hostname rejection: otel-collector:4438 +PASS verified TLS + hostname rejection: otel-collector:8899 +PASS verified TLS + hostname rejection: otel-collector:8898 +PASS verified TLS + hostname rejection: loki:3443 +PASS verified TLS + hostname rejection: tempo:3443 +PASS verified TLS + hostname rejection: tempo:4438 +PASS verified TLS + hostname rejection: prometheus:9443 +PASS verified TLS + hostname rejection: grafana:3443 +PASS verified TLS + hostname rejection: openbao:8200 +PASS telemetry otel-collector: authorized HTTP works; no-cert/foreign/wrong-URI rejected +PASS telemetry loki: authorized HTTP works; no-cert/foreign/wrong-URI rejected +PASS telemetry tempo: authorized HTTP works; no-cert/foreign/wrong-URI rejected +PASS telemetry prometheus: authorized HTTP works; no-cert/foreign/wrong-URI rejected +PASS all declared loopback plaintext hops inaccessible from app network +PASS Bao api: cert auth, TTL, own read, cross-role/admin deny, revoked token deny +PASS Bao worker: cert auth, TTL, own read, cross-role/admin deny, revoked token deny +PASS Bao dispatcher: cert auth, TTL, own read, cross-role/admin deny, revoked token deny +PASS Bao wrong identity cannot authenticate as API +PASS DB api: TLS verified and least-privilege DDL/password isolation +PASS DB worker: TLS verified and least-privilege DDL/password isolation +PASS DB dispatcher: TLS verified and least-privilege DDL/password isolation +PASS broker worker: TLS auth + unrelated command/key denied +PASS broker dispatcher: TLS auth + unrelated command/key denied +PASS S3 api: bucket listing denied +PASS S3 worker: bucket listing denied diff --git a/evidence/review-observability.txt b/evidence/review-observability.txt new file mode 100644 index 0000000..7f21362 --- /dev/null +++ b/evidence/review-observability.txt @@ -0,0 +1 @@ +PASS: API trace + matching log, worker consumer trace + matching log, four real SDK metrics; evidence/telemetry.json diff --git a/evidence/review-persistence.txt b/evidence/review-persistence.txt new file mode 100644 index 0000000..6d57a20 --- /dev/null +++ b/evidence/review-persistence.txt @@ -0,0 +1,3 @@ +python3 tests/resilience.py --mode persistence --action-script "scripts/restart.sh" --base-url "https://localhost:8443" --ca-file "/Users/relationskatie/Downloads/mtusi2026lab7/secrets/ca.crt" +Executing explicit persistence hook; hook output suppressed to avoid leaking secrets. +PASS: persistence preserved confirmed data and existing session. Hook scope needs operator evidence. diff --git a/evidence/review-public-tls.txt b/evidence/review-public-tls.txt new file mode 100644 index 0000000..45d5f61 --- /dev/null +++ b/evidence/review-public-tls.txt @@ -0,0 +1,2 @@ +python3 tests/security.py --base-url "https://localhost:8443" --ca-file "/Users/relationskatie/Downloads/mtusi2026lab7/secrets/ca.crt" +PASS: trusted HTTPS works; untrusted CA rejected. This does NOT verify internal mTLS, OpenBao or hardening. diff --git a/evidence/review-secret-scan.txt b/evidence/review-secret-scan.txt new file mode 100644 index 0000000..453ef49 --- /dev/null +++ b/evidence/review-secret-scan.txt @@ -0,0 +1 @@ +PASS no generated credential/root/unseal values or private keys in publishable files diff --git a/evidence/review-smoke.txt b/evidence/review-smoke.txt new file mode 100644 index 0000000..995dcc7 --- /dev/null +++ b/evidence/review-smoke.txt @@ -0,0 +1,2 @@ +python3 tests/smoke.py --base-url "https://localhost:8443" --ca-file "/Users/relationskatie/Downloads/mtusi2026lab7/secrets/ca.crt" +PASS: lab7 public API scenario; infrastructure and grading evidence remain separate. diff --git a/evidence/review-update.txt b/evidence/review-update.txt new file mode 100644 index 0000000..24ba575 --- /dev/null +++ b/evidence/review-update.txt @@ -0,0 +1,38 @@ + Container mtusi-lab7-s3-1 Running + Container mtusi-lab7-postgres-1 Running + Container mtusi-lab7-s3-tls-1 Running + Container mtusi-lab7-s3-gateway-1 Running + Container mtusi-lab7-api-1 Recreate + Container mtusi-lab7-api-2 Recreate + Container mtusi-lab7-api-2 Recreated + Container mtusi-lab7-api-1 Recreated + Container mtusi-lab7-postgres-1 Waiting + Container mtusi-lab7-s3-init-1 Starting + Container mtusi-lab7-s3-init-1 Started + Container mtusi-lab7-postgres-1 Healthy + Container mtusi-lab7-migrate-1 Starting + Container mtusi-lab7-migrate-1 Started + Container mtusi-lab7-s3-init-1 Waiting + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-migrate-1 Exited + Container mtusi-lab7-s3-init-1 Exited + Container mtusi-lab7-api-1 Starting + Container mtusi-lab7-api-1 Started + Container mtusi-lab7-api-2 Starting + Container mtusi-lab7-api-2 Started + Container mtusi-lab7-api-1 Waiting + Container mtusi-lab7-api-2 Waiting + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-s3-init-1 Waiting + Container mtusi-lab7-s3-1 Waiting + Container mtusi-lab7-postgres-1 Waiting + Container mtusi-lab7-s3-tls-1 Waiting + Container mtusi-lab7-s3-gateway-1 Waiting + Container mtusi-lab7-s3-tls-1 Healthy + Container mtusi-lab7-s3-init-1 Exited + Container mtusi-lab7-migrate-1 Exited + Container mtusi-lab7-api-1 Healthy + Container mtusi-lab7-api-2 Healthy + Container mtusi-lab7-s3-gateway-1 Healthy + Container mtusi-lab7-s3-1 Healthy + Container mtusi-lab7-postgres-1 Healthy diff --git a/evidence/review-worker-tests.txt b/evidence/review-worker-tests.txt new file mode 100644 index 0000000..8d97cf9 --- /dev/null +++ b/evidence/review-worker-tests.txt @@ -0,0 +1,11 @@ +test_corrupt_input_rejected (test_thumbnail.ThumbnailTests.test_corrupt_input_rejected) ... ok +test_extreme_aspect_ratios (test_thumbnail.ThumbnailTests.test_extreme_aspect_ratios) ... ok +test_orientation_applied_and_exif_removed (test_thumbnail.ThumbnailTests.test_orientation_applied_and_exif_removed) ... ok +test_pixel_limit_boundary (test_thumbnail.ThumbnailTests.test_pixel_limit_boundary) ... ok +test_size_floor_and_no_upscale (test_thumbnail.ThumbnailTests.test_size_floor_and_no_upscale) ... ok +test_transparency_is_white (test_thumbnail.ThumbnailTests.test_transparency_is_white) ... ok + +---------------------------------------------------------------------- +Ran 6 tests in 0.061s + +OK diff --git a/evidence/runtime.txt b/evidence/runtime.txt new file mode 100644 index 0000000..55a2120 --- /dev/null +++ b/evidence/runtime.txt @@ -0,0 +1 @@ +Docker=29.2.1 architecture=aarch64 CPUs=12 memory_bytes=8216776704 OS=Docker Desktop diff --git a/evidence/secret-scan.txt b/evidence/secret-scan.txt new file mode 100644 index 0000000..453ef49 --- /dev/null +++ b/evidence/secret-scan.txt @@ -0,0 +1 @@ +PASS no generated credential/root/unseal values or private keys in publishable files diff --git a/evidence/session-expiry.txt b/evidence/session-expiry.txt new file mode 100644 index 0000000..7119ebc --- /dev/null +++ b/evidence/session-expiry.txt @@ -0,0 +1,29 @@ + Container mtusi-lab7-expiry Creating + Container mtusi-lab7-expiry Created +PASS API replica: LB accepted; absent cert, foreign CA, same-CA wrong SAN rejected +PASS API replica: LB accepted; absent cert, foreign CA, same-CA wrong SAN rejected +PASS verified TLS + hostname rejection: valkey:6379 +PASS verified TLS + hostname rejection: broker:6379 +PASS verified TLS + hostname rejection: s3:9443 +PASS verified TLS + hostname rejection: otel-collector:4438 +PASS verified TLS + hostname rejection: otel-collector:8899 +PASS verified TLS + hostname rejection: otel-collector:8898 +PASS verified TLS + hostname rejection: loki:3443 +PASS verified TLS + hostname rejection: tempo:3443 +PASS verified TLS + hostname rejection: tempo:4438 +PASS verified TLS + hostname rejection: prometheus:9443 +PASS verified TLS + hostname rejection: grafana:3443 +PASS verified TLS + hostname rejection: openbao:8200 +PASS all declared loopback plaintext hops inaccessible from app network +PASS Bao api: cert auth, TTL, own read, cross-role/admin deny, revoked token deny +PASS Bao worker: cert auth, TTL, own read, cross-role/admin deny, revoked token deny +PASS Bao dispatcher: cert auth, TTL, own read, cross-role/admin deny, revoked token deny +PASS Bao wrong identity cannot authenticate as API +PASS DB api: TLS verified and least-privilege DDL/password isolation +PASS DB worker: TLS verified and least-privilege DDL/password isolation +PASS DB dispatcher: TLS verified and least-privilege DDL/password isolation +PASS broker worker: TLS auth + unrelated command/key denied +PASS broker dispatcher: TLS auth + unrelated command/key denied +PASS S3 api: bucket listing denied +PASS S3 worker: bucket listing denied +PASS real service session expiry: valid token then 401 after TTL=2s diff --git a/evidence/setup.txt b/evidence/setup.txt new file mode 100644 index 0000000..5fe0868 --- /dev/null +++ b/evidence/setup.txt @@ -0,0 +1,44 @@ + Container mtusi-lab7-otel-collector-1 Running + Container mtusi-lab7-prometheus-1 Running + Container mtusi-lab7-s3-1 Running + Container mtusi-lab7-loki-1 Running + Container mtusi-lab7-postgres-1 Running + Container mtusi-lab7-tempo-1 Running + Container mtusi-lab7-grafana-1 Recreate + Container mtusi-lab7-prometheus-tls-1 Creating + Container mtusi-lab7-s3-tls-1 Creating + Container mtusi-lab7-loki-tls-1 Creating + Container mtusi-lab7-otel-collector-tls-1 Creating + Container mtusi-lab7-migrate-1 Creating + Container mtusi-lab7-tempo-tls-1 Creating + Container mtusi-lab7-s3-tls-1 Created + Container mtusi-lab7-loki-tls-1 Created + Container mtusi-lab7-s3-init-1 Creating + Container mtusi-lab7-prometheus-tls-1 Created + Container mtusi-lab7-tempo-tls-1 Created + Container mtusi-lab7-migrate-1 Created + Container mtusi-lab7-otel-collector-tls-1 Created + Container mtusi-lab7-grafana-1 Recreated + Container mtusi-lab7-grafana-tls-1 Creating + Container mtusi-lab7-s3-init-1 Created + Container mtusi-lab7-grafana-tls-1 Created + Container mtusi-lab7-otel-collector-tls-1 Starting + Container mtusi-lab7-loki-tls-1 Starting + Container mtusi-lab7-prometheus-tls-1 Starting + Container mtusi-lab7-s3-tls-1 Starting + Container mtusi-lab7-postgres-1 Waiting + Container mtusi-lab7-grafana-1 Starting + Container mtusi-lab7-tempo-tls-1 Starting + Container mtusi-lab7-loki-tls-1 Started + Container mtusi-lab7-otel-collector-tls-1 Started + Container mtusi-lab7-tempo-tls-1 Started + Container mtusi-lab7-s3-tls-1 Started + Container mtusi-lab7-s3-init-1 Starting + Container mtusi-lab7-prometheus-tls-1 Started + Container mtusi-lab7-grafana-1 Started + Container mtusi-lab7-grafana-tls-1 Starting + Container mtusi-lab7-s3-init-1 Started + Container mtusi-lab7-grafana-tls-1 Started + Container mtusi-lab7-postgres-1 Healthy + Container mtusi-lab7-migrate-1 Starting + Container mtusi-lab7-migrate-1 Started diff --git a/evidence/smoke.txt b/evidence/smoke.txt new file mode 100644 index 0000000..995dcc7 --- /dev/null +++ b/evidence/smoke.txt @@ -0,0 +1,2 @@ +python3 tests/smoke.py --base-url "https://localhost:8443" --ca-file "/Users/relationskatie/Downloads/mtusi2026lab7/secrets/ca.crt" +PASS: lab7 public API scenario; infrastructure and grading evidence remain separate. diff --git a/evidence/start.txt b/evidence/start.txt new file mode 100644 index 0000000..f8cf6bc --- /dev/null +++ b/evidence/start.txt @@ -0,0 +1,109 @@ + Container mtusi-lab7-otel-collector-1 Running + Container mtusi-lab7-valkey-1 Running + Container mtusi-lab7-openbao-1 Running + Container mtusi-lab7-otel-collector-tls-1 Running + Container mtusi-lab7-broker-1 Running + Container mtusi-lab7-tempo-1 Running + Container mtusi-lab7-s3-1 Running + Container mtusi-lab7-tempo-tls-1 Running + Container mtusi-lab7-postgres-1 Running + Container mtusi-lab7-grafana-1 Running + Container mtusi-lab7-prometheus-1 Running + Container mtusi-lab7-grafana-tls-1 Running + Container mtusi-lab7-s3-tls-1 Running + Container mtusi-lab7-loki-1 Running + Container mtusi-lab7-prometheus-tls-1 Running + Container mtusi-lab7-s3-gateway-1 Running + Container mtusi-lab7-loki-tls-1 Running + Container mtusi-lab7-worker-1 Creating + Container mtusi-lab7-dispatcher-1 Creating + Container mtusi-lab7-api-2 Creating + Container mtusi-lab7-api-1 Creating + Container mtusi-lab7-dispatcher-1 Created + Container mtusi-lab7-api-2 Created + Container mtusi-lab7-worker-1 Created + Container mtusi-lab7-api-1 Created + Container mtusi-lab7-lb-1 Creating + Container mtusi-lab7-lb-1 Created + Container mtusi-lab7-bao-volume-init-1 Starting + Container mtusi-lab7-postgres-1 Waiting + Container mtusi-lab7-s3-init-1 Starting + Container mtusi-lab7-s3-init-1 Started + Container mtusi-lab7-bao-volume-init-1 Started + Container mtusi-lab7-bao-volume-init-1 Waiting + Container mtusi-lab7-postgres-1 Healthy + Container mtusi-lab7-migrate-1 Starting + Container mtusi-lab7-migrate-1 Started + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-s3-init-1 Waiting + Container mtusi-lab7-s3-init-1 Waiting + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-s3-init-1 Waiting + Container mtusi-lab7-bao-volume-init-1 Exited + Container mtusi-lab7-s3-init-1 Exited + Container mtusi-lab7-migrate-1 Exited + Container mtusi-lab7-migrate-1 Exited + Container mtusi-lab7-s3-init-1 Exited + Container mtusi-lab7-dispatcher-1 Starting + Container mtusi-lab7-s3-init-1 Exited + Container mtusi-lab7-api-2 Starting + Container mtusi-lab7-migrate-1 Exited + Container mtusi-lab7-worker-1 Starting + Container mtusi-lab7-dispatcher-1 Started + Container mtusi-lab7-worker-1 Started + Container mtusi-lab7-api-2 Started + Container mtusi-lab7-api-1 Starting + Container mtusi-lab7-api-1 Started + Container mtusi-lab7-lb-1 Starting + Container mtusi-lab7-lb-1 Started + Container mtusi-lab7-grafana-tls-1 Waiting + Container mtusi-lab7-bao-volume-init-1 Waiting + Container mtusi-lab7-loki-tls-1 Waiting + Container mtusi-lab7-s3-init-1 Waiting + Container mtusi-lab7-openbao-1 Waiting + Container mtusi-lab7-otel-collector-1 Waiting + Container mtusi-lab7-dispatcher-1 Waiting + Container mtusi-lab7-loki-1 Waiting + Container mtusi-lab7-broker-1 Waiting + Container mtusi-lab7-s3-1 Waiting + Container mtusi-lab7-valkey-1 Waiting + Container mtusi-lab7-s3-gateway-1 Waiting + Container mtusi-lab7-otel-collector-tls-1 Waiting + Container mtusi-lab7-tempo-tls-1 Waiting + Container mtusi-lab7-s3-tls-1 Waiting + Container mtusi-lab7-migrate-1 Waiting + Container mtusi-lab7-tempo-1 Waiting + Container mtusi-lab7-prometheus-tls-1 Waiting + Container mtusi-lab7-lb-1 Waiting + Container mtusi-lab7-postgres-1 Waiting + Container mtusi-lab7-api-2 Waiting + Container mtusi-lab7-api-1 Waiting + Container mtusi-lab7-prometheus-1 Waiting + Container mtusi-lab7-grafana-1 Waiting + Container mtusi-lab7-worker-1 Waiting + Container mtusi-lab7-prometheus-tls-1 Healthy + Container mtusi-lab7-s3-gateway-1 Healthy + Container mtusi-lab7-grafana-tls-1 Healthy + Container mtusi-lab7-loki-1 Healthy + Container mtusi-lab7-s3-tls-1 Healthy + Container mtusi-lab7-otel-collector-1 Healthy + Container mtusi-lab7-loki-tls-1 Healthy + Container mtusi-lab7-s3-init-1 Exited + Container mtusi-lab7-migrate-1 Exited + Container mtusi-lab7-tempo-1 Healthy + Container mtusi-lab7-tempo-tls-1 Healthy + Container mtusi-lab7-otel-collector-tls-1 Healthy + Container mtusi-lab7-valkey-1 Healthy + Container mtusi-lab7-grafana-1 Healthy + Container mtusi-lab7-broker-1 Healthy + Container mtusi-lab7-openbao-1 Healthy + Container mtusi-lab7-lb-1 Healthy + Container mtusi-lab7-prometheus-1 Healthy + Container mtusi-lab7-bao-volume-init-1 Exited + Container mtusi-lab7-dispatcher-1 Healthy + Container mtusi-lab7-s3-1 Healthy + Container mtusi-lab7-postgres-1 Healthy + Container mtusi-lab7-api-2 Healthy + Container mtusi-lab7-api-1 Healthy + Container mtusi-lab7-worker-1 Healthy diff --git a/evidence/telemetry.json b/evidence/telemetry.json new file mode 100644 index 0000000..fa012dd --- /dev/null +++ b/evidence/telemetry.json @@ -0,0 +1,4701 @@ +{ + "api_trace_id": "a52265d394f78b05beb9d5de5e79b12f", + "api_request_id": "ef19d434-e487-4605-9f69-4454b08238bd", + "worker_trace_id": "39a6dbafa2ce702eebc79fd1c8ed6814", + "api_logs": [ + { + "stream": { + "deployment_environment_name": "lab", + "detected_level": "info", + "event": "http.request", + "flags": "1", + "method": "GET", + "observed_timestamp": "1794562654365014041", + "request_id": "ef19d434-e487-4605-9f69-4454b08238bd", + "route": "/api/v1/chats/:chat_id/messages", + "scope_name": "messenger", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "severity_number": "9", + "span_id": "00bf5eaf29eb0c36", + "status": "200", + "trace_id": "a52265d394f78b05beb9d5de5e79b12f" + }, + "values": [ + [ + "1794562654365012375", + "http.request" + ] + ] + } + ], + "worker_logs": [ + { + "stream": { + "code_file_path": "/app/telemetry.py", + "code_function_name": "event", + "code_line_number": "67", + "deployment_environment_name": "lab", + "detected_level": "INFO", + "event": "job.success", + "flags": "1", + "observed_timestamp": "1794562654602658666", + "scope_name": "jobs", + "service_instance_id": "058bed449bfa", + "service_name": "messenger-worker", + "service_version": "lab6-1", + "severity_number": "9", + "severity_text": "INFO", + "span_id": "7a540c955f968586", + "telemetry_sdk_language": "python", + "telemetry_sdk_name": "opentelemetry", + "telemetry_sdk_version": "1.38.0", + "trace_id": "39a6dbafa2ce702eebc79fd1c8ed6814" + }, + "values": [ + [ + "1794562654602643968", + "job.success" + ] + ] + } + ], + "api_trace": { + "batches": [ + { + "resource": { + "attributes": [ + { + "key": "deployment.environment.name", + "value": { + "stringValue": "lab" + } + }, + { + "key": "service.instance.id", + "value": { + "stringValue": "c81886a84f7c" + } + }, + { + "key": "service.name", + "value": { + "stringValue": "messenger-api" + } + }, + { + "key": "service.version", + "value": { + "stringValue": "lab6-1" + } + } + ] + }, + "scopeSpans": [ + { + "scope": { + "name": "messenger" + }, + "spans": [ + { + "traceId": "pSJl05T3iwW+udXeXnmxLw==", + "spanId": "BXCcEz10x/w=", + "parentSpanId": "AL9erynrDDY=", + "flags": 256, + "name": "db.SELECT", + "kind": "SPAN_KIND_CLIENT", + "startTimeUnixNano": "1794562654363344291", + "endTimeUnixNano": "1794562654363670625", + "attributes": [ + { + "key": "db.system.name", + "value": { + "stringValue": "postgresql" + } + } + ], + "status": {} + }, + { + "traceId": "pSJl05T3iwW+udXeXnmxLw==", + "spanId": "EgZMOT//6S4=", + "parentSpanId": "AL9erynrDDY=", + "flags": 256, + "name": "db.SELECT", + "kind": "SPAN_KIND_CLIENT", + "startTimeUnixNano": "1794562654363683083", + "endTimeUnixNano": "1794562654364940583", + "attributes": [ + { + "key": "db.system.name", + "value": { + "stringValue": "postgresql" + } + } + ], + "status": {} + }, + { + "traceId": "pSJl05T3iwW+udXeXnmxLw==", + "spanId": "AL9erynrDDY=", + "flags": 256, + "name": "GET /api/v1/chats/:chat_id/messages", + "kind": "SPAN_KIND_SERVER", + "startTimeUnixNano": "1794562654363217333", + "endTimeUnixNano": "1794562654365017083", + "attributes": [ + { + "key": "method", + "value": { + "stringValue": "GET" + } + }, + { + "key": "route", + "value": { + "stringValue": "/api/v1/chats/:chat_id/messages" + } + }, + { + "key": "status_class", + "value": { + "stringValue": "2xx" + } + }, + { + "key": "http.response.status_code", + "value": { + "intValue": "200" + } + } + ], + "status": {} + } + ] + } + ] + } + ] + }, + "worker_trace": { + "batches": [ + { + "resource": { + "attributes": [ + { + "key": "deployment.environment.name", + "value": { + "stringValue": "lab" + } + }, + { + "key": "service.instance.id", + "value": { + "stringValue": "aa973ed06f41" + } + }, + { + "key": "service.name", + "value": { + "stringValue": "messenger-api" + } + }, + { + "key": "service.version", + "value": { + "stringValue": "lab6-1" + } + } + ] + }, + "scopeSpans": [ + { + "scope": { + "name": "messenger" + }, + "spans": [ + { + "traceId": "Oabbr6LOcC7rx5/RyO1oFA==", + "spanId": "3vtinp2UMoQ=", + "parentSpanId": "6zhUf5v+y4s=", + "flags": 256, + "name": "db.SELECT", + "kind": "SPAN_KIND_CLIENT", + "startTimeUnixNano": "1794562654367786416", + "endTimeUnixNano": "1794562654368294375", + "attributes": [ + { + "key": "db.system.name", + "value": { + "stringValue": "postgresql" + } + } + ], + "status": {} + }, + { + "traceId": "Oabbr6LOcC7rx5/RyO1oFA==", + "spanId": "dIDumDdcxd0=", + "parentSpanId": "+qDb6hbMw1M=", + "flags": 256, + "name": "db.BEGIN", + "kind": "SPAN_KIND_CLIENT", + "startTimeUnixNano": "1794562654375179458", + "endTimeUnixNano": "1794562654375274166", + "attributes": [ + { + "key": "db.system.name", + "value": { + "stringValue": "postgresql" + } + } + ], + "status": {} + }, + { + "traceId": "Oabbr6LOcC7rx5/RyO1oFA==", + "spanId": "d/fbXRVAeao=", + "parentSpanId": "+qDb6hbMw1M=", + "flags": 256, + "name": "db.SELECT", + "kind": "SPAN_KIND_CLIENT", + "startTimeUnixNano": "1794562654375279291", + "endTimeUnixNano": "1794562654376222333", + "attributes": [ + { + "key": "db.system.name", + "value": { + "stringValue": "postgresql" + } + } + ], + "status": {} + }, + { + "traceId": "Oabbr6LOcC7rx5/RyO1oFA==", + "spanId": "gGzkU6mR9Yg=", + "parentSpanId": "+qDb6hbMw1M=", + "flags": 256, + "name": "db.INSERT", + "kind": "SPAN_KIND_CLIENT", + "startTimeUnixNano": "1794562654376226708", + "endTimeUnixNano": "1794562654378580791", + "attributes": [ + { + "key": "db.system.name", + "value": { + "stringValue": "postgresql" + } + } + ], + "status": {} + }, + { + "traceId": "Oabbr6LOcC7rx5/RyO1oFA==", + "spanId": "hLSj3AJ2jJY=", + "parentSpanId": "+qDb6hbMw1M=", + "flags": 256, + "name": "db.COMMIT", + "kind": "SPAN_KIND_CLIENT", + "startTimeUnixNano": "1794562654378586708", + "endTimeUnixNano": "1794562654378866958", + "attributes": [ + { + "key": "db.system.name", + "value": { + "stringValue": "postgresql" + } + } + ], + "status": {} + }, + { + "traceId": "Oabbr6LOcC7rx5/RyO1oFA==", + "spanId": "+qDb6hbMw1M=", + "parentSpanId": "6zhUf5v+y4s=", + "flags": 256, + "name": "attachment.enqueue", + "kind": "SPAN_KIND_PRODUCER", + "startTimeUnixNano": "1794562654375172291", + "endTimeUnixNano": "1794562654378869583", + "status": {} + }, + { + "traceId": "Oabbr6LOcC7rx5/RyO1oFA==", + "spanId": "6zhUf5v+y4s=", + "flags": 256, + "name": "POST /api/v1/chats/:chat_id/attachments", + "kind": "SPAN_KIND_SERVER", + "startTimeUnixNano": "1794562654367686500", + "endTimeUnixNano": "1794562654378944625", + "attributes": [ + { + "key": "method", + "value": { + "stringValue": "POST" + } + }, + { + "key": "route", + "value": { + "stringValue": "/api/v1/chats/:chat_id/attachments" + } + }, + { + "key": "status_class", + "value": { + "stringValue": "2xx" + } + }, + { + "key": "http.response.status_code", + "value": { + "intValue": "202" + } + } + ], + "status": {} + } + ] + } + ] + }, + { + "resource": { + "attributes": [ + { + "key": "telemetry.sdk.language", + "value": { + "stringValue": "python" + } + }, + { + "key": "telemetry.sdk.name", + "value": { + "stringValue": "opentelemetry" + } + }, + { + "key": "telemetry.sdk.version", + "value": { + "stringValue": "1.38.0" + } + }, + { + "key": "deployment.environment.name", + "value": { + "stringValue": "lab" + } + }, + { + "key": "service.name", + "value": { + "stringValue": "messenger-worker" + } + }, + { + "key": "service.version", + "value": { + "stringValue": "lab6-1" + } + }, + { + "key": "service.instance.id", + "value": { + "stringValue": "058bed449bfa" + } + } + ] + }, + "scopeSpans": [ + { + "scope": { + "name": "messenger-worker" + }, + "spans": [ + { + "traceId": "Oabbr6LOcC7rx5/RyO1oFA==", + "spanId": "wXZ1/YALM5I=", + "parentSpanId": "elQMlV+WhYY=", + "flags": 256, + "name": "db.SELECT", + "kind": "SPAN_KIND_CLIENT", + "startTimeUnixNano": "1794562654575508666", + "endTimeUnixNano": "1794562654575954708", + "attributes": [ + { + "key": "db.system.name", + "value": { + "stringValue": "postgresql" + } + } + ], + "status": {} + }, + { + "traceId": "Oabbr6LOcC7rx5/RyO1oFA==", + "spanId": "FCZnmHbl4so=", + "parentSpanId": "elQMlV+WhYY=", + "flags": 256, + "name": "db.SELECT", + "kind": "SPAN_KIND_CLIENT", + "startTimeUnixNano": "1794562654576015083", + "endTimeUnixNano": "1794562654576268166", + "attributes": [ + { + "key": "db.system.name", + "value": { + "stringValue": "postgresql" + } + } + ], + "status": {} + }, + { + "traceId": "Oabbr6LOcC7rx5/RyO1oFA==", + "spanId": "Xge8sjuDPUs=", + "parentSpanId": "elQMlV+WhYY=", + "flags": 256, + "name": "db.UPDATE", + "kind": "SPAN_KIND_CLIENT", + "startTimeUnixNano": "1794562654576468583", + "endTimeUnixNano": "1794562654576893791", + "attributes": [ + { + "key": "db.system.name", + "value": { + "stringValue": "postgresql" + } + } + ], + "status": {} + }, + { + "traceId": "Oabbr6LOcC7rx5/RyO1oFA==", + "spanId": "veQrK/l1qkQ=", + "parentSpanId": "elQMlV+WhYY=", + "flags": 256, + "name": "db.UPDATE", + "kind": "SPAN_KIND_CLIENT", + "startTimeUnixNano": "1794562654576937041", + "endTimeUnixNano": "1794562654577334458", + "attributes": [ + { + "key": "db.system.name", + "value": { + "stringValue": "postgresql" + } + } + ], + "status": {} + }, + { + "traceId": "Oabbr6LOcC7rx5/RyO1oFA==", + "spanId": "8PZ34aZ8xsM=", + "parentSpanId": "elQMlV+WhYY=", + "flags": 256, + "name": "s3.get_object", + "kind": "SPAN_KIND_CLIENT", + "startTimeUnixNano": "1794562654577789416", + "endTimeUnixNano": "1794562654585735208", + "status": {} + }, + { + "traceId": "Oabbr6LOcC7rx5/RyO1oFA==", + "spanId": "GYr5oRtPVkY=", + "parentSpanId": "elQMlV+WhYY=", + "flags": 256, + "name": "s3.put_original", + "kind": "SPAN_KIND_CLIENT", + "startTimeUnixNano": "1794562654592798916", + "endTimeUnixNano": "1794562654598000375", + "status": {} + }, + { + "traceId": "Oabbr6LOcC7rx5/RyO1oFA==", + "spanId": "ZTDysHSKJgc=", + "parentSpanId": "elQMlV+WhYY=", + "flags": 256, + "name": "s3.put_thumbnail", + "kind": "SPAN_KIND_CLIENT", + "startTimeUnixNano": "1794562654598040833", + "endTimeUnixNano": "1794562654600409250", + "status": {} + }, + { + "traceId": "Oabbr6LOcC7rx5/RyO1oFA==", + "spanId": "rwRIYoOiuTM=", + "parentSpanId": "elQMlV+WhYY=", + "flags": 256, + "name": "db.UPDATE", + "kind": "SPAN_KIND_CLIENT", + "startTimeUnixNano": "1794562654600465416", + "endTimeUnixNano": "1794562654601321166", + "attributes": [ + { + "key": "db.system.name", + "value": { + "stringValue": "postgresql" + } + } + ], + "status": {} + }, + { + "traceId": "Oabbr6LOcC7rx5/RyO1oFA==", + "spanId": "vClqwKc23/A=", + "parentSpanId": "elQMlV+WhYY=", + "flags": 256, + "name": "db.SELECT", + "kind": "SPAN_KIND_CLIENT", + "startTimeUnixNano": "1794562654602418708", + "endTimeUnixNano": "1794562654602593000", + "attributes": [ + { + "key": "db.system.name", + "value": { + "stringValue": "postgresql" + } + } + ], + "status": {} + }, + { + "traceId": "Oabbr6LOcC7rx5/RyO1oFA==", + "spanId": "elQMlV+WhYY=", + "parentSpanId": "S6h6hzlpMMQ=", + "flags": 768, + "name": "attachment.process", + "kind": "SPAN_KIND_CONSUMER", + "startTimeUnixNano": "1794562654575413833", + "endTimeUnixNano": "1794562654602741541", + "attributes": [ + { + "key": "messaging.message.id", + "value": { + "stringValue": "11e88479-2c7e-44cb-9c5c-8fd994027382" + } + }, + { + "key": "job.attempt", + "value": { + "intValue": "1" + } + }, + { + "key": "job_type", + "value": { + "stringValue": "attachment.process.v1" + } + }, + { + "key": "outcome", + "value": { + "stringValue": "success" + } + } + ], + "status": {} + } + ] + } + ] + }, + { + "resource": { + "attributes": [ + { + "key": "telemetry.sdk.language", + "value": { + "stringValue": "python" + } + }, + { + "key": "telemetry.sdk.name", + "value": { + "stringValue": "opentelemetry" + } + }, + { + "key": "telemetry.sdk.version", + "value": { + "stringValue": "1.38.0" + } + }, + { + "key": "deployment.environment.name", + "value": { + "stringValue": "lab" + } + }, + { + "key": "service.name", + "value": { + "stringValue": "messenger-dispatcher" + } + }, + { + "key": "service.version", + "value": { + "stringValue": "lab6-1" + } + }, + { + "key": "service.instance.id", + "value": { + "stringValue": "8b9758cc1dcb" + } + } + ] + }, + "scopeSpans": [ + { + "scope": { + "name": "messenger-worker" + }, + "spans": [ + { + "traceId": "Oabbr6LOcC7rx5/RyO1oFA==", + "spanId": "S6h6hzlpMMQ=", + "parentSpanId": "+qDb6hbMw1M=", + "flags": 768, + "name": "attachment.publish", + "kind": "SPAN_KIND_PRODUCER", + "startTimeUnixNano": "1794562654569365125", + "endTimeUnixNano": "1794562654575150041", + "status": {} + } + ] + } + ] + } + ] + }, + "metrics": { + "api_requests_total": [ + { + "metric": { + "__name__": "api_requests_total", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.799, + "11" + ] + }, + { + "metric": { + "__name__": "api_requests_total", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.799, + "1" + ] + }, + { + "metric": { + "__name__": "api_requests_total", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.799, + "1" + ] + }, + { + "metric": { + "__name__": "api_requests_total", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id/content", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.799, + "1" + ] + }, + { + "metric": { + "__name__": "api_requests_total", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.799, + "2" + ] + }, + { + "metric": { + "__name__": "api_requests_total", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/users/me", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.799, + "1" + ] + }, + { + "metric": { + "__name__": "api_requests_total", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/live", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.799, + "1" + ] + }, + { + "metric": { + "__name__": "api_requests_total", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/auth/sessions", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.799, + "3" + ] + }, + { + "metric": { + "__name__": "api_requests_total", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.799, + "2" + ] + }, + { + "metric": { + "__name__": "api_requests_total", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.799, + "1" + ] + }, + { + "metric": { + "__name__": "api_requests_total", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "5xx" + }, + "value": [ + 1794562658.799, + "3" + ] + }, + { + "metric": { + "__name__": "api_requests_total", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.799, + "1" + ] + }, + { + "metric": { + "__name__": "api_requests_total", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.799, + "2" + ] + } + ], + "api_duration_seconds_bucket": [ + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.005", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "11" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.01", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "11" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.025", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "11" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.05", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "11" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.1", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "11" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.25", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "11" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.5", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "11" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "1.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "11" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "2.5", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "11" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "5.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "11" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "10.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "11" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "+Inf", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "11" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.005", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.01", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.025", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.05", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.1", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.25", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.5", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "1.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "2.5", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "5.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "10.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "+Inf", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.005", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.01", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.025", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.05", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.1", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.25", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.5", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "1.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "2.5", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "5.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "10.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "+Inf", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.005", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id/content", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "0" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.01", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id/content", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "0" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.025", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id/content", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.05", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id/content", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.1", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id/content", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.25", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id/content", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.5", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id/content", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "1.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id/content", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "2.5", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id/content", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "5.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id/content", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "10.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id/content", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "+Inf", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/attachments/:attachment_id/content", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.005", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.01", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.025", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.05", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.1", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.25", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.5", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "1.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "2.5", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "5.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "10.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "+Inf", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.005", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/users/me", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.01", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/users/me", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.025", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/users/me", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.05", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/users/me", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.1", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/users/me", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.25", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/users/me", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.5", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/users/me", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "1.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/users/me", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "2.5", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/users/me", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "5.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/users/me", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "10.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/users/me", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "+Inf", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/api/v1/users/me", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.005", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/live", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.01", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/live", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.025", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/live", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.05", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/live", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.1", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/live", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.25", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/live", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.5", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/live", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "1.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/live", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "2.5", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/live", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "5.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/live", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "10.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/live", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "+Inf", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/live", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.005", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/auth/sessions", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "0" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.01", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/auth/sessions", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "0" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.025", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/auth/sessions", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.05", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/auth/sessions", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.1", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/auth/sessions", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.25", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/auth/sessions", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.5", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/auth/sessions", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "1.0", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/auth/sessions", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "2.5", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/auth/sessions", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "5.0", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/auth/sessions", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "10.0", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/auth/sessions", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "+Inf", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/auth/sessions", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.005", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.01", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.025", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.05", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.1", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.25", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.5", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "1.0", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "2.5", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "5.0", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "10.0", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "+Inf", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats/:chat_id/messages", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.005", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "0" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.01", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "0" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.025", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "0" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.05", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.1", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.25", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.5", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "1.0", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "2.5", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "5.0", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "10.0", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "aa973ed06f41", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "+Inf", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "aa973ed06f41", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.005", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "5xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.01", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "5xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.025", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "5xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.05", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "5xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.1", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "5xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.25", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "5xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.5", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "5xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "1.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "5xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "2.5", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "5xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "5.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "5xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "10.0", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "5xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "+Inf", + "method": "GET", + "otel_scope_name": "messenger", + "route": "/health/ready", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "5xx" + }, + "value": [ + 1794562658.805, + "3" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.005", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.01", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.025", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.05", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.1", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.25", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.5", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "1.0", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "2.5", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "5.0", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "10.0", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "+Inf", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/chats", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.005", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "0" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.01", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "0" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.025", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.05", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "1" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.1", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.25", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "0.5", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "1.0", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "2.5", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "5.0", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "10.0", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + }, + { + "metric": { + "__name__": "api_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "c81886a84f7c", + "exported_job": "messenger-api", + "instance": "otel-collector:8899", + "job": "messenger", + "le": "+Inf", + "method": "POST", + "otel_scope_name": "messenger", + "route": "/api/v1/users", + "service_instance_id": "c81886a84f7c", + "service_name": "messenger-api", + "service_version": "lab6-1", + "status_class": "2xx" + }, + "value": [ + 1794562658.805, + "2" + ] + } + ], + "worker_jobs_total": [ + { + "metric": { + "__name__": "worker_jobs_total", + "deployment_environment_name": "lab", + "exported_instance": "058bed449bfa", + "exported_job": "messenger-worker", + "instance": "otel-collector:8899", + "job": "messenger", + "job_type": "attachment.process.v1", + "otel_scope_name": "messenger-worker", + "outcome": "skipped", + "service_instance_id": "058bed449bfa", + "service_name": "messenger-worker", + "service_version": "lab6-1", + "telemetry_sdk_language": "python", + "telemetry_sdk_name": "opentelemetry", + "telemetry_sdk_version": "1.38.0" + }, + "value": [ + 1794562658.811, + "11" + ] + } + ], + "worker_duration_seconds_bucket": [ + { + "metric": { + "__name__": "worker_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "058bed449bfa", + "exported_job": "messenger-worker", + "instance": "otel-collector:8899", + "job": "messenger", + "job_type": "attachment.process.v1", + "le": "0.01", + "otel_scope_name": "messenger-worker", + "outcome": "skipped", + "service_instance_id": "058bed449bfa", + "service_name": "messenger-worker", + "service_version": "lab6-1", + "telemetry_sdk_language": "python", + "telemetry_sdk_name": "opentelemetry", + "telemetry_sdk_version": "1.38.0" + }, + "value": [ + 1794562658.815, + "11" + ] + }, + { + "metric": { + "__name__": "worker_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "058bed449bfa", + "exported_job": "messenger-worker", + "instance": "otel-collector:8899", + "job": "messenger", + "job_type": "attachment.process.v1", + "le": "0.05", + "otel_scope_name": "messenger-worker", + "outcome": "skipped", + "service_instance_id": "058bed449bfa", + "service_name": "messenger-worker", + "service_version": "lab6-1", + "telemetry_sdk_language": "python", + "telemetry_sdk_name": "opentelemetry", + "telemetry_sdk_version": "1.38.0" + }, + "value": [ + 1794562658.815, + "11" + ] + }, + { + "metric": { + "__name__": "worker_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "058bed449bfa", + "exported_job": "messenger-worker", + "instance": "otel-collector:8899", + "job": "messenger", + "job_type": "attachment.process.v1", + "le": "0.1", + "otel_scope_name": "messenger-worker", + "outcome": "skipped", + "service_instance_id": "058bed449bfa", + "service_name": "messenger-worker", + "service_version": "lab6-1", + "telemetry_sdk_language": "python", + "telemetry_sdk_name": "opentelemetry", + "telemetry_sdk_version": "1.38.0" + }, + "value": [ + 1794562658.815, + "11" + ] + }, + { + "metric": { + "__name__": "worker_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "058bed449bfa", + "exported_job": "messenger-worker", + "instance": "otel-collector:8899", + "job": "messenger", + "job_type": "attachment.process.v1", + "le": "0.25", + "otel_scope_name": "messenger-worker", + "outcome": "skipped", + "service_instance_id": "058bed449bfa", + "service_name": "messenger-worker", + "service_version": "lab6-1", + "telemetry_sdk_language": "python", + "telemetry_sdk_name": "opentelemetry", + "telemetry_sdk_version": "1.38.0" + }, + "value": [ + 1794562658.815, + "11" + ] + }, + { + "metric": { + "__name__": "worker_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "058bed449bfa", + "exported_job": "messenger-worker", + "instance": "otel-collector:8899", + "job": "messenger", + "job_type": "attachment.process.v1", + "le": "0.5", + "otel_scope_name": "messenger-worker", + "outcome": "skipped", + "service_instance_id": "058bed449bfa", + "service_name": "messenger-worker", + "service_version": "lab6-1", + "telemetry_sdk_language": "python", + "telemetry_sdk_name": "opentelemetry", + "telemetry_sdk_version": "1.38.0" + }, + "value": [ + 1794562658.815, + "11" + ] + }, + { + "metric": { + "__name__": "worker_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "058bed449bfa", + "exported_job": "messenger-worker", + "instance": "otel-collector:8899", + "job": "messenger", + "job_type": "attachment.process.v1", + "le": "1.0", + "otel_scope_name": "messenger-worker", + "outcome": "skipped", + "service_instance_id": "058bed449bfa", + "service_name": "messenger-worker", + "service_version": "lab6-1", + "telemetry_sdk_language": "python", + "telemetry_sdk_name": "opentelemetry", + "telemetry_sdk_version": "1.38.0" + }, + "value": [ + 1794562658.815, + "11" + ] + }, + { + "metric": { + "__name__": "worker_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "058bed449bfa", + "exported_job": "messenger-worker", + "instance": "otel-collector:8899", + "job": "messenger", + "job_type": "attachment.process.v1", + "le": "2.5", + "otel_scope_name": "messenger-worker", + "outcome": "skipped", + "service_instance_id": "058bed449bfa", + "service_name": "messenger-worker", + "service_version": "lab6-1", + "telemetry_sdk_language": "python", + "telemetry_sdk_name": "opentelemetry", + "telemetry_sdk_version": "1.38.0" + }, + "value": [ + 1794562658.815, + "11" + ] + }, + { + "metric": { + "__name__": "worker_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "058bed449bfa", + "exported_job": "messenger-worker", + "instance": "otel-collector:8899", + "job": "messenger", + "job_type": "attachment.process.v1", + "le": "5.0", + "otel_scope_name": "messenger-worker", + "outcome": "skipped", + "service_instance_id": "058bed449bfa", + "service_name": "messenger-worker", + "service_version": "lab6-1", + "telemetry_sdk_language": "python", + "telemetry_sdk_name": "opentelemetry", + "telemetry_sdk_version": "1.38.0" + }, + "value": [ + 1794562658.815, + "11" + ] + }, + { + "metric": { + "__name__": "worker_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "058bed449bfa", + "exported_job": "messenger-worker", + "instance": "otel-collector:8899", + "job": "messenger", + "job_type": "attachment.process.v1", + "le": "10.0", + "otel_scope_name": "messenger-worker", + "outcome": "skipped", + "service_instance_id": "058bed449bfa", + "service_name": "messenger-worker", + "service_version": "lab6-1", + "telemetry_sdk_language": "python", + "telemetry_sdk_name": "opentelemetry", + "telemetry_sdk_version": "1.38.0" + }, + "value": [ + 1794562658.815, + "11" + ] + }, + { + "metric": { + "__name__": "worker_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "058bed449bfa", + "exported_job": "messenger-worker", + "instance": "otel-collector:8899", + "job": "messenger", + "job_type": "attachment.process.v1", + "le": "30.0", + "otel_scope_name": "messenger-worker", + "outcome": "skipped", + "service_instance_id": "058bed449bfa", + "service_name": "messenger-worker", + "service_version": "lab6-1", + "telemetry_sdk_language": "python", + "telemetry_sdk_name": "opentelemetry", + "telemetry_sdk_version": "1.38.0" + }, + "value": [ + 1794562658.815, + "11" + ] + }, + { + "metric": { + "__name__": "worker_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "058bed449bfa", + "exported_job": "messenger-worker", + "instance": "otel-collector:8899", + "job": "messenger", + "job_type": "attachment.process.v1", + "le": "60.0", + "otel_scope_name": "messenger-worker", + "outcome": "skipped", + "service_instance_id": "058bed449bfa", + "service_name": "messenger-worker", + "service_version": "lab6-1", + "telemetry_sdk_language": "python", + "telemetry_sdk_name": "opentelemetry", + "telemetry_sdk_version": "1.38.0" + }, + "value": [ + 1794562658.815, + "11" + ] + }, + { + "metric": { + "__name__": "worker_duration_seconds_bucket", + "deployment_environment_name": "lab", + "exported_instance": "058bed449bfa", + "exported_job": "messenger-worker", + "instance": "otel-collector:8899", + "job": "messenger", + "job_type": "attachment.process.v1", + "le": "+Inf", + "otel_scope_name": "messenger-worker", + "outcome": "skipped", + "service_instance_id": "058bed449bfa", + "service_name": "messenger-worker", + "service_version": "lab6-1", + "telemetry_sdk_language": "python", + "telemetry_sdk_name": "opentelemetry", + "telemetry_sdk_version": "1.38.0" + }, + "value": [ + 1794562658.815, + "11" + ] + } + ] + } +} diff --git a/evidence/test-build.txt b/evidence/test-build.txt new file mode 100644 index 0000000..0d1e606 --- /dev/null +++ b/evidence/test-build.txt @@ -0,0 +1,60 @@ +#0 building with "desktop-linux" instance using docker driver + +#1 [internal] load build definition from Dockerfile +#1 transferring dockerfile: 6.11kB done +#1 DONE 0.0s + +#2 resolve image config for docker-image://docker.io/docker/dockerfile:1.7 +#2 DONE 1.1s + +#3 docker-image://docker.io/docker/dockerfile:1.7@sha256:a57df69d0ea827fb7266491f2813635de6f17269be881f696fbfdf2d83dda33e +#3 CACHED + +#4 [internal] load metadata for docker.io/library/golang:1.26.10-alpine3.24 +#4 DONE 0.0s + +#5 [internal] load .dockerignore +#5 transferring context: 205B done +#5 DONE 0.0s + +#6 [builder 1/10] FROM docker.io/library/golang:1.26.10-alpine3.24 +#6 DONE 0.0s + +#7 [internal] load build context +#7 transferring context: 6.60kB done +#7 DONE 0.0s + +#8 [builder 6/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/messenger ./cmd/messenger +#8 CACHED + +#9 [builder 3/10] COPY app/go.mod app/go.sum ./ +#9 CACHED + +#10 [builder 7/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/loadgen ./cmd/loadgen +#10 CACHED + +#11 [builder 8/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/s3init ./cmd/s3init +#11 CACHED + +#12 [builder 9/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/janitor ./cmd/janitor +#12 CACHED + +#13 [builder 2/10] WORKDIR /src +#13 CACHED + +#14 [builder 4/10] RUN go mod download +#14 CACHED + +#15 [builder 5/10] COPY app/ ./ +#15 CACHED + +#16 [builder 10/10] RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -trimpath -o /out/s3check ./cmd/s3check +#16 CACHED + +#17 exporting to image +#17 exporting layers +#17 exporting layers 0.6s done +#17 writing image sha256:52ef671aea4cf5024d9c85300bbeed2c499b0c32aca3529aa05b126857fb4865 +#17 writing image sha256:52ef671aea4cf5024d9c85300bbeed2c499b0c32aca3529aa05b126857fb4865 done +#17 naming to docker.io/library/lab7-tests done +#17 DONE 0.7s diff --git a/evidence/tls-start.txt b/evidence/tls-start.txt new file mode 100644 index 0000000..21326a2 --- /dev/null +++ b/evidence/tls-start.txt @@ -0,0 +1,64 @@ + Container mtusi-lab7-grafana-1 Recreate + Container mtusi-lab7-prometheus-1 Recreate + Container mtusi-lab7-loki-1 Recreate + Container mtusi-lab7-postgres-1 Recreate + Container mtusi-lab7-broker-1 Recreate + Container mtusi-lab7-s3-1 Recreate + Container mtusi-lab7-valkey-1 Recreate + Container mtusi-lab7-otel-collector-1 Recreate + Container mtusi-lab7-tempo-1 Recreate + Container mtusi-lab7-otel-collector-1 Recreated + Container mtusi-lab7-otel-collector-tls-1 Recreate + Container mtusi-lab7-prometheus-1 Recreated + Container mtusi-lab7-prometheus-tls-1 Recreate + Container mtusi-lab7-s3-1 Recreated + Container mtusi-lab7-s3-tls-1 Recreate + Container mtusi-lab7-grafana-1 Recreated + Container mtusi-lab7-grafana-tls-1 Recreate + Container mtusi-lab7-tempo-1 Recreated + Container mtusi-lab7-tempo-tls-1 Recreate + Container mtusi-lab7-broker-1 Recreated + Container mtusi-lab7-postgres-1 Recreated + Container mtusi-lab7-valkey-1 Recreated + Container mtusi-lab7-loki-1 Recreated + Container mtusi-lab7-loki-tls-1 Recreate + Container mtusi-lab7-otel-collector-tls-1 Recreated + Container mtusi-lab7-prometheus-tls-1 Recreated + Container mtusi-lab7-s3-tls-1 Recreated + Container mtusi-lab7-s3-gateway-1 Recreate + Container mtusi-lab7-grafana-tls-1 Recreated + Container mtusi-lab7-tempo-tls-1 Recreated + Container mtusi-lab7-s3-gateway-1 Recreated + Container mtusi-lab7-loki-tls-1 Recreated + Container mtusi-lab7-grafana-1 Starting + Container mtusi-lab7-otel-collector-1 Starting + Container mtusi-lab7-prometheus-1 Starting + Container mtusi-lab7-s3-1 Starting + Container mtusi-lab7-broker-1 Starting + Container mtusi-lab7-valkey-1 Starting + Container mtusi-lab7-postgres-1 Starting + Container mtusi-lab7-tempo-1 Starting + Container mtusi-lab7-loki-1 Starting + Container mtusi-lab7-grafana-1 Started + Container mtusi-lab7-grafana-tls-1 Starting + Container mtusi-lab7-loki-1 Started + Container mtusi-lab7-loki-tls-1 Starting + Container mtusi-lab7-valkey-1 Started + Container mtusi-lab7-s3-1 Started + Container mtusi-lab7-s3-tls-1 Starting + Container mtusi-lab7-broker-1 Started + Container mtusi-lab7-tempo-1 Started + Container mtusi-lab7-tempo-tls-1 Starting + Container mtusi-lab7-otel-collector-1 Started + Container mtusi-lab7-otel-collector-tls-1 Starting + Container mtusi-lab7-prometheus-1 Started + Container mtusi-lab7-prometheus-tls-1 Starting + Container mtusi-lab7-postgres-1 Started + Container mtusi-lab7-grafana-tls-1 Started + Container mtusi-lab7-otel-collector-tls-1 Started + Container mtusi-lab7-s3-tls-1 Started + Container mtusi-lab7-s3-gateway-1 Starting + Container mtusi-lab7-loki-tls-1 Started + Container mtusi-lab7-tempo-tls-1 Started + Container mtusi-lab7-prometheus-tls-1 Started + Container mtusi-lab7-s3-gateway-1 Started diff --git a/infra/README.md b/infra/README.md index 5a39e86..7512063 100644 --- a/infra/README.md +++ b/infra/README.md @@ -1,7 +1,15 @@ -# Инфраструктура студента +# Воспроизводимый стенд lab7 -Здесь разместите конфигурации выбранных сервисов; основную топологию — в корневом compose.yaml/stack.yaml. `compose.example.yaml` — только worksheet ролей и намеренно не запускается. `contracts/infrastructure.json` задаёт минимальные роли, не готовые образы/пароли. +Запуск из корня: `sh scripts/start.sh`. Docker Compose v2, Python3.9+ и OpenSSL/LibreSSL нужны на host. Все роли и pinned versions перечислены в compose.yaml (JSON — корректное подмножество YAML). -В REPORT.md сопоставьте роль → service name → версия/digest → health/readiness → volume → сеть/порт → способ передачи credentials. Приведите bootstrap (schema, bucket, broker topology, а с lab6 provisioning) и безопасное повторение этих команд. +- `haproxy`: внешний HTTPS :8443 → обязательный mTLS api:8080. +- `security`: TLS sidecar только с loopback plaintext hop; mTLS allowlist на telemetry. +- `openbao`: non-dev single-node Raft; explicit operator init/unseal и scoped cert auth. +- `otel`/`grafana`: реальные OTLP traces/logs/metrics и provisioning, соединения TLS/mTLS. +- `seaweedfs`/`s3-gateway`: приватный bucket и изоляция служебных интерфейсов. -Приложение строится из исходников. Не используйте заранее существующий образ преподавательского сервера вместо своей реализации. Restart hook перезапускает все соответствующие stores с volumes; failover hook останавливает только заданную API-реплику. +В Git нет рабочих credentials и сертификатных ключей. Bootstrap создаёт только локальные secrets/operator/. Данные: именованные Docker volumes. Остальные каталоги проекта не зависят от соседних лабораторных после переноса исходников. + +HTTPS API: https://localhost:8443; Grafana Viewer: https://localhost:13007; OpenBao operator API: https://localhost:18200. CA — secrets/ca.crt. Сертификат CA можно импортировать в браузер локально; глобальное отключение проверки TLS не требуется. + +Readiness проверяет scripts/wait-ready.py. Persistence hook пересоздаёт TLS sidecar после рестарта backend namespace. Остановка без удаления данных: `docker compose down`; намеренный сброс учебных данных: `docker compose down -v` (после этого архивировать старые operator/secrets и создать новые). Полные команды, права и ограничения — в REPORT.md и contracts/trust-matrix.md. diff --git a/infra/grafana/dashboards/messenger.json b/infra/grafana/dashboards/messenger.json new file mode 100644 index 0000000..29b5fee --- /dev/null +++ b/infra/grafana/dashboards/messenger.json @@ -0,0 +1,225 @@ +{ + "uid": "messenger-lab6", + "title": "Messenger — Lab 6", + "schemaVersion": 41, + "version": 2, + "refresh": "5s", + "time": { + "from": "now-15m", + "to": "now" + }, + "panels": [ + { + "id": 1, + "title": "API RPS", + "type": "timeseries", + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "gridPos": { + "x": 0, + "y": 0, + "w": 12, + "h": 8 + }, + "targets": [ + { + "expr": "sum by (method,route) (rate(api_requests_total{route!~\"/health/.*\"}[1m]))", + "refId": "A", + "legendFormat": "{{outcome}} {{method}} {{route}}" + } + ], + "fieldConfig": { + "defaults": { + "unit": "reqps" + }, + "overrides": [] + } + }, + { + "id": 2, + "title": "API 5xx / all business requests", + "type": "timeseries", + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "gridPos": { + "x": 12, + "y": 0, + "w": 12, + "h": 8 + }, + "targets": [ + { + "expr": "(sum(rate(api_requests_total{status_class=\"5xx\",route!~\"/health/.*\"}[1m])) or vector(0)) / clamp_min(sum(rate(api_requests_total{route!~\"/health/.*\"}[1m])),0.001)", + "refId": "A", + "legendFormat": "{{outcome}} {{method}} {{route}}" + } + ], + "fieldConfig": { + "defaults": { + "unit": "percentunit" + }, + "overrides": [] + } + }, + { + "id": 3, + "title": "API p95 seconds", + "type": "timeseries", + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "gridPos": { + "x": 0, + "y": 8, + "w": 12, + "h": 8 + }, + "targets": [ + { + "expr": "histogram_quantile(0.95,sum by (le) (rate(api_duration_seconds_bucket{route!~\"/health/.*\"}[1m])))", + "refId": "B", + "legendFormat": "p95" + } + ], + "fieldConfig": { + "defaults": { + "unit": "s" + }, + "overrides": [] + } + }, + { + "id": 4, + "title": "Worker jobs / sec", + "type": "timeseries", + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "gridPos": { + "x": 12, + "y": 8, + "w": 12, + "h": 8 + }, + "targets": [ + { + "expr": "sum by (outcome) (rate(worker_jobs_total[1m]))", + "refId": "A", + "legendFormat": "{{outcome}} {{method}} {{route}}" + } + ], + "fieldConfig": { + "defaults": { + "unit": "ops" + }, + "overrides": [] + } + }, + { + "id": 5, + "title": "Worker p95 seconds", + "type": "timeseries", + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "gridPos": { + "x": 0, + "y": 16, + "w": 12, + "h": 8 + }, + "targets": [ + { + "expr": "histogram_quantile(0.95,sum by (le) (rate(worker_duration_seconds_bucket[1m])))", + "refId": "A", + "legendFormat": "{{outcome}} {{method}} {{route}}" + } + ], + "fieldConfig": { + "defaults": { + "unit": "s" + }, + "overrides": [] + } + }, + { + "id": 6, + "title": "Worker total attempts", + "type": "timeseries", + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "gridPos": { + "x": 12, + "y": 16, + "w": 12, + "h": 8 + }, + "targets": [ + { + "expr": "sum by (outcome) (worker_jobs_total)", + "refId": "A", + "legendFormat": "{{outcome}} {{method}} {{route}}" + } + ], + "fieldConfig": { + "defaults": { + "unit": "short" + }, + "overrides": [] + } + }, + { + "id": 7, + "title": "API and worker structured logs", + "type": "logs", + "datasource": { + "type": "loki", + "uid": "loki" + }, + "gridPos": { + "x": 0, + "y": 24, + "w": 24, + "h": 10 + }, + "targets": [ + { + "expr": "{service_name=~\"messenger-api|messenger-worker\"}", + "refId": "A" + } + ] + }, + { + "id": 8, + "title": "Real application traces", + "type": "table", + "datasource": { + "type": "tempo", + "uid": "tempo" + }, + "gridPos": { + "x": 0, + "y": 34, + "w": 24, + "h": 8 + }, + "targets": [ + { + "queryType": "traceql", + "query": "{resource.service.name =~ \"messenger-api|messenger-worker\"}", + "refId": "A", + "limit": 20 + } + ] + } + ] +} diff --git a/infra/grafana/provisioning/dashboards/default.yaml b/infra/grafana/provisioning/dashboards/default.yaml new file mode 100644 index 0000000..0811276 --- /dev/null +++ b/infra/grafana/provisioning/dashboards/default.yaml @@ -0,0 +1,7 @@ +apiVersion: 1 +providers: + - name: messenger + folder: Lab6 + type: file + options: + path: /var/lib/grafana/dashboards diff --git a/infra/grafana/provisioning/datasources/sources.yaml b/infra/grafana/provisioning/datasources/sources.yaml new file mode 100644 index 0000000..047db0f --- /dev/null +++ b/infra/grafana/provisioning/datasources/sources.yaml @@ -0,0 +1,30 @@ +apiVersion: 1 +datasources: + - name: Prometheus + uid: prometheus + type: prometheus + access: proxy + url: https://prometheus:9443 + isDefault: true + - name: Loki + uid: loki + type: loki + access: proxy + url: https://loki:3443 + jsonData: + derivedFields: + - name: TraceID + matcherType: label + matcherRegex: trace_id + datasourceUid: tempo + url: '$${__value.raw}' + - name: Tempo + uid: tempo + type: tempo + access: proxy + url: https://tempo:3443 + jsonData: + tracesToLogsV2: + datasourceUid: loki + filterByTraceID: true + tags: [{key: service.name, value: service_name}] diff --git a/infra/haproxy/haproxy.cfg b/infra/haproxy/haproxy.cfg new file mode 100644 index 0000000..34009c5 --- /dev/null +++ b/infra/haproxy/haproxy.cfg @@ -0,0 +1,58 @@ +global + log stdout format raw local0 info + +resolvers docker + nameserver dns 127.0.0.11:53 + accepted_payload_size 8192 + resolve_retries 3 + timeout resolve 1s + timeout retry 1s + hold valid 5s + hold obsolete 5s + +defaults + mode http + log global + option httplog + option dontlognull + + retries 2 + retry-on conn-failure + option redispatch 1 + + timeout connect 500ms + timeout client 30s + timeout server 15s + timeout http-request 10s + timeout http-keep-alive 30s + timeout queue 5s + timeout check 1500ms + + # Ответы самого LB в формате контракта: схема Error и X-Request-Id, совпадающий с request_id. + # Контракт разрешает таким ответам не иметь X-Instance-Id. Ответы реплик эти правила не меняют. + http-error status 502 content-type application/json hdr X-Request-Id "%[var(txn.request_id)]" lf-string '{"error":{"code":"unavailable","message":"Service temporarily unavailable","request_id":"%[var(txn.request_id)]"}}' + http-error status 503 content-type application/json hdr X-Request-Id "%[var(txn.request_id)]" lf-string '{"error":{"code":"unavailable","message":"Service temporarily unavailable","request_id":"%[var(txn.request_id)]"}}' + http-error status 504 content-type application/json hdr X-Request-Id "%[var(txn.request_id)]" lf-string '{"error":{"code":"unavailable","message":"Service temporarily unavailable","request_id":"%[var(txn.request_id)]"}}' + +frontend public + http-request set-var(txn.request_id) uuid() + stick-table type ip size 10k expire 10s store http_req_rate(10s) + http-request track-sc0 src if { path /api/v1/auth/sessions } { method POST } + http-request return status 429 content-type application/json hdr Retry-After 10 hdr X-Request-Id "%[var(txn.request_id)]" lf-string '{"error":{"code":"rate_limited","message":"Too many requests","request_id":"%[var(txn.request_id)]"}}' if { path /api/v1/auth/sessions } { method POST } { sc_http_req_rate(0) gt 20 } + bind :8443 ssl crt /tls/lb.pem ssl-min-ver TLSv1.2 + # Идентификатор для ответов самого LB. У ответов реплик свой X-Request-Id. + http-request set-var(txn.request_id) uuid() + default_backend api + +backend api + balance roundrobin + option httpchk GET /health/ready + http-check expect status 200 + default-server check init-state down inter 1s fall 2 rise 2 observe layer4 error-limit 2 on-error mark-down resolvers docker init-addr none resolve-prefer ipv4 + server-template api 1-8 api:8080 ssl verify required ca-file /tls/ca.crt crt /tls/lb.pem verifyhost api sni str(api) check-sni api + +frontend stats + bind 127.0.0.1:8404 + monitor-uri /health + stats enable + stats uri /stats diff --git a/infra/openbao/README.md b/infra/openbao/README.md index 0850e23..4975a57 100644 --- a/infra/openbao/README.md +++ b/infra/openbao/README.md @@ -1,7 +1,15 @@ -# OpenBao — реализовать конфигурацию и политики +# OpenBao operator runbook -Добавьте non-dev конфигурацию listener/storage/TLS, API/worker policies, bootstrap и rotation scripts. Credentials и unseal material создаются локально; здесь нет готового root token или private key. +Образ ghcr.io/openbao/openbao:2.7.1, non-dev, один Raft узел и volume baodata. TLS listener :8200, встроенный TLS cluster listener :8201; наружу только localhost:18200. One-shot bao-volume-init устанавливает владельца тома UID100/GID1000, сам Bao работает non-root. -Решение должно показать реальную сервисную аутентификацию и получение нужного secret по ограниченной policy; просто работающий контейнер OpenBao не засчитывается. На 3 статический KV secret допустим. На 4 покажите expiry/renewal/rotation и allow/deny. Путь KV v2 data/metadata и ACL должен соответствовать фактическому mount; не копируйте широкое `path "*"` для приложения. +1. `python3 scripts/bootstrap.py` создаёт CA, leaf и разные credentials локально. +2. `docker compose up -d openbao` запускает sealed сервер с пустым/существующим volume. +3. `python3 scripts/bao-setup.py` выполняет init только для нового хранилища (3 shares, threshold2), сохраняет результат в operator/bao-init.json (0600), затем unseal, KVv2, cert auth, роли, policy и bundles. +4. После обычного restart Bao: `python3 scripts/bao-setup.py --unseal-only`. +5. После restart API оператор не нужен: runtime.py выполняет cert auth, читает только свою KV запись в tmpfs и отзывает токен. Новый API при sealed/unavailable Bao завершается. Работающий API продолжает использовать static KV credentials. -Документируйте шаги оператора init/unseal и восстановление после restart. Скрипт не должен печатать tokens/shares или хранить их в Git. См. contracts/trust-matrix.md и REPORT.md. +Policy api/worker/dispatcher разрешает только read secret/data/ и revoke-self; default policy исключена. Login role привязана к конкретному leaf и URI SAN. Token TTL5m/max10m. Root token/unseal/CA key не монтируются ни в один контейнер. + +Тест: `sh scripts/check-internal.sh` → own200, cross-role403, sys/mounts403, revoked403; wrong-role certificate не логинится как API. Разрешённое чтение проверяется до отрицательного, чтобы сетевой отказ не считался защитой. + +Сервисные сертификаты 30 дней; это bootstrap credential, а не постоянный пароль для «получения секретов». Renewal на 3 выполняет оператор с остановкой и повторной настройкой cert auth. Ротация без downtime, CRL и dynamic DB leases не заявлены. Root token и shares остаются в закрытом operator каталоге лабораторного host; для реальной эксплуатации требуются отдельные держатели shares/offline storage. diff --git a/infra/openbao/api.hcl b/infra/openbao/api.hcl new file mode 100644 index 0000000..e880a9e --- /dev/null +++ b/infra/openbao/api.hcl @@ -0,0 +1,2 @@ +path "secret/data/api" { capabilities = ["read"] } +path "auth/token/revoke-self" { capabilities = ["update"] } diff --git a/infra/openbao/config.hcl b/infra/openbao/config.hcl new file mode 100644 index 0000000..900f91d --- /dev/null +++ b/infra/openbao/config.hcl @@ -0,0 +1,14 @@ +ui = false +api_addr = "https://openbao:8200" +cluster_addr = "https://openbao:8201" +storage "raft" { + node_id = "lab7-bao" + path = "/openbao/file" +} +listener "tcp" { + address = "0.0.0.0:8200" + tls_cert_file = "/tls/service.crt" + tls_key_file = "/tls/service.key" + tls_client_ca_file = "/tls/ca.crt" + tls_min_version = "tls12" +} diff --git a/infra/openbao/dispatcher.hcl b/infra/openbao/dispatcher.hcl new file mode 100644 index 0000000..ca57393 --- /dev/null +++ b/infra/openbao/dispatcher.hcl @@ -0,0 +1,2 @@ +path "secret/data/dispatcher" { capabilities = ["read"] } +path "auth/token/revoke-self" { capabilities = ["update"] } diff --git a/infra/openbao/worker.hcl b/infra/openbao/worker.hcl new file mode 100644 index 0000000..1a5e177 --- /dev/null +++ b/infra/openbao/worker.hcl @@ -0,0 +1,2 @@ +path "secret/data/worker" { capabilities = ["read"] } +path "auth/token/revoke-self" { capabilities = ["update"] } diff --git a/infra/otel/README.md b/infra/otel/README.md index c46fe89..325b6cd 100644 --- a/infra/otel/README.md +++ b/infra/otel/README.md @@ -1,7 +1,9 @@ -# Конфигурация наблюдаемости — реализовать +# Telemetry через TLS -Добавьте `collector.yaml` с OTLP receivers, processors и exporters выбранной версии Collector. Укажите явные bind endpoints, внутренние сети, memory limits/batch и поведение при backpressure по уровню. Сопоставьте все три pipeline с реально развёрнутыми backend. +Collector 0.137.0 принимает HTTP/protobuf OTLP только loopback4318 за TLS sidecar4438. Клиенты api/worker/dispatcher предъявляют свои сертификаты; allowlist проверяет URI SAN. Collector отправляет traces в Tempo :4438 и logs в Loki :3443/otlp со своей identity. -Добавьте конфигурации storage, Grafana provisioning/datasources, provisioning/dashboards и импортируемые dashboard JSON. На 4 — alert rules и runbooks. Пустой dashboard или debug exporter, который только печатает данные в stdout, не заменяют хранилища/доказательства из `contracts/observability.md`. +Prometheus scrape получает app metrics :8899 и collector metrics :8898 по mTLS identity prometheus. Grafana datasource endpoints также mTLS; приватный client key добавляется в secrets/grafana-datasources.yaml при локальном bootstrap, в Git только шаблон sources.yaml без значений. -Не публикуйте OTLP/metrics/административные ports в общую сеть без необходимости. В lab7 реализуйте TLS/mTLS по trust matrix; экспорт Authorization и message bodies запрещён. +Поля telemetry разрешены явно: route template, method/status, duration, request_id/trace_id/span_id, job type/outcome. Ни Authorization, ни тела, ни SQL arguments/credentials не экспортируются. Метрики: api_requests_total, api_duration_seconds_bucket, worker_jobs_total, worker_duration_seconds_bucket. См. dashboards/messenger.json в infra/grafana (точное имя файла можно посмотреть в каталоге). + +`student-tests/observability.py` выполняется во временном operator контейнере: создаёт synthetic chat/upload и проверяет фактические matching log/trace и четыре SDK metrics. Результат evidence/telemetry.json содержит только разрешённые технические данные. diff --git a/infra/otel/collector.yaml b/infra/otel/collector.yaml new file mode 100644 index 0000000..d62fe27 --- /dev/null +++ b/infra/otel/collector.yaml @@ -0,0 +1,63 @@ +receivers: + otlp: + protocols: + http: + endpoint: 127.0.0.1:4318 +processors: + memory_limiter: + check_interval: 1s + limit_mib: 192 + spike_limit_mib: 32 + batch: + timeout: 2s + send_batch_size: 128 + send_batch_max_size: 256 +exporters: + prometheus: + endpoint: 127.0.0.1:8889 + resource_to_telemetry_conversion: + enabled: true + otlphttp/tempo: + endpoint: https://tempo:4438 + tls: + ca_file: /tls/ca.crt + cert_file: /tls/service.crt + key_file: /tls/service.key + timeout: 3s + sending_queue: + queue_size: 256 + retry_on_failure: + max_elapsed_time: 30s + otlphttp/loki: + endpoint: https://loki:3443/otlp + tls: + ca_file: /tls/ca.crt + cert_file: /tls/service.crt + key_file: /tls/service.key + timeout: 3s + sending_queue: + queue_size: 256 + retry_on_failure: + max_elapsed_time: 30s +service: + telemetry: + metrics: + readers: + - pull: + exporter: + prometheus: + host: 127.0.0.1 + port: 8888 + pipelines: + traces: + receivers: [otlp] + processors: [memory_limiter, batch] + exporters: [otlphttp/tempo] + metrics: + receivers: [otlp] + processors: [memory_limiter, batch] + exporters: [prometheus] + logs: + receivers: [otlp] + processors: [memory_limiter, batch] + exporters: [otlphttp/loki] diff --git a/infra/otel/loki.yaml b/infra/otel/loki.yaml new file mode 100644 index 0000000..06111e3 --- /dev/null +++ b/infra/otel/loki.yaml @@ -0,0 +1,34 @@ +auth_enabled: false +server: + http_listen_address: 127.0.0.1 + grpc_listen_address: 127.0.0.1 + http_listen_port: 3100 +common: + instance_addr: 127.0.0.1 + path_prefix: /loki + storage: + filesystem: + chunks_directory: /loki/chunks + rules_directory: /loki/rules + replication_factor: 1 + ring: + kvstore: + store: inmemory +schema_config: + configs: + - from: 2024-01-01 + store: tsdb + object_store: filesystem + schema: v13 + index: + prefix: index_ + period: 24h +limits_config: + allow_structured_metadata: true + retention_period: 72h +compactor: + working_directory: /loki/compactor + retention_enabled: true + delete_request_store: filesystem +analytics: + reporting_enabled: false diff --git a/infra/otel/prometheus.yaml b/infra/otel/prometheus.yaml new file mode 100644 index 0000000..3e1ff84 --- /dev/null +++ b/infra/otel/prometheus.yaml @@ -0,0 +1,21 @@ +global: + scrape_interval: 5s + evaluation_interval: 5s +scrape_configs: + - job_name: messenger + scheme: https + tls_config: + ca_file: /tls/ca.crt + cert_file: /tls/service.crt + key_file: /tls/service.key + static_configs: + - targets: ['otel-collector:8899'] + + - job_name: collector + scheme: https + tls_config: + ca_file: /tls/ca.crt + cert_file: /tls/service.crt + key_file: /tls/service.key + static_configs: + - targets: ['otel-collector:8898'] diff --git a/infra/otel/tempo.yaml b/infra/otel/tempo.yaml new file mode 100644 index 0000000..befab11 --- /dev/null +++ b/infra/otel/tempo.yaml @@ -0,0 +1,22 @@ +server: + http_listen_address: 127.0.0.1 + grpc_listen_address: 127.0.0.1 + http_listen_port: 3200 +distributor: + receivers: + otlp: + protocols: + http: + endpoint: 127.0.0.1:4318 +ingester: + max_block_duration: 1m +compactor: + compaction: + block_retention: 72h +storage: + trace: + backend: local + wal: + path: /var/tempo/wal + local: + path: /var/tempo/blocks diff --git a/infra/s3-gateway/haproxy.cfg b/infra/s3-gateway/haproxy.cfg new file mode 100644 index 0000000..e5fd805 --- /dev/null +++ b/infra/s3-gateway/haproxy.cfg @@ -0,0 +1,12 @@ +global + maxconn 256 +defaults + mode tcp + timeout connect 3s + timeout client 30s + timeout server 30s +frontend s3_tls_only + bind :9443 + default_backend s3_tls +backend s3_tls + server storage s3-storage:9443 diff --git a/infra/seaweedfs/master.toml b/infra/seaweedfs/master.toml new file mode 100644 index 0000000..cffbcc0 --- /dev/null +++ b/infra/seaweedfs/master.toml @@ -0,0 +1,4 @@ +# Allocate one volume at a time for this single-node teaching setup. +# The default batch of seven quickly exhausts volume slots across buckets. +[master.volume_growth] +copy_1 = 1 diff --git a/infra/security/Dockerfile b/infra/security/Dockerfile new file mode 100644 index 0000000..1cd419b --- /dev/null +++ b/infra/security/Dockerfile @@ -0,0 +1,4 @@ +FROM python:3.13.9-alpine3.22 +COPY runtime.py /runtime.py +USER nobody +ENTRYPOINT ["python", "/runtime.py", "proxy"] diff --git a/infra/security/pg_hba.conf b/infra/security/pg_hba.conf new file mode 100644 index 0000000..2092634 --- /dev/null +++ b/infra/security/pg_hba.conf @@ -0,0 +1,5 @@ +local all all trust +hostssl all all 0.0.0.0/0 scram-sha-256 +hostssl all all ::/0 scram-sha-256 +hostnossl all all 0.0.0.0/0 reject +hostnossl all all ::/0 reject diff --git a/infra/security/runtime.py b/infra/security/runtime.py new file mode 100644 index 0000000..cc1371d --- /dev/null +++ b/infra/security/runtime.py @@ -0,0 +1,97 @@ +"""Small TLS-only sidecar and fail-closed service bootstrap. No secret logging.""" +import asyncio +import json +import os +from pathlib import Path +import ssl +import sys +import urllib.request + + +def fetch(): + role = os.environ['BAO_ROLE'] + ctx = ssl.create_default_context(cafile='/tls/ca.crt') + ctx.load_cert_chain('/tls/service.crt', '/tls/service.key') + addr = os.getenv('BAO_ADDR', 'https://openbao:8200') + def request(path, data=None, token=None): + headers = {'Content-Type': 'application/json'} + if token: + headers['X-Vault-Token'] = token + req = urllib.request.Request(addr + '/v1/' + path, data=json.dumps(data).encode() if data is not None else None, headers=headers) + with urllib.request.urlopen(req, context=ctx, timeout=10) as response: + raw = response.read() + return json.loads(raw) if raw else {} + token = request('auth/cert/login', {'name': role})['auth']['client_token'] + try: + values = request('secret/data/' + role, token=token)['data']['data'] + out = Path('/run/app-secrets') + out.mkdir(exist_ok=True) + for name, value in values.items(): + if name not in ('database_url', 'cache_url', 'broker_url', 's3_access_key_id', 's3_secret_access_key'): + raise ValueError('unexpected secret field') + file = out / name + file.write_text(value) + file.chmod(0o600) + finally: + request('auth/token/revoke-self', {}, token) + + +async def proxy(specs): + context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) + context.minimum_version = ssl.TLSVersion.TLSv1_2 + context.load_cert_chain('/tls/service.crt', '/tls/service.key') + allowed = set(os.getenv('TLS_ALLOWED_IDS', '').split(',')) - {''} + if allowed: + context.load_verify_locations('/tls/ca.crt') + context.verify_mode = ssl.CERT_REQUIRED + sem = asyncio.Semaphore(256) + async def connection(reader, writer, target): + async with sem: + peer = None + try: + if allowed: + cert = writer.get_extra_info('peercert') + identities = {value for kind, value in cert.get('subjectAltName', []) if kind == 'URI'} + if not identities.intersection(allowed): + return + upstream, peer = await asyncio.wait_for(asyncio.open_connection('127.0.0.1', target), 5) + async def copy(src, dst): + while data := await src.read(65536): + dst.write(data) + await dst.drain() + tasks = [asyncio.create_task(copy(reader, peer)), asyncio.create_task(copy(upstream, writer))] + try: + await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED) + finally: + for task in tasks: + task.cancel() + await asyncio.gather(*tasks, return_exceptions=True) + except (OSError, asyncio.TimeoutError): + pass + finally: + writer.close() + if peer: + peer.close() + servers = [] + for spec in specs: + port, target = map(int, spec.split(':')) + async def handler(r, w, target=target): + await connection(r, w, target) + servers.append(await asyncio.start_server(handler, '0.0.0.0', port, ssl=context, ssl_handshake_timeout=5, backlog=128)) + await asyncio.gather(*(s.serve_forever() for s in servers)) + + +if __name__ == '__main__': + if sys.argv[1] == 'proxy': + asyncio.run(proxy(sys.argv[2:])) + else: + try: + fetch() + except Exception as exc: + sys.exit('OpenBao bootstrap denied/unavailable: ' + type(exc).__name__) + if os.environ['BAO_ROLE'] == 'api': + import uuid + alias = str(uuid.uuid4()) + os.environ['APP_INSTANCE_ID'] = alias + Path('/tmp/instance-alias').write_text(alias) + os.execvp(sys.argv[2], sys.argv[2:]) diff --git a/migrations/00001_create_users_table.sql b/migrations/00001_create_users_table.sql new file mode 100644 index 0000000..34e3184 --- /dev/null +++ b/migrations/00001_create_users_table.sql @@ -0,0 +1,22 @@ +-- +goose Up +-- +goose StatementBegin +CREATE TABLE users ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + username text NOT NULL, + display_name text NOT NULL, + -- Строка password KDF (Argon2id/scrypt) вместе с солью и параметрами; никогда не отдаётся в API. + password_hash text NOT NULL, + created_at timestamptz NOT NULL DEFAULT now(), + + CONSTRAINT users_username_key UNIQUE (username), + CONSTRAINT users_username_format CHECK (username ~ '^[a-z0-9_]{3,32}$'), + CONSTRAINT users_display_name_len CHECK (char_length(display_name) BETWEEN 1 AND 100 + AND btrim(display_name) <> ''), + CONSTRAINT users_password_hash_not_empty CHECK (password_hash <> '') +); +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +DROP TABLE IF EXISTS users; +-- +goose StatementEnd diff --git a/migrations/00002_create_chats_table.sql b/migrations/00002_create_chats_table.sql new file mode 100644 index 0000000..7b5cdd4 --- /dev/null +++ b/migrations/00002_create_chats_table.sql @@ -0,0 +1,16 @@ +-- +goose Up +-- +goose StatementBegin +CREATE TABLE chats ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + title text NOT NULL, + created_at timestamptz NOT NULL DEFAULT now(), + + CONSTRAINT chats_title_len CHECK (char_length(title) BETWEEN 1 AND 100 + AND btrim(title) <> '') +); +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +DROP TABLE IF EXISTS chats; +-- +goose StatementEnd diff --git a/migrations/00003_create_chat_members_table.sql b/migrations/00003_create_chat_members_table.sql new file mode 100644 index 0000000..91aaf57 --- /dev/null +++ b/migrations/00003_create_chat_members_table.sql @@ -0,0 +1,16 @@ +-- +goose Up +-- +goose StatementBegin +CREATE TABLE chat_members ( + chat_id uuid NOT NULL REFERENCES chats (id) ON DELETE CASCADE, + user_id uuid NOT NULL REFERENCES users (id) ON DELETE RESTRICT, + + CONSTRAINT chat_members_pkey PRIMARY KEY (chat_id, user_id) +); + +CREATE INDEX chat_members_user_id_chat_id_idx ON chat_members (user_id, chat_id); +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +DROP TABLE IF EXISTS chat_members; +-- +goose StatementEnd diff --git a/migrations/00004_create_messages_table.sql b/migrations/00004_create_messages_table.sql new file mode 100644 index 0000000..4466222 --- /dev/null +++ b/migrations/00004_create_messages_table.sql @@ -0,0 +1,25 @@ +-- +goose Up +-- +goose StatementBegin +CREATE TABLE messages ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + chat_id uuid NOT NULL, + sender_id uuid NOT NULL, + text text NOT NULL, + created_at timestamptz NOT NULL DEFAULT now(), + + -- Отправитель обязан быть участником этого чата: FK на пару из chat_members. + CONSTRAINT messages_chat_member_fkey FOREIGN KEY (chat_id, sender_id) + REFERENCES chat_members (chat_id, user_id) ON DELETE RESTRICT, + CONSTRAINT messages_text_len CHECK (char_length(text) BETWEEN 1 AND 4000) +); + +-- История чата с keyset-пагинацией: +-- WHERE chat_id = $1 AND (created_at, id) > ($2, $3) ORDER BY created_at, id LIMIT $4 +-- Индекс отдаёт страницу без полного scan и без сортировки. +CREATE INDEX messages_chat_id_created_at_id_idx ON messages (chat_id, created_at, id); +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +DROP TABLE IF EXISTS messages; +-- +goose StatementEnd diff --git a/migrations/00005_escape_nul_in_text.sql b/migrations/00005_escape_nul_in_text.sql new file mode 100644 index 0000000..2aede12 --- /dev/null +++ b/migrations/00005_escape_nul_in_text.sql @@ -0,0 +1,45 @@ +-- PostgreSQL text не хранит U+0000, а контракт допускает его в display_name, +-- title и text. Приложение пишет эти поля экранированными: `\` → `\\`, +-- U+0000 → `\0` (app/internal/store/db/text.go). Ограничения длины проверяют +-- раскодированное значение: regexp_replace(x, '\\(.)', '\1', 'g') сворачивает +-- каждую escape-пару в один символ, поэтому char_length совпадает с числом +-- code points исходной строки. + +-- +goose Up +-- +goose StatementBegin +ALTER TABLE users DROP CONSTRAINT users_display_name_len; +ALTER TABLE chats DROP CONSTRAINT chats_title_len; +ALTER TABLE messages DROP CONSTRAINT messages_text_len; + +UPDATE users SET display_name = replace(display_name, '\', '\\') WHERE strpos(display_name, '\') > 0; +UPDATE chats SET title = replace(title, '\', '\\') WHERE strpos(title, '\') > 0; +UPDATE messages SET text = replace(text, '\', '\\') WHERE strpos(text, '\') > 0; + +ALTER TABLE users ADD CONSTRAINT users_display_name_len + CHECK (char_length(regexp_replace(display_name, '\\(.)', '\1', 'g')) BETWEEN 1 AND 100 + AND btrim(regexp_replace(display_name, '\\(.)', '\1', 'g')) <> ''); +ALTER TABLE chats ADD CONSTRAINT chats_title_len + CHECK (char_length(regexp_replace(title, '\\(.)', '\1', 'g')) BETWEEN 1 AND 100 + AND btrim(regexp_replace(title, '\\(.)', '\1', 'g')) <> ''); +ALTER TABLE messages ADD CONSTRAINT messages_text_len + CHECK (char_length(regexp_replace(text, '\\(.)', '\1', 'g')) BETWEEN 1 AND 4000); +-- +goose StatementEnd + +-- +goose Down +-- Откат с потерей: U+0000 непредставим в text и превращается в '0'. +-- +goose StatementBegin +ALTER TABLE users DROP CONSTRAINT users_display_name_len; +ALTER TABLE chats DROP CONSTRAINT chats_title_len; +ALTER TABLE messages DROP CONSTRAINT messages_text_len; + +UPDATE users SET display_name = regexp_replace(display_name, '\\(.)', '\1', 'g') WHERE strpos(display_name, '\') > 0; +UPDATE chats SET title = regexp_replace(title, '\\(.)', '\1', 'g') WHERE strpos(title, '\') > 0; +UPDATE messages SET text = regexp_replace(text, '\\(.)', '\1', 'g') WHERE strpos(text, '\') > 0; + +ALTER TABLE users ADD CONSTRAINT users_display_name_len + CHECK (char_length(display_name) BETWEEN 1 AND 100 AND btrim(display_name) <> ''); +ALTER TABLE chats ADD CONSTRAINT chats_title_len + CHECK (char_length(title) BETWEEN 1 AND 100 AND btrim(title) <> ''); +ALTER TABLE messages ADD CONSTRAINT messages_text_len + CHECK (char_length(text) BETWEEN 1 AND 4000); +-- +goose StatementEnd diff --git a/migrations/00006_create_cache_invalidations_table.sql b/migrations/00006_create_cache_invalidations_table.sql new file mode 100644 index 0000000..852dddb --- /dev/null +++ b/migrations/00006_create_cache_invalidations_table.sql @@ -0,0 +1,23 @@ +-- Отложенная инвалидация кэша истории. Если после COMMIT сообщения сброс +-- версии чата в Valkey не удался, строка фиксирует долг до ответа 201 и +-- переживает рестарт API. gen берётся из общей последовательности и при +-- каждом новом сбое получает ещё не выданное значение: строку удаляет только +-- тот повтор, который видел актуальный gen (compare-and-delete). Счётчик +-- внутри строки не годится: после удаления строки он начался бы снова с 1. + +-- +goose Up +-- +goose StatementBegin +CREATE SEQUENCE cache_invalidations_gen_seq; + +CREATE TABLE cache_invalidations ( + chat_id uuid PRIMARY KEY REFERENCES chats (id) ON DELETE CASCADE, + gen bigint NOT NULL DEFAULT nextval('cache_invalidations_gen_seq'), + updated_at timestamptz NOT NULL DEFAULT now() +); +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +DROP TABLE IF EXISTS cache_invalidations; +DROP SEQUENCE IF EXISTS cache_invalidations_gen_seq; +-- +goose StatementEnd diff --git a/migrations/00007_create_message_idempotency_keys_table.sql b/migrations/00007_create_message_idempotency_keys_table.sql new file mode 100644 index 0000000..e4c1b49 --- /dev/null +++ b/migrations/00007_create_message_idempotency_keys_table.sql @@ -0,0 +1,32 @@ +-- Идемпотентность отправки сообщений, общая для всех реплик API. +-- Область ключа: пользователь + чат + ключ (метод и путь у эндпоинта фиксированы). +-- Строка ключа и сообщение пишутся одной транзакцией: конкурентный INSERT с тем же +-- ключом ждёт её завершения и после COMMIT получает конфликт, после ROLLBACK — вставляет. +-- FK на chat_members не даёт появиться ключу постороннего, поэтому существующий ключ +-- означает, что вызывающий — участник чата. Это и есть проверка доступа при повторе. +-- FK на messages отложенный: ключ вставляется первым, чтобы захватить право на запись. + +-- +goose Up +-- +goose StatementBegin +CREATE TABLE message_idempotency_keys ( + user_id uuid NOT NULL, + chat_id uuid NOT NULL, + key text NOT NULL, + message_id uuid NOT NULL, + created_at timestamptz NOT NULL DEFAULT now(), + + PRIMARY KEY (user_id, chat_id, key), + CONSTRAINT message_idempotency_keys_member_fkey FOREIGN KEY (chat_id, user_id) + REFERENCES chat_members (chat_id, user_id) ON DELETE RESTRICT, + CONSTRAINT message_idempotency_keys_message_fkey FOREIGN KEY (message_id) + REFERENCES messages (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED +); + +-- Для удаления ключей старше срока хранения. +CREATE INDEX message_idempotency_keys_created_at_idx ON message_idempotency_keys (created_at); +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +DROP TABLE IF EXISTS message_idempotency_keys; +-- +goose StatementEnd diff --git a/migrations/00008_create_attachments_tables.sql b/migrations/00008_create_attachments_tables.sql new file mode 100644 index 0000000..f752e24 --- /dev/null +++ b/migrations/00008_create_attachments_tables.sql @@ -0,0 +1,69 @@ +-- Вложения: метаданные живут здесь, байты — в приватном S3-bucket (object_key назначает сервер). +-- Составные FK гарантируют на уровне БД: загрузил участник чата, а сообщение ссылается только +-- на вложения своего чата. Поэтому чужое вложение в сообщении невозможно даже при ошибке в коде. +-- Текст сообщения теперь может быть пустым: правило «пустой текст только с вложением» проверяет +-- приложение, потому что вложения пишутся отдельной таблицей. + +-- +goose Up +-- +goose StatementBegin +CREATE TABLE attachments ( + id uuid PRIMARY KEY, + chat_id uuid NOT NULL, + owner_id uuid NOT NULL, + filename text NOT NULL, + content_type text NOT NULL, + size_bytes bigint NOT NULL, + sha256 text NOT NULL, + object_key text NOT NULL, + status text NOT NULL DEFAULT 'ready', + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now(), + + CONSTRAINT attachments_member_fkey FOREIGN KEY (chat_id, owner_id) + REFERENCES chat_members (chat_id, user_id) ON DELETE RESTRICT, + CONSTRAINT attachments_chat_id_id_key UNIQUE (chat_id, id), + CONSTRAINT attachments_object_key_key UNIQUE (object_key), + CONSTRAINT attachments_filename_len CHECK (char_length(filename) BETWEEN 1 AND 255), + CONSTRAINT attachments_content_type CHECK (content_type IN ('image/png', 'image/jpeg')), + CONSTRAINT attachments_size CHECK (size_bytes BETWEEN 1 AND 10485760), + CONSTRAINT attachments_sha256 CHECK (sha256 ~ '^[a-f0-9]{64}$'), + CONSTRAINT attachments_status CHECK (status = 'ready') +); + +ALTER TABLE messages ADD CONSTRAINT messages_id_chat_id_key UNIQUE (id, chat_id); + +-- position сохраняет порядок attachment_ids из запроса: повтор POST и чтение истории возвращают +-- тот же порядок. +CREATE TABLE message_attachments ( + message_id uuid NOT NULL, + chat_id uuid NOT NULL, + attachment_id uuid NOT NULL, + position int NOT NULL, + + PRIMARY KEY (message_id, attachment_id), + CONSTRAINT message_attachments_position_key UNIQUE (message_id, position), + CONSTRAINT message_attachments_message_fkey FOREIGN KEY (message_id, chat_id) + REFERENCES messages (id, chat_id) ON DELETE CASCADE, + CONSTRAINT message_attachments_attachment_fkey FOREIGN KEY (chat_id, attachment_id) + REFERENCES attachments (chat_id, id) ON DELETE RESTRICT +); + +CREATE INDEX message_attachments_chat_id_attachment_id_idx ON message_attachments (chat_id, attachment_id); + +ALTER TABLE messages DROP CONSTRAINT messages_text_len; +ALTER TABLE messages ADD CONSTRAINT messages_text_len + CHECK (char_length(regexp_replace(text, '\\(.)', '\1', 'g')) <= 4000); +-- +goose StatementEnd + +-- +goose Down +-- Откат удаляет только метаданные: объекты в bucket остаются. Сообщения без текста получают +-- заполнитель, иначе прежнее ограничение нельзя вернуть. +-- +goose StatementBegin +UPDATE messages SET text = '(attachment)' WHERE text = ''; +ALTER TABLE messages DROP CONSTRAINT messages_text_len; +ALTER TABLE messages ADD CONSTRAINT messages_text_len + CHECK (char_length(regexp_replace(text, '\\(.)', '\1', 'g')) BETWEEN 1 AND 4000); +DROP TABLE message_attachments; +ALTER TABLE messages DROP CONSTRAINT messages_id_chat_id_key; +DROP TABLE attachments; +-- +goose StatementEnd diff --git a/migrations/00009_async_jobs.sql b/migrations/00009_async_jobs.sql new file mode 100644 index 0000000..73ff7bc --- /dev/null +++ b/migrations/00009_async_jobs.sql @@ -0,0 +1,31 @@ +-- +goose Up +-- +goose StatementBegin +ALTER TABLE attachments DROP CONSTRAINT attachments_status; +ALTER TABLE attachments ADD CONSTRAINT attachments_status CHECK (status IN ('queued','processing','ready','failed')); +ALTER TABLE attachments ADD COLUMN variants jsonb NOT NULL DEFAULT '[]'; +ALTER TABLE attachments ADD COLUMN error_code text; +CREATE TABLE attachment_jobs ( + job_id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + attachment_id uuid NOT NULL UNIQUE REFERENCES attachments(id), + pipeline_version int NOT NULL DEFAULT 1 CHECK (pipeline_version=1), + attempt int NOT NULL DEFAULT 0, + staging_key text NOT NULL, + published_at timestamptz, + created_at timestamptz NOT NULL DEFAULT now() +); +CREATE FUNCTION enqueue_attachment() RETURNS trigger LANGUAGE plpgsql AS $$ +BEGIN + IF NEW.status='queued' THEN + INSERT INTO attachment_jobs(attachment_id, staging_key) VALUES (NEW.id, NEW.object_key); + END IF; + RETURN NEW; +END $$; +CREATE TRIGGER attachment_job AFTER INSERT ON attachments FOR EACH ROW EXECUTE FUNCTION enqueue_attachment(); +-- +goose StatementEnd +-- +goose Down +DROP TRIGGER attachment_job ON attachments; +DROP FUNCTION enqueue_attachment(); +DROP TABLE attachment_jobs; +ALTER TABLE attachments DROP COLUMN variants, DROP COLUMN error_code; +ALTER TABLE attachments DROP CONSTRAINT attachments_status; +ALTER TABLE attachments ADD CONSTRAINT attachments_status CHECK (status='ready'); diff --git a/migrations/00010_trace_context.sql b/migrations/00010_trace_context.sql new file mode 100644 index 0000000..141c012 --- /dev/null +++ b/migrations/00010_trace_context.sql @@ -0,0 +1,24 @@ +-- +goose Up +ALTER TABLE attachment_jobs ADD COLUMN traceparent text NOT NULL DEFAULT ''; +ALTER TABLE attachment_jobs ADD COLUMN tracestate text NOT NULL DEFAULT ''; +-- +goose StatementBegin +CREATE OR REPLACE FUNCTION enqueue_attachment() RETURNS trigger LANGUAGE plpgsql AS $$ +BEGIN + IF NEW.status='queued' THEN + INSERT INTO attachment_jobs(attachment_id, staging_key, traceparent, tracestate) + VALUES (NEW.id, NEW.object_key, coalesce(current_setting('messenger.traceparent',true),''), coalesce(current_setting('messenger.tracestate',true),'')); + END IF; + RETURN NEW; +END $$; +-- +goose StatementEnd +-- +goose Down +-- +goose StatementBegin +CREATE OR REPLACE FUNCTION enqueue_attachment() RETURNS trigger LANGUAGE plpgsql AS $$ +BEGIN + IF NEW.status='queued' THEN + INSERT INTO attachment_jobs(attachment_id, staging_key) VALUES (NEW.id, NEW.object_key); + END IF; + RETURN NEW; +END $$; +-- +goose StatementEnd +ALTER TABLE attachment_jobs DROP COLUMN traceparent, DROP COLUMN tracestate; diff --git a/migrations/00011_service_grants.sql b/migrations/00011_service_grants.sql new file mode 100644 index 0000000..c51d5dc --- /dev/null +++ b/migrations/00011_service_grants.sql @@ -0,0 +1,13 @@ +-- +goose Up +REVOKE CREATE ON SCHEMA public FROM PUBLIC; +GRANT USAGE ON SCHEMA public TO api, worker, dispatcher; +GRANT SELECT, INSERT ON users, chats, chat_members, messages, message_attachments, message_idempotency_keys TO api; +GRANT DELETE ON message_idempotency_keys TO api; +GRANT UPDATE ON message_idempotency_keys TO api; +GRANT SELECT, INSERT, UPDATE, DELETE ON cache_invalidations TO api; +GRANT SELECT, INSERT, UPDATE ON attachments, attachment_jobs TO api; +GRANT SELECT ON attachments, attachment_jobs TO worker, dispatcher; +GRANT UPDATE ON attachments, attachment_jobs TO worker; +GRANT UPDATE ON attachment_jobs TO dispatcher; +-- +goose Down +REVOKE ALL ON ALL TABLES IN SCHEMA public FROM api, worker, dispatcher; diff --git a/scripts/bao-setup.py b/scripts/bao-setup.py new file mode 100644 index 0000000..8fa9a81 --- /dev/null +++ b/scripts/bao-setup.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python3 +"""Explicit operator init/unseal and scoped cert-auth configuration (no dev-mode).""" +import json +import os +from pathlib import Path +import ssl +import urllib.request +import urllib.error +os.chdir(Path(__file__).resolve().parents[1]) +os.umask(0o077) +ctx=ssl.create_default_context(cafile='secrets/ca.crt') +addr='https://localhost:18200/v1/' +def request(path,data=None,method=None,token=None): + headers={'Content-Type':'application/json'} + if token: headers['X-Vault-Token']=token + req=urllib.request.Request(addr+path,data=json.dumps(data).encode() if data is not None else None,headers=headers,method=method) + with urllib.request.urlopen(req,context=ctx,timeout=10) as response: + raw=response.read() + return json.loads(raw) if raw else {} +p=Path('operator/bao-init.json') +if not request('sys/init')['initialized']: + if p.exists(): raise SystemExit('Existing operator keys with new storage: inspect manually') + result=request('sys/init',{'secret_shares':3,'secret_threshold':2}) + p.write_text(json.dumps(result)); p.chmod(0o600) +if not p.exists(): raise SystemExit('Operator unseal keys required in operator/bao-init.json') +state=json.loads(p.read_text()) +if request('sys/seal-status')['sealed']: + for key in state['keys'][:2]: request('sys/unseal',{'key':key}) +if '--unseal-only' in __import__('sys').argv: + print('OpenBao unsealed with persistent storage.'); raise SystemExit(0) +token=state['root_token'] +mounts=request('sys/mounts',token=token) +if 'secret/' not in mounts: request('sys/mounts/secret',{'type':'kv','options':{'version':'2'}},token=token) +auth=request('sys/auth',token=token) +if 'cert/' not in auth: request('sys/auth/cert',{'type':'cert'},token=token) +for role,bundle in json.loads(Path('operator/bundles.json').read_text()).items(): + policy=f'path "secret/data/{role}" {{ capabilities = ["read"] }}\npath "auth/token/revoke-self" {{ capabilities = ["update"] }}\n' + Path('infra/openbao/'+role+'.hcl').write_text(policy) + request('sys/policies/acl/'+role,{'policy':policy},token=token) + request('auth/cert/certs/'+role,{'display_name':role,'certificate':Path('secrets/'+role+'/service.crt').read_text(),'allowed_uri_sans':['spiffe://lab7/'+role],'token_policies':[role],'token_no_default_policy':True,'token_ttl':'5m','token_max_ttl':'10m'},token=token) + request('secret/data/'+role,{'data':bundle},token=token) +print('OpenBao initialized/unsealed; leaf-bound service policies configured, token TTL 5m/max 10m.') diff --git a/scripts/bootstrap.py b/scripts/bootstrap.py new file mode 100644 index 0000000..21bc560 --- /dev/null +++ b/scripts/bootstrap.py @@ -0,0 +1,111 @@ +#!/usr/bin/env python3 +"""Operator: generate a private local CA, leaf certs and synthetic credentials once.""" +import json +import os +from pathlib import Path +import secrets +import subprocess + +os.chdir(Path(__file__).resolve().parents[1]) +os.umask(0o077) +root = Path('secrets') +root.mkdir(exist_ok=True) +operator = Path('operator') +operator.mkdir(exist_ok=True) +pki = operator / 'pki' +pki.mkdir(exist_ok=True) + +def openssl(*args): + subprocess.run(['openssl', *map(str,args)], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE) + +if not (pki/'ca.key').exists(): + openssl('req','-x509','-newkey','rsa:3072','-nodes','-keyout',pki/'ca.key','-out',root/'ca.crt','-days','365','-subj','/CN=Lab7 local CA','-addext','basicConstraints=critical,CA:TRUE','-addext','keyUsage=critical,keyCertSign,cRLSign','-addext','subjectKeyIdentifier=hash') +roles = ['lb','api','worker','dispatcher','postgres','valkey','broker','s3','otel-collector','loki','tempo','prometheus','grafana','openbao','wrong-role'] +for role in roles: + d = root/role + d.mkdir(exist_ok=True) + if (d/'service.crt').exists() and '--renew-leaves' not in __import__('sys').argv: + continue + ext = pki/(role+'.ext') + sans = f'DNS:{role},URI:spiffe://lab7/{role}' + if role in ('lb','openbao','grafana'): + sans += ',DNS:localhost,IP:127.0.0.1' + ext.write_text('subjectKeyIdentifier=hash\nauthorityKeyIdentifier=keyid,issuer\nbasicConstraints=critical,CA:FALSE\nkeyUsage=critical,digitalSignature,keyEncipherment\nextendedKeyUsage=serverAuth,clientAuth\nsubjectAltName='+sans+'\n') + openssl('req','-new','-newkey','rsa:2048','-nodes','-keyout',d/'service.key','-out',pki/(role+'.csr'),'-subj','/CN='+role) + openssl('x509','-req','-in',pki/(role+'.csr'),'-CA',root/'ca.crt','-CAkey',pki/'ca.key','-set_serial',str(secrets.randbits(128)),'-out',d/'service.crt','-days','30','-extfile',ext) + (d/'service.pem').write_bytes((d/'service.crt').read_bytes()+(d/'service.key').read_bytes()) +# Separate untrusted CA for negative checks. +if not (operator/'foreign.key').exists(): + openssl('req','-x509','-newkey','rsa:2048','-nodes','-keyout',operator/'foreign.key','-out',operator/'foreign.crt','-days','30','-subj','/CN=Foreign CA') + openssl('req','-new','-newkey','rsa:2048','-nodes','-keyout',operator/'foreign-client.key','-out',operator/'foreign.csr','-subj','/CN=lb') + openssl('x509','-req','-in',operator/'foreign.csr','-CA',operator/'foreign.crt','-CAkey',operator/'foreign.key','-set_serial','42','-out',operator/'foreign-client.crt','-days','30','-extfile',pki/'lb.ext') + +credentials = operator/'credentials.json' +if not credentials.exists(): + passwords = {k: secrets.token_hex(24) for k in ('postgres','api','worker','dispatcher','session','broker-worker','broker-dispatcher')} + keys = {r: (secrets.token_hex(10),secrets.token_hex(24)) for r in ('api','worker','admin')} + credentials.write_text(json.dumps({'passwords':passwords,'keys':keys})) +c = json.loads(credentials.read_text()); pw=c['passwords']; keys=c['keys'] +(root/'postgres_password').write_text(pw['postgres']) +(root/'database_url').write_text(f"postgres://messenger:{pw['postgres']}@postgres:5432/messenger?sslmode=verify-full&sslrootcert=/tls/ca.crt") +# Executed only on first DB initialization. No app has a superuser credential. +(root/'roles.sql').write_text('\n'.join(f"CREATE ROLE {r} LOGIN PASSWORD '{pw[r]}';" for r in ('api','worker','dispatcher'))) +(root/'valkey.conf').write_text(f'''bind 0.0.0.0 +port 0 +tls-port 6379 +tls-cert-file /tls/service.crt +tls-key-file /tls/service.key +tls-ca-cert-file /tls/ca.crt +tls-auth-clients no +appendonly yes +appendfsync always +maxmemory 128mb +maxmemory-policy noeviction +user default off +user api on >{pw['session']} ~session:* +ping +get +set +del +''') +(root/'broker.conf').write_text(f'''bind 0.0.0.0 +port 0 +tls-port 6379 +tls-cert-file /tls/service.crt +tls-key-file /tls/service.key +tls-ca-cert-file /tls/ca.crt +tls-auth-clients no +appendonly yes +appendfsync always +maxmemory-policy noeviction +user default off +user dispatcher on >{pw['broker-dispatcher']} ~attachment-jobs-v1 +ping +xadd +user worker on >{pw['broker-worker']} ~attachment-jobs-v1 +ping +xgroup +xreadgroup +xautoclaim +xack +''') +bucket='messenger-attachments' +identities=[] +for role in ('admin','api','worker'): + actions=['Admin','Read','Write','List'] if role=='admin' else ([f'Write:{bucket}/staging/*',f'Read:{bucket}/originals/*',f'Read:{bucket}/variants/*'] if role=='api' else [f'Read:{bucket}/staging/*',f'Write:{bucket}/originals/*',f'Write:{bucket}/variants/*']) + identities.append(dict(name=role,credentials=[dict(accessKey=keys[role][0],secretKey=keys[role][1])],actions=actions)) +(root/'s3_config').write_text(json.dumps(dict(identities=identities))) +for suffix,value in zip(('access_key_id','secret_access_key'),keys['admin']): + (root/('s3_admin_'+suffix)).write_text(value) +bundles={} +for role in ('api','worker','dispatcher'): + data={'database_url':f"postgres://{role}:{pw[role]}@postgres:5432/messenger?sslmode=verify-full&sslrootcert=/tls/ca.crt"} + if role=='api': + data['cache_url']=f"rediss://api:{pw['session']}@valkey:6379/0" + else: + data['broker_url']=f"rediss://{role}:{pw['broker-'+role]}@broker:6379/0" + if role in keys: + data.update(s3_access_key_id=keys[role][0],s3_secret_access_key=keys[role][1]) + bundles[role]=data +(operator/'bundles.json').write_text(json.dumps(bundles)) +# Grafana datasource provisioning contains private client material and stays outside Git. +datasources=[] +for name,uid,kind,url in [('Prometheus','prometheus','prometheus','https://prometheus:9443'),('Loki','loki','loki','https://loki:3443'),('Tempo','tempo','tempo','https://tempo:3443')]: + datasources.append(dict(name=name,uid=uid,type=kind,access='proxy',url=url,isDefault=(uid=='prometheus'),jsonData=dict(tlsAuth=True,tlsAuthWithCACert=True),secureJsonData=dict(tlsCACert=(root/'ca.crt').read_text(),tlsClientCert=(root/'grafana/service.crt').read_text(),tlsClientKey=(root/'grafana/service.key').read_text()))) +(root/'grafana-datasources.yaml').write_text(json.dumps(dict(apiVersion=1,datasources=datasources))) +# Host directory is 0700. Individual files readable by non-root containers; +# only explicitly selected files are mounted, never the whole secrets directory. +for f in root.rglob('*'): + if f.is_file(): f.chmod(0o644) +if not Path('.env').exists(): + Path('.env').write_text(Path('.env.example').read_text()) +print('Local CA, 30-day leaf certificates and separate credentials ready; no values printed.') diff --git a/scripts/check-expiry.sh b/scripts/check-expiry.sh new file mode 100755 index 0000000..a4a410c --- /dev/null +++ b/scripts/check-expiry.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -eu +cd "$(dirname "$0")/.." +# Temporary third API, same scoped role and no published ports. It is not in LB DNS. +name=mtusi-lab7-expiry +cleanup() { docker rm -f "$name" >/dev/null 2>&1 || true; } +trap cleanup EXIT INT TERM +docker compose run --no-deps -d --name "$name" -e SESSION_TTL_SECONDS=2 api >/dev/null +# Wait for the real TLS listener inside this one service, then test the expiry. +for attempt in 1 2 3 4 5 6 7 8 9 10; do + if docker exec "$name" test -f /tmp/instance-alias; then break; fi + sleep 1 +done +docker run --rm --network mtusi-lab7_default -e EXPIRY_TARGET="$name" -v "$PWD:/audit:ro" --entrypoint python mtusi-lab7-worker /audit/student-tests/internal.py diff --git a/scripts/check-internal.sh b/scripts/check-internal.sh new file mode 100755 index 0000000..87b914c --- /dev/null +++ b/scripts/check-internal.sh @@ -0,0 +1,4 @@ +#!/bin/sh +set -eu +cd "$(dirname "$0")/.." +docker run --rm --network mtusi-lab7_default -v "$PWD:/audit:ro" --entrypoint python mtusi-lab7-worker /audit/student-tests/internal.py diff --git a/scripts/restart.sh b/scripts/restart.sh new file mode 100755 index 0000000..8102910 --- /dev/null +++ b/scripts/restart.sh @@ -0,0 +1,25 @@ +#!/bin/sh +set -eu +cd "$(dirname "$0")/.." +snapshot() { + for id in $(docker compose ps -q); do + docker inspect --format '{{.Name}} {{.State.StartedAt}}' "$id" + done +} +snapshot > evidence/persistence-containers.txt +docker compose stop -t 3 api worker dispatcher lb s3-gateway s3-tls otel-collector-tls loki-tls tempo-tls prometheus-tls grafana-tls +docker compose restart postgres valkey broker s3 openbao otel-collector prometheus loki tempo grafana +python3 - <<'PY' +import ssl,time,urllib.request +ctx=ssl.create_default_context(cafile='secrets/ca.crt') +for _ in range(30): + try: + urllib.request.urlopen('https://localhost:18200/v1/sys/init',context=ctx,timeout=1).close(); break + except OSError: time.sleep(1) +else: raise SystemExit('OpenBao listener unavailable') +PY +python3 scripts/bao-setup.py --unseal-only +# Recreate sidecars: backend restart changes network namespace. +docker compose up -d --force-recreate s3-tls otel-collector-tls loki-tls tempo-tls prometheus-tls grafana-tls s3-gateway +docker compose up -d --wait +snapshot >> evidence/persistence-containers.txt diff --git a/scripts/start.sh b/scripts/start.sh new file mode 100755 index 0000000..2b389de --- /dev/null +++ b/scripts/start.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu +cd "$(dirname "$0")/.." +python3 scripts/bootstrap.py +docker compose build +docker compose up -d openbao +# Init endpoint is not available until TLS listener starts. +python3 - <<'PY' +import ssl,time,urllib.request +ctx=ssl.create_default_context(cafile='secrets/ca.crt') +for _ in range(60): + try: + urllib.request.urlopen('https://localhost:18200/v1/sys/init',context=ctx,timeout=2).close() + break + except OSError: time.sleep(1) +else: raise SystemExit('OpenBao TLS did not become ready') +PY +python3 scripts/bao-setup.py +docker compose up -d --wait +python3 scripts/wait-ready.py diff --git a/scripts/stop-one.sh b/scripts/stop-one.sh new file mode 100755 index 0000000..2091fc0 --- /dev/null +++ b/scripts/stop-one.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -eu +cd "$(dirname "$0")/.." +: "${TARGET_INSTANCE_ID:?API alias required}" +for id in $(docker compose ps -q api); do + alias=$(docker exec "$id" cat /tmp/instance-alias) + if [ "$alias" = "$TARGET_INSTANCE_ID" ]; then + docker inspect --format '{{.Name}}' "$id" >> evidence/failover-stopped.txt + docker stop -t 5 "$id" >/dev/null + echo 'Stopped API replica with requested random alias' + exit 0 + fi +done +exit 2 diff --git a/scripts/wait-ready.py b/scripts/wait-ready.py new file mode 100644 index 0000000..36db50d --- /dev/null +++ b/scripts/wait-ready.py @@ -0,0 +1,11 @@ +#!/usr/bin/env python3 +import ssl,time,urllib.request +ctx=ssl.create_default_context(cafile='secrets/ca.crt') +for _ in range(90): + try: + with urllib.request.urlopen('https://localhost:8443/health/ready',context=ctx,timeout=2) as r: + if r.status==200: break + except OSError: pass + time.sleep(1) +else: raise SystemExit('HTTPS API readiness timeout') +print('HTTPS API ready with verified CA/hostname') diff --git a/security/THREAT_MODEL.md b/security/THREAT_MODEL.md index 31da287..ee02989 100644 --- a/security/THREAT_MODEL.md +++ b/security/THREAT_MODEL.md @@ -1,19 +1,26 @@ -# Модель угроз — заполнить +# Модель угроз учебного стенда -## Активы и акторы +Активы: пароли и хеши, сессии, история чатов, оригиналы/варианты вложений, SQL outbox, CA и service keys, OpenBao root/unseal, техническая telemetry. Акторы: внешний клиент, участник/посторонний пользователь, сервис с действующим сертификатом, оператор Docker host. Компрометация Docker host/оператора не покрывается: оператор может прочитать volumes и память. -TODO: пользовательские credentials/сессии, сообщения/вложения, service identities, CA/secrets, telemetry. Акторы: участник чата, посторонний пользователь, внешний клиент, скомпрометированный сервис, оператор. Опишите доступ атакующего и границы учебного стенда. +Границы: внешний HTTPS → LB → mTLS API → TLS dependencies; изолированный local backend hop sidecar; оператор → локальный TLS admin интерфейс. [Матрица](../contracts/trust-matrix.md) фиксирует все соединения, SAN, ACL и порты. -## Границы доверия +| Путь атаки | Контроль | Воспроизводимая проверка | Ограничение | +| --- | --- | --- | --- | +| Посторонний Bearer читает chat/attachment/content | membership SQL check на каждом endpoint, 404 | make test: чужой чат/вложение/ссылка | DB operator видит данные | +| Контейнер с доверенным wrong-role cert обходит LB | API проверяет CA, clientAuth и точный URI LB | check-internal.sh: wrong-role + foreign + no cert | похищенный действующий LB key даёт transport identity, но не пользовательскую сессию | +| MITM подменяет зависимость | проверка CA и hostname, без insecure/fallback | internal.py hostname mismatch для каждой TLS роли; внешний test-security | CA operator доверен | +| Worker читает password_hash или создаёт таблицу | отдельная SQL роль без users/DDL | internal.py: InsufficientPrivilege | worker может обновлять свои jobs/attachment metadata | +| App читает admin/чужие Bao secrets | cert-bound role, scoped read policy | internal.py: own200, other403, sys/mounts403, revoke403 | static KV не становится динамическим от TTL токена | +| Credential stuffing и дорогой Argon2id | единая LB stick table: 20 login/10s/IP; KDF semaphore≤4; request size/inflight/memory limits | external.py:429+Retry-After,413; benchmark | распределённый DoS и NAT fairness не решены | +| Чтение bucket напрямую/смена policy | private bucket, разные SigV4 prefix roles, нет List/Admin у app | s3-init + internal.py + public attachment ACL | один Docker host, один S3 процесс | +| Plaintext bypass proxy через служебный порт | loopback backend binds и private S3 network | internal.py проверяет 9000/19000 и telemetry plaintext ports | proxy входит в доверенную границу сервиса | +| Подмена/произвольная отправка telemetry | mTLS CA+URI allowlist, без публикации backend ports | internal.py + observability.py | разрешённые telemetry identities могут подделать технический event | +| Утечка ключей через image/Git/log | .dockerignore/.gitignore, точечные mounts, allowlist полей telemetry, без логирования bodies/auth | hardening.py, review исходников, git status | runtime file secret доступен процессу своего сервиса | -TODO: схема и ссылка на заполненную contracts/trust-matrix.md; публичные/внутренние интерфейсы, процессы, секреты и их выдача. +Сессии: случайный Bearer, SHA-256 token hash в Valkey, абсолютный TTL и logout; AOF сохраняет сессию при restart. При logout/expiry старый токен больше не действует (smoke и check-expiry.sh). -| Угроза и конкретный путь | Нарушаемый инвариант | Контроль | Отрицательный тест | Остаточное ограничение | -| --- | --- | --- | --- | --- | -| TODO | TODO | TODO | TODO | TODO | +Жизненный цикл: CA 365 дней, leaf 30 дней. `bootstrap.py` повторно сохраняет существующие identity/credentials. Истечение leaf приводит к TLS отказу; замены в обход проверки нет. Ручной перевыпуск всех leaf: остановить workloads, `bootstrap.py --renew-leaves`, пересоздать использующие cert контейнеры и повторно `bao-setup.py`, затем аудит. Это обслуживание с остановкой, не бесшовная ротация уровня4. При компрометации credentials оператор заменяет пароль/ACL и KV, перезапускает клиента, проверяет отзыв. Автоматическая PKI renewal/CRL и secret rotation не заявлены. -На 4 минимум 6 конкретных угроз. Не заменяйте сценарии словами «SQL injection», «безопасный Docker», «mTLS включён» без пути и проверки. +OpenBao: non-dev, Raft persistent volume; unseal threshold2/3. Все shares лежат только в закрытом operator каталоге локального учебного хоста, не рядом с OpenBao внутри контейнера. Для реальной эксплуатации shares следует разнести между операторами/офлайн хранилищами. При restart Bao запечатан; оператор явно выполняет unseal. Работающие процессы продолжают пользоваться полученными static credentials; новые не стартуют до unseal. Root token оставлен оператору для повторяемой настройки лаборатории, в service окружении и образах его нет. -## Lifecycle и инциденты - -TODO: bootstrap, expiry/renewal, revoke/rotation, компрометация identity, sealed OpenBao и восстановление. Указать владельца CA/unseal и способ защиты bootstrap credentials. Сопоставить scan findings с реальной применимостью и исправлением/остаточным риском. +Stateful сервисы сохраняют writable volumes; PostgreSQL entrypoint и Tempo имеют root для инициализации/владения своим каталогом. API/worker/dispatcher UID65534, cap_drop ALL, read_only, no-new-privileges, tmpfs. One-shot bao-volume-init root меняет владельца только каталога данных и завершается. No privileged, host network и Docker socket; limits у всех ролей. diff --git a/student-tests/external.py b/student-tests/external.py new file mode 100644 index 0000000..291940e --- /dev/null +++ b/student-tests/external.py @@ -0,0 +1,21 @@ +"""Public ingress: real login rate limit, body limit and hostname check.""" +import ssl +import json +import urllib.request +import urllib.error +ctx=ssl.create_default_context(cafile='secrets/ca.crt') +for i in range(25): + req=urllib.request.Request('https://localhost:8443/api/v1/auth/sessions',data=b'',method='POST') + try: urllib.request.urlopen(req,context=ctx,timeout=5) + except urllib.error.HTTPError as e: + if e.code==429: + assert int(e.headers['Retry-After'])>0 + assert json.load(e)['error']['request_id']==e.headers['X-Request-Id'] + print('PASS login rate limit: 429 with Retry-After');break + assert e.code==401 +else: raise AssertionError('429 not received') +req=urllib.request.Request('https://localhost:8443/api/v1/users',data=b'x'*65537,headers={'Content-Type':'application/json'},method='POST') +try: urllib.request.urlopen(req,context=ctx,timeout=5) +except urllib.error.HTTPError as e: assert e.code==413 +else: raise AssertionError('body limit absent') +print('PASS JSON request size limit: 413') diff --git a/student-tests/failover-each.py b/student-tests/failover-each.py new file mode 100644 index 0000000..af2c5fa --- /dev/null +++ b/student-tests/failover-each.py @@ -0,0 +1,40 @@ +#!/usr/bin/env python3 +"""Target both concrete replicas in sequence and preserve session/data through each stop.""" +import json +import os +from pathlib import Path +import subprocess +import sys +import time +sys.path.insert(0,str(Path(__file__).resolve().parents[1]/'tests')) +from client import Client +c=Client('https://localhost:8443',ca_file='secrets/ca.crt') +alice,bob,eve,chat=c.bootstrap() +ids=subprocess.check_output(['docker','compose','ps','-q','api'],text=True).split() +assert len(ids)==2 +saved=[] +for id in ids: + alias=subprocess.check_output(['docker','exec',id,'cat','/tmp/instance-alias'],text=True).strip() + before=c.message(alice,chat,'confirmed-before-'+alias)['json']; saved.append(before) + start=time.monotonic() + subprocess.run(['scripts/stop-one.sh'],env=dict(os.environ,TARGET_INSTANCE_ID=alias),check=True,stdout=subprocess.DEVNULL) + for attempt in range(30): + try: + response=c.message(alice,chat,'confirmed-after-'+alias,key='retry-'+alias) + break + except Exception: + time.sleep(.25) + else: raise AssertionError('no recovery') + assert response['headers']['X-Instance-Id']!=alias + saved.append(response['json']) + page=c.call('GET','/api/v1/chats/'+chat['id']+'/messages',actor=bob,schema='MessagePage')['json'] + assert all(x in page['items'] for x in saved) + name=subprocess.check_output(['docker','inspect','--format','{{.Name}}',id],text=True).strip() + print('PASS stopped',name,'confirmed data/session preserved; recovery_seconds',round(time.monotonic()-start,3),flush=True) + subprocess.run(['docker','start',id],check=True,stdout=subprocess.DEVNULL) + for attempt in range(100): + seen={c.call('GET','/health/ready')['headers']['X-Instance-Id'] for _ in range(4)} + if len(seen)>=2: break + time.sleep(.2) + else: raise AssertionError('replica did not rejoin') +print('PASS both distinct API containers stopped in sequence and restored') diff --git a/student-tests/hardening.py b/student-tests/hardening.py new file mode 100644 index 0000000..6682791 --- /dev/null +++ b/student-tests/hardening.py @@ -0,0 +1,25 @@ +#!/usr/bin/env python3 +"""Inspect only safe fields; do not dump environment, mounts contents or tokens.""" +import json +import subprocess +ids=subprocess.check_output(['docker','compose','ps','-q'],text=True).split() +assert ids +for id in ids: + c=json.loads(subprocess.check_output(['docker','inspect',id]))[0] + role=c['Config']['Labels']['com.docker.compose.service'] + h=c['HostConfig'] + assert not h['Privileged'] and h['NetworkMode']!='host' + assert all('docker.sock' not in m['Source'] for m in c['Mounts']) + assert h['Memory']>0 and h['NanoCpus']>0 + if role in ('api','worker','dispatcher'): + assert c['Config']['User']=='65534:65534' + assert 'ALL' in h['CapDrop'] and h['ReadonlyRootfs'] + assert 'no-new-privileges:true' in h['SecurityOpt'] + assert not h['PortBindings'] + assert all('/operator' not in m['Destination'] for m in c['Mounts']) + ports=h['PortBindings'] or {} + for entries in ports.values(): + for entry in entries or []: + assert entry['HostIp']=='127.0.0.1' + assert role in ('lb','grafana','openbao') + print('PASS hardening/resource/port checks:',role) diff --git a/student-tests/internal.py b/student-tests/internal.py new file mode 100644 index 0000000..ef6e03e --- /dev/null +++ b/student-tests/internal.py @@ -0,0 +1,128 @@ +"""Run in an ephemeral operator test container, never in production app containers.""" +import base64 +import http.client +import json +from pathlib import Path +import socket +import ssl +import time +import uuid +import os + +ROOT=Path('/audit') +CA=str(ROOT/'secrets/ca.crt') +def context(role=None): + ctx=ssl.create_default_context(cafile=CA) + if role: + if role=='foreign': + ctx.load_cert_chain(str(ROOT/'operator/foreign-client.crt'),str(ROOT/'operator/foreign-client.key')) + else: ctx.load_cert_chain(str(ROOT/f'secrets/{role}/service.crt'),str(ROOT/f'secrets/{role}/service.key')) + return ctx + +def request(host, port, path, method='GET', body=None, headers=None, role=None, target=None): + c=http.client.HTTPSConnection(host,port,context=context(role),timeout=5) + c.sock=context(role).wrap_socket(socket.create_connection((target or host,port),timeout=5),server_hostname=host) + try: + c.request(method,path,body=body,headers=headers or {}) + r=c.getresponse(); data=r.read(); return r.status,dict(r.getheaders()),json.loads(data) if data else None + finally: c.close() + +addresses=sorted({x[4][0] for x in socket.getaddrinfo('api',8080,type=socket.SOCK_STREAM)}) +assert len(addresses)>=2 +for ip in addresses: + assert request('api',8080,'/health/ready',role='lb',target=ip)[0]==200 + for role in (None,'foreign','wrong-role'): + try: request('api',8080,'/health/ready',role=role,target=ip) + except ssl.SSLError: pass + else: raise AssertionError('mTLS allowed forbidden identity') + print('PASS API replica: LB accepted; absent cert, foreign CA, same-CA wrong SAN rejected') + +for host,port in [('valkey',6379),('broker',6379),('s3',9443),('otel-collector',4438),('otel-collector',8899),('otel-collector',8898),('loki',3443),('tempo',3443),('tempo',4438),('prometheus',9443),('grafana',3443),('openbao',8200)]: + client_role = 'api' if host=='otel-collector' else 'grafana' if host in ('loki','tempo','prometheus') else None + with context(client_role).wrap_socket(socket.create_connection((host,port),timeout=5),server_hostname=host): pass + try: + with context(client_role).wrap_socket(socket.create_connection((host,port),timeout=5),server_hostname='forbidden.example'): pass + except ssl.SSLCertVerificationError: pass + else: raise AssertionError('hostname unchecked') + print(f'PASS verified TLS + hostname rejection: {host}:{port}') +for host,port,good in [('otel-collector',4438,'api'),('loki',3443,'otel-collector'),('tempo',4438,'otel-collector'),('prometheus',9443,'grafana')]: + def probe(role): + with context(role).wrap_socket(socket.create_connection((host,port),timeout=5),server_hostname=host) as conn: + conn.sendall(b'GET / HTTP/1.1\r\nHost: test\r\nConnection: close\r\n\r\n') + return conn.recv(64) + assert probe(good).startswith(b'HTTP/') + for bad in (None,'foreign','wrong-role'): + try: + result=probe(bad) + except (ssl.SSLError,ConnectionResetError,BrokenPipeError): + pass + else: + assert not result, 'telemetry wrong identity allowed' + print(f'PASS telemetry {host}: authorized HTTP works; no-cert/foreign/wrong-URI rejected') + +for host,ports in [('s3',[9000,9333,8080,8888,19000,19333,18080,18888]),('otel-collector',[4318,8889,8888]),('loki',[3100,9095]),('tempo',[3200,4318,9095]),('prometheus',[9090]),('grafana',[3000])]: + for port in ports: + try: socket.create_connection((host,port),timeout=1).close() + except OSError: pass + else: raise AssertionError(f'plaintext bypass {host}:{port}') +print('PASS all declared loopback plaintext hops inaccessible from app network') + +for role in ('api','worker','dispatcher'): + status,_,auth=request('openbao',8200,'/v1/auth/cert/login','POST',json.dumps({'name':role}),{'Content-Type':'application/json'},role=role) + assert status==200 and auth['auth']['lease_duration']<=300 + headers={'X-Vault-Token':auth['auth']['client_token']} + assert request('openbao',8200,'/v1/secret/data/'+role,headers=headers,role=role)[0]==200 + for path in ('secret/data/'+('worker' if role=='api' else 'api'),'sys/mounts'): + assert request('openbao',8200,'/v1/'+path,headers=headers,role=role)[0]==403 + assert request('openbao',8200,'/v1/auth/token/revoke-self','POST','{}',headers,role=role)[0] in (200,204) + assert request('openbao',8200,'/v1/secret/data/'+role,headers=headers,role=role)[0]==403 + print(f'PASS Bao {role}: cert auth, TTL, own read, cross-role/admin deny, revoked token deny') +assert request('openbao',8200,'/v1/auth/cert/login','POST','{"name":"api"}',role='wrong-role')[0] in (400,403) +print('PASS Bao wrong identity cannot authenticate as API') + +import psycopg +import redis +import boto3 +from botocore.exceptions import ClientError +bundles=json.loads((ROOT/'operator/bundles.json').read_text()) +for role in ('api','worker','dispatcher'): + dsn=bundles[role]['database_url'].replace('/tls/ca.crt',CA) + with psycopg.connect(dsn,autocommit=True) as db: + assert db.execute('SELECT ssl FROM pg_stat_ssl WHERE pid=pg_backend_pid()').fetchone()[0] + try: db.execute('CREATE TABLE forbidden_probe(id int)') + except psycopg.errors.InsufficientPrivilege: pass + else: raise AssertionError('DB DDL privilege') + if role!='api': + try: db.execute('SELECT password_hash FROM users LIMIT 1') + except psycopg.errors.InsufficientPrivilege: pass + else: raise AssertionError('worker read password hashes') + print(f'PASS DB {role}: TLS verified and least-privilege DDL/password isolation') +try: + psycopg.connect(bundles['api']['database_url'].split('?')[0]+'?sslmode=disable',connect_timeout=3) +except psycopg.OperationalError: pass +else: raise AssertionError('DB plaintext accepted') +for role in ('worker','dispatcher'): + r=redis.Redis.from_url(bundles[role]['broker_url'],ssl_ca_certs=CA,ssl_check_hostname=True) + assert r.ping() + try: r.set('forbidden-key','test') + except redis.exceptions.NoPermissionError: pass + else: raise AssertionError('broker privilege escalation') + print(f'PASS broker {role}: TLS auth + unrelated command/key denied') +for role in ('api','worker'): + b=bundles[role] + s3=boto3.client('s3',endpoint_url='https://s3:9443',aws_access_key_id=b['s3_access_key_id'],aws_secret_access_key=b['s3_secret_access_key'],region_name='us-east-1',verify=CA) + try: s3.list_objects_v2(Bucket='messenger-attachments') + except ClientError as e: assert e.response['ResponseMetadata']['HTTPStatusCode']==403 + else: raise AssertionError('S3 listing allowed') + print(f'PASS S3 {role}: bucket listing denied') +if os.getenv('EXPIRY_TARGET'): + target=os.environ['EXPIRY_TARGET'] + user='expiry_'+uuid.uuid4().hex[:16]; password='SyntheticExpiryPassword123' + assert request('api',8080,'/api/v1/users','POST',json.dumps({'username':user,'display_name':'Expiry','password':password}),{'Content-Type':'application/json'},role='lb',target=target)[0]==201 + status,_,session=request('api',8080,'/api/v1/auth/sessions','POST',headers={'Authorization':'Basic '+base64.b64encode((user+':'+password).encode()).decode()},role='lb',target=target) + assert status==201 + headers={'Authorization':'Bearer '+session['token']} + assert request('api',8080,'/api/v1/users/me',headers=headers,role='lb',target=target)[0]==200 + time.sleep(3) + assert request('api',8080,'/api/v1/users/me',headers=headers,role='lb',target=target)[0]==401 + print('PASS real service session expiry: valid token then 401 after TTL=2s') diff --git a/student-tests/observability.py b/student-tests/observability.py new file mode 100644 index 0000000..7d09452 --- /dev/null +++ b/student-tests/observability.py @@ -0,0 +1,88 @@ +#!/usr/bin/env python3 +"""Assert actual application signals in each backend; persist no credentials.""" +import json +import ssl +import sys +import time +import urllib.parse +import urllib.request +from pathlib import Path + +sys.path.insert(0, str(Path(__file__).resolve().parents[1] / 'tests')) +from client import Client, check + +ROOT = Path(__file__).resolve().parents[1] +CA = ROOT / 'secrets/ca.crt' + +def backend_context(): + ctx = ssl.create_default_context(cafile=str(CA)) + ctx.load_cert_chain(str(ROOT/'secrets/grafana/service.crt'), str(ROOT/'secrets/grafana/service.key')) + return ctx + +def get(base, path, params=None): + if params: + path += '?' + urllib.parse.urlencode(params) + with urllib.request.urlopen(base + path, timeout=15, context=backend_context()) as response: + return json.load(response) + +def eventually(fn, seconds=90): + deadline = time.monotonic() + seconds + last = None + while time.monotonic() < deadline: + try: + value = fn() + if value: + return value + except Exception as exc: + last = type(exc).__name__ + time.sleep(2) + raise AssertionError('signal did not arrive: ' + str(last)) + +def logs(service, suffix=''): + return get('https://loki:3443', '/loki/api/v1/query_range', { + 'query': '{service_name="'+service+'"}' + suffix, + 'start': int((time.time()-600)*1e9), 'end': int(time.time()*1e9), 'limit': 100 + })['data']['result'] + +def trace_exists(tid): + data = get('https://tempo:3443', '/api/traces/' + tid) + return data if data.get('batches') or data.get('resourceSpans') else None + +def main(): + c = Client('https://lb:8443', ca_file=str(CA)) + alice, bob, eve, chat = c.bootstrap() + response = c.message(alice, chat, 'telemetry synthetic check') + # Follow a controlled request by server-generated X-Trace-Id and X-Request-Id. + response = c.call('GET', '/api/v1/chats/'+chat['id']+'/messages', actor=alice) + headers = response['headers'] + tid = headers.get('X-Trace-Id') + rid = headers.get('X-Request-Id') + check(bool(tid) and len(tid)==32, 'missing trace ID') + job_started = time.time() + att, _ = c.attachment(alice, chat) + c.wait_ready(alice, att) + api_logs = eventually(lambda: logs('messenger-api', ' | trace_id="'+tid+'"')) + api_trace = eventually(lambda: trace_exists(tid)) + worker_logs = eventually(lambda: [row for row in logs('messenger-worker', ' | event="job.success"') if int(row['values'][0][0])/1e9 >= job_started]) + values = worker_logs[0]['values'] + # Native OTLP metadata carries trace_id without making it a metric label. + worker_tid = values[0][2].get('trace_id') if len(values[0]) > 2 else None + if not worker_tid: + worker_tid = worker_logs[0]['stream'].get('trace_id') + check(bool(worker_tid), 'worker log lacks trace ID') + worker_trace = eventually(lambda: trace_exists(worker_tid)) + metric_names = ['api_requests_total','api_duration_seconds_bucket','worker_jobs_total','worker_duration_seconds_bucket'] + metric_results = {} + for name in metric_names: + metric_results[name] = eventually(lambda: get('https://prometheus:9443','/api/v1/query',{'query': name})['data']['result']) + for results in metric_results.values(): + for result in results: + check(not (set(result['metric']) & {'user_id','chat_id','message_id','attachment_id','request_id','filename'}), 'high cardinality metric labels') + proof = {'api_trace_id':tid,'api_request_id':rid,'worker_trace_id':worker_tid, + 'api_logs':api_logs,'worker_logs':worker_logs,'api_trace':api_trace,'worker_trace':worker_trace, + 'metrics':metric_results} + (ROOT/'evidence'/'telemetry.json').write_text(json.dumps(proof,ensure_ascii=False,indent=2)+'\n') + print('PASS: API trace + matching log, worker consumer trace + matching log, four real SDK metrics; evidence/telemetry.json') + +if __name__ == '__main__': + main() diff --git a/student-tests/secret-scan.py b/student-tests/secret-scan.py new file mode 100644 index 0000000..0bd3d74 --- /dev/null +++ b/student-tests/secret-scan.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python3 +"""Check publishable files against actual local secret values without printing them.""" +import json +from pathlib import Path +import subprocess +values=[] +def collect(x): + if isinstance(x,dict): + for v in x.values(): collect(v) + elif isinstance(x,list): + for v in x: collect(v) + elif isinstance(x,str) and len(x)>=20: values.append(x.encode()) +for p in ('operator/credentials.json','operator/bao-init.json'): + collect(json.loads(Path(p).read_text())) +files=subprocess.check_output(['git','ls-files','--cached','--others','--exclude-standard'],text=True).splitlines() +for file in files: + p=Path(file) + if not p.is_file(): continue + data=p.read_bytes() + assert not any(v in data for v in values), 'secret value in '+file + # Split literals avoid scanner matching its own source code. + for marker in (b'-----BEGIN '+b'PRIVATE KEY-----',b'-----BEGIN RSA '+b'PRIVATE KEY-----'): + assert marker not in data,'private key in '+file +print('PASS no generated credential/root/unseal values or private keys in publishable files') diff --git a/worker/Dockerfile b/worker/Dockerfile new file mode 100644 index 0000000..2520782 --- /dev/null +++ b/worker/Dockerfile @@ -0,0 +1,7 @@ +FROM python:3.13.9-slim +WORKDIR /app +COPY worker/requirements.txt . +RUN pip install --no-cache-dir -r requirements.txt +COPY worker/main.py worker/telemetry.py ./ +USER nobody +CMD ["python", "-u", "main.py"] diff --git a/worker/main.py b/worker/main.py new file mode 100644 index 0000000..d312007 --- /dev/null +++ b/worker/main.py @@ -0,0 +1,257 @@ +"""Durable DB intent -> Valkey Streams -> idempotent S3 effects -> DB -> ack.""" +import hashlib +import io +import json +import math +import os +from pathlib import Path +import signal +import sys +import time +import uuid +from multiprocessing import Process +from datetime import datetime, timezone + +import boto3 +from botocore.config import Config +from PIL import Image, ImageOps, UnidentifiedImageError +import psycopg +from psycopg.rows import dict_row +import redis +import telemetry + +STREAM = 'attachment-jobs-v1' +GROUP = 'image-workers-v1' +MAX_ATTEMPTS = int(os.getenv('JOB_MAX_ATTEMPTS', '5')) +TIMEOUT = int(os.getenv('JOB_TIMEOUT_SECONDS', '60')) +Image.MAX_IMAGE_PIXELS = int(os.getenv('MAX_IMAGE_PIXELS', '40000000')) + + +def secret(name): + return Path(os.environ[name + '_FILE']).read_text().strip() + + +def database(): + return telemetry.Database(psycopg.connect(secret('DATABASE_URL'), autocommit=True, row_factory=dict_row, + connect_timeout=5, options='-c statement_timeout=5000')) + + +def broker(): + return redis.Redis.from_url(secret('BROKER_URL'), decode_responses=True, + socket_connect_timeout=5, socket_timeout=5, ssl_ca_certs='/tls/ca.crt', ssl_check_hostname=True) + + +def event(row): + return dict(schema_version=1, job_id=str(row['job_id']), type='attachment.process.v1', + attachment_id=str(row['attachment_id']), pipeline_version=1, + attempt=row['attempt'] + 1, + created_at=row['created_at'].isoformat().replace('+00:00', 'Z')) + + +def dispatch(): + """Publish before marking: crash can duplicate, but cannot lose committed intent.""" + telemetry.init("messenger-dispatcher") + while True: + try: + with database() as db: + r = broker() + measured = 0 + while True: + if time.monotonic()-measured >= 1: + q = db.execute("SELECT count(*) AS depth, extract(epoch from min(j.created_at)) AS oldest FROM attachment_jobs j JOIN attachments a ON a.id=j.attachment_id WHERE a.status IN ('queued','processing')").fetchone() + telemetry.queue.update(depth=q['depth'],oldest=float(q['oldest']) if q['oldest'] else None,up=1) + measured = time.monotonic() + with db.transaction(): + rows = db.execute('''SELECT j.* FROM attachment_jobs j + JOIN attachments a ON a.id=j.attachment_id + WHERE j.published_at IS NULL AND a.status='queued' + ORDER BY j.created_at LIMIT 100 FOR UPDATE OF j SKIP LOCKED''').fetchall() + for row in rows: + with telemetry.publishing(row) as carrier: + r.xadd(STREAM, {'job': json.dumps(event(row)), **carrier}) + db.execute('UPDATE attachment_jobs SET published_at=now() WHERE job_id=%s', + (row['job_id'],)) + time.sleep(0.25) + except Exception as exc: + telemetry.queue['up'] = 0 + print('dispatcher reconnect:', type(exc).__name__, flush=True) + time.sleep(1) + + +def thumbnail(data): + with Image.open(io.BytesIO(data)) as source: + if source.width * source.height > Image.MAX_IMAGE_PIXELS: + raise ValueError('pixel limit') + source.load() + oriented = ImageOps.exif_transpose(source) + rgba = oriented.convert('RGBA') + white = Image.new('RGBA', rgba.size, 'white') + white.alpha_composite(rgba) + rgb = white.convert('RGB') + scale = min(1, 256 / rgb.width, 256 / rgb.height) + size = (max(1, math.floor(rgb.width * scale)), max(1, math.floor(rgb.height * scale))) + rgb = rgb.resize(size, Image.Resampling.LANCZOS) + out = io.BytesIO() + rgb.save(out, format='JPEG', quality=85, exif=b'') + return out.getvalue(), size + + +def alarm_handler(*_): + raise TimeoutError('job deadline') + + +def handle(db, s3, r, message_id, fields): + payload = json.loads(fields['job']) + job_id = str(uuid.UUID(payload['job_id'])) + attachment_id = str(uuid.UUID(payload['attachment_id'])) + # Session advisory lock survives small transaction boundaries, releases on process death. + locked = db.execute('SELECT pg_try_advisory_lock(hashtextextended(%s,0)) AS ok', + (attachment_id,)).fetchone()['ok'] + if not locked: + return + try: + row = db.execute('''SELECT a.*, j.job_id, j.attempt, j.staging_key, j.created_at AS job_created_at + FROM attachments a JOIN attachment_jobs j ON j.attachment_id=a.id + WHERE a.id=%s AND j.job_id=%s AND j.pipeline_version=%s''', + (attachment_id, job_id, payload['pipeline_version'])).fetchone() + if row is None: + raise ValueError('unknown job') + if row['status'] in ('ready', 'failed'): + r.xack(STREAM, GROUP, message_id) + return + if row['attempt'] >= MAX_ATTEMPTS: + db.execute("UPDATE attachments SET status='failed',error_code='retry_exhausted',updated_at=now() WHERE id=%s", (attachment_id,)) + r.xack(STREAM, GROUP, message_id) + return + with db.transaction(): + db.execute('UPDATE attachment_jobs SET attempt=attempt+1 WHERE job_id=%s', (job_id,)) + db.execute("UPDATE attachments SET status='processing',updated_at=now() WHERE id=%s", (attachment_id,)) + telemetry.event('job.processing') + outcome = 'success' + signal.alarm(TIMEOUT) + try: + bucket = os.environ['S3_BUCKET'] + response = telemetry.call('s3.get_object', s3.get_object, Bucket=bucket, Key=row['staging_key']) + try: + data = response['Body'].read(int(os.getenv('MAX_UPLOAD_BYTES', '10485760')) + 1) + finally: + response['Body'].close() + if len(data) != row['size_bytes'] or hashlib.sha256(data).hexdigest() != row['sha256']: + raise ValueError('original checksum mismatch') + thumb, (width, height) = thumbnail(data) + original_key = 'originals/' + attachment_id + thumb_key = 'variants/' + attachment_id + '/v1/thumbnail' + telemetry.call('s3.put_original', s3.put_object, Bucket=bucket, Key=original_key, Body=data, ContentType=row['content_type']) + telemetry.call('s3.put_thumbnail', s3.put_object, Bucket=bucket, Key=thumb_key, Body=thumb, ContentType='image/jpeg') + variants = [dict(name='thumbnail', content_type='image/jpeg', size_bytes=len(thumb), + width=width, height=height, sha256=hashlib.sha256(thumb).hexdigest())] + db.execute("""UPDATE attachments SET status='ready',object_key=%s,variants=%s::jsonb, + error_code=NULL,updated_at=now() WHERE id=%s""", + (original_key, json.dumps(variants), attachment_id)) + if telemetry.ready_duration: + telemetry.ready_duration.record((datetime.now(timezone.utc)-row['job_created_at']).total_seconds(), {'job_type':'attachment.process.v1'}) + telemetry.event('job.ready') + except Exception as exc: + permanent = isinstance(exc, (ValueError, UnidentifiedImageError, Image.DecompressionBombError)) + failed = permanent or row['attempt'] + 1 >= MAX_ATTEMPTS + with db.transaction(): + db.execute('UPDATE attachments SET status=%s,error_code=%s,updated_at=now() WHERE id=%s', + ('failed' if failed else 'queued', + 'invalid_image' if permanent else 'retry_exhausted' if failed else None, + attachment_id)) + if not failed: + carrier = telemetry.carrier() + db.execute('UPDATE attachment_jobs SET published_at=NULL,traceparent=%s,tracestate=%s WHERE job_id=%s', (carrier.get('traceparent',''),carrier.get('tracestate',''),job_id)) + outcome = 'failed' if failed else 'retry' + finally: + signal.alarm(0) + # Both success and retry intent are committed before ack. + r.xack(STREAM, GROUP, message_id) + return outcome + finally: + db.execute('SELECT pg_advisory_unlock(hashtextextended(%s,0))', (attachment_id,)) + + +def consume(): + telemetry.init() + signal.signal(signal.SIGALRM, alarm_handler) + consumer = 'worker-' + str(uuid.uuid4()) + while True: + try: + with database() as db: + r = broker() + s3 = boto3.client('s3', endpoint_url=os.environ['S3_ENDPOINT'], + region_name=os.getenv('S3_REGION', 'us-east-1'), + aws_access_key_id=secret('S3_ACCESS_KEY_ID'), + aws_secret_access_key=secret('S3_SECRET_ACCESS_KEY'), + config=Config(connect_timeout=3, read_timeout=10, + retries={'max_attempts': 1}, + s3={'addressing_style': 'path'})) + try: + r.xgroup_create(STREAM, GROUP, id='0', mkstream=True) + except redis.ResponseError as exc: + if 'BUSYGROUP' not in str(exc): + raise + while True: + # Reclaim abandoned deliveries. Advisory lock excludes a still active worker. + claimed = r.xautoclaim(STREAM, GROUP, consumer, min_idle_time=3000, count=1)[1] + batches = [(STREAM, claimed)] if claimed else r.xreadgroup( + GROUP, consumer, {STREAM: '>'}, count=1, block=1000) + for _, entries in batches: + for message_id, fields in entries: + telemetry.run_job(handle, db, s3, r, message_id, fields) + except Exception as exc: + print('worker reconnect:', type(exc).__name__, flush=True) + time.sleep(1) + + +def cleanup(): + """Explicit maintenance: only terminal jobs older than the retention interval.""" + retention = int(os.getenv('STAGING_RETENTION_SECONDS', '86400')) + if retention < 3600: + raise ValueError('retention must be at least one hour') + s3 = boto3.client('s3', endpoint_url=os.environ['S3_ENDPOINT'], + region_name=os.getenv('S3_REGION', 'us-east-1'), + aws_access_key_id=secret('S3_ACCESS_KEY_ID'), + aws_secret_access_key=secret('S3_SECRET_ACCESS_KEY')) + with database() as db: + rows = db.execute("""SELECT j.staging_key FROM attachment_jobs j + JOIN attachments a ON a.id=j.attachment_id + WHERE a.status IN ('ready','failed') + AND a.updated_at < now()-make_interval(secs => %s)""", (retention,)).fetchall() + for row in rows: + s3.delete_object(Bucket=os.environ['S3_BUCKET'], Key=row['staging_key']) + print('terminal staging cleanup:', len(rows), 'eligible keys') + + +def shutdown(*_): + raise SystemExit(0) + + +if __name__ == '__main__': + signal.signal(signal.SIGTERM, shutdown) + if MAX_ATTEMPTS < 1 or TIMEOUT < 1: + raise ValueError('invalid retry configuration') + if len(sys.argv) > 1 and sys.argv[1] == 'dispatch': + dispatch() + elif len(sys.argv) > 1 and sys.argv[1] == 'cleanup': + cleanup() + else: + count = int(os.getenv('WORKER_CONCURRENCY', '1')) + if count < 1: + raise ValueError('invalid concurrency') + if count == 1: + consume() + else: + children = [Process(target=consume) for _ in range(count)] + for child in children: + child.start() + try: + for child in children: + child.join() + finally: + for child in children: + if child.is_alive(): + child.terminate() + for child in children: + child.join(timeout=10) diff --git a/worker/requirements.txt b/worker/requirements.txt new file mode 100644 index 0000000..c1370fd --- /dev/null +++ b/worker/requirements.txt @@ -0,0 +1,6 @@ +Pillow==12.0.0 +psycopg[binary]==3.2.10 +redis==6.4.0 +boto3==1.40.65 +opentelemetry-sdk==1.38.0 +opentelemetry-exporter-otlp-proto-http==1.38.0 diff --git a/worker/telemetry.py b/worker/telemetry.py new file mode 100644 index 0000000..3f8d87e --- /dev/null +++ b/worker/telemetry.py @@ -0,0 +1,146 @@ +"""Bounded OTLP exporters; explicit technical data only, never exception text.""" +import atexit +import json +import resource +from contextlib import contextmanager +from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator +from opentelemetry.metrics import Observation +import logging +import os +import socket +import time +from opentelemetry import trace, metrics +from opentelemetry.sdk.resources import Resource +from opentelemetry.sdk.trace import TracerProvider +from opentelemetry.sdk.trace.sampling import ParentBased, TraceIdRatioBased +from opentelemetry.sdk.trace.export import BatchSpanProcessor +from opentelemetry.sdk.metrics import MeterProvider +from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader +from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler +from opentelemetry.sdk._logs.export import BatchLogRecordProcessor +from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter +from opentelemetry.exporter.otlp.proto.http.metric_exporter import OTLPMetricExporter +from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter + +logger = logging.getLogger('jobs') +tracer = trace.get_tracer('messenger-worker') +counter = histogram = ready_duration = None +busy = 0 +queue = {"depth":0,"oldest":None,"up":0} +propagator = TraceContextTextMapPropagator() + +def init(service="messenger-worker"): + global tracer, counter, histogram, ready_duration + if not os.getenv('OTEL_EXPORTER_OTLP_ENDPOINT') or os.getenv('OTEL_SDK_DISABLED') == 'true': + return + res = Resource.create({'service.name': service, 'service.version': 'lab6-1', + 'service.instance.id': socket.gethostname(), + 'deployment.environment.name': 'lab'}) + tp = TracerProvider(resource=res, sampler=ParentBased(TraceIdRatioBased(float(os.getenv('OTEL_TRACES_SAMPLER_ARG','1'))))) + tp.add_span_processor(BatchSpanProcessor(OTLPSpanExporter(timeout=3), max_queue_size=1024, max_export_batch_size=128)) + trace.set_tracer_provider(tp) + mp = MeterProvider(resource=res, metric_readers=[PeriodicExportingMetricReader(OTLPMetricExporter(timeout=3), export_interval_millis=5000)]) + metrics.set_meter_provider(mp) + lp = LoggerProvider(resource=res) + lp.add_log_record_processor(BatchLogRecordProcessor(OTLPLogExporter(timeout=3), max_queue_size=1024, max_export_batch_size=128)) + logger.addHandler(LoggingHandler(logger_provider=lp)); logger.setLevel(logging.INFO); logger.propagate = False + tracer = trace.get_tracer('messenger-worker') + meter = metrics.get_meter('messenger-worker') + counter = meter.create_counter('worker_jobs') + histogram = meter.create_histogram('worker_duration', unit='s', explicit_bucket_boundaries_advisory=(.01,.05,.1,.25,.5,1,2.5,5,10,30,60)) + ready_duration = meter.create_histogram('attachment_ready_duration', unit='s', explicit_bucket_boundaries_advisory=(.1,.5,1,2,5,10,30,60,120)) + meter.create_observable_counter('process_cpu', unit='s', callbacks=[lambda _: [Observation(resource.getrusage(resource.RUSAGE_SELF).ru_utime + resource.getrusage(resource.RUSAGE_SELF).ru_stime)]]) + meter.create_observable_gauge('process_memory', unit='By', callbacks=[lambda _: [Observation(int(open('/proc/self/statm').read().split()[1])*os.sysconf('SC_PAGE_SIZE'))]]) + if service == 'messenger-worker': + meter.create_observable_gauge('worker_busy', callbacks=[lambda _: [Observation(busy)]]) + meter.create_observable_gauge('worker_capacity', callbacks=[lambda _: [Observation(1)]]) + else: + attrs = {'queue_name':'attachment-jobs-v1'} + meter.create_observable_gauge('queue_depth', callbacks=[lambda _: [Observation(queue['depth'],attrs)]]) + meter.create_observable_gauge('queue_oldest_age', unit='s', callbacks=[lambda _: [Observation(max(0,time.time()-queue['oldest']) if queue['oldest'] else 0,attrs)]]) + meter.create_observable_gauge('queue_monitor_up', callbacks=[lambda _: [Observation(queue['up'],attrs)]]) + atexit.register(lp.shutdown); atexit.register(mp.shutdown); atexit.register(tp.shutdown) + +def event(name): + span = trace.get_current_span() + sc = span.get_span_context() + logger.info(name, extra={'event': name, 'trace_id': format(sc.trace_id,'032x'), 'span_id': format(sc.span_id,'016x')}) + +def run_job(fn, *args): + global busy + parent = propagator.extract(args[-1]) + payload = json.loads(args[-1]['job']) + with tracer.start_as_current_span('attachment.process', context=parent, kind=trace.SpanKind.CONSUMER, record_exception=False, set_status_on_exception=False) as span: + span.set_attribute('messaging.message.id', payload['job_id']) + span.set_attribute('job.attempt', payload['attempt']) + busy += 1 + start = time.monotonic() + outcome = 'error' + try: + result = fn(*args) + outcome = result or 'skipped' + return result + finally: + busy -= 1 + attrs = {'job_type': 'attachment.process.v1', 'outcome': outcome} + span.set_attributes(attrs) + if outcome in ('error','failed','retry'): + span.set_status(trace.Status(trace.StatusCode.ERROR, outcome)) + event('job.' + outcome) + if counter: + counter.add(1, attrs); histogram.record(time.monotonic()-start, attrs) + + +def call(name, fn, **kwargs): + with tracer.start_as_current_span(name, kind=trace.SpanKind.CLIENT, + record_exception=False, set_status_on_exception=False) as span: + try: + return fn(**kwargs) + except Exception as exc: + span.set_attribute('error.type', type(exc).__name__) + span.set_status(trace.Status(trace.StatusCode.ERROR, 'S3 operation failed')) + event('s3.error') + raise + + +@contextmanager +def publishing(row): + parent = propagator.extract({'traceparent':row['traceparent'], 'tracestate':row['tracestate']}) + with tracer.start_as_current_span('attachment.publish', context=parent, kind=trace.SpanKind.PRODUCER, + record_exception=False, set_status_on_exception=False): + carrier = {} + propagator.inject(carrier) + yield carrier + +def carrier(): + result = {} + propagator.inject(result) + return result + +class Database: + """Instrument only queries inside an active request/job, omit SQL and parameters.""" + def __init__(self, connection): + self.connection = connection + def __enter__(self): + self.connection.__enter__() + return self + def __exit__(self, *args): + return self.connection.__exit__(*args) + def __getattr__(self, name): + return getattr(self.connection, name) + def execute(self, sql, *args, **kwargs): + if not trace.get_current_span().get_span_context().is_valid: + return self.connection.execute(sql,*args,**kwargs) + op = sql.strip().split()[0].upper() + if op not in ('SELECT','UPDATE','INSERT','DELETE'): + op = 'query' + with tracer.start_as_current_span('db.'+op, kind=trace.SpanKind.CLIENT, + attributes={'db.system.name':'postgresql'}, + record_exception=False, set_status_on_exception=False) as span: + try: + return self.connection.execute(sql,*args,**kwargs) + except Exception as exc: + span.set_attribute('error.type', type(exc).__name__) + span.set_status(trace.Status(trace.StatusCode.ERROR,'database operation failed')) + event('db.error') + raise diff --git a/worker/test_thumbnail.py b/worker/test_thumbnail.py new file mode 100644 index 0000000..f4351d7 --- /dev/null +++ b/worker/test_thumbnail.py @@ -0,0 +1,70 @@ +import hashlib +import io +import unittest +from unittest.mock import patch +from PIL import Image +from main import thumbnail + + +class ThumbnailTests(unittest.TestCase): + def test_extreme_aspect_ratios(self): + for dimensions, expected in [((1, 1000), (1, 256)), ((1000, 1), (256, 1)), ((1, 1), (1, 1)), ((256, 256), (256, 256))]: + with self.subTest(dimensions=dimensions): + source = io.BytesIO() + Image.new('RGB', dimensions).save(source, 'PNG') + data, size = thumbnail(source.getvalue()) + self.assertEqual(size, expected) + with Image.open(io.BytesIO(data)) as result: + self.assertEqual(result.size, expected) + + def test_corrupt_input_rejected(self): + source = io.BytesIO() + Image.new('RGB', (10, 10)).save(source, 'PNG') + for data in (b'', b'not an image', source.getvalue()[:40]): + with self.subTest(data=data): + with self.assertRaises((OSError, ValueError)): + thumbnail(data) + + def test_pixel_limit_boundary(self): + source = io.BytesIO() + Image.new('RGB', (10, 10)).save(source, 'PNG') + with patch.object(Image, 'MAX_IMAGE_PIXELS', 100): + self.assertEqual(thumbnail(source.getvalue())[1], (10, 10)) + with patch.object(Image, 'MAX_IMAGE_PIXELS', 99): + with self.assertWarns(Image.DecompressionBombWarning): + with self.assertRaises(ValueError): + thumbnail(source.getvalue()) + + def test_size_floor_and_no_upscale(self): + for dimensions, expected in [((320,200),(256,160)), ((7,3),(7,3)), ((1000,333),(256,85))]: + source = io.BytesIO() + Image.new('RGB', dimensions, 'red').save(source, 'PNG') + data, size = thumbnail(source.getvalue()) + self.assertEqual(size, expected) + with Image.open(io.BytesIO(data)) as result: + self.assertEqual(result.format, 'JPEG') + self.assertEqual(result.size, expected) + + def test_transparency_is_white(self): + source = io.BytesIO() + Image.new('RGBA', (10,10), (0,0,0,0)).save(source, 'PNG') + result, _ = thumbnail(source.getvalue()) + with Image.open(io.BytesIO(result)) as image: + self.assertTrue(all(value >= 250 for value in image.getpixel((5,5)))) + + def test_orientation_applied_and_exif_removed(self): + source = io.BytesIO() + exif = Image.Exif() + exif[274] = 6 + Image.new('RGB', (320,200), 'blue').save(source, 'JPEG', exif=exif) + data = source.getvalue() + original_hash = hashlib.sha256(data).hexdigest() + result, size = thumbnail(data) + self.assertEqual(size, (160,256)) + self.assertEqual(hashlib.sha256(data).hexdigest(), original_hash) + with Image.open(io.BytesIO(result)) as image: + self.assertFalse(image.getexif()) + + +if __name__ == '__main__': + unittest.main() -- 2.54.0