jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-13 08:17:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preventing working with incomplete discoveries from user config flow in upnp (#57994)

Browse Source
This commit is contained in:
Steven Looman 2021-10-19 08:57:48 +02:00 committed by GitHub
parent 4625a05706
commit db474707a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
homeassistant/components/upnp/config_flow.py
View File

@ -37,6 +37,16 @@ def _friendly_name_from_discovery(discovery_info: Mapping[str, Any]) -> str:
) )
def _is_complete_discovery(discovery_info: Mapping[str, Any]) -> bool:
"""Test if discovery is complete and usable."""
return (
ssdp.ATTR_UPNP_UDN in discovery_info
and ssdp.ATTR_SSDP_ST in discovery_info
and ssdp.ATTR_SSDP_LOCATION in discovery_info
and ssdp.ATTR_SSDP_USN in discovery_info
)
async def _async_wait_for_discoveries(hass: HomeAssistant) -> bool: async def _async_wait_for_discoveries(hass: HomeAssistant) -> bool:
"""Wait for a device to be discovered.""" """Wait for a device to be discovered."""
device_discovered_event = asyncio.Event() device_discovered_event = asyncio.Event()
@ -133,7 +143,10 @@ class UpnpFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
self._discoveries = [ self._discoveries = [
discovery discovery
for discovery in discoveries for discovery in discoveries
if discovery[ssdp.ATTR_SSDP_USN] not in current_unique_ids if (
_is_complete_discovery(discovery)
and discovery[ssdp.ATTR_SSDP_USN] not in current_unique_ids
)
] ]
# Ensure anything to add. # Ensure anything to add.
@ -183,12 +196,7 @@ class UpnpFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
# Ensure complete discovery. # Ensure complete discovery.
discovery = discoveries[0] discovery = discoveries[0]
if ( if not _is_complete_discovery(discovery):
ssdp.ATTR_UPNP_UDN not in discovery
or ssdp.ATTR_SSDP_ST not in discovery
or ssdp.ATTR_SSDP_LOCATION not in discovery
or ssdp.ATTR_SSDP_USN not in discovery
):
LOGGER.debug("Incomplete discovery, ignoring") LOGGER.debug("Incomplete discovery, ignoring")
return self.async_abort(reason="incomplete_discovery") return self.async_abort(reason="incomplete_discovery")
@ -207,12 +215,7 @@ class UpnpFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
LOGGER.debug("async_step_ssdp: discovery_info: %s", discovery_info) LOGGER.debug("async_step_ssdp: discovery_info: %s", discovery_info)
# Ensure complete discovery. # Ensure complete discovery.
if ( if not _is_complete_discovery(discovery_info):
ssdp.ATTR_UPNP_UDN not in discovery_info
or ssdp.ATTR_SSDP_ST not in discovery_info
or ssdp.ATTR_SSDP_LOCATION not in discovery_info
or ssdp.ATTR_SSDP_USN not in discovery_info
):
LOGGER.debug("Incomplete discovery, ignoring") LOGGER.debug("Incomplete discovery, ignoring")
return self.async_abort(reason="incomplete_discovery") return self.async_abort(reason="incomplete_discovery")