Merge pull request #1224 from home-assistant/dev

Release 178

hassio/addons/__init__.py

@@ -10,7 +10,9 @@ from ..coresys import CoreSys, CoreSysAttributes
 from ..exceptions import (
     AddonsError,
     AddonsNotSupportedError,
+    CoreDNSError,
     DockerAPIError,
+    HomeAssistantAPIError,
     HostAppArmorError,
 )
 from ..store.addon import AddonStore
@@ -73,6 +75,9 @@ class AddonManager(CoreSysAttributes):
         if tasks:
             await asyncio.wait(tasks)
 
+        # Sync DNS
+        await self.sync_dns()
+
     async def boot(self, stage: str) -> None:
         """Boot add-ons with mode auto."""
         tasks = []
@@ -155,8 +160,15 @@ class AddonManager(CoreSysAttributes):
         with suppress(HostAppArmorError):
             await addon.uninstall_apparmor()
 
+        # Cleanup Ingress panel from sidebar
+        if addon.ingress_panel:
+            addon.ingress_panel = False
+            with suppress(HomeAssistantAPIError):
+                await self.sys_ingress.update_hass_panel(addon)
+
         # Cleanup internal data
         addon.remove_discovery()
+
         self.data.uninstall(addon)
         self.local.pop(slug)
 
@@ -291,3 +303,17 @@ class AddonManager(CoreSysAttributes):
             _LOGGER.error("Can't repair %s", addon.slug)
             with suppress(AddonsError):
                 await self.uninstall(addon.slug)
+
+    async def sync_dns(self) -> None:
+        """Sync add-ons DNS names."""
+        # Update hosts
+        for addon in self.installed:
+            if not await addon.instance.is_running():
+                continue
+            self.sys_dns.add_host(
+                ipv4=addon.ip_address, names=[addon.hostname], write=False
+            )
+
+        # Write hosts files
+        with suppress(CoreDNSError):
+            self.sys_dns.write_hosts()

hassio/addons/addon.py

@@ -1,7 +1,7 @@
 """Init file for Hass.io add-ons."""
 from contextlib import suppress
 from copy import deepcopy
-from ipaddress import IPv4Address, ip_address
+from ipaddress import IPv4Address
 import logging
 from pathlib import Path, PurePath
 import re
@@ -36,7 +36,6 @@ from ..const import (
     ATTR_UUID,
     ATTR_VERSION,
     DNS_SUFFIX,
-    STATE_NONE,
     STATE_STARTED,
     STATE_STOPPED,
 )
@@ -81,8 +80,6 @@ class Addon(AddonModel):
     @property
     def ip_address(self) -> IPv4Address:
         """Return IP of Add-on instance."""
-        if not self.is_installed:
-            return ip_address("0.0.0.0")
         return self.instance.ip_address
 
     @property
@@ -453,9 +450,6 @@ class Addon(AddonModel):
 
     async def state(self) -> str:
         """Return running state of add-on."""
-        if not self.is_installed:
-            return STATE_NONE
-
         if await self.instance.is_running():
             return STATE_STARTED
         return STATE_STOPPED

hassio/api/security.py

@@ -67,6 +67,7 @@ ADDONS_ROLE_ACCESS = {
     ),
     ROLE_MANAGER: re.compile(
         r"^(?:"
+        r"|/dns/.*"
         r"|/homeassistant/.+"
         r"|/host/.+"
         r"|/hardware/.+"

hassio/const.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from ipaddress import ip_network
 
 
-HASSIO_VERSION = "176"
+HASSIO_VERSION = "178"
 
 URL_HASSIO_ADDONS = "https://github.com/home-assistant/hassio-addons"
 URL_HASSIO_VERSION = "https://version.home-assistant.io/{channel}.json"

hassio/dns.py

@@ -2,7 +2,7 @@
 import asyncio
 import logging
 from contextlib import suppress
-from ipaddress import IPv4Address, AddressValueError
+from ipaddress import IPv4Address
 from pathlib import Path
 from string import Template
 from typing import Awaitable, Dict, List, Optional
@@ -81,8 +81,7 @@ class CoreDNS(JsonConfig, CoreSysAttributes):
 
     async def load(self) -> None:
         """Load DNS setup."""
-        with suppress(CoreDNSError):
-            self._import_hosts()
+        self._init_hosts()
 
         # Check CoreDNS state
         try:
@@ -181,13 +180,15 @@ class CoreDNS(JsonConfig, CoreSysAttributes):
             _LOGGER.error("Can't start CoreDNS plugin")
             raise CoreDNSError() from None
 
-    def reset(self) -> None:
+    async def reset(self) -> None:
         """Reset Config / Hosts."""
         self.servers = DNS_SERVERS
 
         with suppress(OSError):
             self.hosts.unlink()
-        self._import_hosts()
+        self._init_hosts()
+
+        await self.sys_addons.sync_dns()
 
     def _write_corefile(self) -> None:
         """Write CoreDNS config."""
@@ -207,43 +208,34 @@ class CoreDNS(JsonConfig, CoreSysAttributes):
             _LOGGER.error("Can't update corefile: %s", err)
             raise CoreDNSError() from None
 
-    def _import_hosts(self) -> None:
+    def _init_hosts(self) -> None:
         """Import hosts entry."""
         # Generate Default
-        if not self.hosts.exists():
-            self.add_host(self.sys_docker.network.supervisor, ["hassio", "supervisor"])
-            self.add_host(
-                self.sys_docker.network.gateway, ["homeassistant", "home-assistant"]
-            )
-            return
+        self.add_host(
+            self.sys_docker.network.supervisor, ["hassio", "supervisor"], write=False
+        )
+        self.add_host(
+            self.sys_docker.network.gateway,
+            ["homeassistant", "home-assistant"],
+            write=False,
+        )
 
-        # Import Exists host table
-        try:
-            with self.hosts.open("r") as hosts:
-                for line in hosts.readlines():
-                    try:
-                        data = line.split(" ")
-                        self._hosts[IPv4Address(data[0])] = data[1:]
-                    except AddressValueError:
-                        _LOGGER.warning("Fails to read %s", line)
-
-        except OSError as err:
-            _LOGGER.error("Can't read hosts file: %s", err)
-            raise CoreDNSError() from None
-
-    def _write_hosts(self) -> None:
+    def write_hosts(self) -> None:
         """Write hosts from memory to file."""
         try:
             with self.hosts.open("w") as hosts:
                 for address, hostnames in self._hosts.items():
                     host = " ".join(hostnames)
-                    hosts.write(f"{address!s} {host}")
+                    hosts.write(f"{address!s} {host}\n")
         except OSError as err:
             _LOGGER.error("Can't write hosts file: %s", err)
             raise CoreDNSError() from None
 
-    def add_host(self, ipv4: IPv4Address, names: List[str]) -> None:
+    def add_host(self, ipv4: IPv4Address, names: List[str], write: bool = True) -> None:
         """Add a new host entry."""
+        if not ipv4 or ipv4 == IPv4Address("0.0.0.0"):
+            return
+
         hostnames: List[str] = []
         for name in names:
             hostnames.append(name)
@@ -252,10 +244,14 @@ class CoreDNS(JsonConfig, CoreSysAttributes):
         self._hosts[ipv4] = hostnames
         _LOGGER.debug("Add Host entry %s -> %s", ipv4, hostnames)
 
-        self._write_hosts()
+        if write:
+            self.write_hosts()
 
     def delete_host(
-        self, ipv4: Optional[IPv4Address] = None, host: Optional[str] = None
+        self,
+        ipv4: Optional[IPv4Address] = None,
+        host: Optional[str] = None,
+        write: bool = True,
     ) -> None:
         """Remove a entry from hosts."""
         if host:
@@ -270,7 +266,8 @@ class CoreDNS(JsonConfig, CoreSysAttributes):
             _LOGGER.debug("Remove Host entry %s", ipv4)
             self._hosts.pop(ipv4, None)
 
-            self._write_hosts()
+            if write:
+                self.write_hosts()
         else:
             _LOGGER.warning("Can't remove Host entry: %s/%s", ipv4, host)
 
@@ -322,7 +319,9 @@ class CoreDNS(JsonConfig, CoreSysAttributes):
         try:
             with RESOLV_CONF.open("r") as resolv:
                 for line in resolv.readlines():
-                    resolv_lines.append(line)
+                    if not line:
+                        continue
+                    resolv_lines.append(line.strip())
         except OSError as err:
             _LOGGER.error("Can't read local resolv: %s", err)
             raise CoreDNSError() from None
@@ -336,7 +335,7 @@ class CoreDNS(JsonConfig, CoreSysAttributes):
         try:
             with RESOLV_CONF.open("w") as resolv:
                 for line in resolv_lines:
-                    resolv.write(line)
+                    resolv.write(f"{line}\n")
         except OSError as err:
             _LOGGER.error("Can't write local resolv: %s", err)
             raise CoreDNSError() from None

hassio/tasks.py

@@ -228,7 +228,7 @@ class Tasks(CoreSysAttributes):
 
         if await self.sys_dns.is_fails():
             _LOGGER.warning("CoreDNS plugin is in fails state / Reset config")
-            self.sys_dns.reset()
+            await self.sys_dns.reset()
 
         try:
             await self.sys_dns.start()

hassio/validate.py

@@ -51,7 +51,8 @@ UUID_MATCH = vol.Match(r"^[0-9a-f]{32}$")
 SHA256 = vol.Match(r"^[0-9a-f]{64}$")
 TOKEN = vol.Match(r"^[0-9a-f]{32,256}$")
 LOG_LEVEL = vol.In(["debug", "info", "warning", "error", "critical"])
-DNS_SERVER_LIST = vol.All([vol.Url()], vol.Length(max=8))
+DNS_URL = vol.Match(r"^dns://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$")
+DNS_SERVER_LIST = vol.All([DNS_URL], vol.Length(max=8))
 
 
 def validate_repository(repository):