lab2: finalize track 2, fix backup restore evidence, add full report

This commit is contained in:
2026-11-02 18:31:47 +03:00
parent 491ff37b2e
commit 43c5eb20bf
7 changed files with 104 additions and 42 deletions
+2
View File
@@ -142,3 +142,5 @@ docker compose down -v
4. **Почему hash пароля и checksum разные?**
`bcrypt` предназначен для безопасного хранения паролей: он медленный и использует соль. `SHA-256` — быстрый детерминированный checksum/hash для проверки целостности, поэтому для хранения паролей он не подходит.
+71 -27
View File
@@ -44,8 +44,22 @@ class APIError(Exception):
self.code = code
self.message = message
def now_iso():
return datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%S.%fZ")
def format_dt(dt_obj):
return dt_obj.strftime("%Y-%m-%dT%H:%M:%S.%fZ")
def parse_limit(query):
if "limit" not in query:
return 50
values = query["limit"]
if len(values) != 1:
raise APIError(400, "invalid_request", "Invalid limit")
try:
limit = int(values[0])
except ValueError:
raise APIError(400, "invalid_request", "limit must be an integer")
if limit < 1 or limit > 100:
raise APIError(400, "invalid_request", "limit must be 1..100")
return limit
def encode_cursor(resource_type, resource_id, item):
payload = {"r": resource_type, "id": resource_id, "ts": item["created_at"], "iid": item["id"]}
@@ -76,7 +90,6 @@ def get_user_by_token(handler):
raise APIError(401, "unauthorized", "Missing Bearer token")
token = auth.split(" ")[1]
# Достаем user_id из Redis
user_id = redis_client.get(f"session:{token}")
if not user_id:
raise APIError(401, "unauthorized", "Invalid or expired token")
@@ -89,7 +102,7 @@ def get_user_by_token(handler):
if not row: raise APIError(401, "unauthorized", "User not found")
return {
"id": str(row[0]), "username": row[1], "display_name": row[2],
"created_at": row[3].strftime("%Y-%m-%dT%H:%M:%S.%fZ")
"created_at": format_dt(row[3])
}
finally:
db_pool.putconn(conn)
@@ -108,12 +121,11 @@ class Handler(BaseHTTPRequestHandler):
try:
parsed = urlparse(self.path)
path = parsed.path
query = parse_qs(parsed.query)
query = parse_qs(parsed.query, keep_blank_values=False)
if method == "GET" and path == "/health/live":
return self.send_json(200, {"status": "ok"}, request_id)
if method == "GET" and path == "/health/ready":
# Проверяем БД
try:
conn = db_pool.getconn()
with conn.cursor() as cur: cur.execute("SELECT 1")
@@ -166,7 +178,7 @@ class Handler(BaseHTTPRequestHandler):
)
created_at = cur.fetchone()[0]
conn.commit()
self.send_json(201, {"id": uid, "username": username, "display_name": display_name, "created_at": created_at.strftime("%Y-%m-%dT%H:%M:%SZ")}, request_id)
self.send_json(201, {"id": uid, "username": username, "display_name": display_name, "created_at": format_dt(created_at)}, request_id)
except psycopg2.errors.UniqueViolation:
conn.rollback()
raise APIError(409, "conflict", "Username taken")
@@ -192,26 +204,32 @@ class Handler(BaseHTTPRequestHandler):
raise APIError(401, "unauthorized", "Invalid credentials")
token = secrets.token_urlsafe(32)
# Сохраняем сессию в Redis с TTL
redis_client.setex(f"session:{token}", SESSION_TTL, row[0])
expires_at = (datetime.now(timezone.utc) + timedelta(seconds=SESSION_TTL)).strftime("%Y-%m-%dT%H:%M:%SZ")
expires_at = datetime.now(timezone.utc) + timedelta(seconds=SESSION_TTL)
self.send_json(201, {
"token": token, "token_type": "Bearer", "expires_at": expires_at,
"user": {"id": str(row[0]), "username": username, "display_name": row[1], "created_at": row[3].strftime("%Y-%m-%dT%H:%M:%SZ")}
"token": token, "token_type": "Bearer", "expires_at": format_dt(expires_at),
"user": {"id": str(row[0]), "username": username, "display_name": row[1], "created_at": format_dt(row[3])}
}, request_id)
finally:
db_pool.putconn(conn)
def delete_session(self, request_id):
auth = self.headers.get("Authorization")
if auth and auth.startswith("Bearer "):
token = auth.split(" ")[1]
redis_client.delete(f"session:{token}")
self.send_json(204, None, request_id)
else:
raise APIError(401, "unauthorized", "Missing Bearer")
if not auth or not auth.startswith("Bearer "):
raise APIError(401, "unauthorized", "Missing Bearer token")
token = auth.split(" ")[1]
# Проверяем, существует ли еще сессия (чтобы вернуть 401, если уже разлогинились)
user_id = redis_client.get(f"session:{token}")
if not user_id:
raise APIError(401, "unauthorized", "Invalid or expired token")
# Удаляем сессию
redis_client.delete(f"session:{token}")
self.send_json(204, None, request_id)
def get_me(self, request_id):
actor = get_user_by_token(self)
@@ -234,7 +252,7 @@ class Handler(BaseHTTPRequestHandler):
for uid in member_ids:
cur.execute("INSERT INTO chat_members (chat_id, user_id) VALUES (%s, %s)", (cid, uid))
conn.commit()
self.send_json(201, {"id": cid, "title": title, "member_ids": member_ids, "created_at": created_at.strftime("%Y-%m-%dT%H:%M:%SZ")}, request_id)
self.send_json(201, {"id": cid, "title": title, "member_ids": member_ids, "created_at": format_dt(created_at)}, request_id)
except Exception:
conn.rollback()
raise
@@ -243,16 +261,30 @@ class Handler(BaseHTTPRequestHandler):
def list_chats(self, request_id, query):
actor = get_user_by_token(self)
limit = parse_limit(query) # <-- ВАЛИДАЦИЯ LIMIT
conn = db_pool.getconn()
try:
with conn.cursor() as cur:
cur.execute("""
SELECT c.id, c.title, c.created_at FROM chats c
JOIN chat_members cm ON c.id = cm.chat_id
WHERE cm.user_id = %s ORDER BY c.created_at DESC LIMIT 50
""", (actor["id"],))
WHERE cm.user_id = %s ORDER BY c.created_at DESC LIMIT %s
""", (actor["id"], limit + 1))
rows = cur.fetchall()
items = [{"id": str(r[0]), "title": r[1], "created_at": r[2].strftime("%Y-%m-%dT%H:%M:%SZ")} for r in rows]
has_more = len(rows) > limit
rows = rows[:limit]
items = []
for r in rows:
cur.execute("SELECT user_id FROM chat_members WHERE chat_id = %s", (r[0],))
members = [str(m[0]) for m in cur.fetchall()]
items.append({
"id": str(r[0]),
"title": r[1],
"member_ids": members,
"created_at": format_dt(r[2])
})
self.send_json(200, {"items": items, "next_cursor": None}, request_id)
finally:
db_pool.putconn(conn)
@@ -273,7 +305,7 @@ class Handler(BaseHTTPRequestHandler):
cur.execute("SELECT user_id FROM chat_members WHERE chat_id = %s", (chat_id,))
members = [str(r[0]) for r in cur.fetchall()]
self.send_json(200, {"id": str(row[0]), "title": row[1], "member_ids": members, "created_at": row[2].strftime("%Y-%m-%dT%H:%M:%SZ")}, request_id)
self.send_json(200, {"id": str(row[0]), "title": row[1], "member_ids": members, "created_at": format_dt(row[2])}, request_id)
finally:
db_pool.putconn(conn)
@@ -282,7 +314,6 @@ class Handler(BaseHTTPRequestHandler):
conn = db_pool.getconn()
try:
with conn.cursor() as cur:
# Проверяем членство
cur.execute("SELECT 1 FROM chat_members WHERE chat_id = %s AND user_id = %s", (chat_id, actor["id"]))
if not cur.fetchone(): raise APIError(404, "not_found", "Chat not found")
@@ -297,13 +328,13 @@ class Handler(BaseHTTPRequestHandler):
)
created_at = cur.fetchone()[0]
conn.commit()
self.send_json(201, {"id": mid, "chat_id": chat_id, "sender_id": actor["id"], "text": text, "created_at": created_at.strftime("%Y-%m-%dT%H:%M:%SZ")}, request_id)
self.send_json(201, {"id": mid, "chat_id": chat_id, "sender_id": actor["id"], "text": text, "created_at": format_dt(created_at)}, request_id)
finally:
db_pool.putconn(conn)
def list_messages(self, request_id, chat_id, query):
actor = get_user_by_token(self)
limit = int(query.get("limit", ["50"])[0])
limit = parse_limit(query) # <-- ВАЛИДАЦИЯ LIMIT
cursor = query.get("cursor", [None])[0]
conn = db_pool.getconn()
@@ -329,7 +360,7 @@ class Handler(BaseHTTPRequestHandler):
has_more = len(rows) > limit
rows = rows[:limit]
items = [{"id": str(r[0]), "chat_id": chat_id, "sender_id": str(r[1]), "text": r[2], "created_at": r[3].strftime("%Y-%m-%dT%H:%M:%S.%fZ")} for r in rows]
items = [{"id": str(r[0]), "chat_id": chat_id, "sender_id": str(r[1]), "text": r[2], "created_at": format_dt(r[3])} for r in rows]
next_cursor = encode_cursor("messages", chat_id, items[-1]) if has_more and items else None
self.send_json(200, {"items": items, "next_cursor": next_cursor}, request_id)
@@ -355,20 +386,33 @@ class Handler(BaseHTTPRequestHandler):
self._status = status
body = json.dumps({"error": {"code": code, "message": message, "request_id": request_id}}, ensure_ascii=False).encode("utf-8")
self.send_response(status)
if status == 401:
parsed_path = urlparse(self.path).path
if parsed_path == "/api/v1/auth/sessions":
self.send_header("WWW-Authenticate", 'Basic realm="messenger", charset="UTF-8"')
else:
self.send_header("WWW-Authenticate", 'Bearer realm="messenger"')
self.send_header("Content-Type", "application/json")
self.send_header("X-Request-Id", request_id)
self.send_header("Content-Length", str(len(body)))
self.end_headers()
self.wfile.write(body)
def main():
ThreadingHTTPServer.daemon_threads = True
ThreadingHTTPServer.allow_reuse_address = True
server = ThreadingHTTPServer((HOST, PORT), Handler)
def shutdown(signum, frame):
threading.Thread(target=server.shutdown, daemon=True).start()
signal.signal(signal.SIGTERM, shutdown)
signal.signal(signal.SIGINT, shutdown)
print(f"Listening on {HOST}:{PORT}", file=sys.stderr)
server.serve_forever()
try:
server.serve_forever()
finally:
server.server_close()
if __name__ == "__main__":
main()
+20 -7
View File
@@ -1,5 +1,3 @@
version: '3.8'
services:
db:
image: postgres:16-alpine
@@ -9,12 +7,22 @@ services:
POSTGRES_PASSWORD: secret
volumes:
- pgdata:/var/lib/postgresql/data
- ./migrations:/docker-entrypoint-initdb.d # Автоматически применит 001_init.sql
- ./migrations:/docker-entrypoint-initdb.d
healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres -d messenger"]
interval: 5s
timeout: 5s
retries: 5
redis:
redis:
image: valkey/valkey:7-alpine
volumes:
- redisdata:/data
healthcheck:
test: ["CMD", "valkey-cli", "ping"]
interval: 5s
timeout: 5s
retries: 5
api:
build: .
@@ -22,11 +30,16 @@ services:
- "8080:8080"
environment:
- DB_HOST=db
- DB_USER=postgres
- DB_PASSWORD=secret
- REDIS_HOST=redis
- DB_NAME=messenger
- REDIS_HOST=redis
- SESSION_TTL_SECONDS=3600
depends_on:
- db
- redis
db:
condition: service_healthy
redis:
condition: service_healthy
volumes:
pgdata:
+1
View File
@@ -8,3 +8,4 @@ DROP INDEX
3. ВОЗВРАЩАЕМ ИНДЕКС:
CREATE INDEX
+6 -8
View File
@@ -1,11 +1,9 @@
=== ТЕСТ BACKUP И RESTORE (Track 2) ===
1. Количество строк ДО удаления:
100002
1. Количество строк ДО удаления: 100002
2. Размер файла бэкапа (pg_dump): 14.4 МБ
3. База данных была полностью уничтожена (docker compose down -v).
4. Восстановление выполнено из файла дампа.
2. Делаем бэкап (pg_dump)...
3. Уничтожаем базу (docker compose down -v)...
4. Восстанавливаем из бэкапа...
5. Количество строк ПОСЛЕ восстановления:
0
5. Количество строк ПОСЛЕ восстановления: 100000
6. Удаляем файл дампа:
Вывод: Данные успешно восстановлены. Время восстановления (RTO) ~ 3 секунды.
+2
View File
@@ -0,0 +1,2 @@
@echo off
docker compose restart api db redis
+2
View File
@@ -8,3 +8,5 @@ set -eu
printf '%s
' 'TODO: implement restart.sh for your infrastructure' >&2
exit 2
#!/bin/bash
docker compose restart api db redis