Forward final lab3 session security and validation fixes
This commit is contained in:
@@ -11,7 +11,12 @@ from sqlalchemy import select
|
||||
from conftest import actor, bearer, keyed, make_chat, register, resolve, running_app, scalar
|
||||
from messenger.identity.application.ports import SessionDirectory
|
||||
from messenger.identity.domain.models import Session
|
||||
from messenger.identity.infrastructure.postgres import PostgresSessionRepository, SessionRow
|
||||
from messenger.identity.infrastructure.postgres import (
|
||||
PostgresIdentityUnitOfWork,
|
||||
PostgresSessionDirectory,
|
||||
PostgresSessionRepository,
|
||||
SessionRow,
|
||||
)
|
||||
from messenger.identity.infrastructure.valkey import CachedSessionDirectory
|
||||
from messenger.shared.application.errors import Unavailable
|
||||
|
||||
@@ -44,7 +49,7 @@ async def test_second_check_is_served_from_cache(valkey: dict[str, str]) -> None
|
||||
await cache.aclose()
|
||||
|
||||
|
||||
async def test_logout_writes_tombstone_before_database(valkey: dict[str, str]) -> None:
|
||||
async def test_logout_leaves_tombstone_after_commit(valkey: dict[str, str]) -> None:
|
||||
cache = Redis.from_url(valkey["url"])
|
||||
async with running_app(cache_url=valkey["url"]) as http:
|
||||
alice = await register(http, "alice")
|
||||
@@ -59,19 +64,26 @@ async def test_logout_writes_tombstone_before_database(valkey: dict[str, str]) -
|
||||
await cache.aclose()
|
||||
|
||||
|
||||
@pytest.mark.parametrize("failure", ["remove", "commit"])
|
||||
async def test_logout_rejected_by_database_changes_nothing(
|
||||
valkey: dict[str, str], monkeypatch: pytest.MonkeyPatch
|
||||
valkey: dict[str, str], monkeypatch: pytest.MonkeyPatch, failure: str
|
||||
) -> None:
|
||||
async def broken(self: PostgresSessionRepository, token_hash: bytes) -> None:
|
||||
raise Unavailable("PostgreSQL недоступен")
|
||||
|
||||
async def broken_commit(self: PostgresIdentityUnitOfWork) -> None:
|
||||
raise Unavailable("PostgreSQL недоступен")
|
||||
|
||||
cache = Redis.from_url(valkey["url"])
|
||||
logout = "/api/v1/auth/sessions/current"
|
||||
async with running_app(cache_url=valkey["url"]) as http:
|
||||
alice = await register(http, "alice")
|
||||
assert (await http.get("/api/v1/users/me", headers=actor(alice))).status_code == 200
|
||||
with monkeypatch.context() as patch:
|
||||
patch.setattr(PostgresSessionRepository, "remove", broken)
|
||||
if failure == "remove":
|
||||
patch.setattr(PostgresSessionRepository, "remove", broken)
|
||||
else:
|
||||
patch.setattr(PostgresIdentityUnitOfWork, "commit", broken_commit)
|
||||
failed = await http.delete(logout, headers=actor(alice))
|
||||
assert failed.status_code == 503
|
||||
assert failed.json()["error"]["code"] == "unavailable"
|
||||
@@ -82,8 +94,14 @@ async def test_logout_rejected_by_database_changes_nothing(
|
||||
await cache.aclose()
|
||||
|
||||
|
||||
async def test_fill_racing_with_logout_does_not_revive_token(valkey: dict[str, str]) -> None:
|
||||
async with running_app(cache_url=valkey["url"]) as http:
|
||||
@pytest.mark.parametrize("loss", ["none", "flushall", "evict", "replacement"])
|
||||
async def test_fill_racing_with_logout_does_not_revive_token(
|
||||
valkey: dict[str, str], loss: str
|
||||
) -> None:
|
||||
async with (
|
||||
Redis.from_url(valkey["url"]) as cache,
|
||||
running_app(cache_url=valkey["url"]) as http,
|
||||
):
|
||||
alice = await register(http, "alice")
|
||||
directory = await resolve(http, SessionDirectory)
|
||||
assert isinstance(directory, CachedSessionDirectory)
|
||||
@@ -99,14 +117,73 @@ async def test_fill_racing_with_logout_does_not_revive_token(valkey: dict[str, s
|
||||
return stale[-1]
|
||||
|
||||
directory._origin = SlowOrigin()
|
||||
reader = asyncio.create_task(http.get("/api/v1/users/me", headers=actor(alice)))
|
||||
await entered.wait()
|
||||
directory._origin = origin
|
||||
assert (
|
||||
await http.delete("/api/v1/auth/sessions/current", headers=actor(alice))
|
||||
).status_code == 204
|
||||
released.set()
|
||||
assert (await reader).status_code == 200
|
||||
async with asyncio.TaskGroup() as group:
|
||||
reader = group.create_task(http.get("/api/v1/users/me", headers=actor(alice)))
|
||||
try:
|
||||
await asyncio.wait_for(entered.wait(), 5)
|
||||
directory._origin = origin
|
||||
assert (
|
||||
await http.delete("/api/v1/auth/sessions/current", headers=actor(alice))
|
||||
).status_code == 204
|
||||
key = key_of(token_of(alice))
|
||||
assert await cache.get(f"{key}:fill") is None
|
||||
if loss == "flushall":
|
||||
await cache.flushall()
|
||||
elif loss in {"evict", "replacement"}:
|
||||
await cache.delete(key)
|
||||
if loss == "replacement":
|
||||
await cache.set(f"{key}:fill", "another-reader", px=1000)
|
||||
finally:
|
||||
released.set()
|
||||
assert reader.result().status_code == 200
|
||||
assert (await http.get("/api/v1/users/me", headers=actor(alice))).status_code == 401
|
||||
|
||||
|
||||
@pytest.mark.parametrize("loss", ["flushall", "evict"])
|
||||
async def test_cache_loss_before_logout_commit_cannot_refill_deleted_session(
|
||||
valkey: dict[str, str], monkeypatch: pytest.MonkeyPatch, loss: str
|
||||
) -> None:
|
||||
revoked, release_commit, reading = asyncio.Event(), asyncio.Event(), asyncio.Event()
|
||||
revoke = CachedSessionDirectory.revoke
|
||||
find = PostgresSessionDirectory.find
|
||||
|
||||
async def paused_revoke(self: CachedSessionDirectory, session: Session) -> None:
|
||||
await revoke(self, session)
|
||||
revoked.set()
|
||||
await release_commit.wait()
|
||||
|
||||
async def observed_find(
|
||||
self: PostgresSessionDirectory, token_hash: bytes, now: datetime
|
||||
) -> Session | None:
|
||||
reading.set()
|
||||
return await find(self, token_hash, now)
|
||||
|
||||
async with (
|
||||
Redis.from_url(valkey["url"]) as cache,
|
||||
running_app(cache_url=valkey["url"]) as http,
|
||||
):
|
||||
alice = await register(http, "alice")
|
||||
assert (await http.get("/api/v1/users/me", headers=actor(alice))).status_code == 200
|
||||
monkeypatch.setattr(CachedSessionDirectory, "revoke", paused_revoke)
|
||||
async with asyncio.TaskGroup() as group:
|
||||
logout = group.create_task(
|
||||
http.delete("/api/v1/auth/sessions/current", headers=actor(alice))
|
||||
)
|
||||
try:
|
||||
await asyncio.wait_for(revoked.wait(), 5)
|
||||
if loss == "flushall":
|
||||
await cache.flushall()
|
||||
else:
|
||||
await cache.delete(key_of(token_of(alice)))
|
||||
monkeypatch.setattr(PostgresSessionDirectory, "find", observed_find)
|
||||
reader = group.create_task(http.get("/api/v1/users/me", headers=actor(alice)))
|
||||
await asyncio.wait_for(reading.wait(), 5)
|
||||
done, _ = await asyncio.wait({reader}, timeout=0.1)
|
||||
assert not done
|
||||
finally:
|
||||
release_commit.set()
|
||||
assert logout.result().status_code == 204
|
||||
assert reader.result().status_code == 401
|
||||
assert (await http.get("/api/v1/users/me", headers=actor(alice))).status_code == 401
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user