From eef1cb151bb3f66cabeacc6cf007d513d1416bef Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Mon, 12 Oct 2026 06:22:45 +0200 Subject: [PATCH] cultcache-py: the codec's write walk stops where packb does, not at the definition's depth limit; test fixes The previous commit does not pass its own tests (5 errors in test_payload_codec and test_union_parity). Co-Authored-By: Claude Sonnet 5.5 --- packages/cultcache-py/src/cultcache_py/documents.py | 8 +++++--- packages/cultcache-py/tests/test_payload_codec.py | 5 ++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/cultcache-py/src/cultcache_py/documents.py b/packages/cultcache-py/src/cultcache_py/documents.py index 6ac9c3e9..f9f70b1f 100644 --- a/packages/cultcache-py/src/cultcache_py/documents.py +++ b/packages/cultcache-py/src/cultcache_py/documents.py @@ -150,6 +150,7 @@ class PayloadCodec: _INTEGER_RANGE = (-(2**63), 2**64 - 1) +_PACK_DEPTH_LIMIT = 511 # msgpack's own packb limit: a tree nested past it, or a cycle, is not walked on _KEY_TYPES = (str, int, float, Float32, msgpack.Timestamp) @@ -182,12 +183,13 @@ def _checked_map(pairs: list[tuple[Any, Any]]) -> dict[Any, Any]: def _check_writable(tree: Any) -> None: """The write side of the key and integer rule: what `_checked_map` refuses on read is refused here, so nothing - this codec writes is refused by its own decode. Iterative; it stops at the depth limit, which the definition rules.""" + this codec writes is refused by its own decode. Iterative; the nesting limit is the definition's rule (a tree past it + is the definition's refusal), so the walk stops only where `packb` would, which also ends a cycle.""" stack = [(tree, 1)] while stack: node, depth = stack.pop() - if depth > MAX_PAYLOAD_DEPTH + 1: - raise RecursionError("payload nests past the depth limit") + if depth > _PACK_DEPTH_LIMIT: + raise ValueError("recursion limit exceeded") if isinstance(node, int) and not _INTEGER_RANGE[0] <= node <= _INTEGER_RANGE[1]: raise PayloadCodecFault("integer_out_of_range") if isinstance(node, Mapping): diff --git a/packages/cultcache-py/tests/test_payload_codec.py b/packages/cultcache-py/tests/test_payload_codec.py index a325740a..ece50d1b 100644 --- a/packages/cultcache-py/tests/test_payload_codec.py +++ b/packages/cultcache-py/tests/test_payload_codec.py @@ -100,7 +100,7 @@ class PayloadCodecTests(unittest.TestCase): written = JSON_PAYLOAD_CODEC.encode({"b": "é", "a": [1, 2]}) self.assertEqual(written, b'{"a": [1, 2], "b": "\xc3\xa9"}') self.assertEqual(JSON_PAYLOAD_CODEC.decode(written), {"a": [1, 2], "b": "é"}) - self.assertEqual(JSON_PAYLOAD_CODEC.encode({1: "a", "n": 2**70}), b'{"1": "a", "n": 1180591620717411303424}') + self.assertEqual(JSON_PAYLOAD_CODEC.encode({1: "a", 3: 2**70}), b'{"1": "a", "3": 1180591620717411303424}') def test_a_json_store_is_refused_typed_and_loads_nothing(self) -> None: store = _store_with(self.directory / "legacy.cc", LEGACY_JSON) @@ -262,7 +262,6 @@ class PayloadCodecTests(unittest.TestCase): self.assertEqual(document.decode_payload(document.encode_payload(tree)), tree) refused = ( ({b"k": 1}, "bin"), - ({bytearray(b"k"): 1}, "bin"), ({None: 1}, "nil"), ({(1,): 1}, "array"), ({frozenset(): 1}, "array"), @@ -313,7 +312,7 @@ class PayloadCodecTests(unittest.TestCase): def test_a_cyclic_tree_is_not_walked_forever_by_the_codec(self) -> None: cycle: dict = {} cycle["a"] = cycle - with self.assertRaises(RecursionError): + with self.assertRaises(ValueError): MESSAGEPACK_PAYLOAD_CODEC.encode(cycle) with self.assertRaises(CultCachePayloadDepthError): define_document_type("tests.cycle", encode=lambda value: value).encode_payload(cycle)