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

Update doorbird zeroconf checks to use stdlib ipaddress methods (#100623)

Browse Source
This commit is contained in:
J. Nick Koston 2023-09-20 18:35:55 +02:00 committed by GitHub
parent fbcc5318c5
commit 1f0c9a48d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/components/doorbird/config_flow.py
View File

@ -2,7 +2,6 @@
from __future__ import annotations from __future__ import annotations
from http import HTTPStatus from http import HTTPStatus
from ipaddress import ip_address
import logging import logging
from typing import Any from typing import Any
@ -15,7 +14,6 @@ from homeassistant.components import zeroconf
from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_USERNAME from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_USERNAME
from homeassistant.core import HomeAssistant, callback from homeassistant.core import HomeAssistant, callback
from homeassistant.data_entry_flow import FlowResult from homeassistant.data_entry_flow import FlowResult
from homeassistant.util.network import is_ipv4_address, is_link_local
from .const import CONF_EVENTS, DOMAIN, DOORBIRD_OUI from .const import CONF_EVENTS, DOMAIN, DOORBIRD_OUI
from .util import get_mac_address_from_door_station_info from .util import get_mac_address_from_door_station_info
@ -106,16 +104,16 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
) -> FlowResult: ) -> FlowResult:
"""Prepare configuration for a discovered doorbird device.""" """Prepare configuration for a discovered doorbird device."""
macaddress = discovery_info.properties["macaddress"] macaddress = discovery_info.properties["macaddress"]
host = discovery_info.host
if macaddress[:6] != DOORBIRD_OUI: if macaddress[:6] != DOORBIRD_OUI:
return self.async_abort(reason="not_doorbird_device") return self.async_abort(reason="not_doorbird_device")
if is_link_local(ip_address(host)): if discovery_info.ip_address.is_link_local:
return self.async_abort(reason="link_local_address") return self.async_abort(reason="link_local_address")
if not is_ipv4_address(host): if discovery_info.ip_address.version != 4:
return self.async_abort(reason="not_ipv4_address") return self.async_abort(reason="not_ipv4_address")
await self.async_set_unique_id(macaddress) await self.async_set_unique_id(macaddress)
host = discovery_info.host
self._abort_if_unique_id_configured(updates={CONF_HOST: host}) self._abort_if_unique_id_configured(updates={CONF_HOST: host})
self._async_abort_entries_match({CONF_HOST: host}) self._async_abort_entries_match({CONF_HOST: host})