zlei6/ComfyUI
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI.git synced 2026-08-26 19:02:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(assets): require cursor o field, drop legacy permissive path

Browse Source 
Cursor pagination hasn't shipped on either runtime yet — this PR is
still draft and cloud's mirror is just behind it — so there are no
legacy no-o cursors in the wild. Make o mandatory from day one
rather than landing permissive and tightening later.

decode_cursor now rejects any payload without o (or with a non-string
o) as malformed. CursorPayload.order becomes a required str. Tests
that constructed CursorPayload directly now pass order="desc";
test_legacy_cursor_without_order_accepted flips to
test_cursor_without_order_rejected.
This commit is contained in:
Matt Miller
2026-05-20 20:44:40 -07:00
parent 33a57cc9e8
commit 9a7f580b37
2 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/assets/services/cursor.py
View File

@@ -9,11 +9,10 @@ runtimes. Payload JSON uses short keys to keep the encoded length small:
The `o` key binds the cursor to the sort direction it was minted under,
so replaying a `desc` cursor against an `asc` request fails with
``INVALID_CURSOR`` rather than silently walking the wrong direction.
Decoders accept payloads without `o` for backward compatibility with
cursors minted before the binding was introduced (these skip the order
check); new cursors always include it. Cloud has a follow-up to mirror
the field — until then, Python and cloud cursors differ by exactly the
`o` key.
`o` is mandatory on every payload — a cursor without it is rejected as
malformed. Cloud will land the same field in its mirror PR; until then,
Python and cloud cursors differ by exactly the `o` key, and a cloud-
minted cursor cannot be decoded by this endpoint.
Encoding is base64url with no padding. JSON serialization escapes `<`,
`>`, `&`, U+2028, and U+2029 to match Go's default `json.Marshal`
@@ -61,9 +60,7 @@ class CursorPayload:
sort_field: str
value: str
id: str
# None means "minted by a producer that did not bind order" (e.g. a cloud
# cursor from before BE-944's follow-up lands). New cursors always set it.
order: str | None = None
order: str
# Order direction tokens. Mirrored on the cloud follow-up so cursors carrying
@@ -123,9 +120,8 @@ def decode_cursor(
timestamp string compared against a ``name`` column).
``expected_order`` (``"asc"``/``"desc"``), when supplied, must match the
payload's ``o`` field. Cursors minted without ``o`` (e.g. by an older
cloud build) pass the check unconditionally — the binding is best-effort
until both runtimes ship the field.
payload's ``o`` field. ``o`` is required on every payload; a cursor
missing it is rejected as malformed.
Passing no allowed fields rejects every cursor.
"""
@@ -151,7 +147,7 @@ def decode_cursor(
sort_field = decoded.get("s")
value = decoded.get("v")
id = decoded.get("id")
order = decoded.get("o") # may be absent on legacy cursors
order = decoded.get("o")
if not isinstance(sort_field, str) or not isinstance(value, str) or not isinstance(id, str):
raise InvalidCursorError("payload: missing or non-string s/v/id")
@@ -166,11 +162,11 @@ def decode_cursor(
if sort_field not in allowed_sort_fields:
raise InvalidCursorError(f"unsupported sort field {sort_field!r}")
if order is not None and not isinstance(order, str):
raise InvalidCursorError("payload: non-string o")
if order is not None and order not in _VALID_ORDERS:
if not isinstance(order, str):
raise InvalidCursorError("missing or non-string o")
if order not in _VALID_ORDERS:
raise InvalidCursorError(f"unsupported order {order!r}")
if expected_order is not None and order is not None and order != expected_order:
if expected_order is not None and order != expected_order:
raise InvalidCursorError(
f"cursor order {order!r} does not match request order {expected_order!r}"
)