Done Track 4

This commit is contained in:
2026-10-30 16:53:49 +03:00
parent e9ee60b0ba
commit fe4a32bb79
42 changed files with 3363 additions and 118 deletions
+7
View File
@@ -34,3 +34,10 @@ if [ ! -f "$dir/valkey_password.txt" ]; then
fi
valkey_password="$(cat "$dir/valkey_password.txt")"
write_new cache_url.txt "redis://:${valkey_password}@valkey:6379/0"
# Lab4: S3 (SeaweedFS). Admin credentials are used only by the s3-init
# bootstrap; the API gets its own key pair restricted to one bucket.
write_new s3_admin_access_key_id.txt "admin$(random | cut -c1-15)"
write_new s3_admin_secret_access_key.txt "$(random)$(random)"
write_new s3_access_key_id.txt "api$(random | cut -c1-17)"
write_new s3_secret_access_key.txt "$(random)$(random)"
+1 -1
View File
@@ -1,7 +1,7 @@
#!/bin/sh
# Общие функции операторских скриптов. Используют только docker CLI и метки Compose,
# поэтому работают и на хосте, и в контейнере tester (docker.sock).
PROJECT="${COMPOSE_PROJECT:-messenger-lab3}"
PROJECT="${COMPOSE_PROJECT:-messenger-lab4}"
# ID контейнеров сервиса (по умолчанию только работающих); -a — включая остановленные.
service_ids() {
+11 -10
View File
@@ -1,19 +1,20 @@
#!/bin/sh
# Persistence hook: restarts the LB, every API replica and both stores
# (PostgreSQL with its volume, Valkey cache). No "down -v", no re-seed.
# Persistence hook: restarts the LB, every API replica and all stores
# (PostgreSQL and S3 with their volumes, Valkey cache). No "down -v", no re-seed.
# Uses only the docker CLI and Compose labels, so it also runs in "tester".
set -eu
. "$(dirname "$0")/lib.sh"
api=$(service_ids api); lb=$(service_ids lb); db=$(service_ids db); valkey=$(service_ids valkey)
[ -n "$api" ] && [ -n "$db" ] && [ -n "$lb" ] && [ -n "$valkey" ] || { echo "stack is not running" >&2; exit 2; }
echo "stopping lb + api, then db + valkey"
api=$(service_ids api); lb=$(service_ids lb); db=$(service_ids db)
valkey=$(service_ids valkey); s3=$(service_ids s3)
[ -n "$api" ] && [ -n "$db" ] && [ -n "$lb" ] && [ -n "$valkey" ] && [ -n "$s3" ] || { echo "stack is not running" >&2; exit 2; }
echo "stopping lb + api, then db + valkey + s3"
docker stop --time 15 $lb $api >/dev/null
docker stop --time 30 $db $valkey >/dev/null
echo "starting db + valkey"
docker start $db $valkey >/dev/null
wait_healthy 60 $db $valkey
docker stop --time 30 $db $valkey $s3 >/dev/null
echo "starting db + valkey + s3"
docker start $db $valkey $s3 >/dev/null
wait_healthy 80 $db $valkey $s3
echo "starting api"
docker start $api >/dev/null
wait_healthy 60 $api
docker start $lb >/dev/null
echo "restart complete: db=$(short $db) valkey=$(short $valkey) api=$(for i in $api; do short $i; done | tr '\n' ' ')"
echo "restart complete: db=$(short $db) valkey=$(short $valkey) s3=$(short $s3) api=$(for i in $api; do short $i; done | tr '\n' ' ')"
+161
View File
@@ -0,0 +1,161 @@
"""Idempotent bootstrap of the private attachments bucket (service s3-init).
Runs with the S3 ADMIN credentials (only this one-shot container gets them),
before any API replica starts:
1. wait until the S3 gateway answers;
2. create the bucket if it does not exist (a repeated run prints "keep");
3. self-checks, the stand does not start if one fails:
- anonymous (unsigned) GET/PUT/LIST of the bucket -> 403: bucket is private;
- API credentials can PUT/GET/DELETE under the prefix;
- API credentials can NOT create/delete buckets or touch other buckets.
The API identity and its rights are declared in infra/seaweedfs/s3.json.template.
"""
from __future__ import annotations
import os
import sys
import time
import urllib.error
import urllib.request
import uuid
from pathlib import Path
import botocore.session
from botocore.config import Config
from botocore.exceptions import BotoCoreError, ClientError
def secret(name: str) -> str:
file_name = os.getenv(f"{name}_FILE")
if file_name:
return Path(file_name).read_text(encoding="utf-8").strip()
value = os.getenv(name)
if not value:
raise RuntimeError(f"{name} or {name}_FILE is required")
return value
ENDPOINT = os.getenv("S3_ENDPOINT", "http://s3:9000")
BUCKET = os.getenv("S3_BUCKET", "messenger-attachments")
PREFIX = os.getenv("S3_OBJECT_PREFIX", "originals/")
def client(access_key: str, secret_key: str):
return botocore.session.get_session().create_client(
"s3",
endpoint_url=ENDPOINT,
region_name=os.getenv("S3_REGION", "us-east-1"),
aws_access_key_id=access_key,
aws_secret_access_key=secret_key,
config=Config(
signature_version="s3v4",
s3={"addressing_style": "path"},
connect_timeout=2,
read_timeout=5,
retries={"max_attempts": 1},
),
)
def error_code(exc: ClientError) -> str:
return exc.response.get("Error", {}).get("Code", "")
failures = 0
def check(label: str, ok: bool) -> None:
global failures
failures += not ok
print(("PASS " if ok else "FAIL ") + label, flush=True)
def denied(call) -> bool:
try:
call()
except ClientError as exc:
return error_code(exc) in {"AccessDenied", "403", "Forbidden", "AllAccessDisabled"}
return False
def anonymous_status(method: str, path: str, data: bytes | None = None) -> int:
request = urllib.request.Request(ENDPOINT + path, data=data, method=method)
try:
with urllib.request.urlopen(request, timeout=5) as response:
return response.status
except urllib.error.HTTPError as exc:
return exc.code
def main() -> int:
admin = client(secret("S3_ADMIN_ACCESS_KEY_ID"), secret("S3_ADMIN_SECRET_ACCESS_KEY"))
api = client(secret("S3_ACCESS_KEY_ID"), secret("S3_SECRET_ACCESS_KEY"))
for attempt in range(1, 61):
try:
admin.list_buckets()
break
except (BotoCoreError, ClientError) as exc:
if attempt == 60:
raise
print(f"WAIT s3 ({type(exc).__name__}), retry {attempt}", flush=True)
time.sleep(1)
try:
admin.head_bucket(Bucket=BUCKET)
print(f"keep bucket {BUCKET}", flush=True)
except ClientError as exc:
if error_code(exc) not in {"404", "NoSuchBucket", "NotFound"}:
raise
try:
admin.create_bucket(Bucket=BUCKET)
print(f"create bucket {BUCKET}", flush=True)
except ClientError as create_exc:
# Two bootstrap runs at the same time: the other one won.
if error_code(create_exc) not in {"BucketAlreadyOwnedByYou", "BucketAlreadyExists"}:
raise
print(f"keep bucket {BUCKET}", flush=True)
probe = f"{PREFIX}bootstrap-probe-{uuid.uuid4().hex}"
check("api credentials: PUT object", not denied(
lambda: api.put_object(Bucket=BUCKET, Key=probe, Body=b"probe")))
check("api credentials: GET object",
api.get_object(Bucket=BUCKET, Key=probe)["Body"].read() == b"probe")
check("anonymous GET object -> 403", anonymous_status("GET", f"/{BUCKET}/{probe}") == 403)
check("anonymous LIST bucket -> 403", anonymous_status("GET", f"/{BUCKET}?list-type=2") == 403)
check("anonymous PUT object -> 403",
anonymous_status("PUT", f"/{BUCKET}/{PREFIX}anonymous-{uuid.uuid4().hex}", b"x") == 403)
other = f"forbidden-{uuid.uuid4().hex[:12]}"
check("api credentials: CreateBucket denied",
denied(lambda: api.create_bucket(Bucket=other)))
check("api credentials: DeleteBucket denied",
denied(lambda: api.delete_bucket(Bucket=BUCKET)))
check("api credentials: DELETE object", not denied(
lambda: api.delete_object(Bucket=BUCKET, Key=probe)))
def foreign_buckets_hidden() -> bool:
# SeaweedFS denies ListBuckets to a bucket-scoped identity; other
# servers may answer with only the allowed bucket. Both are fine.
try:
names = [b["Name"] for b in api.list_buckets().get("Buckets", [])]
except ClientError as exc:
return error_code(exc) in {"AccessDenied", "403", "Forbidden"}
return all(name == BUCKET for name in names)
check("api credentials: ListBuckets shows no foreign buckets", foreign_buckets_hidden())
if failures:
print(f"FAIL: {failures} bucket checks failed; the API must not start", flush=True)
return 1
print("PASS: bucket bootstrap complete (idempotent, private, least privilege)", flush=True)
return 0
if __name__ == "__main__":
sys.exit(main())