evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Failback to v4 resolver for AAAA records in DNSIP integration (#82740)

Browse source
This commit is contained in:
G Johansson 2022-12-05 11:02:38 +01:00 • committed by GitHub
parent c8fbdde3b8
commit 1c86a543b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
homeassistant/components/dnsip/config_flow.py
View file

@ -19,6 +19,7 @@ from .const import (
CONF_HOSTNAME, CONF_HOSTNAME,
CONF_IPV4, CONF_IPV4,
CONF_IPV6, CONF_IPV6,
CONF_IPV6_V4,
CONF_RESOLVER, CONF_RESOLVER,
CONF_RESOLVER_IPV6, CONF_RESOLVER_IPV6,
DEFAULT_HOSTNAME, DEFAULT_HOSTNAME,
@ -61,10 +62,12 @@ async def async_validate_hostname(
tasks = await asyncio.gather( tasks = await asyncio.gather(
async_check(hostname, resolver_ipv4, "A"), async_check(hostname, resolver_ipv4, "A"),
async_check(hostname, resolver_ipv6, "AAAA"), async_check(hostname, resolver_ipv6, "AAAA"),
async_check(hostname, resolver_ipv4, "AAAA"),
) )
result[CONF_IPV4] = tasks[0] result[CONF_IPV4] = tasks[0]
result[CONF_IPV6] = tasks[1] result[CONF_IPV6] = tasks[1]
result[CONF_IPV6_V4] = tasks[2]
return result return result
@ -98,7 +101,15 @@ class DnsIPConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
validate = await async_validate_hostname(hostname, resolver, resolver_ipv6) validate = await async_validate_hostname(hostname, resolver, resolver_ipv6)
if not validate[CONF_IPV4] and not validate[CONF_IPV6]: set_resolver = resolver
if validate[CONF_IPV6]:
set_resolver = resolver_ipv6
if (
not validate[CONF_IPV4]
and not validate[CONF_IPV6]
and not validate[CONF_IPV6_V4]
):
errors["base"] = "invalid_hostname" errors["base"] = "invalid_hostname"
else: else:
await self.async_set_unique_id(hostname) await self.async_set_unique_id(hostname)
@ -110,11 +121,11 @@ class DnsIPConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
CONF_HOSTNAME: hostname, CONF_HOSTNAME: hostname,
CONF_NAME: name, CONF_NAME: name,
CONF_IPV4: validate[CONF_IPV4], CONF_IPV4: validate[CONF_IPV4],
CONF_IPV6: validate[CONF_IPV6], CONF_IPV6: validate[CONF_IPV6] or validate[CONF_IPV6_V4],
}, },
options={ options={
CONF_RESOLVER: resolver, CONF_RESOLVER: resolver,
CONF_RESOLVER_IPV6: resolver_ipv6, CONF_RESOLVER_IPV6: set_resolver,
}, },
) )

1
homeassistant/components/dnsip/const.py
View file

@ -9,6 +9,7 @@ CONF_RESOLVER = "resolver"
CONF_RESOLVER_IPV6 = "resolver_ipv6" CONF_RESOLVER_IPV6 = "resolver_ipv6"
CONF_IPV4 = "ipv4" CONF_IPV4 = "ipv4"
CONF_IPV6 = "ipv6" CONF_IPV6 = "ipv6"
CONF_IPV6_V4 = "ipv6_v4"
DEFAULT_HOSTNAME = "myip.opendns.com" DEFAULT_HOSTNAME = "myip.opendns.com"
DEFAULT_IPV6 = False DEFAULT_IPV6 = False