Skip to content

armgit / rea

Public Imported from GitHub
0

Reverse engineer anything with agents, from app behavior down to native binaries.

fix(cutter): preserve mixed Unicode output within the frame limit

Mohamed Ayoub Eleuch8a2a1a2b8bc6
diff --git a/bridge/cutter/rea_bridge.py b/bridge/cutter/rea_bridge.py
index 9dfb4d875..be229f081 100644
--- a/bridge/cutter/rea_bridge.py
+++ b/bridge/cutter/rea_bridge.py
@@ -783,14 +783,22 @@ def _within_response_limit(value: Any) -> bool:
current = pending.pop()
if isinstance(current, str):
size += 2
+ if len(current) > MAX_FRAME_BYTES - size:
+ return False
if current.isascii():
size += len(current)
- size += current.count('"') + current.count("\\")
- size += sum(5 for character in current if ord(character) < 0x20)
else:
- size += 4 * len(current)
- size += current.count('"') + current.count("\\")
- size += sum(5 for character in current if ord(character) < 0x20)
+ # Count UTF-8 bytes without allocating a copy of the whole output.
+ try:
+ size += sum(
+ len(current[start:start + 65536].encode("utf-8"))
+ for start in range(0, len(current), 65536)
+ )
+ except UnicodeEncodeError:
+ # Unencodable output also needs the signed omission fallback.
+ return False
+ size += current.count('"') + current.count("\\")
+ size += sum(5 for character in current if ord(character) < 0x20)
elif isinstance(current, dict):
identity = id(current)
if identity in seen:
diff --git a/tests/fixtures/cutter_bridge_protocol_test.py b/tests/fixtures/cutter_bridge_protocol_test.py
index b1abdc275..d6ea183ea 100644
--- a/tests/fixtures/cutter_bridge_protocol_test.py
+++ b/tests/fixtures/cutter_bridge_protocol_test.py
@@ -223,6 +223,52 @@ def run_serve_mode():
server.join(timeout=3)
+class ResponseEncodingTest(unittest.TestCase):
+ def setUp(self):
+ self.server = bridge._BridgeServer.__new__(bridge._BridgeServer)
+ self.server.token = "test-token"
+ self.server.session_id = str(uuid.uuid4())
+
+ def assert_authenticated_response(self, frame):
+ expected = hmac.new(
+ self.server.token.encode(),
+ f"rea-cutter-response-v2:{self.server.session_id}:{'a' * 64}:{'b' * 64}:{frame['response']}".encode(),
+ hashlib.sha256,
+ ).hexdigest()
+ self.assertTrue(hmac.compare_digest(frame["proof"], expected))
+ return json.loads(frame["response"])
+
+ def test_large_mixed_unicode_output_fits_the_authenticated_frame(self):
+ for suffix in ("a", "é", "雪", "😀"):
+ with self.subTest(suffix=suffix):
+ output = "a" * (5 * 1024 * 1024 - 1) + suffix
+ value = {"ok": True, "output": output, "execution_state": "complete"}
+ encoded = self.server._encode_authenticated_response(value, "a" * 64, "b" * 64)
+ self.assertIsNotNone(encoded)
+ self.assertLessEqual(len(encoded), bridge.MAX_FRAME_BYTES)
+ frame = json.loads(encoded)
+ self.assertEqual(self.assert_authenticated_response(frame), value)
+ self.assertIsNone(self.server._encode_authenticated_response({
+ "ok": True, "output": "😀" * (5 * 1024 * 1024),
+ "execution_state": "complete",
+ }, "a" * 64, "b" * 64))
+
+ def test_unencodable_output_preserves_authenticated_completion(self):
+ for index, surrogate in ((0, "\ud800"), (5 * 1024 * 1024 - 1, "\udfff")):
+ with self.subTest(index=index):
+ output = "a" * index + surrogate + "a" * (5 * 1024 * 1024 - index - 1)
+ value = {"ok": True, "output": output, "execution_state": "complete"}
+ sender, receiver = socket.socketpair()
+ with sender, receiver:
+ receiver.settimeout(2)
+ self.server._send_authenticated(sender, value, "a" * 64, "b" * 64)
+ response = self.assert_authenticated_response(_frame(receiver))
+ self.assertTrue(response["ok"])
+ self.assertEqual(response["execution_state"], "complete")
+ self.assertIsNone(response["output"])
+ self.assertTrue(response["output_truncated"])
+
+
class DocumentIdentityTest(unittest.TestCase):
def test_document_config_drives_generation_and_command_admission(self):
first = "/tmp/Cutter 雪 #1?.elf"