Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion roborock/protocols/v1_protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def decode_rpc_response(message: RoborockMessage) -> ResponseMessage:
return ResponseMessage(request_id=message.seq, data={})
try:
payload = json.loads(message.payload.decode())
except (json.JSONDecodeError, TypeError) as e:
except (json.JSONDecodeError, TypeError, UnicodeDecodeError) as e:
raise RoborockException(f"Invalid V1 message payload: {e} for {message.payload!r}") from e

_LOGGER.debug("Decoded V1 message payload: %s", payload)
Expand Down
14 changes: 14 additions & 0 deletions tests/protocols/test_v1_protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,3 +274,17 @@ def test_decode_no_request_id():
)
with pytest.raises(RoborockException, match="The method called is not recognized by the device"):
decode_rpc_response(message)


def test_invalid_unicode() -> None:
"""Test an error while decoding unicode bytes"""
message = RoborockMessage(
protocol=RoborockMessageProtocol.GENERAL_RESPONSE,
payload=b"hello\xff\xfe", # Invalid UTF-8 bytes
seq=12750,
version=b"1.0",
random=97431,
timestamp=1652547161,
)
with pytest.raises(RoborockException, match="Invalid V1 message payload"):
decode_rpc_response(message)