forked from mtusi2026/mtusi2026lab2
ЛР2: PostgreSQL, Bearer-сессии и Valkey — уровень 4
This commit is contained in:
@@ -0,0 +1,22 @@
|
||||
"""Generate local-only synthetic credentials once; never overwrite them."""
|
||||
import os
|
||||
import secrets
|
||||
from pathlib import Path
|
||||
root = Path(__file__).resolve().parents[1]
|
||||
os.umask(0o077)
|
||||
(root / "secrets").mkdir(exist_ok=True)
|
||||
p = root / "secrets/postgres_password"
|
||||
if not p.exists():
|
||||
p.write_text(secrets.token_hex(32))
|
||||
values = {"database_url": "postgresql://messenger:" + p.read_text().strip() + "@postgres:5432/messenger", "cache_url": "redis://valkey:6379/0"}
|
||||
for name, value in values.items():
|
||||
dest = root / "secrets" / name
|
||||
if not dest.exists():
|
||||
dest.write_text(value)
|
||||
# Docker Desktop bind-mounted secrets need read permission for container UID 10001.
|
||||
for name in ["postgres_password", "database_url", "cache_url"]:
|
||||
(root / "secrets" / name).chmod(0o644)
|
||||
env = root / ".env"
|
||||
if not env.exists():
|
||||
env.write_text("SESSION_TTL_SECONDS=3600\nHOST_PORT=8080\n")
|
||||
print("Local configuration ready (secrets not printed)")
|
||||
Executable
+4
@@ -0,0 +1,4 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
cd "$(dirname "$0")/.."
|
||||
docker compose --env-file .env restart postgres valkey api
|
||||
@@ -0,0 +1,31 @@
|
||||
"""Run against an already started local Compose stack; save sanitized evidence."""
|
||||
from pathlib import Path
|
||||
import json
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
|
||||
def run(name, args):
|
||||
p = subprocess.run(args, cwd=ROOT, text=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
|
||||
(ROOT / "evidence" / name).write_text(p.stdout)
|
||||
print(p.stdout, end="", flush=True)
|
||||
p.check_returncode()
|
||||
|
||||
def states():
|
||||
ids = subprocess.check_output(["docker", "compose", "ps", "-q"], cwd=ROOT, text=True).split()
|
||||
data = json.loads(subprocess.check_output(["docker", "inspect", *ids], text=True))
|
||||
return [{"Name": d["Name"], "Id": d["Id"], "StartedAt": d["State"]["StartedAt"]} for d in data]
|
||||
|
||||
run("check.txt", ["make", "check"])
|
||||
run("smoke.txt", ["make", "test"])
|
||||
before = states()
|
||||
run("persistence.txt", ["make", "test-persistence", "ACTION_SCRIPT=scripts/restart.sh"])
|
||||
after = states()
|
||||
for name in ("api", "postgres", "valkey"):
|
||||
b = next(x for x in before if x["Name"] == "/mtusi-lab2-" + name + "-1")
|
||||
a = next(x for x in after if x["Name"] == b["Name"])
|
||||
assert a["StartedAt"] != b["StartedAt"], name + " did not restart"
|
||||
(ROOT / "evidence/restart-containers.json").write_text(json.dumps({"before":before,"after":after},indent=2)+"\n")
|
||||
run("student-tests.txt", [sys.executable, "student-tests/verify.py"])
|
||||
run("explain.txt", [sys.executable, "student-tests/explain.py"])
|
||||
Reference in New Issue
Block a user