When the ready commit fails after the object was written, the upload handler now locks the row, keeps it if it turned out ready, and otherwise deletes the object first and the pending row second before answering 503. A ready update that touches no row means the intent was already swept, so it fails as unavailable and the object goes too; a 201 without a row cannot happen. Every worker runs an UploadSweeper that every 30 s removes pending intents older than UPLOAD_GRACE_SECONDS (900 s, at least 60 s) one row at a time under FOR UPDATE SKIP LOCKED over the partial pending index, object first, and logs an audit event for each discard. Bodies are buffered only inside one of UPLOAD_CONCURRENCY slots per worker and released before the ready commit, and a client that disconnects in the middle of a body becomes a 400 instead of an unhandled 500. The tests run against a throwaway PostgreSQL: a trigger rejects the ready commit and the compensation leaves neither row nor object, a row removed during the write gives 503, a failed write stays until the grace ends, fresh intents and an aged ready attachment in a message survive a sweep, two concurrent sweeps share five intents exactly, the background loop runs by itself, a second upload waits for the slot without reading its body, and aborted and stalled bodies leave nothing. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01V1d3RLHNBBMA6UqBLLJv27
91 lines
2.9 KiB
Python
91 lines
2.9 KiB
Python
from datetime import UTC, datetime, timedelta
|
|
from uuid import uuid4
|
|
|
|
import pytest
|
|
|
|
from messenger.attachments.domain.errors import InvalidFilename, UnsupportedImage
|
|
from messenger.attachments.domain.events import AttachmentDiscarded, AttachmentStored
|
|
from messenger.attachments.domain.models import Attachment, AttachmentStatus
|
|
from messenger.attachments.domain.values import Filename, ImageInfo, ImageKind
|
|
|
|
MOMENT = datetime(2026, 1, 1, tzinfo=UTC)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"raw",
|
|
[
|
|
*("", " ", "\t\n", "../a.png", "a/b.png", "a\\b.png"),
|
|
*("a\x00.png", "a\x01.png", "a\x7f.png", "a\n.png", "\x9f.png", "x" * 256),
|
|
],
|
|
)
|
|
def test_filename_rejects_dangerous_and_empty(raw: str) -> None:
|
|
with pytest.raises(InvalidFilename):
|
|
Filename(raw)
|
|
|
|
|
|
@pytest.mark.parametrize("raw", ["sample.png", "фото 1.png", "я" * 255, "👋.jpg", "a..b.png"])
|
|
def test_filename_keeps_display_names(raw: str) -> None:
|
|
assert Filename(raw).value == raw
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
("header", "kind"),
|
|
[
|
|
("image/png", ImageKind.PNG),
|
|
("IMAGE/JPEG", ImageKind.JPEG),
|
|
("image/png; charset=binary", ImageKind.PNG),
|
|
],
|
|
)
|
|
def test_declared_type_ignores_case_and_parameters(header: str, kind: ImageKind) -> None:
|
|
assert ImageKind.declared(header) is kind
|
|
|
|
|
|
@pytest.mark.parametrize("header", [None, "", "image/gif", "application/octet-stream", "image/*"])
|
|
def test_declared_type_accepts_only_png_and_jpeg(header: str | None) -> None:
|
|
with pytest.raises(UnsupportedImage):
|
|
ImageKind.declared(header)
|
|
|
|
|
|
def test_attachment_is_pending_until_stored() -> None:
|
|
attachment_id = uuid4()
|
|
attachment = Attachment.stage(
|
|
attachment_id=attachment_id,
|
|
chat_id=uuid4(),
|
|
owner_id=uuid4(),
|
|
filename=Filename("a.png"),
|
|
image=ImageInfo(ImageKind.PNG, 2, 3),
|
|
size_bytes=10,
|
|
sha256="0" * 64,
|
|
now=MOMENT,
|
|
)
|
|
assert attachment.status is AttachmentStatus.PENDING
|
|
assert attachment.object_key == f"attachments/{attachment_id}"
|
|
assert attachment.collect_events() == []
|
|
attachment.store(MOMENT - timedelta(seconds=1))
|
|
assert attachment.status is AttachmentStatus.READY
|
|
assert attachment.updated_at == MOMENT
|
|
events = attachment.collect_events()
|
|
assert [type(event) for event in events] == [AttachmentStored]
|
|
assert attachment.collect_events() == []
|
|
|
|
|
|
def test_discarded_intent_records_its_reason() -> None:
|
|
attachment = Attachment.stage(
|
|
attachment_id=uuid4(),
|
|
chat_id=uuid4(),
|
|
owner_id=uuid4(),
|
|
filename=Filename("a.png"),
|
|
image=ImageInfo(ImageKind.PNG, 1, 1),
|
|
size_bytes=1,
|
|
sha256="0" * 64,
|
|
now=MOMENT,
|
|
)
|
|
attachment.discard("abandoned")
|
|
(event,) = attachment.collect_events()
|
|
assert isinstance(event, AttachmentDiscarded)
|
|
assert (event.attachment_id, event.chat_id, event.reason) == (
|
|
attachment.id,
|
|
attachment.chat_id,
|
|
"abandoned",
|
|
)
|