Skip to content

Fix handling of corrupted msgs to avoid crash #441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tofu-rocketry merged 1 commit into from
Aug 18, 2026
Merged

Fix handling of corrupted msgs to avoid crash #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 17 additions & 4 deletions ssm/ssm2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,11 +322,24 @@ def _handle_msg(self, text):

def _save_msg_to_queue(self, body, empaid):
"""Extract message contents and add to the accept or reject queue."""
if isinstance(body, bytes):
body = body.decode('ascii')

extracted_msg, signer, err_msg = self._handle_msg(body)
try:
if isinstance(body, bytes):
try:
body = body.decode('ascii')
except UnicodeDecodeError:
err_msg = "Non-ASCII or corrupted message"
log.warning("Message rejected: %s", err_msg)
# Extract the message body replacing malformed data with backslashed
# escape sequence (hexadecimal form of byte value with format \xhh).
body = body.decode('ascii', errors='backslashreplace')
name = self._rejectq.add({'body': body,
'signer': 'Not available.',
'empaid': empaid,
'error': err_msg})
log.info("Message saved to reject queue as %s", name)
return # Return early to skip the rest of the method.

extracted_msg, signer, err_msg = self._handle_msg(body)
# If the message is empty or the error message is not empty
# then reject the message.
if extracted_msg is None or err_msg is not None:
Expand Down
2 changes: 2 additions & 0 deletions test/test_ssm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ def test_on_message(self):
test_ssm.on_message({'empa-id': 'ping'}, 'body')
# Check that msg with ID and no real content doesn't raise exception.
test_ssm.on_message({'empa-id': '012345'}, 'body')
# Check that non-ASCII messages don't crash the receiver.
test_ssm.on_message({'empa-id': '543210'}, '^LagelosÄü'.encode('utf-8'))

def test_init_expired_cert(self):
"""Test right exception is thrown creating an SSM with expired cert."""
Expand Down