Verify clean clone and restrict migration secrets

This commit is contained in:
2026-10-29 21:42:29 +03:00
parent 99c87315cf
commit 3a3ebd2115
6 changed files with 297 additions and 11 deletions
+2
View File
@@ -98,3 +98,5 @@ SIGTERM: Stop-флаг исключает новые операции, Shutdown
- [PostgreSQL 17 locks](https://www.postgresql.org/docs/17/explicit-locking.html)
- [Docker Compose services](https://docs.docker.com/reference/compose-file/services/)
- [pgx pool statistics](https://pkg.go.dev/github.com/jackc/pgx/v5/pgxpool)
Migration job получает только database_url. Команды CLI завершают нужный путь до чтения остальных секретов.
+10 -10
View File
@@ -60,6 +60,16 @@ func run() error {
if err != nil {
return err
}
startup, cancel := context.WithTimeout(context.Background(), 15*time.Second)
defer cancel()
pool, err := database.Open(startup, databaseURL)
if err != nil {
return err
}
defer pool.Close()
if len(os.Args) == 2 && os.Args[1] == "migrate" {
return database.Migrate(startup, pool)
}
cacheURL, err := secret("CACHE_URL_FILE")
if err != nil {
return err
@@ -72,16 +82,6 @@ func run() error {
if err != nil || len(key) != 32 {
return fmt.Errorf("invalid cursor key")
}
startup, cancel := context.WithTimeout(context.Background(), 15*time.Second)
defer cancel()
pool, err := database.Open(startup, databaseURL)
if err != nil {
return err
}
defer pool.Close()
if len(os.Args) == 2 && os.Args[1] == "migrate" {
return database.Migrate(startup, pool)
}
opts, err := redis.ParseURL(cacheURL)
if err != nil {
return fmt.Errorf("invalid cache configuration")
+1
View File
@@ -39,6 +39,7 @@ services:
mem_limit: 128m
migrate:
<<: *api
secrets: [database_url]
command: [migrate]
depends_on:
postgres: {condition: service_healthy}
+220
View File
@@ -0,0 +1,220 @@
Cloning into '/var/folders/hx/czbzpyk92ds_mnf7n9xrzn_80000gn/T/verify-lab3-d38bd66978-07zrg0xk/repo'...
done.
python3 scripts/bootstrap.py
Local secrets ready (values hidden); .env and secrets/ are ignored by Git.
docker compose --env-file .env up -d --build --wait
Compose can now delegate builds to bake for better performance.
To do so, set COMPOSE_BAKE=true.
#0 building with "desktop-linux" instance using docker driver
#1 [migrate internal] load build definition from Dockerfile
#1 transferring dockerfile: 782B done
#1 DONE 0.0s
#2 [migrate internal] load metadata for docker.io/library/golang:1.24.4-alpine3.22
#2 DONE 0.3s
#3 [migrate internal] load metadata for docker.io/library/alpine:3.22.1
#3 DONE 0.3s
#4 [migrate stage-2 1/3] FROM docker.io/library/alpine:3.22.1@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1
#4 resolve docker.io/library/alpine:3.22.1@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1 done
#4 DONE 0.0s
#5 [migrate build 1/7] FROM docker.io/library/golang:1.24.4-alpine3.22@sha256:68932fa6d4d4059845c8f40ad7e654e626f3ebd3706eef7846f319293ab5cb7a
#5 resolve docker.io/library/golang:1.24.4-alpine3.22@sha256:68932fa6d4d4059845c8f40ad7e654e626f3ebd3706eef7846f319293ab5cb7a 0.0s done
#5 DONE 0.0s
#6 [migrate build 2/7] WORKDIR /src
#6 CACHED
#7 [migrate internal] load .dockerignore
#7 transferring context: 196B done
#7 DONE 0.0s
#8 [migrate internal] load build context
#8 transferring context: 43.68kB done
#8 DONE 0.0s
#9 [migrate build 6/7] COPY internal/ ./internal/
#9 CACHED
#10 [migrate stage-2 2/3] RUN addgroup -g 10001 app && adduser -D -u 10001 -G app app
#10 CACHED
#11 [migrate build 5/7] COPY cmd/ ./cmd/
#11 CACHED
#12 [migrate build 7/7] RUN CGO_ENABLED=0 go build -trimpath -ldflags="-s -w" -o /out/messenger ./cmd/server
#12 CACHED
#13 [migrate build 4/7] RUN go mod download
#13 CACHED
#14 [migrate build 3/7] COPY go.mod go.sum ./
#14 CACHED
#15 [migrate stage-2 3/3] COPY --from=build /out/messenger /usr/local/bin/messenger
#15 CACHED
#16 [migrate] exporting to image
#16 exporting layers done
#16 exporting manifest sha256:07905620f32fdd80de269eab5446b77a11cd702963e4bd0c719697946e967dcc done
#16 exporting config sha256:001f6e3f887d6b86f2755eff748bc4e7d3a00801fbd137dbc46156e4e48dd873 done
#16 exporting attestation manifest sha256:5572d85c06b5a6c072b663ed037369bab15af2bc4506e0c587da4fbb04c4a908 done
#16 exporting manifest list sha256:9c6d4a8b8bf7176f936847d596086ea5001aaf6ad868ca4f1ade4819e306de7d done
#16 naming to docker.io/library/mtusi-messenger:lab3 done
#16 unpacking to docker.io/library/mtusi-messenger:lab3 done
#16 DONE 0.0s
#17 [migrate] resolving provenance for metadata file
#17 DONE 0.0s
#18 [api internal] load build definition from Dockerfile
#18 transferring dockerfile: 782B done
#18 DONE 0.0s
#2 [api internal] load metadata for docker.io/library/golang:1.24.4-alpine3.22
#2 DONE 0.5s
#3 [api internal] load metadata for docker.io/library/alpine:3.22.1
#3 DONE 0.5s
#4 [api stage-2 1/3] FROM docker.io/library/alpine:3.22.1@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1
#4 resolve docker.io/library/alpine:3.22.1@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1 done
#4 DONE 0.0s
#5 [api build 1/7] FROM docker.io/library/golang:1.24.4-alpine3.22@sha256:68932fa6d4d4059845c8f40ad7e654e626f3ebd3706eef7846f319293ab5cb7a
#5 resolve docker.io/library/golang:1.24.4-alpine3.22@sha256:68932fa6d4d4059845c8f40ad7e654e626f3ebd3706eef7846f319293ab5cb7a 0.0s done
#5 DONE 0.0s
#6 [api build 2/7] WORKDIR /src
#6 CACHED
#19 [api internal] load .dockerignore
#19 transferring context: 196B done
#19 DONE 0.0s
#20 [api internal] load build context
#20 transferring context: 752B done
#20 DONE 0.0s
#21 [api build 5/7] COPY cmd/ ./cmd/
#21 CACHED
#22 [api build 3/7] COPY go.mod go.sum ./
#22 CACHED
#23 [api build 7/7] RUN CGO_ENABLED=0 go build -trimpath -ldflags="-s -w" -o /out/messenger ./cmd/server
#23 CACHED
#10 [api stage-2 2/3] RUN addgroup -g 10001 app && adduser -D -u 10001 -G app app
#10 CACHED
#24 [api build 6/7] COPY internal/ ./internal/
#24 CACHED
#25 [api build 4/7] RUN go mod download
#25 CACHED
#26 [api stage-2 3/3] COPY --from=build /out/messenger /usr/local/bin/messenger
#26 CACHED
#27 [api] exporting to image
#27 exporting layers done
#27 exporting manifest sha256:cb3af50c8817668d75dae93840d6f64e54ca7147de1c6d759235d87167febce2 done
#27 exporting config sha256:7059afd72af26199b6fdd27fab99f6e21860db6200ccfbaaf59581d064288200 done
#27 exporting attestation manifest sha256:efdd917e783c4b40bc5a94eed0b4963953ff5b08e8df36725a379f2e0c61b749 done
#27 exporting manifest list sha256:5da05cb4fa5f1e3f4be2806c2d908f6cfbbadd8611d750764a0ec6b60364df65 done
#27 naming to docker.io/library/mtusi-messenger:lab3 done
#27 unpacking to docker.io/library/mtusi-messenger:lab3 done
#27 DONE 0.0s
#28 [api] resolving provenance for metadata file
#28 DONE 0.0s
api Built
migrate Built
Network verify-lab3-d38bd66978_default Creating
Network verify-lab3-d38bd66978_default Created
Volume "verify-lab3-d38bd66978_postgres_data" Creating
Volume "verify-lab3-d38bd66978_postgres_data" Created
Container verify-lab3-d38bd66978-valkey-1 Creating
Container verify-lab3-d38bd66978-postgres-1 Creating
Container verify-lab3-d38bd66978-valkey-1 Created
Container verify-lab3-d38bd66978-postgres-1 Created
Container verify-lab3-d38bd66978-migrate-1 Creating
Container verify-lab3-d38bd66978-migrate-1 Created
Container verify-lab3-d38bd66978-api-2 Creating
Container verify-lab3-d38bd66978-api-1 Creating
Container verify-lab3-d38bd66978-api-2 Created
Container verify-lab3-d38bd66978-api-1 Created
Container verify-lab3-d38bd66978-lb-1 Creating
Container verify-lab3-d38bd66978-lb-1 Created
Container verify-lab3-d38bd66978-postgres-1 Starting
Container verify-lab3-d38bd66978-valkey-1 Starting
Container verify-lab3-d38bd66978-postgres-1 Started
Container verify-lab3-d38bd66978-postgres-1 Waiting
Container verify-lab3-d38bd66978-valkey-1 Started
Container verify-lab3-d38bd66978-postgres-1 Healthy
Container verify-lab3-d38bd66978-migrate-1 Starting
Container verify-lab3-d38bd66978-migrate-1 Started
Container verify-lab3-d38bd66978-migrate-1 Waiting
Container verify-lab3-d38bd66978-migrate-1 Exited
Container verify-lab3-d38bd66978-api-1 Starting
Container verify-lab3-d38bd66978-api-1 Started
Container verify-lab3-d38bd66978-api-2 Starting
Container verify-lab3-d38bd66978-api-2 Started
Container verify-lab3-d38bd66978-api-1 Waiting
Container verify-lab3-d38bd66978-api-2 Waiting
Container verify-lab3-d38bd66978-api-1 Healthy
Container verify-lab3-d38bd66978-api-2 Healthy
Container verify-lab3-d38bd66978-lb-1 Starting
Container verify-lab3-d38bd66978-lb-1 Started
Container verify-lab3-d38bd66978-api-1 Waiting
Container verify-lab3-d38bd66978-api-2 Waiting
Container verify-lab3-d38bd66978-lb-1 Waiting
Container verify-lab3-d38bd66978-postgres-1 Waiting
Container verify-lab3-d38bd66978-valkey-1 Waiting
Container verify-lab3-d38bd66978-migrate-1 Waiting
Container verify-lab3-d38bd66978-postgres-1 Healthy
Container verify-lab3-d38bd66978-valkey-1 Healthy
Container verify-lab3-d38bd66978-migrate-1 Exited
Container verify-lab3-d38bd66978-api-1 Healthy
Container verify-lab3-d38bd66978-api-2 Healthy
Container verify-lab3-d38bd66978-lb-1 Healthy
python3 scripts/check_contract.py
PASS: offline skeleton structure, local refs and Python syntax; application NOT tested.
python3 tests/smoke.py --base-url "http://localhost:49528"
PASS: lab3 public API scenario; infrastructure and grading evidence remain separate.
python3 tests/resilience.py --mode persistence --action-script "scripts/restart.sh" --base-url "http://localhost:49528"
Executing explicit persistence hook; hook output suppressed to avoid leaking secrets.
PASS: persistence preserved confirmed data and existing session. Hook scope needs operator evidence.
Container verify-lab3-d38bd66978-lb-1 Stopping
Container verify-lab3-d38bd66978-lb-1 Stopped
Container verify-lab3-d38bd66978-lb-1 Removing
Container verify-lab3-d38bd66978-lb-1 Removed
Container verify-lab3-d38bd66978-api-2 Stopping
Container verify-lab3-d38bd66978-api-1 Stopping
Container verify-lab3-d38bd66978-api-1 Stopped
Container verify-lab3-d38bd66978-api-1 Removing
Container verify-lab3-d38bd66978-api-1 Removed
Container verify-lab3-d38bd66978-api-2 Stopped
Container verify-lab3-d38bd66978-api-2 Removing
Container verify-lab3-d38bd66978-api-2 Removed
Container verify-lab3-d38bd66978-migrate-1 Stopping
Container verify-lab3-d38bd66978-valkey-1 Stopping
Container verify-lab3-d38bd66978-migrate-1 Stopped
Container verify-lab3-d38bd66978-migrate-1 Removing
Container verify-lab3-d38bd66978-migrate-1 Removed
Container verify-lab3-d38bd66978-postgres-1 Stopping
Container verify-lab3-d38bd66978-postgres-1 Stopped
Container verify-lab3-d38bd66978-postgres-1 Removing
Container verify-lab3-d38bd66978-valkey-1 Stopped
Container verify-lab3-d38bd66978-valkey-1 Removing
Container verify-lab3-d38bd66978-postgres-1 Removed
Container verify-lab3-d38bd66978-valkey-1 Removed
Network verify-lab3-d38bd66978_default Removing
Volume verify-lab3-d38bd66978_postgres_data Removing
Volume verify-lab3-d38bd66978_postgres_data Removed
Network verify-lab3-d38bd66978_default Removed
PASS: real clean clone, fresh secrets/volumes, smoke, same-session persistence, actual store/API restart, non-root PID1
+63
View File
@@ -0,0 +1,63 @@
{
"scope": "disposable real clean clone",
"before": {
"/verify-lab3-d38bd66978-api-1": {
"service": "api",
"started_at": "2026-10-29T18:37:07.643409388Z",
"image_id": "sha256:5da05cb4fa5f1e3f4be2806c2d908f6cfbbadd8611d750764a0ec6b60364df65",
"user": "10001:10001",
"pid1": "/usr/local/bin/messenger"
},
"/verify-lab3-d38bd66978-api-2": {
"service": "api",
"started_at": "2026-10-29T18:37:07.707615513Z",
"image_id": "sha256:5da05cb4fa5f1e3f4be2806c2d908f6cfbbadd8611d750764a0ec6b60364df65",
"user": "10001:10001",
"pid1": "/usr/local/bin/messenger"
},
"/verify-lab3-d38bd66978-postgres-1": {
"service": "postgres",
"started_at": "2026-10-29T18:37:05.470527512Z",
"image_id": "sha256:ef257d85f76e48da1c64832459b59fcaba1a4dac97bf5d7450c77753542eee94",
"user": "",
"pid1": "docker-entrypoint.sh"
},
"/verify-lab3-d38bd66978-valkey-1": {
"service": "valkey",
"started_at": "2026-10-29T18:37:05.470183095Z",
"image_id": "sha256:d827e7f7552cdee40cc7482dbae9da020f42bc47669af6f71182a4ef76a22773",
"user": "",
"pid1": "docker-entrypoint.sh"
}
},
"after": {
"/verify-lab3-d38bd66978-api-1": {
"service": "api",
"started_at": "2026-10-29T18:37:20.276185838Z",
"image_id": "sha256:5da05cb4fa5f1e3f4be2806c2d908f6cfbbadd8611d750764a0ec6b60364df65",
"user": "10001:10001",
"pid1": "/usr/local/bin/messenger"
},
"/verify-lab3-d38bd66978-api-2": {
"service": "api",
"started_at": "2026-10-29T18:37:20.33474363Z",
"image_id": "sha256:5da05cb4fa5f1e3f4be2806c2d908f6cfbbadd8611d750764a0ec6b60364df65",
"user": "10001:10001",
"pid1": "/usr/local/bin/messenger"
},
"/verify-lab3-d38bd66978-postgres-1": {
"service": "postgres",
"started_at": "2026-10-29T18:37:18.115751879Z",
"image_id": "sha256:ef257d85f76e48da1c64832459b59fcaba1a4dac97bf5d7450c77753542eee94",
"user": "",
"pid1": "docker-entrypoint.sh"
},
"/verify-lab3-d38bd66978-valkey-1": {
"service": "valkey",
"started_at": "2026-10-29T18:37:18.124661212Z",
"image_id": "sha256:d827e7f7552cdee40cc7482dbae9da020f42bc47669af6f71182a4ef76a22773",
"user": "",
"pid1": "docker-entrypoint.sh"
}
}
}
+1 -1
View File
@@ -1,4 +1,4 @@
? mtusi/messenger/cmd/bench [no test files]
? mtusi/messenger/cmd/server [no test files]
? mtusi/messenger/internal/database [no test files]
ok mtusi/messenger/internal/messenger 3.007s
ok mtusi/messenger/internal/messenger 3.022s