Skip to content

Fix reversed logic in zeroconf homekit pairing check #35596

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
MartinHjelmare merged 2 commits into from
May 14, 2020
Merged

Fix reversed logic in zeroconf homekit pairing check #35596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
727e6a4
Fix reversed logic in zeroconf homekit pairing check
bdraco May 13, 2020
79665aa
s/server_info/service_info/
bdraco May 14, 2020
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
8 changes: 7 additions & 1 deletion homeassistant/components/zeroconf/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,11 @@ def service_update(zeroconf, service_type, name, state_change):
return

service_info = zeroconf.get_service_info(service_type, name)
if not service_info:
# Prevent the browser thread from collapsing as
# service_info can be None
return

info = info_from_service(service_info)
_LOGGER.debug("Discovered new device %s %s", name, info)

Expand All @@ -196,7 +201,8 @@ def service_update(zeroconf, service_type, name, state_change):
and HOMEKIT_PAIRED_STATUS_FLAG in info[HOMEKIT_PROPERTIES]
):
try:
if not int(info[HOMEKIT_PROPERTIES][HOMEKIT_PAIRED_STATUS_FLAG]):
# 0 means paired and not discoverable by iOS clients)
if int(info[HOMEKIT_PROPERTIES][HOMEKIT_PAIRED_STATUS_FLAG]):
return
except ValueError:
# HomeKit pairing status unknown
Expand Down
4 changes: 2 additions & 2 deletions tests/components/zeroconf/test_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
NON_ASCII_KEY: None,
}

HOMEKIT_STATUS_UNPAIRED = b"0"
HOMEKIT_STATUS_PAIRED = b"1"
HOMEKIT_STATUS_UNPAIRED = b"1"
HOMEKIT_STATUS_PAIRED = b"0"


@pytest.fixture
Expand Down