Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix `host_valid()` logic in Vilfo config flow (#49862)

pull/50190/head
Maciej Bieniek 2021-04-29 17:11:22 +02:00 committed by GitHub
parent a4db35a16e
commit 0379dee47e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/vilfo/config_flow.py
View File

@ -32,7 +32,7 @@ RESULT_INVALID_AUTH = "invalid_auth"
def host_valid(host):
"""Return True if hostname or IP address is valid."""
try:
if ipaddress.ip_address(host).version == (4 or 6):
if ipaddress.ip_address(host).version in [4, 6]:
return True
except ValueError:
disallowed = re.compile(r"[^a-zA-Z\d\-]")

9
tests/components/vilfo/test_config_flow.py
View File

@ -155,6 +155,7 @@ async def test_validate_input_returns_data(hass):
"""Test we handle the MAC address being resolved or not."""
mock_data = {"host": "testadmin.vilfo.com", "access_token": "test-token"}
mock_data_with_ip = {"host": "192.168.0.1", "access_token": "test-token"}
mock_data_with_ipv6 = {"host": "2001:db8::1428:57ab", "access_token": "test-token"}
mock_mac = "FF-00-00-00-00-00"
with patch("vilfo.Client.ping", return_value=None), patch(
@ -178,6 +179,9 @@ async def test_validate_input_returns_data(hass):
result3 = await hass.components.vilfo.config_flow.validate_input(
hass, data=mock_data_with_ip
)
result4 = await hass.components.vilfo.config_flow.validate_input(
hass, data=mock_data_with_ipv6
)
assert result2["title"] == mock_data["host"]
assert result2[CONF_HOST] == mock_data["host"]
@ -188,3 +192,8 @@ async def test_validate_input_returns_data(hass):
assert result3[CONF_HOST] == mock_data_with_ip["host"]
assert result3[CONF_MAC] == mock_mac
assert result3[CONF_ID] == mock_mac
assert result4["title"] == mock_data_with_ipv6["host"]
assert result4[CONF_HOST] == mock_data_with_ipv6["host"]
assert result4[CONF_MAC] == mock_mac
assert result4[CONF_ID] == mock_mac