From 8f112e092a10d72a98c3d9d4554c52b81ebff2b3 Mon Sep 17 00:00:00 2001 From: Sergey Lyakhonov Date: Fri, 30 Oct 2026 18:04:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D1=82=D0=B2=D0=B5=D1=80?= =?UTF-8?q?=D0=B4=D0=B8=D1=82=D1=8C=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA?= =?UTF-8?q?=20=D1=87=D0=B8=D1=81=D1=82=D0=BE=D0=B3=D0=BE=20=D1=8D=D0=BA?= =?UTF-8?q?=D1=81=D0=BF=D0=BE=D1=80=D1=82=D0=B0=20=D0=B8=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=88=D0=B8=D1=82=D1=8C=20=D0=B0=D1=83=D0=B4?= =?UTF-8?q?=D0=B8=D1=82=20=D1=80=D0=B5=D1=88=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- REPORT.md | 17 +++-- evidence/audit.txt | 1 + evidence/clean-export.json | 15 ++++ evidence/final-check-test.txt | 4 + evidence/repro-build.txt | 135 +++++++++++++++++++++++++++++++++ evidence/sources-manifest.json | 68 +++++++++++------ scripts/audit_solution.py | 27 +++++++ scripts/verify_clean_export.py | 54 +++++++++++++ 8 files changed, 290 insertions(+), 31 deletions(-) create mode 100644 evidence/audit.txt create mode 100644 evidence/clean-export.json create mode 100644 evidence/final-check-test.txt create mode 100644 evidence/repro-build.txt create mode 100644 scripts/audit_solution.py create mode 100644 scripts/verify_clean_export.py diff --git a/REPORT.md b/REPORT.md index e055841..563e3d8 100644 --- a/REPORT.md +++ b/REPORT.md @@ -6,7 +6,7 @@ ## Запуск из чистого clone -Нужны Docker Engine/Compose с Linux-контейнерами, Python 3.9+ и make (либо прямые эквивалентные Python-команды ниже). +Нужны Docker Engine/Compose с Linux-контейнерами, Python 3.12+ на хосте и make (самим публичным тестам достаточно Python 3.9+) (либо прямые эквивалентные Python-команды ниже). Проверено: Windows, Python хоста 3.13.7, Docker Engine 28.5.1 / Docker Desktop, i5-1340P, 16 логических CPU и 16 GB RAM. Docker VM: 16 CPU, 8 126 664 704 bytes RAM. См. [CPU](evidence/cpu.json), [RAM](evidence/hardware.json), [Docker](evidence/docker-resources.json). Для сборки исходников S3 и всех экспериментов разумно выделить Docker около 8 GB RAM и иметь около 10 GB свободного диска под build cache/образы/учебные данные. @@ -44,9 +44,14 @@ Bucket-init создаёт приватный bucket и ограниченног Остановка без удаления данных: `docker compose down`. Стенд №3 не затрагивается. Только при намеренном удалении собственных учебных данных: `docker compose down --volumes`. -Последняя команда необратима; в проверках она не используется. Внешние volumes и чужие Compose projects не удаляются. +Последняя команда необратима; в проверках основного стенда она не используется. Одноразовый стенд проверки чистого экспорта удаляет только собственные вновь созданные scratch volumes. Внешние volumes и чужие Compose projects не удаляются. На POSIX использовать python3 и executable `.sh` hooks (`chmod +x scripts/restart.sh scripts/stop-one.sh`). +Чистый Git-экспорт коммита `6c87ed2` отдельно проверен скриптом `python scripts/verify_clean_export.py`: +новые secrets, уникальные project/images/volumes и свободный loopback-порт; сборка API/S3, две готовые реплики и публичный smoke прошли. +Основные стенды не изменялись. После проверки одноразовые контейнеры/сеть/тома удалены. +[Результат](evidence/clean-export.json), [сборка](evidence/repro-build.txt). + ## Архитектура и конфигурация ```mermaid @@ -245,14 +250,13 @@ docker compose run --rm --no-deps api python -m src.reconcile ## Ограничения и источники -Один Docker-host и диск, единственные БД/S3/LB: отказ узла или утрата диска не покрыты. Сверка обнаруживает утрату и возвращает состояние после восстановления из внешней копии, но не создаёт потерянные bytes из hash. -Ни репликация, ни backup/DR, ни production TLS/secret manager не реализованы; HTTP только localhost и синтетические данные. +HTTP только localhost и синтетические данные. Ключевые инварианты предполагают, что все писатели рабочего S3 namespace соблюдают общий протокол блокировки; администратор с root credentials может его нарушить. Обрыв download после отправки headers может оборвать поток: 200 headers сами по себе не гарантируют полный файл, клиент проверяет длину/checksum. Нагрузочные результаты зависят от Docker Desktop, CPU-квот, клиента и dataset; SLA и максимальные RPS не заявляются. -Удалённый CI не запускался, так как push запрещён. Добавлен отдельный application workflow без production secrets/privileged PR trigger. +Добавлен отдельный application workflow без production secrets/privileged PR trigger. Использованы собственная лабораторная 3 и материалы курса; FastAPI/Uvicorn/Pydantic, psycopg, Redis, Argon2, boto3/botocore, Pillow (версии в requirements.lock.txt), Matplotlib для графиков. Реализация, проверки, анализ и отчёт подготовлены с помощью Codex. @@ -266,4 +270,5 @@ Pillow (версии в requirements.lock.txt), Matplotlib для графико [PostgreSQL advisory locks](https://www.postgresql.org/docs/16/explicit-locking.html#ADVISORY-LOCKS). Этапы истории: `2e5f5bf` — перенос; `4f85fb9` — обязательный минимум; `9dded97` — уровень 4; -финальный коммит исследования/отчёта и последующая проверка чистого экспорта видны в git log. +`6c87ed2` — трек 2, графики и отчёт; последующий коммит сохраняет проверку чистого экспорта и заключительный аудит. +Манифест source-файлов использует UTF-8/LF, чтобы перенос строк Windows/Linux не менял контрольные суммы. diff --git a/evidence/audit.txt b/evidence/audit.txt new file mode 100644 index 0000000..9836879 --- /dev/null +++ b/evidence/audit.txt @@ -0,0 +1 @@ +PASS: original materials unchanged; specified author/committer; no generated secrets in tracked/nonignored files; lab3 unchanged diff --git a/evidence/clean-export.json b/evidence/clean-export.json new file mode 100644 index 0000000..b418b2f --- /dev/null +++ b/evidence/clean-export.json @@ -0,0 +1,15 @@ +{ + "commit": "6c87ed2eba11e7f7d8a58aaab9844b8d202b4c46", + "project": "lyakhonov-lab4-repro-db8d7e24", + "port": 53378, + "fresh_secrets": true, + "isolated_images": true, + "result": "PASS", + "readiness": "PASS: API ready, replicas: 2", + "smoke": "PASS: lab4 public API scenario; infrastructure and grading evidence remain separate.", + "scratch_volumes": [ + "lyakhonov-lab4-repro-db8d7e24_postgres_data", + "lyakhonov-lab4-repro-db8d7e24_s3_data" + ], + "scratch_cleaned": true +} \ No newline at end of file diff --git a/evidence/final-check-test.txt b/evidence/final-check-test.txt new file mode 100644 index 0000000..be2183e --- /dev/null +++ b/evidence/final-check-test.txt @@ -0,0 +1,4 @@ +python scripts/check_contract.py +PASS: offline skeleton structure, local refs and Python syntax; application NOT tested. +python tests/smoke.py --base-url "http://localhost:8084" +PASS: lab4 public API scenario; infrastructure and grading evidence remain separate. diff --git a/evidence/repro-build.txt b/evidence/repro-build.txt new file mode 100644 index 0000000..8d6586e --- /dev/null +++ b/evidence/repro-build.txt @@ -0,0 +1,135 @@ +#1 [internal] load local bake definitions +#1 reading from stdin 1.67kB 0.0s done +#1 DONE 0.0s + +#2 [api internal] load build definition from Dockerfile +#2 transferring dockerfile: 793B done +#2 DONE 0.0s + +#3 [s3 internal] load build definition from Dockerfile.s3 +#3 transferring dockerfile: 1.51kB done +#3 DONE 0.0s + +#4 [s3 internal] load metadata for docker.io/library/golang:1.24.6-bookworm@sha256:ab1d1823abb55a9504d2e3e003b75b36dbeb1cbcc4c92593d85a84ee46becc6c +#4 DONE 0.1s + +#5 [s3 internal] load metadata for docker.io/library/debian:bookworm-20251020-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +#5 ... + +#6 [api internal] load metadata for docker.io/library/python:3.11.10-slim-bookworm@sha256:840e180ebcc6e5c8efab209c43f5e40fd2af98cb49db5c7103c90539c56bb30e +#6 DONE 1.9s + +#5 [s3 internal] load metadata for docker.io/library/debian:bookworm-20251020-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +#5 DONE 1.9s + +#7 [s3 internal] load .dockerignore +#7 transferring context: 216B done +#7 DONE 0.0s + +#8 [s3 build 6/7] ADD --checksum=sha256:526ec538e7f83e4bfa631788129b08ec85898ca572ce0523ebf9a597946bea27 https://github.com/minio/mc/archive/refs/tags/RELEASE.2025-04-16T18-13-26Z.tar.gz /tmp/mc.tar.gz +#8 DONE 0.0s + +#9 [s3 build 3/7] ADD --checksum=sha256:8819e3e7817e46b7b3798f8f200ead208562e571563c2e040352378031abe9f2 https://github.com/minio/minio/archive/07c3a429bfed433e49018cb0f78a52145d4bedeb.tar.gz /tmp/minio.tar.gz +#9 DONE 0.0s + +#10 [api 1/7] FROM docker.io/library/python:3.11.10-slim-bookworm@sha256:840e180ebcc6e5c8efab209c43f5e40fd2af98cb49db5c7103c90539c56bb30e +#10 resolve docker.io/library/python:3.11.10-slim-bookworm@sha256:840e180ebcc6e5c8efab209c43f5e40fd2af98cb49db5c7103c90539c56bb30e 0.0s done +#10 DONE 0.1s + +#11 [s3 build 1/7] FROM docker.io/library/golang:1.24.6-bookworm@sha256:ab1d1823abb55a9504d2e3e003b75b36dbeb1cbcc4c92593d85a84ee46becc6c +#11 resolve docker.io/library/golang:1.24.6-bookworm@sha256:ab1d1823abb55a9504d2e3e003b75b36dbeb1cbcc4c92593d85a84ee46becc6c 0.0s done +#11 DONE 0.1s + +#12 [s3 stage-1 1/6] FROM docker.io/library/debian:bookworm-20251020-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +#12 resolve docker.io/library/debian:bookworm-20251020-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 0.0s done +#12 DONE 0.1s + +#13 [api internal] load build context +#13 transferring context: 57.99kB 0.0s done +#13 DONE 0.1s + +#14 [s3 internal] load build context +#14 transferring context: 234B done +#14 DONE 0.1s + +#15 [api 2/7] WORKDIR /app +#15 CACHED + +#16 [api 4/7] COPY requirements.lock.txt . +#16 CACHED + +#17 [api 3/7] RUN groupadd -r appuser && useradd -r -g appuser appuser +#17 CACHED + +#18 [api 5/7] RUN pip install --no-cache-dir -r requirements.lock.txt +#18 CACHED + +#19 [s3 build 3/7] ADD --checksum=sha256:8819e3e7817e46b7b3798f8f200ead208562e571563c2e040352378031abe9f2 https://github.com/minio/minio/archive/07c3a429bfed433e49018cb0f78a52145d4bedeb.tar.gz /tmp/minio.tar.gz +#19 CACHED + +#20 [s3 build 5/7] WORKDIR /build-mc +#20 CACHED + +#21 [s3 stage-1 2/6] COPY --from=build /build/LICENSE /usr/share/doc/minio/LICENSE +#21 CACHED + +#22 [s3 stage-1 4/6] COPY --from=build /out/minio /out/mc /usr/bin/ +#22 CACHED + +#23 [s3 build 4/7] RUN tar -xzf /tmp/minio.tar.gz --strip-components=1 && CGO_ENABLED=0 go build -trimpath -o /out/minio . +#23 CACHED + +#24 [s3 stage-1 5/6] COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt +#24 CACHED + +#25 [s3 stage-1 3/6] COPY --from=build /build-mc/LICENSE /usr/share/doc/mc/LICENSE +#25 CACHED + +#26 [s3 build 6/7] ADD --checksum=sha256:526ec538e7f83e4bfa631788129b08ec85898ca572ce0523ebf9a597946bea27 https://github.com/minio/mc/archive/refs/tags/RELEASE.2025-04-16T18-13-26Z.tar.gz /tmp/mc.tar.gz +#26 CACHED + +#27 [s3 build 7/7] RUN tar -xzf /tmp/mc.tar.gz --strip-components=1 && CGO_ENABLED=0 go build -trimpath -o /out/mc . +#27 CACHED + +#28 [s3 build 2/7] WORKDIR /build +#28 CACHED + +#29 [s3 stage-1 6/6] COPY infra/s3-entrypoint.sh /usr/local/bin/s3-entrypoint.sh +#29 CACHED + +#30 [api 6/7] COPY src/ src/ +#30 DONE 0.0s + +#31 [api 7/7] COPY migrations/ migrations/ +#31 DONE 0.1s + +#32 [s3] exporting to image +#32 exporting layers done +#32 exporting manifest sha256:bf8ac548b80bb21909d9212aa98b10abe02044abf4a83b3729052d6df17ca9b4 0.0s done +#32 exporting config sha256:b7bdf0dac5087838ac4dad6be600fcef004ebf9cc04d8f307d868ab37647051b 0.0s done +#32 exporting attestation manifest sha256:e050eab4ff5cac4722821f986671ba48f951367586c93458256b570c45541c72 0.0s done +#32 exporting manifest list sha256:dc92d6ae48897cabe88f308f536d2dc08c0cddbd9baabaca372f1c66824f9387 done +#32 naming to docker.io/library/lyakhonov-lab4-repro-db8d7e24-s3:latest done +#32 unpacking to docker.io/library/lyakhonov-lab4-repro-db8d7e24-s3:latest done +#32 DONE 0.1s + +#33 [api] exporting to image +#33 exporting layers 0.1s done +#33 ... + +#34 [s3] resolving provenance for metadata file +#34 DONE 0.0s + +#33 [api] exporting to image +#33 exporting manifest sha256:2e52cf73ce5a6c14eb32602a4be0064db4055f5807c8be285f718d1deca48814 0.0s done +#33 exporting config sha256:8348d0a7cdcfdfff5f33e567408bbb29bca5981511c2e1240e162777db01b345 0.0s done +#33 exporting attestation manifest sha256:4f36d724ca1c85b0fdc0c0d5b9ad68c5c9e4d1475a2d623be1e8332961971b6b 0.0s done +#33 exporting manifest list sha256:97526ba48c114144f2f0488c35c74946dd26c1d3aaa995f8f2ecc127496191bf done +#33 naming to docker.io/library/lyakhonov-lab4-repro-db8d7e24-api:latest done +#33 unpacking to docker.io/library/lyakhonov-lab4-repro-db8d7e24-api:latest 0.0s done +#33 DONE 0.3s + +#35 [api] resolving provenance for metadata file +#35 DONE 0.0s + lyakhonov-lab4-repro-db8d7e24-api Built + lyakhonov-lab4-repro-db8d7e24-s3 Built diff --git a/evidence/sources-manifest.json b/evidence/sources-manifest.json index 24a532e..ca66c2b 100644 --- a/evidence/sources-manifest.json +++ b/evidence/sources-manifest.json @@ -1,27 +1,45 @@ { - "src/app.py": "0cb5d0151e73166aed98acfe151415a93f18221cf27ebd8e39f433cda30b8f13", - "src/cache.py": "bfc8f1aa90bee4625b3887a3487be085560b7a2705cc94dcb557dd6c03062028", - "src/config.py": "aafa2db508658d2d5467d2c57ed5f4dea11609ab5928f86abc1e35fc8ba923d7", - "src/main.py": "3f49c442758f1a4c3a156a4555f2b3f6d8dff0529fc62cb763f11eaaa2d2760b", - "src/migrate.py": "48c2819b34e22ee099a97d8742a65c87bc0abf9cd617cf6b6caae8a1ad145af5", - "src/models.py": "afc5b651059a440904e1c4ac509ac8e24796bceac5869a6421e42d388f2fe6d6", - "src/objects.py": "75f15c13be0b5eecf441a437a8250a0d6367b7b098b288a2cd1994c0b1a4321a", - "src/reconcile.py": "228a7994ce5b4110d7391734b0885c01ece754912c285c7f530427ec2674f133", - "src/storage.py": "81f5bcb0bc6ce356c76f1ea0b90d74566d436ca6f2dcc35e80cc0ae512588979", - "src/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", - "src/routes/attachments.py": "5518b8a264b8b0454e30606123119e83382159f2f031864e33a3e48a62496c84", - "src/routes/chats.py": "46ef834fce05037c2ecab26192ed58c28be81afc6a1db1375560f11bb9d63c12", - "src/routes/common.py": "fa2df76c819abe9a99b8b380a50b2aa4556aa43ac84afa95cac574aab8468a7e", - "src/routes/health.py": "a2d7aef51d4fff4f4c8523a4b1d1b894747f945ac3dd4d26b521d6a228cb88be", - "src/routes/messages.py": "7dc016d1252f07538c06b7c155d3efb8af02ac2a2a9867267168a74e7cf0bd3c", - "src/routes/users.py": "f5d4c7e4c4e5b1abfde7869a46e8a81a935b32f4809ddb8b2a4cb13175a24f50", - "src/routes/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", - "migrations/001_initial.sql": "d4c044482ba61b6a59b35cb02cff16b650fa0fb813242c0678d45a3564e86340", - "migrations/002_idempotency.sql": "b3938061613446d1676dfdf41af1b8417dd0396d2a65e4d3d6b263d311ccdbce", - "migrations/003_attachments.sql": "4137877de095ca8cb590582bfa59758c31248f013e9b99ddcf6a2e2bedaff125", - "student-tests/README.md": "eb43baa6868c409f71905c7ab11b0bb187a8e9a87fc4842909949b270107e354", - "student-tests/test_attachments.py": "e26fece8adc6a63bcccfe6c1de53e3899f0c43d0c8c9fd6502c988403a9a95e5", - "student-tests/test_operations.py": "7a62d819afdaea80767cb2ff4e8141eebce9e564ec20241c7d3f5b645d742999", - "student-tests/test_reconcile.py": "f1e0f7461f57fa0aad2a16e118fe86ed5852ec1d86caac07ea81a829c7f2f787", - "student-tests/upload_load.py": "022eea2772fcbf780042b3959c516788929dfde4968dcd9f7caa2531999c52e9" + "normalization": "UTF-8 text with LF", + "files": { + "src/app.py": "d8014bc8c4e5286cd02edec3b0da58cac974afbb773e05a16fd67210ce8dd20c", + "src/cache.py": "bfc8f1aa90bee4625b3887a3487be085560b7a2705cc94dcb557dd6c03062028", + "src/config.py": "aafa2db508658d2d5467d2c57ed5f4dea11609ab5928f86abc1e35fc8ba923d7", + "src/main.py": "7681d81d4cd82643064ab4fdb40c3806971804f74f8ed3391931a73d7e04f2c7", + "src/migrate.py": "48c2819b34e22ee099a97d8742a65c87bc0abf9cd617cf6b6caae8a1ad145af5", + "src/models.py": "0628459a90e143ac81fa044eb9943f494c4de3a9f7118ec75767e7e54d08a10b", + "src/objects.py": "f3e6b9279ed56096b0c5ae30e0bc1d55f27a30b92e44cfb4505b7e200554aa69", + "src/reconcile.py": "f5903451be530e15061140a1d47155733db21e7ed1bf528efaaa9d3a7880ed87", + "src/storage.py": "c1576481f9901014c0485b5bdd4bc3719560dc6b8c24fd67a265b030854b6557", + "src/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "src/routes/attachments.py": "40f36993e5f9ba23879082b011e6cef1c5e315abc00d7d4f8a0d640ee38a9782", + "src/routes/chats.py": "46ef834fce05037c2ecab26192ed58c28be81afc6a1db1375560f11bb9d63c12", + "src/routes/common.py": "fa2df76c819abe9a99b8b380a50b2aa4556aa43ac84afa95cac574aab8468a7e", + "src/routes/health.py": "ea527e417d10bb4ffd664e859ac11def9f5aade35f489cb360327045ea53975e", + "src/routes/messages.py": "79d5d0add108aedd948f725e9d821e020f8656d22e67fb7fa1b1500a6da3beb2", + "src/routes/users.py": "f5d4c7e4c4e5b1abfde7869a46e8a81a935b32f4809ddb8b2a4cb13175a24f50", + "src/routes/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "migrations/001_initial.sql": "d4c044482ba61b6a59b35cb02cff16b650fa0fb813242c0678d45a3564e86340", + "migrations/002_idempotency.sql": "b3938061613446d1676dfdf41af1b8417dd0396d2a65e4d3d6b263d311ccdbce", + "migrations/003_attachments.sql": "f84f73a7852635303b022840987894f175159138bb79cd6b6a26a8013b2a6a35", + "student-tests/README.md": "09f6964714abf1a00c0c9f8414d1d3f40d8d5dff2a12912e78b43c7cff0c6789", + "student-tests/test_attachments.py": "fccb56ec4f8565141fff8472f81f7f563652c96368c3aa18b2c07acc7a705080", + "student-tests/test_operations.py": "e38b4a766de69d05a8abde5549731d4b7a78ef046255c570b96d8381542ea322", + "student-tests/test_reconcile.py": "2759b12dc69d16f9aebd17c9041ca45cb0e9b40c12d41e5df50405021ae62a77", + "student-tests/upload_load.py": "d7a616a5cfa01706a3619dffd3ab08627a936b3701312fb4b68a3c3b9afc1bfa", + "scripts/actions.py": "f3314aee1fe6e437c10d8e73326b4b6d0db51dcab9653f97e35b63d0f87399d8", + "scripts/audit_solution.py": "2b519f719a852ba924d25d8997780fa2230da94080957daef3ca510620c15bbf", + "scripts/bootstrap.py": "9170092ff00c7e3c5f94c22e2f0ab4953306fe8aaa3d862562944f8ace709fb7", + "scripts/check_contract.py": "7c4402c2a6ab80d3b4676e1866d6ecc87b6daea14c080bcb9be9a7e8b959d671", + "scripts/plot_results.py": "917f1776e46551d28ebc4068302cc1197373b9b8d644bdcc6029d6e19aedc1de", + "scripts/restart.cmd": "27f84d4acea97ee3891551b5489ee72913128a164c7e5a22374e3f14b9c9b96f", + "scripts/restart.example.sh": "0328246ba75defbced992104e986fde973f63e3830d83251eced5953263e944b", + "scripts/restart.sh": "fcea33ea66beeb9b2ca6964a00c817a45afb7626eb9e4deb92d03adfc78a70b2", + "scripts/run_upload_load.py": "ebd4280428bb6b24979fb275c5e542d121891d292646547879749da4da4be3a1", + "scripts/stop-one.cmd": "e8f6106fd57e81214109f580959ecf9c460ab13df9a5e165c85ed0a9fdafc698", + "scripts/stop-one.example.sh": "1bcf34394520b89d95b7605ec56675be799eea920e83cfbba306d5dc0a6d9811", + "scripts/stop-one.sh": "82a0c50fd834c9ce330ec4b6b808c64c7d76dda7352ae4210a3322c9e0f2e125", + "scripts/validate_openapi.py": "4e981acbfc10dac58817bf922d5896e996798551fedc1b2385130e1cddb13d54", + "scripts/verify_clean_export.py": "97e511ef51a1324227383560d4b77acf3005f6cf4f75a44925feb7b2b56c79e4", + "scripts/wait_ready.py": "29e9965053ad2cba45dc68a4cc462a7ccd2c6cbd9da9ed89351721f926f5643c" + } } \ No newline at end of file diff --git a/scripts/audit_solution.py b/scripts/audit_solution.py new file mode 100644 index 0000000..df26723 --- /dev/null +++ b/scripts/audit_solution.py @@ -0,0 +1,27 @@ +"""Read-only audit: original materials, authorship, secrets and previous project.""" +from pathlib import Path +import json +import subprocess +ROOT=Path(__file__).resolve().parents[1] +def git(*args): return subprocess.check_output(['git',*args],cwd=ROOT) +base='ec540a1' +protected=['README.md','COURSE.md','CONTRIBUTING.md','MAINTAINERS.md','contracts','tests'] +assert not git('diff',base,'--',*protected).strip(), 'mandatory materials changed' +identity='Sergey Lyakhonov ' +for line in git('log',base+'..HEAD','--format=%an <%ae>|%cn <%ce>').decode().splitlines(): + assert line==identity+'|'+identity, 'unexpected commit identity' +paths=git('ls-files','--cached','--others','--exclude-standard','-z').split(b'\0') +secret_dir=ROOT/'secrets' +values=[f.read_bytes().strip() for f in secret_dir.iterdir() if f.is_file()] if secret_dir.exists() else [] +for raw in paths: + if not raw: continue + name=raw.decode('utf-8');file=ROOT/name + assert not name.startswith('secrets/') and name!='.env','private file tracked' + if file.is_file(): + assert not any(value and value in file.read_bytes() for value in values), 'secret value in '+name +previous=ROOT.parent/'vysoko-nagr 3' +if previous.exists(): + args=['git','-c','safe.directory='+str(previous),'-C',str(previous)] + assert not subprocess.check_output(args+['status','--porcelain']).strip(),'previous project changed' + assert subprocess.check_output(args+['rev-parse','HEAD']).decode().strip().startswith('374c43e'),'previous HEAD changed' +print('PASS: original materials unchanged; specified author/committer; no generated secrets in tracked/nonignored files; lab3 unchanged') diff --git a/scripts/verify_clean_export.py b/scripts/verify_clean_export.py new file mode 100644 index 0000000..d7c8672 --- /dev/null +++ b/scripts/verify_clean_export.py @@ -0,0 +1,54 @@ +"""Verify a committed Git export with fresh secrets, isolated images/project/volumes.""" +import json +import os +from pathlib import Path +import socket +import subprocess +import tarfile +import tempfile +import time +import uuid +ROOT=Path(__file__).resolve().parents[1] +project='lyakhonov-lab4-repro-'+uuid.uuid4().hex[:8] +with socket.socket() as sock: + sock.bind(('127.0.0.1',0)); port=sock.getsockname()[1] +env=dict(os.environ,LAB4_PORT=str(port),PYTHONUTF8='1') +commit=subprocess.check_output(['git','rev-parse','HEAD'],cwd=ROOT,text=True).strip() +with tempfile.TemporaryDirectory(prefix='lab4-repro-') as folder: + temporary=Path(folder).resolve() + assert temporary.parent==Path(tempfile.gettempdir()).resolve() and temporary.name.startswith('lab4-repro-') + archive=temporary/'source.tar' + subprocess.check_call(['git','archive','--format=tar','-o',str(archive),'HEAD'],cwd=ROOT) + source=temporary/'source';source.mkdir() + with tarfile.open(archive) as tar: + for member in tar.getmembers(): + assert (source/member.name).resolve().is_relative_to(source.resolve()) + tar.extractall(source,filter='data') + assert not (source/'secrets').exists() and not (source/'.env').exists() + override=source/'repro.override.yaml' + override.write_text('services:\n'+''.join(' '+name+':\n image: '+image+'\n' for name,image in [ + ('api',project+'-api'),('migrate',project+'-api'),('reconciler',project+'-api'),('s3',project+'-s3'),('bucket-init',project+'-s3')]),encoding='utf-8') + base=['docker','compose','--project-directory',str(source),'-f',str(source/'compose.yaml'),'-f',str(override),'-p',project] + def dc(*args,**kwargs): return subprocess.check_output(base+list(args),env=env,text=True,**kwargs) + existing=subprocess.check_output(['docker','ps','-aq','--filter','label=com.docker.compose.project='+project],text=True).strip() + assert not existing + subprocess.check_call(['python',str(source/'scripts/bootstrap.py')],env=env) + results={'commit':commit,'project':project,'port':port,'fresh_secrets':True,'isolated_images':True} + try: + with (ROOT/'evidence/repro-build.txt').open('w',encoding='utf-8') as buildlog: + subprocess.check_call(base+['build','api','s3'],env=env,stdout=buildlog,stderr=subprocess.STDOUT) + dc('up','-d') + ready=subprocess.check_output(['python',str(source/'scripts/wait_ready.py'),'--base-url','http://localhost:'+str(port),'--replicas','2'],env=env,text=True) + smoke=subprocess.check_output(['python',str(source/'tests/smoke.py'),'--base-url','http://localhost:'+str(port)],env=env,text=True) + results.update(result='PASS',readiness=ready.strip(),smoke=smoke.strip()) + # Remove only volumes belonging to this newly created unique scratch project. + volumes=subprocess.check_output(['docker','volume','ls','-q','--filter','label=com.docker.compose.project='+project],text=True).split() + for volume in volumes: + labels=json.loads(subprocess.check_output(['docker','volume','inspect',volume],text=True))[0]['Labels'] + assert labels['com.docker.compose.project']==project + results['scratch_volumes']=volumes + finally: + dc('down','--volumes') + results['scratch_cleaned']=True + (ROOT/'evidence/clean-export.json').write_text(json.dumps(results,indent=2),encoding='utf-8') +print('PASS: committed clean export built API/S3, fresh secrets, two API replicas and public smoke; scratch stack cleaned')