mirror of
https://github.com/home-assistant/core.git
synced 2025-07-23 13:17:32 +00:00
Ensure service browser does not collapse on bad dns names (#38851)
If a device on the network presented a bad name, zeroconf would throw zeroconf.BadTypeInNameException and the service browser would die off. We now trap the exception and continue.
This commit is contained in:
parent
2f955ccfd7
commit
49478298cc
@ -8,6 +8,7 @@ import voluptuous as vol
|
||||
from zeroconf import (
|
||||
DNSPointer,
|
||||
DNSRecord,
|
||||
Error as ZeroconfError,
|
||||
InterfaceChoice,
|
||||
IPVersion,
|
||||
NonUniqueNameException,
|
||||
@ -212,7 +213,12 @@ def setup(hass, config):
|
||||
if state_change != ServiceStateChange.Added:
|
||||
return
|
||||
|
||||
service_info = zeroconf.get_service_info(service_type, name)
|
||||
try:
|
||||
service_info = zeroconf.get_service_info(service_type, name)
|
||||
except ZeroconfError:
|
||||
_LOGGER.exception("Failed to get info for device %s", name)
|
||||
return
|
||||
|
||||
if not service_info:
|
||||
# Prevent the browser thread from collapsing as
|
||||
# service_info can be None
|
||||
|
@ -1,5 +1,11 @@
|
||||
"""Test Zeroconf component setup process."""
|
||||
from zeroconf import InterfaceChoice, IPVersion, ServiceInfo, ServiceStateChange
|
||||
from zeroconf import (
|
||||
BadTypeInNameException,
|
||||
InterfaceChoice,
|
||||
IPVersion,
|
||||
ServiceInfo,
|
||||
ServiceStateChange,
|
||||
)
|
||||
|
||||
from homeassistant.components import zeroconf
|
||||
from homeassistant.components.zeroconf import CONF_DEFAULT_INTERFACE, CONF_IPV6
|
||||
@ -167,6 +173,20 @@ async def test_setup_with_ipv6_default(hass, mock_zeroconf):
|
||||
assert mock_zeroconf.called_with()
|
||||
|
||||
|
||||
async def test_service_with_invalid_name(hass, mock_zeroconf, caplog):
|
||||
"""Test we do not crash on service with an invalid name."""
|
||||
with patch.object(
|
||||
zeroconf, "HaServiceBrowser", side_effect=service_update_mock
|
||||
) as mock_service_browser:
|
||||
mock_zeroconf.get_service_info.side_effect = BadTypeInNameException
|
||||
assert await async_setup_component(hass, zeroconf.DOMAIN, {zeroconf.DOMAIN: {}})
|
||||
hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
assert len(mock_service_browser.mock_calls) == 1
|
||||
assert "Failed to get info for device name" in caplog.text
|
||||
|
||||
|
||||
async def test_homekit_match_partial_space(hass, mock_zeroconf):
|
||||
"""Test configured options for a device are loaded via config entry."""
|
||||
with patch.dict(
|
||||
|
Loading…
x
Reference in New Issue
Block a user