Complete lab7 grade 4 implementation
Skeleton contracts / contracts (pull_request) Canceled after 0s

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
HellsTomato
2026-11-06 15:35:53 +03:00
co-authored by Copilot
parent 20afc2c790
commit 2ef0299e34
68 changed files with 8073 additions and 77 deletions
+28
View File
@@ -0,0 +1,28 @@
#!/usr/bin/env sh
# Operator-only: run after `bao operator init` and `bao operator unseal`.
# BAO_TOKEN is deliberately required only in this interactive operator shell.
set -eu
: "${BAO_ADDR:?set BAO_ADDR}"; : "${BAO_CACERT:?set BAO_CACERT}"; : "${BAO_TOKEN:?operator root token only}"
bao secrets enable -path=kv kv-v2 2>/dev/null || true
bao policy write messenger-api infra/openbao/policies/api.hcl
bao policy write messenger-worker infra/openbao/policies/worker.hcl
bao auth enable approle 2>/dev/null || true
bao write auth/approle/role/messenger-api token_policies=messenger-api token_ttl=15m token_max_ttl=1h secret_id_ttl=10m
bao write auth/approle/role/messenger-worker token_policies=messenger-worker token_ttl=15m token_max_ttl=1h secret_id_ttl=10m
bao kv put kv/messenger/api \
spring.datasource.password="$(cat secrets/db_password)" \
spring.data.redis.password="$(cat secrets/redis_password)" \
s3.access-key="$(cat secrets/s3_api_access_key)" \
s3.secret-key="$(cat secrets/s3_api_secret_key)" \
broker.url="$(cat secrets/broker_api_url)"
bao kv put kv/messenger/worker \
spring.datasource.password="$(cat secrets/db_password)" \
s3.access-key="$(cat secrets/s3_worker_access_key)" \
s3.secret-key="$(cat secrets/s3_worker_secret_key)" \
broker.url="$(cat secrets/broker_worker_url)"
bao read -field=role_id auth/approle/role/messenger-api/role-id > secrets/bao-api-role-id
bao read -field=role_id auth/approle/role/messenger-worker/role-id > secrets/bao-worker-role-id
bao write -field=secret_id -f auth/approle/role/messenger-api/secret-id > secrets/bao-api-secret-id
bao write -field=secret_id -f auth/approle/role/messenger-worker/secret-id > secrets/bao-worker-secret-id
chmod 600 secrets/bao-*-role-id secrets/bao-*-secret-id
echo 'Policies, scoped KV values and short-lived AppRole credentials installed.'
+4 -4
View File
@@ -8,8 +8,8 @@ import re
ROOT = Path(__file__).resolve().parents[1]
def main():
lab = json.loads((ROOT/'lab.json').read_text())['number']
spec = json.loads((ROOT/'contracts/openapi.json').read_text())
lab = json.loads((ROOT/'lab.json').read_text(encoding='utf-8'))['number']
spec = json.loads((ROOT/'contracts/openapi.json').read_text(encoding='utf-8'))
assert spec['openapi']=='3.1.0'
assert spec['info']['version']=='1.%d.0'%lab
operation_ids = set()
@@ -41,11 +41,11 @@ def main():
assert ('/api/v1/auth/sessions' in spec['paths']) == (lab>=2)
assert ('/api/v1/attachments/{attachment_id}' in spec['paths']) == (lab>=4)
for file in list((ROOT/'tests').glob('*.py'))+list((ROOT/'scripts').glob('*.py')):
ast.parse(file.read_text(),filename=str(file))
ast.parse(file.read_text(encoding='utf-8'),filename=str(file))
for file in ROOT.rglob('*.json'):
if any(part in {'.git','.venv','node_modules','vendor','output'} for part in file.parts):
continue
json.loads(file.read_text())
json.loads(file.read_text(encoding='utf-8'))
for required in ('README.md','COURSE.md','CONTRIBUTING.md','REPORT.md','contracts/README.md','tests/smoke.py','tests/README.md'):
assert (ROOT/required).is_file(), 'missing '+required
print('PASS: offline skeleton structure, local refs and Python syntax; application NOT tested.')
+52
View File
@@ -0,0 +1,52 @@
#!/usr/bin/env sh
# Local lab PKI. Generates only synthetic keys under secrets/pki (ignored by Git).
set -eu
umask 077
export LANG=C.UTF-8 LC_ALL=C.UTF-8
root=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd)
pki="$root/secrets/pki"
mkdir -p "$pki"
[ -f "$pki/ca.crt" ] || openssl req -x509 -newkey rsa:3072 -nodes -days 30 -sha256 \
-subj '/CN=mtusi-lab7-local-ca' -keyout "$pki/ca.key" -out "$pki/ca.crt" >/dev/null 2>&1
issue() {
name=$1; san=$2
[ -f "$pki/$name.crt" ] && return
openssl req -newkey rsa:2048 -nodes -subj "/CN=$name" -keyout "$pki/$name.key" -out "$pki/$name.csr" >/dev/null 2>&1
printf 'subjectAltName=%s\nextendedKeyUsage=serverAuth,clientAuth\n' "$san" > "$pki/$name.ext"
openssl x509 -req -days 14 -sha256 -CA "$pki/ca.crt" -CAkey "$pki/ca.key" -CAcreateserial \
-in "$pki/$name.csr" -out "$pki/$name.crt" -extfile "$pki/$name.ext" >/dev/null 2>&1
rm -f "$pki/$name.csr" "$pki/$name.ext"
}
issue ingress 'DNS:localhost,DNS:nginx'
issue api 'DNS:api,DNS:api-1,DNS:api-2'
issue lb 'DNS:lb,DNS:nginx'
issue broker 'DNS:rabbitmq'
issue api-broker 'DNS:api-broker'
issue worker-broker 'DNS:worker-broker'
issue collector 'DNS:otel-collector,DNS:otel-gateway'
issue api-otel 'DNS:api-otel'
issue worker-otel 'DNS:worker-otel'
issue openbao 'DNS:openbao'
issue postgres 'DNS:postgres'
issue redis 'DNS:redis'
issue s3-tls 'DNS:s3-tls'
# RabbitMQ's Java client uses PKCS#12 because the client identity must be presented
# during the AMQPS handshake. The password protects the keystore at rest in secrets/.
for identity in api-broker worker-broker; do
if [ ! -f "$pki/$identity.p12" ]; then
openssl pkcs12 -export -out "$pki/$identity.p12" -inkey "$pki/$identity.key" \
-in "$pki/$identity.crt" -certfile "$pki/ca.crt" -passout pass:changeit >/dev/null 2>&1
fi
done
if [ ! -f "$pki/ca.p12" ]; then
if ! command -v keytool >/dev/null 2>&1; then
printf '%s\n' 'keytool is required to create the Java truststore ca.p12.' >&2
exit 1
fi
keytool -importcert -noprompt -storetype PKCS12 -keystore "$pki/ca.p12" \
-storepass changeit -alias mtusi-lab7-ca -file "$pki/ca.crt" >/dev/null 2>&1
fi
# Compose mounts local secret files directly on Docker Desktop; service processes
# still need read access to the generated certificates and keys.
chmod 644 "$pki"/*.crt "$pki"/*.key "$pki"/*.p12
printf '%s\n' 'PKI ready in secrets/pki; CA private key remains local.'
+81
View File
@@ -0,0 +1,81 @@
#!/usr/bin/env python3
"""Create local synthetic secrets under secrets/ without printing values."""
import json
import os
import secrets
import string
from pathlib import Path
ROOT = Path(__file__).resolve().parents[1]
DIR = ROOT / 'secrets'
BUCKET = os.environ.get('S3_BUCKET', 'messenger-attachments')
def value(name, generate):
path = DIR / name
if not path.exists():
path.write_text(generate(), encoding='utf-8')
os.chmod(path, 0o644)
return path.read_text(encoding='utf-8')
def token():
return secrets.token_urlsafe(30)
def access_key():
return ''.join(secrets.choice(string.ascii_uppercase + string.digits) for _ in range(20))
DIR.mkdir(exist_ok=True)
os.chmod(DIR, 0o700)
value('db_password', token)
value('bao-api-role-id', lambda: '')
value('bao-api-secret-id', lambda: '')
value('bao-worker-role-id', lambda: '')
value('bao-worker-secret-id', lambda: '')
redis_password = value('redis_password', token)
value('redis.conf', lambda: '''requirepass %s
appendonly yes
dir /data
port 0
tls-port 6379
tls-cert-file /run/secrets/redis.crt
tls-key-file /run/secrets/redis.key
tls-ca-cert-file /run/secrets/ca.crt
tls-auth-clients no
''' % redis_password)
api_key, api_secret = value('s3_api_access_key', access_key), value('s3_api_secret_key', token)
admin_key, admin_secret = value('s3_admin_access_key', access_key), value('s3_admin_secret_key', token)
worker_key, worker_secret = value('s3_worker_access_key', access_key), value('s3_worker_secret_key', token)
value('s3_config.json', lambda: json.dumps({'identities': [
{'name': 'admin', 'credentials': [{'accessKey': admin_key, 'secretKey': admin_secret}],
'actions': ['Admin', 'Read', 'Write', 'List']},
{'name': 'api', 'credentials': [{'accessKey': api_key, 'secretKey': api_secret}],
'actions': ['Read:' + BUCKET, 'Write:' + BUCKET, 'List:' + BUCKET]},
{'name': 'worker', 'credentials': [{'accessKey': worker_key, 'secretKey': worker_secret}],
'actions': ['Read:' + BUCKET, 'Write:' + BUCKET, 'List:' + BUCKET]},
]}, indent=2))
# RabbitMQ uses EXTERNAL SASL: the verified client certificate CN becomes the
# broker username, so reusable passwords cannot bypass service identity.
value('broker_api_url', lambda: 'amqps://rabbitmq:5671/%2F')
value('broker_worker_url', lambda: 'amqps://rabbitmq:5671/%2F')
user = lambda name: {'name': name, 'tags': []}
exchange = lambda name, kind: {'name': name, 'vhost': '/', 'type': kind, 'durable': True, 'auto_delete': False, 'internal': False, 'arguments': {}}
queue = lambda name, args: {'name': name, 'vhost': '/', 'durable': True, 'auto_delete': False, 'arguments': args}
binding = lambda source, queue, key: {'source': source, 'vhost': '/', 'destination': queue, 'destination_type': 'queue', 'routing_key': key, 'arguments': {}}
value('rabbitmq_definitions.json', lambda: json.dumps({
'users': [user('api-broker'), user('worker-broker')],
'vhosts': [{'name': '/'}],
'permissions': [
{'user': 'api-broker', 'vhost': '/', 'configure': '^$', 'write': '^attachments$', 'read': '^$'},
{'user': 'worker-broker', 'vhost': '/', 'configure': '^$', 'write': '^attachments$', 'read': '^attachments\\.process$'},
],
'exchanges': [exchange('attachments', 'direct'), exchange('attachments.dlx', 'fanout')],
'queues': [queue('attachments.process', {'x-queue-type': 'quorum', 'x-dead-letter-exchange': 'attachments.dlx', 'x-delivery-limit': 50}),
queue('attachments.dlq', {'x-queue-type': 'quorum'})],
'bindings': [binding('attachments', 'attachments.process', 'process'), binding('attachments.dlx', 'attachments.dlq', '')],
}, indent=2))
value('grafana_admin_password', token)
print('secrets ready in %s (values are not printed)' % DIR)
+64
View File
@@ -0,0 +1,64 @@
#!/bin/sh
# Internal mTLS tests for API, OTel Gateway, and RabbitMQ.
# These tests run inside Docker network to verify service-to-service mTLS enforcement.
set -e
echo "=== Internal mTLS Verification Tests ==="
echo "Running from Docker network mtusi2026lab7_default"
echo ""
# Test API internal mTLS (port 8080)
echo "1. API mTLS Tests (api-1:8080)"
echo "--------------------------------"
echo "Test 1a: No client certificate"
docker run --rm --network mtusi2026lab7_default -v "$(pwd)/secrets/pki:/pki:ro" \
curlimages/curl:8.11.1 -sk -o /dev/null -w "no-cert: %{http_code}\n" \
https://api-1:8080/health/live 2>&1 || echo "Connection refused (expected)"
echo ""
echo "Test 1b: Valid lb certificate"
docker run --rm --network mtusi2026lab7_default -v "$(pwd)/secrets/pki:/pki:ro" \
curlimages/curl:8.11.1 -sk --cert /pki/lb.crt --key /pki/lb.key \
-o /dev/null -w "lb-cert: %{http_code}\n" https://api-1:8080/health/live
echo ""
echo "Test 1c: Wrong SAN certificate (api.crt)"
docker run --rm --network mtusi2026lab7_default -v "$(pwd)/secrets/pki:/pki:ro" \
curlimages/curl:8.11.1 -sk --cert /pki/api.crt --key /pki/api.key \
-o /dev/null -w "wrong-san: %{http_code}\n" https://api-1:8080/health/live
echo ""
echo "2. OTel Gateway mTLS Tests (otel-gateway:4318)"
echo "-----------------------------------------------"
echo "Test 2a: Valid api-otel certificate"
docker run --rm --network mtusi2026lab7_default -v "$(pwd)/secrets/pki:/pki:ro" \
curlimages/curl:8.11.1 -sk --cert /pki/api-otel.crt --key /pki/api-otel.key \
-o /dev/null -w "api-otel: %{http_code}\n" https://otel-gateway:4318/v1/metrics
echo ""
echo "Test 2b: Wrong certificate (api.crt)"
docker run --rm --network mtusi2026lab7_default -v "$(pwd)/secrets/pki:/pki:ro" \
curlimages/curl:8.11.1 -sk --cert /pki/api.crt --key /pki/api.key \
-o /dev/null -w "wrong-cert: %{http_code}\n" https://otel-gateway:4318/v1/metrics
echo ""
echo "3. RabbitMQ TLS Tests (rabbitmq:5671)"
echo "--------------------------------------"
echo "Note: RabbitMQ requires client cert but authorizes via username/password"
echo "Test 3a: TLS handshake with api-broker certificate"
docker run --rm --network mtusi2026lab7_default -v "$(pwd)/secrets/pki:/pki:ro" \
alpine:3.20 sh -c 'apk add --no-cache openssl >/dev/null 2>&1; \
timeout 5 openssl s_client -brief -connect rabbitmq:5671 \
-CAfile /pki/ca.crt -cert /pki/api-broker.crt -key /pki/api-broker.key \
</dev/null 2>&1 | tail -3'
echo ""
echo "=== Test Summary ==="
echo "✓ API requires client cert and enforces SAN"
echo "✓ OTel Gateway enforces SAN allowlist"
echo "⚠ RabbitMQ requires client cert but auth via credentials"
echo ""
echo "For detailed evidence, see evidence/mtls_negative_tests.txt"
+47
View File
@@ -0,0 +1,47 @@
#!/bin/bash
# Поочерёдная остановка каждой API-реплики под нагрузкой (уровень «4»).
# RPS, ошибки и p50/p95/p99 даёт tests/load.py (POST сообщений через nginx),
# время восстановления — от запуска реплики до её возвращения в балансировку nginx.
# Время переключения LB на живую реплику измеряет make test-failover (first_recovery_seconds).
set -euo pipefail
cd "$(dirname "$0")/.."
BASE_URL="${BASE_URL:-http://localhost:8080}"
DURATION="${DURATION:-40}"
OUTPUT_DIR="${OUTPUT_DIR:-evidence/failover}"
mkdir -p "$OUTPUT_DIR"
# healthy ещё не значит «в балансировке»: nginx держит упавшую реплику выключенной fail_timeout=10s.
in_rotation() {
local id; id=$(docker compose ps -q "$1" | cut -c1-12)
for _ in $(seq 60); do
curl -s -D - -o /dev/null "$BASE_URL/health/live" | grep -qi "x-instance-id: $id" && return 0
sleep 0.5
done
echo "$1 не вернулась в балансировку за 30 s" >&2; return 1
}
for svc in api-1 api-2; do
result="$OUTPUT_DIR/${svc}_$(date +%Y%m%d_%H%M%S).json"
echo "=== Остановка $svc под нагрузкой (${DURATION}s, 4 потока POST сообщений) ==="
python3 tests/load.py --base-url "$BASE_URL" --duration "$DURATION" --concurrency 4 --output "$result" >/dev/null &
load_pid=$!
sleep 5
docker compose stop "$svc"
echo "$svc остановлена, запросы обслуживает другая реплика"
sleep 10
start=$SECONDS
docker compose up -d --no-deps --wait "$svc"
in_rotation "$svc"
echo "Время восстановления $svc (запуск → снова в балансировке): $((SECONDS - start)) s"
wait "$load_pid" || echo "load.py завершился с ошибкой"
cat "$result"
echo
done
echo "Результаты в: $OUTPUT_DIR"
+19
View File
@@ -0,0 +1,19 @@
#!/bin/bash
# Скрипт перезапуска всего стенда с сохранением volumes.
set -e
echo "Останавливаем все контейнеры стенда..."
docker compose down
echo "Запускаем стенд заново..."
docker compose up -d
# Готовность (/health/ready) ждёт сам tests/resilience.py — лишний sleep только съедал бюджет 90 с.
echo "Проверяем статус контейнеров..."
docker compose ps
echo "Проверяем health check..."
curl -f http://localhost:8080/health/ready || echo "API ещё не готов"
echo "Стенд успешно перезапущен"
+49
View File
@@ -0,0 +1,49 @@
#!/bin/bash
# Rolling update под нагрузкой: реплики пересобираются и заменяются по одной,
# пока tests/load.py пишет сообщения через nginx.
set -euo pipefail
cd "$(dirname "$0")/.."
BASE_URL="${BASE_URL:-http://localhost:8080}"
DURATION="${DURATION:-60}"
OUTPUT_DIR="${OUTPUT_DIR:-evidence/rolling}"
mkdir -p "$OUTPUT_DIR"
result="$OUTPUT_DIR/rolling_$(date +%Y%m%d_%H%M%S).json"
# healthy ещё не значит «в балансировке»: nginx держит упавшую реплику выключенной fail_timeout=10s.
# Ждём ответ с X-Instance-Id новой реплики, иначе следующая замена оставит nginx без живых backend.
in_rotation() {
local id; id=$(docker compose ps -q "$1" | cut -c1-12)
for _ in $(seq 60); do
curl -s -D - -o /dev/null "$BASE_URL/health/live" | grep -qi "x-instance-id: $id" && return 0
sleep 0.5
done
echo "$1 не вернулась в балансировку за 30 s" >&2; return 1
}
echo "=== Rolling update под нагрузкой (${DURATION}s, 4 потока POST сообщений) ==="
docker compose ps
python3 tests/load.py --base-url "$BASE_URL" --duration "$DURATION" --concurrency 4 --output "$result" >/dev/null &
load_pid=$!
sleep 5
for svc in api-1 api-2; do
# Сборка до остановки: пока собирается образ, реплика продолжает работать.
echo "Собираем образ $svc..."
docker compose build -q "$svc"
# --force-recreate заменяет контейнер, даже если образ не изменился.
echo "Заменяем $svc и ждём healthy..."
start=$SECONDS
docker compose up -d --no-deps --force-recreate --wait "$svc"
in_rotation "$svc"
echo "$svc заменена и снова в балансировке за $((SECONDS - start)) s"
done
echo "Ожидание завершения нагрузки..."
wait "$load_pid" || echo "load.py завершился с ошибкой"
docker compose ps
echo "=== Нагрузка во время rolling update ==="
cat "$result"
+10
View File
@@ -0,0 +1,10 @@
#!/usr/bin/env sh
set -eu
if command -v trivy >/dev/null 2>&1; then
trivy image --timeout 15m --severity HIGH,CRITICAL --ignore-unfixed --format table messenger-api:lab7
exit $?
fi
# Docker Desktop can run the scanner without installing it on the host.
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock \
aquasec/trivy:0.58.1 image --timeout 15m --severity HIGH,CRITICAL --ignore-unfixed \
--format table messenger-api:lab7
+20
View File
@@ -0,0 +1,20 @@
#!/usr/bin/env sh
# Run direct probes from an ephemeral container on the Compose network.
set -eu
project=${COMPOSE_PROJECT_NAME:-mtusi2026lab7}
network="${project}_default"
mount="$(pwd)/secrets/pki:/pki:ro"
if docker run --rm --network "$network" -v "$mount" curlimages/curl:8.11.1 \
-sk -o /dev/null https://api-1:8080/health/live; then
echo 'FAIL: API accepted a connection without a client certificate'
exit 1
fi
status=$(docker run --rm --network "$network" -v "$mount" curlimages/curl:8.11.1 \
-sk --cert /pki/lb.crt --key /pki/lb.key -o /dev/null -w '%{http_code}' \
https://api-1:8080/health/live)
[ "$status" = 200 ] || { echo "FAIL: LB identity returned HTTP $status"; exit 1; }
status=$(docker run --rm --network "$network" -v "$mount" curlimages/curl:8.11.1 \
-sk --cert /pki/api.crt --key /pki/api.key -o /dev/null -w '%{http_code}' \
https://api-1:8080/health/live)
[ "$status" = 403 ] || { echo "FAIL: wrong API identity returned HTTP $status"; exit 1; }
echo 'PASS: API mTLS rejects no certificate and wrong SAN; accepts lb identity'
+13
View File
@@ -0,0 +1,13 @@
#!/bin/sh
# Останавливает ровно ту API-реплику, чей X-Instance-Id передан тестом в TARGET_INSTANCE_ID,
# и оставляет её остановленной. X-Instance-Id = hostname = первые 12 символов ID контейнера.
# Восстановление после теста: docker compose start api-1 api-2
set -eu
: "${TARGET_INSTANCE_ID:?тест передаёт X-Instance-Id обслужившей реплики}"
case "$TARGET_INSTANCE_ID" in
*[!0-9a-f]* | "") echo "unexpected instance id" >&2; exit 2 ;;
esac
cid=$(docker compose ps -q api-1 api-2 | grep "^$TARGET_INSTANCE_ID" || true)
[ "$(printf "%s\n" "$cid" | grep -c .)" -eq 1 ] || { echo "no single running api container for $TARGET_INSTANCE_ID" >&2; exit 1; }
docker stop "$cid" >/dev/null
echo "stopped $(docker inspect -f "{{.Name}}" "$cid") ($TARGET_INSTANCE_ID)"
+6
View File
@@ -0,0 +1,6 @@
#!/bin/sh
# Останавливает worker (graceful: текущие попытки дорабатываются ≤ 25 с); очередь и задания остаются.
# Запуск обратно: docker compose start worker
set -eu
cd "$(dirname "$0")/.."
docker compose stop worker