Skip to content
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

Don't log error message when decoding valid discovery packets #1832

Merged
merged 2 commits into from
Oct 7, 2023
Merged

Don't log error message when decoding valid discovery packets #1832

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15f5dd4
Don't log error message when decoding valid discovery packets (#1824).
gunjambi Sep 24, 2023
d292d9d
Apply review feedback.
gunjambi Oct 7, 2023
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
5 changes: 5 additions & 0 deletions miio/protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,11 @@ def _encode(self, obj, context, path):

def _decode(self, obj, context, path) -> Union[Dict, bytes]:
"""Decrypts the payload using the token stored in the context."""
# if there is no payload, decode to 0 bytes. Missing payload is expected for discovery messages.
# note that we don't have "token" in the context for discovery replies so we couldn't decode it
# anyway.
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# if there is no payload, decode to 0 bytes. Missing payload is expected for discovery messages.
# note that we don't have "token" in the context for discovery replies so we couldn't decode it
# anyway.
# Missing payload is expected for discovery messages.

let's keep it simple here, also, there are some (very) old devices that actually respond with a valid token :-)

if obj == b"":
return b""
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if obj == b"":
return b""
if not obj:
return obj

try:
decrypted = Utils.decrypt(obj, context["_"]["token"])
decrypted = decrypted.rstrip(b"\x00")
Expand Down
Loading