Fix version conflict

* Read version from AWS

* Update const.py

* Update updater.py

* Update updater.py

* Update updater.py

* Update updater.py

* Update updater.py

* Update const.py

* Update updater.py

.github/move.yml

@@ -0,0 +1,13 @@
+# Configuration for move-issues - https://github.com/dessant/move-issues
+
+# Delete the command comment. Ignored when the comment also contains other content
+deleteCommand: true
+# Close the source issue after moving
+closeSourceIssue: true
+# Lock the source issue after moving
+lockSourceIssue: false
+# Set custom aliases for targets
+# aliases:
+#   r: repo
+#   or: owner/repo
+

API.md

@@ -4,7 +4,7 @@
 
 Interface for Home Assistant to control things from supervisor.
 
-On error:
+On error / Code 400:
 
 ```json
 {
@@ -13,7 +13,7 @@ On error:
 }
 ```
 
-On success:
+On success / Code 200:
 
 ```json
 {
@@ -22,6 +22,8 @@ On success:
 }
 ```
 
+For access to API you need set the `X-HASSIO-KEY` they will be available for Add-ons/HomeAssistant with envoriment `HASSIO_TOKEN`.
+
 ### Hass.io
 
 - GET `/supervisor/ping`
@@ -34,7 +36,7 @@ The addons from `addons` are only installed one.
     "version": "INSTALL_VERSION",
     "last_version": "LAST_VERSION",
     "arch": "armhf|aarch64|i386|amd64",
-    "beta_channel": "true|false",
+    "channel": "stable|beta|dev",
     "timezone": "TIMEZONE",
     "wait_boot": "int",
     "addons": [
@@ -45,6 +47,7 @@ The addons from `addons` are only installed one.
             "repository": "12345678|null",
             "version": "LAST_VERSION",
             "installed": "INSTALL_VERSION",
+            "icon": "bool",
             "logo": "bool",
             "state": "started|stopped",
         }
@@ -69,7 +72,7 @@ Optional:
 
 ```json
 {
-    "beta_channel": "true|false",
+    "channel": "stable|beta|dev",
     "timezone": "TIMEZONE",
     "wait_boot": "int",
     "addons_repositories": [
@@ -99,44 +102,7 @@ Output is the raw docker log.
 }
 ```
 
-### Security
+### Snapshot
-
-- GET `/security/info`
-
-```json
-{
-    "initialize": "bool",
-    "totp": "bool"
-}
-```
-
-- POST `/security/options`
-
-```json
-{
-    "password": "xy"
-}
-```
-
-- POST `/security/totp`
-
-```json
-{
-    "password": "xy"
-}
-```
-
-Return QR-Code
-
-- POST `/security/session`
-```json
-{
-    "password": "xy",
-    "totp": "null|123456"
-}
-```
-
-### Backup/Snapshot
 
 - GET `/snapshots`
 
@@ -146,7 +112,9 @@ Return QR-Code
         {
             "slug": "SLUG",
             "date": "ISO",
-            "name": "Custom name"
+            "name": "Custom name",
+            "type": "full|partial",
+            "protected": "bool"
         }
     ]
 }
@@ -154,11 +122,28 @@ Return QR-Code
 
 - POST `/snapshots/reload`
 
+- POST `/snapshots/new/upload`
+
+return:
+```json
+{
+    "slug": ""
+}
+```
+
 - POST `/snapshots/new/full`
 
 ```json
 {
-    "name": "Optional"
+    "name": "Optional",
+    "password": "Optional"
+}
+```
+
+return:
+```json
+{
+    "slug": ""
 }
 ```
 
@@ -168,7 +153,15 @@ Return QR-Code
 {
     "name": "Optional",
     "addons": ["ADDON_SLUG"],
-    "folders": ["FOLDER_NAME"]
+    "folders": ["FOLDER_NAME"],
+    "password": "Optional"
+}
+```
+
+return:
+```json
+{
+    "slug": ""
 }
 ```
 
@@ -183,12 +176,14 @@ Return QR-Code
     "name": "custom snapshot name / description",
     "date": "ISO",
     "size": "SIZE_IN_MB",
+    "protected": "bool",
     "homeassistant": "version",
     "addons": [
         {
             "slug": "ADDON_SLUG",
             "name": "NAME",
-            "version": "INSTALLED_VERSION"
+            "version": "INSTALLED_VERSION",
+            "size": "SIZE_IN_MB"
         }
     ],
     "repositories": ["URL"],
@@ -197,36 +192,49 @@ Return QR-Code
 ```
 
 - POST `/snapshots/{slug}/remove`
+
+- GET `/snapshots/{slug}/download`
+
 - POST `/snapshots/{slug}/restore/full`
+
+```json
+{
+    "password": "Optional"
+}
+```
+
 - POST `/snapshots/{slug}/restore/partial`
 
 ```json
 {
     "homeassistant": "bool",
     "addons": ["ADDON_SLUG"],
-    "folders": ["FOLDER_NAME"]
+    "folders": ["FOLDER_NAME"],
+    "password": "Optional"
 }
 ```
 
 ### Host
 
 - POST `/host/reload`
+
 - POST `/host/shutdown`
+
 - POST `/host/reboot`
+
 - GET `/host/info`
 
 ```json
 {
-    "type": "",
+    "hostname": "hostname|null",
-    "version": "",
+    "features": ["shutdown", "reboot", "update", "hostname"],
-    "last_version": "",
+    "operating_system": "Hass.io-OS XY|Ubuntu 16.4|null",
-    "features": ["shutdown", "reboot", "update", "hostname", "network_info", "network_control"],
+    "kernel": "4.15.7|null",
-    "hostname": "",
+    "chassis": "specific|null",
-    "os": "",
+    "type": "Hass.io-OS Type|null",
-    "audio": {
+    "deployment": "stable|beta|dev|null",
-        "input": "0,0",
+    "version": "xy|null",
-        "output": "0,0"
+    "last_version": "xy|null",
-    }
 }
 ```
 
@@ -234,11 +242,11 @@ Return QR-Code
 
 ```json
 {
-    "audio_input": "0,0",
+    "hostname": "",
-    "audio_output": "0,0"
 }
 ```
 
+
 - POST `/host/update`
 
 Optional:
@@ -249,7 +257,11 @@ Optional:
 }
 ```
 
-- GET `/host/hardware`
+- POST `/host/reload`
+
+### Hardware
+
+- GET `/hardware/info`
 ```json
 {
     "serial": ["/dev/xy"],
@@ -268,23 +280,18 @@ Optional:
 }
 ```
 
-- POST `/host/reload`
+- GET `/hardware/audio`
-
-### Network
-
-- GET `/network/info`
-
 ```json
 {
-    "hostname": ""
+    "audio": {
-}
+        "input": {
-```
+            "0,0": "Mic"
-
+        },
-- POST `/network/options`
+        "output": {
-
+            "1,0": "Jack",
-```json
+            "1,1": "HDMI"
-{
+        }
-    "hostname": "",
+    }
 }
 ```
 
@@ -296,12 +303,14 @@ Optional:
 {
     "version": "INSTALL_VERSION",
     "last_version": "LAST_VERSION",
+    "machine": "Image machine type",
     "image": "str",
     "custom": "bool -> if custom image",
     "boot": "bool",
     "port": 8123,
     "ssl": "bool",
-    "watchdog": "bool"
+    "watchdog": "bool",
+    "startup_time": 600
 }
 ```
 
@@ -333,7 +342,8 @@ Output is the raw Docker log.
     "port": "port for access hass",
     "ssl": "bool",
     "password": "",
-    "watchdog": "bool"
+    "watchdog": "bool",
+    "startup_time": 600
 }
 ```
 
@@ -380,6 +390,7 @@ Get all available addons.
             "detached": "bool",
             "build": "bool",
             "url": "null|url",
+            "icon": "bool",
             "logo": "bool"
         }
     ],
@@ -401,6 +412,7 @@ Get all available addons.
 ```json
 {
     "name": "xy bla",
+    "slug": "xdssd_xybla",
     "description": "description",
     "long_description": "null|markdown",
     "auto_update": "bool",
@@ -418,8 +430,11 @@ Get all available addons.
     "host_ipc": "bool",
     "host_dbus": "bool",
     "privileged": ["NET_ADMIN", "SYS_ADMIN"],
+    "seccomp": "disable|default|profile",
+    "apparmor": "disable|default|profile",
     "devices": ["/dev/xy"],
     "auto_uart": "bool",
+    "icon": "bool",
     "logo": "bool",
     "changelog": "bool",
     "hassio_api": "bool",
@@ -429,10 +444,14 @@ Get all available addons.
     "gpio": "bool",
     "audio": "bool",
     "audio_input": "null|0,0",
-    "audio_output": "null|0,0"
+    "audio_output": "null|0,0",
+    "services": "null|['mqtt']",
+    "discovery": "null|['component/platform']"
 }
 ```
 
+- GET `/addons/{addon}/icon`
+
 - GET `/addons/{addon}/logo`
 
 - GET `/addons/{addon}/changelog`
@@ -452,7 +471,7 @@ Get all available addons.
 }
 ```
 
-For reset custom network/audio settings, set it `null`.
+Reset custom network/audio/options, set it `null`.
 
 - POST `/addons/{addon}/start`
 
@@ -491,45 +510,100 @@ Write data to add-on stdin
 }
 ```
 
-## Host Control
+### Service discovery
 
-Communicate over UNIX socket with a host daemon.
+- GET `/services/discovery`
-
+```json
-- commands
+{
-
+    "discovery": [
-```
+        {
-# info
+            "provider": "name",
--> {'type', 'version', 'last_version', 'features', 'hostname'}
+            "uuid": "uuid",
-# reboot
+            "component": "component",
-# shutdown
+            "platform": "null|platform",
-# host-update [v]
+            "config": {}
-
+        }
-# hostname xy
+    ]
-
+}
-# network info
--> {}
-# network wlan ssd xy
-# network wlan password xy
-# network int ip xy
-# network int netmask xy
-# network int route xy
 ```
 
-Features:
+- GET `/services/discovery/{UUID}`
-
+```json
-- shutdown
+{
-- reboot
+    "provider": "name",
-- update
+    "uuid": "uuid",
-- hostname
+    "component": "component",
-- network_info
+    "platform": "null|platform",
-- network_control
+    "config": {}
-
+}
-Answer:
-```
-{}|OK|ERROR|WRONG
 ```
 
-- {}: json
+- POST `/services/discovery`
-- OK: call was successfully
+```json
-- ERROR: error on call
+{
-- WRONG: not supported
+    "component": "component",
+    "platform": "null|platform",
+    "config": {}
+}
+```
+
+return:
+```json
+{
+    "uuid": "uuid"
+}
+```
+
+- DEL `/services/discovery/{UUID}`
+
+- GET `/services`
+```json
+{
+    "services": [
+        {
+            "slug": "name",
+            "available": "bool",
+            "provider": "null|name|list"
+        }
+    ]
+}
+```
+
+- GET `/services/xy`
+```json
+{
+    "available": "bool",
+    "xy": {}
+}
+```
+
+#### MQTT
+
+This service perform a auto discovery to Home-Assistant.
+
+- GET `/services/mqtt`
+```json
+{
+    "provider": "name",
+    "host": "xy",
+    "port": "8883",
+    "ssl": "bool",
+    "username": "optional",
+    "password": "optional",
+    "protocol": "3.1.1"
+}
+```
+
+- POST `/services/mqtt`
+```json
+{
+    "host": "xy",
+    "port": "8883",
+    "ssl": "bool|optional",
+    "username": "optional",
+    "password": "optional",
+    "protocol": "3.1.1"
+}
+```
+
+- DEL `/services/mqtt`

Dockerfile

@@ -9,14 +9,17 @@ RUN apk add --no-cache \
         python3 \
         git \
         socat \
+        glib \
         libstdc++ \
+        eudev-libs \
     && apk add --no-cache --virtual .build-dependencies \
         make \
         python3-dev \
         g++ \
     && pip3 install --no-cache-dir \
-        uvloop \
+        uvloop==0.9.1 \
-        cchardet \
+        cchardet==2.1.1 \
+        pycryptodome==3.4.11 \
     && apk del .build-dependencies
 
 # Install HassIO

README.md

@@ -1,8 +1,12 @@
 # Hass.io
 
-### First private cloud solution for home automation.
+## First private cloud solution for home automation
 
-Hass.io is a Docker based system for managing your Home Assistant installation and related applications. The system is controlled via Home Assistant which communicates with the supervisor. The supervisor provides an API to manage the installation. This includes changing network settings or installing and updating software.
+Hass.io is a Docker-based system for managing your Home Assistant installation
+and related applications. The system is controlled via Home Assistant which
+communicates with the Supervisor. The Supervisor provides an API to manage the
+installation. This includes changing network settings or installing
+and updating software.
 
 ![](misc/hassio.png?raw=true)
 
@@ -11,4 +15,4 @@ Hass.io is a Docker based system for managing your Home Assistant installation a
 
 ## Installation
 
-Installation instructions can be found at [https://home-assistant.io/hassio](https://home-assistant.io/hassio).
+Installation instructions can be found at <https://home-assistant.io/hassio>.

hassio/__main__.py

@@ -5,7 +5,6 @@ import logging
 import sys
 
 import hassio.bootstrap as bootstrap
-import hassio.core as core
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -34,14 +33,13 @@ if __name__ == "__main__":
 
     _LOGGER.info("Initialize Hassio setup")
     coresys = bootstrap.initialize_coresys(loop)
-    hassio = core.HassIO(coresys)
 
     bootstrap.migrate_system_env(coresys)
 
     _LOGGER.info("Setup HassIO")
-    loop.run_until_complete(hassio.setup())
+    loop.run_until_complete(coresys.core.setup())
 
-    loop.call_soon_threadsafe(loop.create_task, hassio.start())
+    loop.call_soon_threadsafe(loop.create_task, coresys.core.start())
     loop.call_soon_threadsafe(bootstrap.reg_signal, loop)
 
     try:
@@ -49,7 +47,7 @@ if __name__ == "__main__":
         loop.run_forever()
     finally:
         _LOGGER.info("Stopping HassIO")
-        loop.run_until_complete(hassio.stop())
+        loop.run_until_complete(coresys.core.stop())
         executor.shutdown(wait=False)
         loop.close()
 

hassio/addons/__init__.py

@@ -4,8 +4,8 @@ import logging
 
 from .addon import Addon
 from .repository import Repository
-from .data import Data
+from .data import AddonsData
-from ..const import REPOSITORY_CORE, REPOSITORY_LOCAL, BOOT_AUTO
+from ..const import REPOSITORY_CORE, REPOSITORY_LOCAL, BOOT_AUTO, STATE_STARTED
 from ..coresys import CoreSysAttributes
 
 _LOGGER = logging.getLogger(__name__)
@@ -19,7 +19,7 @@ class AddonManager(CoreSysAttributes):
     def __init__(self, coresys):
         """Initialize docker base wrapper."""
         self.coresys = coresys
-        self.data = Data(coresys)
+        self.data = AddonsData(coresys)
         self.addons_obj = {}
         self.repositories_obj = {}
 
@@ -28,22 +28,35 @@ class AddonManager(CoreSysAttributes):
         """Return a list of all addons."""
         return list(self.addons_obj.values())
 
+    @property
+    def list_installed(self):
+        """Return a list of installed addons."""
+        return [addon for addon in self.addons_obj.values()
+                if addon.is_installed]
+
     @property
     def list_repositories(self):
         """Return list of addon repositories."""
         return list(self.repositories_obj.values())
 
     def get(self, addon_slug):
-        """Return a adddon from slug."""
+        """Return a add-on from slug."""
         return self.addons_obj.get(addon_slug)
 
+    def from_uuid(self, uuid):
+        """Return a add-on from uuid."""
+        for addon in self.list_addons:
+            if addon.is_installed and uuid == addon.uuid:
+                return addon
+        return None
+
     async def load(self):
         """Startup addon management."""
         self.data.reload()
 
         # init hassio built-in repositories
         repositories = \
-            set(self._config.addons_repositories) | BUILTIN_REPOSITORIES
+            set(self.sys_config.addons_repositories) | BUILTIN_REPOSITORIES
 
         # init custom repositories & load addons
         await self.load_repositories(repositories)
@@ -53,7 +66,7 @@ class AddonManager(CoreSysAttributes):
         tasks = [repository.update() for repository in
                  self.repositories_obj.values()]
         if tasks:
-            await asyncio.wait(tasks, loop=self._loop)
+            await asyncio.wait(tasks)
 
         # read data from repositories
         self.data.reload()
@@ -77,16 +90,16 @@ class AddonManager(CoreSysAttributes):
 
             # don't add built-in repository to config
             if url not in BUILTIN_REPOSITORIES:
-                self._config.add_addon_repository(url)
+                self.sys_config.add_addon_repository(url)
 
         tasks = [_add_repository(url) for url in new_rep - old_rep]
         if tasks:
-            await asyncio.wait(tasks, loop=self._loop)
+            await asyncio.wait(tasks)
 
         # del new repository
         for url in old_rep - new_rep - BUILTIN_REPOSITORIES:
             self.repositories_obj.pop(url).remove()
-            self._config.drop_addon_repository(url)
+            self.sys_config.drop_addon_repository(url)
 
         # update data
         self.data.reload()
@@ -112,13 +125,13 @@ class AddonManager(CoreSysAttributes):
             self.addons_obj[addon_slug] = addon
 
         if tasks:
-            await asyncio.wait(tasks, loop=self._loop)
+            await asyncio.wait(tasks)
 
         # remove
         for addon_slug in del_addons:
             self.addons_obj.pop(addon_slug)
 
-    async def auto_boot(self, stage):
+    async def boot(self, stage):
         """Boot addons with mode auto."""
         tasks = []
         for addon in self.addons_obj.values():
@@ -128,5 +141,18 @@ class AddonManager(CoreSysAttributes):
 
         _LOGGER.info("Startup %s run %d addons", stage, len(tasks))
         if tasks:
-            await asyncio.wait(tasks, loop=self._loop)
+            await asyncio.wait(tasks)
-            await asyncio.sleep(self._config.wait_boot, loop=self._loop)
+            await asyncio.sleep(self.sys_config.wait_boot)
+
+    async def shutdown(self, stage):
+        """Shutdown addons."""
+        tasks = []
+        for addon in self.addons_obj.values():
+            if addon.is_installed and \
+                    await addon.state() == STATE_STARTED and \
+                    addon.startup == stage:
+                tasks.append(addon.stop())
+
+        _LOGGER.info("Shutdown %s stop %d addons", stage, len(tasks))
+        if tasks:
+            await asyncio.wait(tasks)

hassio/addons/addon.py

@@ -1,4 +1,5 @@
 """Init file for HassIO addons."""
+from contextlib import suppress
 from copy import deepcopy
 import logging
 import json
@@ -12,7 +13,7 @@ import voluptuous as vol
 from voluptuous.humanize import humanize_error
 
 from .validate import (
-    validate_options, SCHEMA_ADDON_SNAPSHOT, RE_VOLUME)
+    validate_options, SCHEMA_ADDON_SNAPSHOT, RE_VOLUME, RE_SERVICE)
 from .utils import check_installed
 from ..const import (
     ATTR_NAME, ATTR_VERSION, ATTR_SLUG, ATTR_DESCRIPTON, ATTR_BOOT, ATTR_MAP,
@@ -23,7 +24,9 @@ from ..const import (
     ATTR_STATE, ATTR_TIMEOUT, ATTR_AUTO_UPDATE, ATTR_NETWORK, ATTR_WEBUI,
     ATTR_HASSIO_API, ATTR_AUDIO, ATTR_AUDIO_OUTPUT, ATTR_AUDIO_INPUT,
     ATTR_GPIO, ATTR_HOMEASSISTANT_API, ATTR_STDIN, ATTR_LEGACY, ATTR_HOST_IPC,
-    ATTR_HOST_DBUS, ATTR_AUTO_UART)
+    ATTR_HOST_DBUS, ATTR_AUTO_UART, ATTR_DISCOVERY, ATTR_SERVICES,
+    ATTR_SECCOMP, ATTR_APPARMOR, SECURITY_PROFILE, SECURITY_DISABLE,
+    SECURITY_DEFAULT)
 from ..coresys import CoreSysAttributes
 from ..docker.addon import DockerAddon
 from ..utils.json import write_json_file, read_json_file
@@ -63,7 +66,7 @@ class Addon(CoreSysAttributes):
     @property
     def _data(self):
         """Return addons data storage."""
-        return self._addons.data
+        return self.sys_addons.data
 
     @property
     def is_installed(self):
@@ -87,25 +90,25 @@ class Addon(CoreSysAttributes):
             ATTR_OPTIONS: {},
             ATTR_VERSION: version,
         }
-        self._data.save()
+        self._data.save_data()
 
     def _set_uninstall(self):
         """Set addon as uninstalled."""
         self._data.system.pop(self._id, None)
         self._data.user.pop(self._id, None)
-        self._data.save()
+        self._data.save_data()
 
     def _set_update(self, version):
         """Update version of addon."""
         self._data.system[self._id] = deepcopy(self._data.cache[self._id])
         self._data.user[self._id][ATTR_VERSION] = version
-        self._data.save()
+        self._data.save_data()
 
     def _restore_data(self, user, system):
         """Restore data to addon."""
         self._data.user[self._id] = deepcopy(user)
         self._data.system[self._id] = deepcopy(system)
-        self._data.save()
+        self._data.save_data()
 
     @property
     def options(self):
@@ -120,8 +123,10 @@ class Addon(CoreSysAttributes):
     @options.setter
     def options(self, value):
         """Store user addon options."""
-        self._data.user[self._id][ATTR_OPTIONS] = deepcopy(value)
+        if value is None:
-        self._data.save()
+            self._data.user[self._id][ATTR_OPTIONS] = {}
+        else:
+            self._data.user[self._id][ATTR_OPTIONS] = deepcopy(value)
 
     @property
     def boot(self):
@@ -134,7 +139,6 @@ class Addon(CoreSysAttributes):
     def boot(self, value):
         """Store user boot options."""
         self._data.user[self._id][ATTR_BOOT] = value
-        self._data.save()
 
     @property
     def auto_update(self):
@@ -147,7 +151,6 @@ class Addon(CoreSysAttributes):
     def auto_update(self, value):
         """Set auto update."""
         self._data.user[self._id][ATTR_AUTO_UPDATE] = value
-        self._data.save()
 
     @property
     def name(self):
@@ -160,7 +163,7 @@ class Addon(CoreSysAttributes):
         return self._mesh[ATTR_TIMEOUT]
 
     @property
-    def api_token(self):
+    def uuid(self):
         """Return a API token for this add-on."""
         if self.is_installed:
             return self._data.user[self._id][ATTR_UUID]
@@ -201,6 +204,26 @@ class Addon(CoreSysAttributes):
         """Return startup type of addon."""
         return self._mesh.get(ATTR_STARTUP)
 
+    @property
+    def services(self):
+        """Return dict of services with rights."""
+        raw_services = self._mesh.get(ATTR_SERVICES)
+        if not raw_services:
+            return None
+
+        formated_services = {}
+        for data in raw_services:
+            service = RE_SERVICE.match(data)
+            formated_services[service.group('service')] = \
+                service.group('rights') or 'ro'
+
+        return formated_services
+
+    @property
+    def discovery(self):
+        """Return list of discoverable components/platforms."""
+        return self._mesh.get(ATTR_DISCOVERY)
+
     @property
     def ports(self):
         """Return ports of addon."""
@@ -225,8 +248,6 @@ class Addon(CoreSysAttributes):
 
             self._data.user[self._id][ATTR_NETWORK] = new_ports
 
-        self._data.save()
-
     @property
     def webui(self):
         """Return URL to webui or None."""
@@ -298,6 +319,24 @@ class Addon(CoreSysAttributes):
         """Return list of privilege."""
         return self._mesh.get(ATTR_PRIVILEGED)
 
+    @property
+    def seccomp(self):
+        """Return True if seccomp is enabled."""
+        if not self._mesh.get(ATTR_SECCOMP):
+            return SECURITY_DISABLE
+        elif self.path_seccomp.exists():
+            return SECURITY_PROFILE
+        return SECURITY_DEFAULT
+
+    @property
+    def apparmor(self):
+        """Return True if seccomp is enabled."""
+        if not self._mesh.get(ATTR_APPARMOR):
+            return SECURITY_DISABLE
+        elif self.path_apparmor.exists():
+            return SECURITY_PROFILE
+        return SECURITY_DEFAULT
+
     @property
     def legacy(self):
         """Return if the add-on don't support hass labels."""
@@ -334,20 +373,18 @@ class Addon(CoreSysAttributes):
         if not self.with_audio:
             return None
 
-        setting = self._config.audio_output
         if self.is_installed and \
                 ATTR_AUDIO_OUTPUT in self._data.user[self._id]:
-            setting = self._data.user[self._id][ATTR_AUDIO_OUTPUT]
+            return self._data.user[self._id][ATTR_AUDIO_OUTPUT]
-        return setting
+        return self.sys_host.alsa.default.output
 
     @audio_output.setter
     def audio_output(self, value):
-        """Set/remove custom audio output settings."""
+        """Set/reset audio output settings."""
         if value is None:
             self._data.user[self._id].pop(ATTR_AUDIO_OUTPUT, None)
         else:
             self._data.user[self._id][ATTR_AUDIO_OUTPUT] = value
-        self._data.save()
 
     @property
     def audio_input(self):
@@ -355,25 +392,28 @@ class Addon(CoreSysAttributes):
         if not self.with_audio:
             return None
 
-        setting = self._config.audio_input
         if self.is_installed and ATTR_AUDIO_INPUT in self._data.user[self._id]:
-            setting = self._data.user[self._id][ATTR_AUDIO_INPUT]
+            return self._data.user[self._id][ATTR_AUDIO_INPUT]
-        return setting
+        return self.sys_host.alsa.default.input
 
     @audio_input.setter
     def audio_input(self, value):
-        """Set/remove custom audio input settings."""
+        """Set/reset audio input settings."""
         if value is None:
             self._data.user[self._id].pop(ATTR_AUDIO_INPUT, None)
         else:
             self._data.user[self._id][ATTR_AUDIO_INPUT] = value
-        self._data.save()
 
     @property
     def url(self):
         """Return url of addon."""
         return self._mesh.get(ATTR_URL)
 
+    @property
+    def with_icon(self):
+        """Return True if a icon exists."""
+        return self.path_icon.exists()
+
     @property
     def with_logo(self):
         """Return True if a logo exists."""
@@ -396,11 +436,11 @@ class Addon(CoreSysAttributes):
 
         # Repository with dockerhub images
         if ATTR_IMAGE in addon_data:
-            return addon_data[ATTR_IMAGE].format(arch=self._arch)
+            return addon_data[ATTR_IMAGE].format(arch=self.sys_arch)
 
         # local build
         return "{}/{}-addon-{}".format(
-            addon_data[ATTR_REPOSITORY], self._arch,
+            addon_data[ATTR_REPOSITORY], self.sys_arch,
             addon_data[ATTR_SLUG])
 
     @property
@@ -421,12 +461,12 @@ class Addon(CoreSysAttributes):
     @property
     def path_data(self):
         """Return addon data path inside supervisor."""
-        return Path(self._config.path_addons_data, self._id)
+        return Path(self.sys_config.path_addons_data, self._id)
 
     @property
     def path_extern_data(self):
         """Return addon data path external for docker."""
-        return PurePath(self._config.path_extern_addons_data, self._id)
+        return PurePath(self.sys_config.path_extern_addons_data, self._id)
 
     @property
     def path_options(self):
@@ -438,6 +478,11 @@ class Addon(CoreSysAttributes):
         """Return path to this addon."""
         return Path(self._mesh[ATTR_LOCATON])
 
+    @property
+    def path_icon(self):
+        """Return path to addon icon."""
+        return Path(self.path_location, 'icon.png')
+
     @property
     def path_logo(self):
         """Return path to addon logo."""
@@ -448,6 +493,30 @@ class Addon(CoreSysAttributes):
         """Return path to addon changelog."""
         return Path(self.path_location, 'CHANGELOG.md')
 
+    @property
+    def path_seccomp(self):
+        """Return path to custom seccomp profile."""
+        return Path(self.path_location, 'seccomp.json')
+
+    @property
+    def path_apparmor(self):
+        """Return path to custom AppArmor profile."""
+        return Path(self.path_location, 'apparmor')
+
+    @property
+    def path_asound(self):
+        """Return path to asound config."""
+        return Path(self.sys_config.path_tmp, f"{self.slug}_asound")
+
+    @property
+    def path_extern_asound(self):
+        """Return path to asound config for docker."""
+        return Path(self.sys_config.path_extern_tmp, f"{self.slug}_asound")
+
+    def save_data(self):
+        """Save data of addon."""
+        self.sys_addons.data.save_data()
+
     def write_options(self):
         """Return True if addon options is written to data."""
         schema = self.schema
@@ -455,13 +524,31 @@ class Addon(CoreSysAttributes):
 
         try:
             schema(options)
-            return write_json_file(self.path_options, options)
+            write_json_file(self.path_options, options)
         except vol.Invalid as ex:
             _LOGGER.error("Addon %s have wrong options: %s", self._id,
                           humanize_error(options, ex))
+        except (OSError, json.JSONDecodeError) as err:
+            _LOGGER.error("Addon %s can't write options: %s", self._id, err)
+        else:
+            return True
 
         return False
 
+    def write_asound(self):
+        """Write asound config to file and return True on success."""
+        asound_config = self.sys_host.alsa.asound(
+            alsa_input=self.audio_input, alsa_output=self.audio_output)
+
+        try:
+            with self.path_asound.open('w') as config_file:
+                config_file.write(asound_config)
+        except OSError as err:
+            _LOGGER.error("Addon %s can't write asound: %s", self._id, err)
+            return False
+
+        return True
+
     @property
     def schema(self):
         """Create a schema for addon options."""
@@ -503,9 +590,9 @@ class Addon(CoreSysAttributes):
 
     async def install(self):
         """Install a addon."""
-        if self._arch not in self.supported_arch:
+        if self.sys_arch not in self.supported_arch:
             _LOGGER.error(
-                "Addon %s not supported on %s", self._id, self._arch)
+                "Addon %s not supported on %s", self._id, self.sys_arch)
             return False
 
         if self.is_installed:
@@ -534,6 +621,11 @@ class Addon(CoreSysAttributes):
                 "Remove Home-Assistant addon data folder %s", self.path_data)
             shutil.rmtree(str(self.path_data))
 
+        # Cleanup audio settings
+        if self.path_asound.exists():
+            with suppress(OSError):
+                self.path_asound.unlink()
+
         self._set_uninstall()
         return True
 
@@ -547,12 +639,17 @@ class Addon(CoreSysAttributes):
         return STATE_STOPPED
 
     @check_installed
-    def start(self):
+    async def start(self):
-        """Set options and start addon.
+        """Set options and start addon."""
+        # Options
+        if not self.write_options():
+            return False
 
-        Return a coroutine.
+        # Sound
-        """
+        if self.with_audio and not self.write_asound():
-        return self.instance.run()
+            return False
+
+        return await self.instance.run()
 
     @check_installed
     def stop(self):
@@ -577,16 +674,14 @@ class Addon(CoreSysAttributes):
 
         # restore state
         if last_state == STATE_STARTED:
-            await self.instance.run()
+            await self.start()
         return True
 
     @check_installed
-    def restart(self):
+    async def restart(self):
-        """Restart addon.
+        """Restart addon."""
-
+        await self.stop()
-        Return a coroutine.
+        return await self.start()
-        """
-        return self.instance.restart()
 
     @check_installed
     def logs(self):
@@ -622,7 +717,7 @@ class Addon(CoreSysAttributes):
 
         # restore state
         if last_state == STATE_STARTED:
-            await self.instance.run()
+            await self.start()
         return True
 
     @check_installed
@@ -640,7 +735,7 @@ class Addon(CoreSysAttributes):
     @check_installed
     async def snapshot(self, tar_file):
         """Snapshot a state of a addon."""
-        with TemporaryDirectory(dir=str(self._config.path_tmp)) as temp:
+        with TemporaryDirectory(dir=str(self.sys_config.path_tmp)) as temp:
             # store local image
             if self.need_build and not await \
                     self.instance.export_image(Path(temp, "image.tar")):
@@ -654,21 +749,22 @@ class Addon(CoreSysAttributes):
             }
 
             # store local configs/state
-            if not write_json_file(Path(temp, "addon.json"), data):
+            try:
-                _LOGGER.error("Can't write addon.json for %s", self._id)
+                write_json_file(Path(temp, "addon.json"), data)
+            except (OSError, json.JSONDecodeError) as err:
+                _LOGGER.error("Can't save meta for %s: %s", self._id, err)
                 return False
 
             # write into tarfile
-            def _create_tar():
+            def _write_tarfile():
                 """Write tar inside loop."""
-                with tarfile.open(tar_file, "w:gz",
+                with tar_file as snapshot:
-                                  compresslevel=1) as snapshot:
                     snapshot.add(temp, arcname=".")
                     snapshot.add(self.path_data, arcname="data")
 
             try:
                 _LOGGER.info("Build snapshot for addon %s", self._id)
-                await self._loop.run_in_executor(None, _create_tar)
+                await self.sys_run_in_executor(_write_tarfile)
             except (tarfile.TarError, OSError) as err:
                 _LOGGER.error("Can't write tarfile %s: %s", tar_file, err)
                 return False
@@ -678,15 +774,15 @@ class Addon(CoreSysAttributes):
 
     async def restore(self, tar_file):
         """Restore a state of a addon."""
-        with TemporaryDirectory(dir=str(self._config.path_tmp)) as temp:
+        with TemporaryDirectory(dir=str(self.sys_config.path_tmp)) as temp:
             # extract snapshot
-            def _extract_tar():
+            def _extract_tarfile():
                 """Extract tar snapshot."""
-                with tarfile.open(tar_file, "r:gz") as snapshot:
+                with tar_file as snapshot:
                     snapshot.extractall(path=Path(temp))
 
             try:
-                await self._loop.run_in_executor(None, _extract_tar)
+                await self.sys_run_in_executor(_extract_tarfile)
             except tarfile.TarError as err:
                 _LOGGER.error("Can't read tarfile %s: %s", tar_file, err)
                 return False
@@ -732,7 +828,7 @@ class Addon(CoreSysAttributes):
 
             try:
                 _LOGGER.info("Restore data for addon %s", self._id)
-                await self._loop.run_in_executor(None, _restore_data)
+                await self.sys_run_in_executor(_restore_data)
             except shutil.Error as err:
                 _LOGGER.error("Can't restore origin data: %s", err)
                 return False

hassio/addons/build.py

@@ -10,23 +10,28 @@ from ..utils.json import JsonConfig
 class AddonBuild(JsonConfig, CoreSysAttributes):
     """Handle build options for addons."""
 
-    def __init__(self, coresys, addon):
+    def __init__(self, coresys, slug):
         """Initialize addon builder."""
         self.coresys = coresys
-        self.addon = addon
+        self._id = slug
 
         super().__init__(
-            Path(addon.path_location, 'build.json'), SCHEMA_BUILD_CONFIG)
+            Path(self.addon.path_location, 'build.json'), SCHEMA_BUILD_CONFIG)
 
-    def save(self):
+    def save_data(self):
         """Ignore save function."""
         pass
 
+    @property
+    def addon(self):
+        """Return addon of build data."""
+        return self.sys_addons.get(self._id)
+
     @property
     def base_image(self):
         """Base images for this addon."""
         return self._data[ATTR_BUILD_FROM].get(
-            self._arch, BASE_IMAGE[self._arch])
+            self.sys_arch, BASE_IMAGE[self.sys_arch])
 
     @property
     def squash(self):
@@ -48,15 +53,15 @@ class AddonBuild(JsonConfig, CoreSysAttributes):
             'squash': self.squash,
             'labels': {
                 'io.hass.version': version,
-                'io.hass.arch': self._arch,
+                'io.hass.arch': self.sys_arch,
                 'io.hass.type': META_ADDON,
-                'io.hass.name': self.addon.name,
+                'io.hass.name': self._fix_label('name'),
-                'io.hass.description': self.addon.description,
+                'io.hass.description': self._fix_label('description'),
             },
             'buildargs': {
                 'BUILD_FROM': self.base_image,
                 'BUILD_VERSION': version,
-                'BUILD_ARCH': self._arch,
+                'BUILD_ARCH': self.sys_arch,
                 **self.additional_args,
             }
         }
@@ -65,3 +70,8 @@ class AddonBuild(JsonConfig, CoreSysAttributes):
             args['labels']['io.hass.url'] = self.addon.url
 
         return args
+
+    def _fix_label(self, label_name):
+        """Remove characters they are not supported."""
+        label = getattr(self.addon, label_name, "")
+        return label.replace("'", "")

hassio/addons/built-in.json

@@ -1,12 +1,12 @@
 {
     "local": {
-        "name": "Local Add-Ons",
+        "name": "Local add-ons",
         "url": "https://home-assistant.io/hassio",
         "maintainer": "you"
     },
     "core": {
-        "name": "Built-in Add-Ons",
+        "name": "Official add-ons",
         "url": "https://home-assistant.io/addons",
-        "maintainer": "Home Assistant authors"
+        "maintainer": "Home Assistant"
     }
 }

hassio/addons/data.py

@@ -9,7 +9,7 @@ from voluptuous.humanize import humanize_error
 
 from .utils import extract_hash_from_path
 from .validate import (
-    SCHEMA_ADDON_CONFIG, SCHEMA_ADDON_FILE, SCHEMA_REPOSITORY_CONFIG)
+    SCHEMA_ADDON_CONFIG, SCHEMA_ADDONS_FILE, SCHEMA_REPOSITORY_CONFIG)
 from ..const import (
     FILE_HASSIO_ADDONS, ATTR_VERSION, ATTR_SLUG, ATTR_REPOSITORY, ATTR_LOCATON,
     REPOSITORY_CORE, REPOSITORY_LOCAL, ATTR_USER, ATTR_SYSTEM)
@@ -19,12 +19,12 @@ from ..utils.json import JsonConfig, read_json_file
 _LOGGER = logging.getLogger(__name__)
 
 
-class Data(JsonConfig, CoreSysAttributes):
+class AddonsData(JsonConfig, CoreSysAttributes):
     """Hold data for addons inside HassIO."""
 
     def __init__(self, coresys):
         """Initialize data holder."""
-        super().__init__(FILE_HASSIO_ADDONS, SCHEMA_ADDON_FILE)
+        super().__init__(FILE_HASSIO_ADDONS, SCHEMA_ADDONS_FILE)
         self.coresys = coresys
         self._repositories = {}
         self._cache = {}
@@ -56,17 +56,17 @@ class Data(JsonConfig, CoreSysAttributes):
 
         # read core repository
         self._read_addons_folder(
-            self._config.path_addons_core, REPOSITORY_CORE)
+            self.sys_config.path_addons_core, REPOSITORY_CORE)
 
         # read local repository
         self._read_addons_folder(
-            self._config.path_addons_local, REPOSITORY_LOCAL)
+            self.sys_config.path_addons_local, REPOSITORY_LOCAL)
 
         # add built-in repositories information
         self._set_builtin_repositories()
 
         # read custom git repositories
-        for repository_element in self._config.path_addons_git.iterdir():
+        for repository_element in self.sys_config.path_addons_git.iterdir():
             if repository_element.is_dir():
                 self._read_git_repository(repository_element)
 
@@ -159,4 +159,4 @@ class Data(JsonConfig, CoreSysAttributes):
                     have_change = True
 
         if have_change:
-            self.save()
+            self.save_data()

hassio/addons/git.py

@@ -8,8 +8,9 @@ import shutil
 import git
 
 from .utils import get_hash_from_repository
-from ..const import URL_HASSIO_ADDONS
+from ..const import URL_HASSIO_ADDONS, ATTR_URL, ATTR_BRANCH
 from ..coresys import CoreSysAttributes
+from ..validate import RE_REPOSITORY
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -22,9 +23,20 @@ class GitRepo(CoreSysAttributes):
         self.coresys = coresys
         self.repo = None
         self.path = path
-        self.url = url
         self.lock = asyncio.Lock(loop=coresys.loop)
 
+        self._data = RE_REPOSITORY.match(url).groupdict()
+
+    @property
+    def url(self):
+        """Return repository URL."""
+        return self._data[ATTR_URL]
+
+    @property
+    def branch(self):
+        """Return repository branch."""
+        return self._data[ATTR_BRANCH]
+
     async def load(self):
         """Init git addon repo."""
         if not self.path.is_dir():
@@ -33,7 +45,7 @@ class GitRepo(CoreSysAttributes):
         async with self.lock:
             try:
                 _LOGGER.info("Load addon %s repository", self.path)
-                self.repo = await self._loop.run_in_executor(
+                self.repo = await self.sys_loop.run_in_executor(
                     None, git.Repo, str(self.path))
 
             except (git.InvalidGitRepositoryError, git.NoSuchPathError,
@@ -46,12 +58,20 @@ class GitRepo(CoreSysAttributes):
     async def clone(self):
         """Clone git addon repo."""
         async with self.lock:
+            git_args = {
+                attribute: value
+                for attribute, value in (
+                    ('recursive', True),
+                    ('branch', self.branch)
+                ) if value is not None
+            }
+
             try:
                 _LOGGER.info("Clone addon %s repository", self.url)
-                self.repo = await self._loop.run_in_executor(
+                self.repo = await self.sys_run_in_executor(ft.partial(
-                    None, ft.partial(
+                    git.Repo.clone_from, self.url, str(self.path),
-                        git.Repo.clone_from, self.url, str(self.path),
+                    **git_args
-                        recursive=True))
+                ))
 
             except (git.InvalidGitRepositoryError, git.NoSuchPathError,
                     git.GitCommandError) as err:
@@ -69,7 +89,7 @@ class GitRepo(CoreSysAttributes):
         async with self.lock:
             try:
                 _LOGGER.info("Pull addon %s repository", self.url)
-                await self._loop.run_in_executor(
+                await self.sys_loop.run_in_executor(
                     None, self.repo.remotes.origin.pull)
 
             except (git.InvalidGitRepositoryError, git.NoSuchPathError,

hassio/addons/repository.py

@@ -30,7 +30,7 @@ class Repository(CoreSysAttributes):
     @property
     def _mesh(self):
         """Return data struct repository."""
-        return self._addons.data.repositories.get(self._id, {})
+        return self.sys_addons.data.repositories.get(self._id, {})
 
     @property
     def slug(self):

hassio/addons/validate.py

@@ -17,13 +17,16 @@ from ..const import (
     ATTR_AUTO_UPDATE, ATTR_WEBUI, ATTR_AUDIO, ATTR_AUDIO_INPUT, ATTR_HOST_IPC,
     ATTR_AUDIO_OUTPUT, ATTR_HASSIO_API, ATTR_BUILD_FROM, ATTR_SQUASH,
     ATTR_ARGS, ATTR_GPIO, ATTR_HOMEASSISTANT_API, ATTR_STDIN, ATTR_LEGACY,
-    ATTR_HOST_DBUS, ATTR_AUTO_UART)
+    ATTR_HOST_DBUS, ATTR_AUTO_UART, ATTR_SERVICES, ATTR_DISCOVERY,
-from ..validate import NETWORK_PORT, DOCKER_PORTS, ALSA_CHANNEL
+    ATTR_SECCOMP, ATTR_APPARMOR)
+from ..validate import NETWORK_PORT, DOCKER_PORTS, ALSA_DEVICE
 
 _LOGGER = logging.getLogger(__name__)
 
 
 RE_VOLUME = re.compile(r"^(config|ssl|addons|backup|share)(?::(rw|:ro))?$")
+RE_SERVICE = re.compile(r"^(?P<service>mqtt)(?::(?P<rights>rw|:ro))?$")
+RE_DISCOVERY = re.compile(r"^(?P<component>\w*)(?:/(?P<platform>\w*>))?$")
 
 V_STR = 'str'
 V_INT = 'int'
@@ -58,6 +61,7 @@ PRIVILEGED_ALL = [
     "NET_ADMIN",
     "SYS_ADMIN",
     "SYS_RAWIO",
+    "IPC_LOCK",
     "SYS_TIME",
     "SYS_NICE"
 ]
@@ -101,15 +105,19 @@ SCHEMA_ADDON_CONFIG = vol.Schema({
     vol.Optional(ATTR_AUTO_UART, default=False): vol.Boolean(),
     vol.Optional(ATTR_TMPFS):
         vol.Match(r"^size=(\d)*[kmg](,uid=\d{1,4})?(,rw)?$"),
-    vol.Optional(ATTR_MAP, default=[]): [vol.Match(RE_VOLUME)],
+    vol.Optional(ATTR_MAP, default=list): [vol.Match(RE_VOLUME)],
     vol.Optional(ATTR_ENVIRONMENT): {vol.Match(r"\w*"): vol.Coerce(str)},
     vol.Optional(ATTR_PRIVILEGED): [vol.In(PRIVILEGED_ALL)],
+    vol.Optional(ATTR_SECCOMP, default=True): vol.Boolean(),
+    vol.Optional(ATTR_APPARMOR, default=True): vol.Boolean(),
     vol.Optional(ATTR_AUDIO, default=False): vol.Boolean(),
     vol.Optional(ATTR_GPIO, default=False): vol.Boolean(),
     vol.Optional(ATTR_HASSIO_API, default=False): vol.Boolean(),
     vol.Optional(ATTR_HOMEASSISTANT_API, default=False): vol.Boolean(),
     vol.Optional(ATTR_STDIN, default=False): vol.Boolean(),
     vol.Optional(ATTR_LEGACY, default=False): vol.Boolean(),
+    vol.Optional(ATTR_SERVICES): [vol.Match(RE_SERVICE)],
+    vol.Optional(ATTR_DISCOVERY): [vol.Match(RE_DISCOVERY)],
     vol.Required(ATTR_OPTIONS): dict,
     vol.Required(ATTR_SCHEMA): vol.Any(vol.Schema({
         vol.Coerce(str): vol.Any(SCHEMA_ELEMENT, [
@@ -141,7 +149,7 @@ SCHEMA_BUILD_CONFIG = vol.Schema({
         vol.In(ARCH_ALL): vol.Match(r"(?:^[\w{}]+/)?[\-\w{}]+:[\.\-\w{}]+$"),
     }),
     vol.Optional(ATTR_SQUASH, default=False): vol.Boolean(),
-    vol.Optional(ATTR_ARGS, default={}): vol.Schema({
+    vol.Optional(ATTR_ARGS, default=dict): vol.Schema({
         vol.Coerce(str): vol.Coerce(str)
     }),
 }, extra=vol.REMOVE_EXTRA)
@@ -152,13 +160,13 @@ SCHEMA_ADDON_USER = vol.Schema({
     vol.Required(ATTR_VERSION): vol.Coerce(str),
     vol.Optional(ATTR_UUID, default=lambda: uuid.uuid4().hex):
         vol.Match(r"^[0-9a-f]{32}$"),
-    vol.Optional(ATTR_OPTIONS, default={}): dict,
+    vol.Optional(ATTR_OPTIONS, default=dict): dict,
     vol.Optional(ATTR_AUTO_UPDATE, default=False): vol.Boolean(),
     vol.Optional(ATTR_BOOT):
         vol.In([BOOT_AUTO, BOOT_MANUAL]),
     vol.Optional(ATTR_NETWORK): DOCKER_PORTS,
-    vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_CHANNEL,
+    vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_DEVICE,
-    vol.Optional(ATTR_AUDIO_INPUT): ALSA_CHANNEL,
+    vol.Optional(ATTR_AUDIO_INPUT): ALSA_DEVICE,
 }, extra=vol.REMOVE_EXTRA)
 
 
@@ -168,11 +176,11 @@ SCHEMA_ADDON_SYSTEM = SCHEMA_ADDON_CONFIG.extend({
 })
 
 
-SCHEMA_ADDON_FILE = vol.Schema({
+SCHEMA_ADDONS_FILE = vol.Schema({
-    vol.Optional(ATTR_USER, default={}): {
+    vol.Optional(ATTR_USER, default=dict): {
         vol.Coerce(str): SCHEMA_ADDON_USER,
     },
-    vol.Optional(ATTR_SYSTEM, default={}): {
+    vol.Optional(ATTR_SYSTEM, default=dict): {
         vol.Coerce(str): SCHEMA_ADDON_SYSTEM,
     }
 })

hassio/api/__init__.py

@@ -5,13 +5,15 @@ from pathlib import Path
 from aiohttp import web
 
 from .addons import APIAddons
+from .discovery import APIDiscovery
 from .homeassistant import APIHomeAssistant
+from .hardware import APIHardware
 from .host import APIHost
-from .network import APINetwork
 from .proxy import APIProxy
 from .supervisor import APISupervisor
-from .security import APISecurity
 from .snapshots import APISnapshots
+from .services import APIServices
+from .security import SecurityMiddleware
 from ..coresys import CoreSysAttributes
 
 _LOGGER = logging.getLogger(__name__)
@@ -23,7 +25,9 @@ class RestAPI(CoreSysAttributes):
     def __init__(self, coresys):
         """Initialize docker base wrapper."""
         self.coresys = coresys
-        self.webapp = web.Application(loop=self._loop)
+        self.security = SecurityMiddleware(coresys)
+        self.webapp = web.Application(
+            middlewares=[self.security.token_validation], loop=coresys.loop)
 
         # service stuff
         self._handler = None
@@ -33,165 +37,186 @@ class RestAPI(CoreSysAttributes):
         """Register REST API Calls."""
         self._register_supervisor()
         self._register_host()
+        self._register_hardware()
         self._register_homeassistant()
         self._register_proxy()
         self._register_panel()
         self._register_addons()
         self._register_snapshots()
-        self._register_security()
+        self._register_discovery()
-        self._register_network()
+        self._register_services()
 
     def _register_host(self):
         """Register hostcontrol function."""
         api_host = APIHost()
         api_host.coresys = self.coresys
 
-        self.webapp.router.add_get('/host/info', api_host.info)
+        self.webapp.add_routes([
-        self.webapp.router.add_get('/host/hardware', api_host.hardware)
+            web.get('/host/info', api_host.info),
-        self.webapp.router.add_post('/host/reboot', api_host.reboot)
+            web.post('/host/reboot', api_host.reboot),
-        self.webapp.router.add_post('/host/shutdown', api_host.shutdown)
+            web.post('/host/shutdown', api_host.shutdown),
-        self.webapp.router.add_post('/host/update', api_host.update)
+            web.post('/host/update', api_host.update),
-        self.webapp.router.add_post('/host/options', api_host.options)
+            web.post('/host/reload', api_host.reload),
-        self.webapp.router.add_post('/host/reload', api_host.reload)
+        ])
 
-    def _register_network(self):
+    def _register_hardware(self):
-        """Register network function."""
+        """Register hardware function."""
-        api_net = APINetwork()
+        api_hardware = APIHardware()
-        api_net.coresys = self.coresys
+        api_hardware.coresys = self.coresys
 
-        self.webapp.router.add_get('/network/info', api_net.info)
+        self.webapp.add_routes([
-        self.webapp.router.add_post('/network/options', api_net.options)
+            web.get('/hardware/info', api_hardware.info),
+            web.get('/hardware/audio', api_hardware.audio),
+        ])
 
     def _register_supervisor(self):
         """Register supervisor function."""
         api_supervisor = APISupervisor()
         api_supervisor.coresys = self.coresys
 
-        self.webapp.router.add_get('/supervisor/ping', api_supervisor.ping)
+        self.webapp.add_routes([
-        self.webapp.router.add_get('/supervisor/info', api_supervisor.info)
+            web.get('/supervisor/ping', api_supervisor.ping),
-        self.webapp.router.add_get('/supervisor/stats', api_supervisor.stats)
+            web.get('/supervisor/info', api_supervisor.info),
-        self.webapp.router.add_post(
+            web.get('/supervisor/stats', api_supervisor.stats),
-            '/supervisor/update', api_supervisor.update)
+            web.get('/supervisor/logs', api_supervisor.logs),
-        self.webapp.router.add_post(
+            web.post('/supervisor/update', api_supervisor.update),
-            '/supervisor/reload', api_supervisor.reload)
+            web.post('/supervisor/reload', api_supervisor.reload),
-        self.webapp.router.add_post(
+            web.post('/supervisor/options', api_supervisor.options),
-            '/supervisor/options', api_supervisor.options)
+        ])
-        self.webapp.router.add_get('/supervisor/logs', api_supervisor.logs)
 
     def _register_homeassistant(self):
         """Register homeassistant function."""
         api_hass = APIHomeAssistant()
         api_hass.coresys = self.coresys
 
-        self.webapp.router.add_get('/homeassistant/info', api_hass.info)
+        self.webapp.add_routes([
-        self.webapp.router.add_get('/homeassistant/logs', api_hass.logs)
+            web.get('/homeassistant/info', api_hass.info),
-        self.webapp.router.add_get('/homeassistant/stats', api_hass.stats)
+            web.get('/homeassistant/logs', api_hass.logs),
-        self.webapp.router.add_post('/homeassistant/options', api_hass.options)
+            web.get('/homeassistant/stats', api_hass.stats),
-        self.webapp.router.add_post('/homeassistant/update', api_hass.update)
+            web.post('/homeassistant/options', api_hass.options),
-        self.webapp.router.add_post('/homeassistant/restart', api_hass.restart)
+            web.post('/homeassistant/update', api_hass.update),
-        self.webapp.router.add_post('/homeassistant/stop', api_hass.stop)
+            web.post('/homeassistant/restart', api_hass.restart),
-        self.webapp.router.add_post('/homeassistant/start', api_hass.start)
+            web.post('/homeassistant/stop', api_hass.stop),
-        self.webapp.router.add_post('/homeassistant/check', api_hass.check)
+            web.post('/homeassistant/start', api_hass.start),
+            web.post('/homeassistant/check', api_hass.check),
+        ])
 
     def _register_proxy(self):
         """Register HomeAssistant API Proxy."""
         api_proxy = APIProxy()
         api_proxy.coresys = self.coresys
 
-        self.webapp.router.add_get(
+        self.webapp.add_routes([
-            '/homeassistant/api/websocket', api_proxy.websocket)
+            web.get('/homeassistant/api/websocket', api_proxy.websocket),
-        self.webapp.router.add_get(
+            web.get('/homeassistant/websocket', api_proxy.websocket),
-            '/homeassistant/websocket', api_proxy.websocket)
+            web.get('/homeassistant/api/stream', api_proxy.stream),
-        self.webapp.router.add_post(
+            web.post('/homeassistant/api/{path:.+}', api_proxy.api),
-            '/homeassistant/api/{path:.+}', api_proxy.api)
+            web.get('/homeassistant/api/{path:.+}', api_proxy.api),
-        self.webapp.router.add_get(
+            web.get('/homeassistant/api/', api_proxy.api),
-            '/homeassistant/api/{path:.+}', api_proxy.api)
+        ])
-        self.webapp.router.add_get(
-            '/homeassistant/api', api_proxy.api)
 
     def _register_addons(self):
         """Register homeassistant function."""
         api_addons = APIAddons()
         api_addons.coresys = self.coresys
 
-        self.webapp.router.add_get('/addons', api_addons.list)
+        self.webapp.add_routes([
-        self.webapp.router.add_post('/addons/reload', api_addons.reload)
+            web.get('/addons', api_addons.list),
-        self.webapp.router.add_get('/addons/{addon}/info', api_addons.info)
+            web.post('/addons/reload', api_addons.reload),
-        self.webapp.router.add_post(
+            web.get('/addons/{addon}/info', api_addons.info),
-            '/addons/{addon}/install', api_addons.install)
+            web.post('/addons/{addon}/install', api_addons.install),
-        self.webapp.router.add_post(
+            web.post('/addons/{addon}/uninstall', api_addons.uninstall),
-            '/addons/{addon}/uninstall', api_addons.uninstall)
+            web.post('/addons/{addon}/start', api_addons.start),
-        self.webapp.router.add_post('/addons/{addon}/start', api_addons.start)
+            web.post('/addons/{addon}/stop', api_addons.stop),
-        self.webapp.router.add_post('/addons/{addon}/stop', api_addons.stop)
+            web.post('/addons/{addon}/restart', api_addons.restart),
-        self.webapp.router.add_post(
+            web.post('/addons/{addon}/update', api_addons.update),
-            '/addons/{addon}/restart', api_addons.restart)
+            web.post('/addons/{addon}/options', api_addons.options),
-        self.webapp.router.add_post(
+            web.post('/addons/{addon}/rebuild', api_addons.rebuild),
-            '/addons/{addon}/update', api_addons.update)
+            web.get('/addons/{addon}/logs', api_addons.logs),
-        self.webapp.router.add_post(
+            web.get('/addons/{addon}/icon', api_addons.icon),
-            '/addons/{addon}/options', api_addons.options)
+            web.get('/addons/{addon}/logo', api_addons.logo),
-        self.webapp.router.add_post(
+            web.get('/addons/{addon}/changelog', api_addons.changelog),
-            '/addons/{addon}/rebuild', api_addons.rebuild)
+            web.post('/addons/{addon}/stdin', api_addons.stdin),
-        self.webapp.router.add_get('/addons/{addon}/logs', api_addons.logs)
+            web.get('/addons/{addon}/stats', api_addons.stats),
-        self.webapp.router.add_get('/addons/{addon}/logo', api_addons.logo)
+        ])
-        self.webapp.router.add_get(
-            '/addons/{addon}/changelog', api_addons.changelog)
-        self.webapp.router.add_post('/addons/{addon}/stdin', api_addons.stdin)
-        self.webapp.router.add_get('/addons/{addon}/stats', api_addons.stats)
-
-    def _register_security(self):
-        """Register security function."""
-        api_security = APISecurity()
-        api_security.coresys = self.coresys
-
-        self.webapp.router.add_get('/security/info', api_security.info)
-        self.webapp.router.add_post('/security/options', api_security.options)
-        self.webapp.router.add_post('/security/totp', api_security.totp)
-        self.webapp.router.add_post('/security/session', api_security.session)
 
     def _register_snapshots(self):
         """Register snapshots function."""
         api_snapshots = APISnapshots()
         api_snapshots.coresys = self.coresys
 
-        self.webapp.router.add_get('/snapshots', api_snapshots.list)
+        self.webapp.add_routes([
-        self.webapp.router.add_post('/snapshots/reload', api_snapshots.reload)
+            web.get('/snapshots', api_snapshots.list),
+            web.post('/snapshots/reload', api_snapshots.reload),
+            web.post('/snapshots/new/full', api_snapshots.snapshot_full),
+            web.post('/snapshots/new/partial', api_snapshots.snapshot_partial),
+            web.post('/snapshots/new/upload', api_snapshots.upload),
+            web.get('/snapshots/{snapshot}/info', api_snapshots.info),
+            web.post('/snapshots/{snapshot}/remove', api_snapshots.remove),
+            web.post('/snapshots/{snapshot}/restore/full',
+                     api_snapshots.restore_full),
+            web.post('/snapshots/{snapshot}/restore/partial',
+                     api_snapshots.restore_partial),
+            web.get('/snapshots/{snapshot}/download', api_snapshots.download),
+        ])
 
-        self.webapp.router.add_post(
+    def _register_services(self):
-            '/snapshots/new/full', api_snapshots.snapshot_full)
+        api_services = APIServices()
-        self.webapp.router.add_post(
+        api_services.coresys = self.coresys
-            '/snapshots/new/partial', api_snapshots.snapshot_partial)
 
-        self.webapp.router.add_get(
+        self.webapp.add_routes([
-            '/snapshots/{snapshot}/info', api_snapshots.info)
+            web.get('/services', api_services.list),
-        self.webapp.router.add_post(
+            web.get('/services/{service}', api_services.get_service),
-            '/snapshots/{snapshot}/remove', api_snapshots.remove)
+            web.post('/services/{service}', api_services.set_service),
-        self.webapp.router.add_post(
+            web.delete('/services/{service}', api_services.del_service),
-            '/snapshots/{snapshot}/restore/full', api_snapshots.restore_full)
+        ])
-        self.webapp.router.add_post(
+
-            '/snapshots/{snapshot}/restore/partial',
+    def _register_discovery(self):
-            api_snapshots.restore_partial)
+        api_discovery = APIDiscovery()
+        api_discovery.coresys = self.coresys
+
+        self.webapp.add_routes([
+            web.get('/services/discovery', api_discovery.list),
+            web.get('/services/discovery/{uuid}', api_discovery.get_discovery),
+            web.delete('/services/discovery/{uuid}',
+                       api_discovery.del_discovery),
+            web.post('/services/discovery', api_discovery.set_discovery),
+        ])
 
     def _register_panel(self):
         """Register panel for homeassistant."""
-        def create_panel_response(build_type):
+        panel_dir = Path(__file__).parent.joinpath("panel")
-            """Create a function to generate a response."""
-            path = Path(__file__).parent.joinpath(
-                'panel/hassio-main-{}.html'.format(build_type))
 
+        def create_response(panel_file):
+            """Create a function to generate a response."""
+            path = panel_dir.joinpath(f"{panel_file!s}.html")
             return lambda request: web.FileResponse(path)
 
         # This route is for backwards compatibility with HA < 0.58
-        self.webapp.router.add_get('/panel', create_panel_response('es5'))
+        self.webapp.add_routes([
-        self.webapp.router.add_get('/panel_es5', create_panel_response('es5'))
+            web.get('/panel', create_response('hassio-main-es5'))])
-        self.webapp.router.add_get(
+
-            '/panel_latest', create_panel_response('latest'))
+        # This route is for backwards compatibility with HA 0.58 - 0.61
+        self.webapp.add_routes([
+            web.get('/panel_es5', create_response('hassio-main-es5')),
+            web.get('/panel_latest', create_response('hassio-main-latest')),
+        ])
+
+        # This route is for backwards compatibility with HA 0.62 - 0.70
+        self.webapp.add_routes([
+            web.get('/app-es5/index.html', create_response('index')),
+            web.get('/app-es5/hassio-app.html', create_response('hassio-app')),
+        ])
+
+        # This route is for HA > 0.70
+        self.webapp.add_routes([web.static('/app', panel_dir)])
 
     async def start(self):
         """Run rest api webserver."""
-        self._handler = self.webapp.make_handler(loop=self._loop)
+        self._handler = self.webapp.make_handler()
 
         try:
-            self.server = await self._loop.create_server(
+            self.server = await self.sys_loop.create_server(
                 self._handler, "0.0.0.0", "80")
         except OSError as err:
             _LOGGER.fatal(

hassio/api/addons.py

@@ -16,10 +16,11 @@ from ..const import (
     ATTR_GPIO, ATTR_HOMEASSISTANT_API, ATTR_STDIN, BOOT_AUTO, BOOT_MANUAL,
     ATTR_CHANGELOG, ATTR_HOST_IPC, ATTR_HOST_DBUS, ATTR_LONG_DESCRIPTION,
     ATTR_CPU_PERCENT, ATTR_MEMORY_LIMIT, ATTR_MEMORY_USAGE, ATTR_NETWORK_TX,
-    ATTR_NETWORK_RX, ATTR_BLK_READ, ATTR_BLK_WRITE,
+    ATTR_NETWORK_RX, ATTR_BLK_READ, ATTR_BLK_WRITE, ATTR_ICON, ATTR_SERVICES,
+    ATTR_DISCOVERY, ATTR_SECCOMP, ATTR_APPARMOR,
     CONTENT_TYPE_PNG, CONTENT_TYPE_BINARY, CONTENT_TYPE_TEXT)
 from ..coresys import CoreSysAttributes
-from ..validate import DOCKER_PORTS
+from ..validate import DOCKER_PORTS, ALSA_DEVICE
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -32,6 +33,8 @@ SCHEMA_OPTIONS = vol.Schema({
     vol.Optional(ATTR_BOOT): vol.In([BOOT_AUTO, BOOT_MANUAL]),
     vol.Optional(ATTR_NETWORK): vol.Any(None, DOCKER_PORTS),
     vol.Optional(ATTR_AUTO_UPDATE): vol.Boolean(),
+    vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_DEVICE,
+    vol.Optional(ATTR_AUDIO_INPUT): ALSA_DEVICE,
 })
 
 
@@ -40,7 +43,7 @@ class APIAddons(CoreSysAttributes):
 
     def _extract_addon(self, request, check_installed=True):
         """Return addon and if not exists trow a exception."""
-        addon = self._addons.get(request.match_info.get('addon'))
+        addon = self.sys_addons.get(request.match_info.get('addon'))
         if not addon:
             raise RuntimeError("Addon not exists")
 
@@ -61,7 +64,7 @@ class APIAddons(CoreSysAttributes):
     async def list(self, request):
         """Return all addons / repositories ."""
         data_addons = []
-        for addon in self._addons.list_addons:
+        for addon in self.sys_addons.list_addons:
             data_addons.append({
                 ATTR_NAME: addon.name,
                 ATTR_SLUG: addon.slug,
@@ -73,11 +76,12 @@ class APIAddons(CoreSysAttributes):
                 ATTR_REPOSITORY: addon.repository,
                 ATTR_BUILD: addon.need_build,
                 ATTR_URL: addon.url,
+                ATTR_ICON: addon.with_icon,
                 ATTR_LOGO: addon.with_logo,
             })
 
         data_repositories = []
-        for repository in self._addons.list_repositories:
+        for repository in self.sys_addons.list_repositories:
             data_repositories.append({
                 ATTR_SLUG: repository.slug,
                 ATTR_NAME: repository.name,
@@ -94,7 +98,7 @@ class APIAddons(CoreSysAttributes):
     @api_process
     async def reload(self, request):
         """Reload all addons data."""
-        await asyncio.shield(self._addons.reload(), loop=self._loop)
+        await asyncio.shield(self.sys_addons.reload())
         return True
 
     @api_process
@@ -104,6 +108,7 @@ class APIAddons(CoreSysAttributes):
 
         return {
             ATTR_NAME: addon.name,
+            ATTR_SLUG: addon.slug,
             ATTR_DESCRIPTON: addon.description,
             ATTR_LONG_DESCRIPTION: addon.long_description,
             ATTR_VERSION: addon.version_installed,
@@ -121,7 +126,10 @@ class APIAddons(CoreSysAttributes):
             ATTR_HOST_IPC: addon.host_ipc,
             ATTR_HOST_DBUS: addon.host_dbus,
             ATTR_PRIVILEGED: addon.privileged,
+            ATTR_SECCOMP: addon.seccomp,
+            ATTR_APPARMOR: addon.apparmor,
             ATTR_DEVICES: self._pretty_devices(addon),
+            ATTR_ICON: addon.with_icon,
             ATTR_LOGO: addon.with_logo,
             ATTR_CHANGELOG: addon.with_changelog,
             ATTR_WEBUI: addon.webui,
@@ -132,6 +140,8 @@ class APIAddons(CoreSysAttributes):
             ATTR_AUDIO: addon.with_audio,
             ATTR_AUDIO_INPUT: addon.audio_input,
             ATTR_AUDIO_OUTPUT: addon.audio_output,
+            ATTR_SERVICES: addon.services,
+            ATTR_DISCOVERY: addon.discovery,
         }
 
     @api_process
@@ -140,7 +150,7 @@ class APIAddons(CoreSysAttributes):
         addon = self._extract_addon(request)
 
         addon_schema = SCHEMA_OPTIONS.extend({
-            vol.Optional(ATTR_OPTIONS): addon.schema,
+            vol.Optional(ATTR_OPTIONS): vol.Any(None, addon.schema),
         })
 
         body = await api_validate(addon_schema, request)
@@ -158,6 +168,7 @@ class APIAddons(CoreSysAttributes):
         if ATTR_AUDIO_OUTPUT in body:
             addon.audio_output = body[ATTR_AUDIO_OUTPUT]
 
+        addon.save_data()
         return True
 
     @api_process
@@ -183,13 +194,13 @@ class APIAddons(CoreSysAttributes):
     def install(self, request):
         """Install addon."""
         addon = self._extract_addon(request, check_installed=False)
-        return asyncio.shield(addon.install(), loop=self._loop)
+        return asyncio.shield(addon.install())
 
     @api_process
     def uninstall(self, request):
         """Uninstall addon."""
         addon = self._extract_addon(request)
-        return asyncio.shield(addon.uninstall(), loop=self._loop)
+        return asyncio.shield(addon.uninstall())
 
     @api_process
     def start(self, request):
@@ -203,13 +214,13 @@ class APIAddons(CoreSysAttributes):
         except vol.Invalid as ex:
             raise RuntimeError(humanize_error(options, ex)) from None
 
-        return asyncio.shield(addon.start(), loop=self._loop)
+        return asyncio.shield(addon.start())
 
     @api_process
     def stop(self, request):
         """Stop addon."""
         addon = self._extract_addon(request)
-        return asyncio.shield(addon.stop(), loop=self._loop)
+        return asyncio.shield(addon.stop())
 
     @api_process
     def update(self, request):
@@ -219,13 +230,13 @@ class APIAddons(CoreSysAttributes):
         if addon.last_version == addon.version_installed:
             raise RuntimeError("No update available!")
 
-        return asyncio.shield(addon.update(), loop=self._loop)
+        return asyncio.shield(addon.update())
 
     @api_process
     def restart(self, request):
         """Restart addon."""
         addon = self._extract_addon(request)
-        return asyncio.shield(addon.restart(), loop=self._loop)
+        return asyncio.shield(addon.restart())
 
     @api_process
     def rebuild(self, request):
@@ -234,7 +245,7 @@ class APIAddons(CoreSysAttributes):
         if not addon.need_build:
             raise RuntimeError("Only local build addons are supported")
 
-        return asyncio.shield(addon.rebuild(), loop=self._loop)
+        return asyncio.shield(addon.rebuild())
 
     @api_process_raw(CONTENT_TYPE_BINARY)
     def logs(self, request):
@@ -242,12 +253,22 @@ class APIAddons(CoreSysAttributes):
         addon = self._extract_addon(request)
         return addon.logs()
 
+    @api_process_raw(CONTENT_TYPE_PNG)
+    async def icon(self, request):
+        """Return icon from addon."""
+        addon = self._extract_addon(request, check_installed=False)
+        if not addon.with_icon:
+            raise RuntimeError("No icon found!")
+
+        with addon.path_icon.open('rb') as png:
+            return png.read()
+
     @api_process_raw(CONTENT_TYPE_PNG)
     async def logo(self, request):
         """Return logo from addon."""
         addon = self._extract_addon(request, check_installed=False)
         if not addon.with_logo:
-            raise RuntimeError("No image found!")
+            raise RuntimeError("No logo found!")
 
         with addon.path_logo.open('rb') as png:
             return png.read()
@@ -267,7 +288,7 @@ class APIAddons(CoreSysAttributes):
         """Write to stdin of addon."""
         addon = self._extract_addon(request)
         if not addon.with_stdin:
-            raise RuntimeError("STDIN not supported by addons")
+            raise RuntimeError("STDIN not supported by addon")
 
         data = await request.read()
-        return await asyncio.shield(addon.write_stdin(data), loop=self._loop)
+        return await asyncio.shield(addon.write_stdin(data))

hassio/api/discovery.py

@@ -0,0 +1,72 @@
+"""Init file for HassIO network rest api."""
+
+import voluptuous as vol
+
+from .utils import api_process, api_validate
+from ..const import (
+    ATTR_PROVIDER, ATTR_UUID, ATTR_COMPONENT, ATTR_PLATFORM, ATTR_CONFIG,
+    ATTR_DISCOVERY, REQUEST_FROM)
+from ..coresys import CoreSysAttributes
+
+
+SCHEMA_DISCOVERY = vol.Schema({
+    vol.Required(ATTR_COMPONENT): vol.Coerce(str),
+    vol.Optional(ATTR_PLATFORM): vol.Any(None, vol.Coerce(str)),
+    vol.Optional(ATTR_CONFIG): vol.Any(None, dict),
+})
+
+
+class APIDiscovery(CoreSysAttributes):
+    """Handle rest api for discovery functions."""
+
+    def _extract_message(self, request):
+        """Extract discovery message from URL."""
+        message = self.sys_discovery.get(request.match_info.get('uuid'))
+        if not message:
+            raise RuntimeError("Discovery message not found")
+        return message
+
+    @api_process
+    async def list(self, request):
+        """Show register services."""
+        discovery = []
+        for message in self.sys_discovery.list_messages:
+            discovery.append({
+                ATTR_PROVIDER: message.provider,
+                ATTR_UUID: message.uuid,
+                ATTR_COMPONENT: message.component,
+                ATTR_PLATFORM: message.platform,
+                ATTR_CONFIG: message.config,
+            })
+
+        return {ATTR_DISCOVERY: discovery}
+
+    @api_process
+    async def set_discovery(self, request):
+        """Write data into a discovery pipeline."""
+        body = await api_validate(SCHEMA_DISCOVERY, request)
+        message = self.sys_discovery.send(
+            provider=request[REQUEST_FROM], **body)
+
+        return {ATTR_UUID: message.uuid}
+
+    @api_process
+    async def get_discovery(self, request):
+        """Read data into a discovery message."""
+        message = self._extract_message(request)
+
+        return {
+            ATTR_PROVIDER: message.provider,
+            ATTR_UUID: message.uuid,
+            ATTR_COMPONENT: message.component,
+            ATTR_PLATFORM: message.platform,
+            ATTR_CONFIG: message.config,
+        }
+
+    @api_process
+    async def del_discovery(self, request):
+        """Delete data into a discovery message."""
+        message = self._extract_message(request)
+
+        self.sys_discovery.remove(message)
+        return True

hassio/api/hardware.py

@@ -0,0 +1,34 @@
+"""Init file for HassIO hardware rest api."""
+import logging
+
+from .utils import api_process
+from ..const import (
+    ATTR_SERIAL, ATTR_DISK, ATTR_GPIO, ATTR_AUDIO, ATTR_INPUT, ATTR_OUTPUT)
+from ..coresys import CoreSysAttributes
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class APIHardware(CoreSysAttributes):
+    """Handle rest api for hardware functions."""
+
+    @api_process
+    async def info(self, request):
+        """Show hardware info."""
+        return {
+            ATTR_SERIAL: list(self.sys_hardware.serial_devices),
+            ATTR_INPUT: list(self.sys_hardware.input_devices),
+            ATTR_DISK: list(self.sys_hardware.disk_devices),
+            ATTR_GPIO: list(self.sys_hardware.gpio_devices),
+            ATTR_AUDIO: self.sys_hardware.audio_devices,
+        }
+
+    @api_process
+    async def audio(self, request):
+        """Show ALSA audio devices."""
+        return {
+            ATTR_AUDIO: {
+                ATTR_INPUT: self.sys_host.alsa.input_devices,
+                ATTR_OUTPUT: self.sys_host.alsa.output_devices,
+            }
+        }

hassio/api/homeassistant.py

@@ -9,9 +9,10 @@ from ..const import (
     ATTR_VERSION, ATTR_LAST_VERSION, ATTR_IMAGE, ATTR_CUSTOM, ATTR_BOOT,
     ATTR_PORT, ATTR_PASSWORD, ATTR_SSL, ATTR_WATCHDOG, ATTR_CPU_PERCENT,
     ATTR_MEMORY_USAGE, ATTR_MEMORY_LIMIT, ATTR_NETWORK_RX, ATTR_NETWORK_TX,
-    ATTR_BLK_READ, ATTR_BLK_WRITE, CONTENT_TYPE_BINARY)
+    ATTR_BLK_READ, ATTR_BLK_WRITE, ATTR_WAIT_BOOT, ATTR_MACHINE,
+    CONTENT_TYPE_BINARY)
 from ..coresys import CoreSysAttributes
-from ..validate import NETWORK_PORT
+from ..validate import NETWORK_PORT, DOCKER_IMAGE
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -22,11 +23,13 @@ SCHEMA_OPTIONS = vol.Schema({
     vol.Inclusive(ATTR_IMAGE, 'custom_hass'):
         vol.Any(None, vol.Coerce(str)),
     vol.Inclusive(ATTR_LAST_VERSION, 'custom_hass'):
-        vol.Any(None, vol.Coerce(str)),
+        vol.Any(None, DOCKER_IMAGE),
     vol.Optional(ATTR_PORT): NETWORK_PORT,
     vol.Optional(ATTR_PASSWORD): vol.Any(None, vol.Coerce(str)),
     vol.Optional(ATTR_SSL): vol.Boolean(),
     vol.Optional(ATTR_WATCHDOG): vol.Boolean(),
+    vol.Optional(ATTR_WAIT_BOOT):
+        vol.All(vol.Coerce(int), vol.Range(min=60)),
 })
 
 SCHEMA_VERSION = vol.Schema({
@@ -41,14 +44,16 @@ class APIHomeAssistant(CoreSysAttributes):
     async def info(self, request):
         """Return host information."""
         return {
-            ATTR_VERSION: self._homeassistant.version,
+            ATTR_VERSION: self.sys_homeassistant.version,
-            ATTR_LAST_VERSION: self._homeassistant.last_version,
+            ATTR_LAST_VERSION: self.sys_homeassistant.last_version,
-            ATTR_IMAGE: self._homeassistant.image,
+            ATTR_MACHINE: self.sys_homeassistant.machine,
-            ATTR_CUSTOM: self._homeassistant.is_custom_image,
+            ATTR_IMAGE: self.sys_homeassistant.image,
-            ATTR_BOOT: self._homeassistant.boot,
+            ATTR_CUSTOM: self.sys_homeassistant.is_custom_image,
-            ATTR_PORT: self._homeassistant.api_port,
+            ATTR_BOOT: self.sys_homeassistant.boot,
-            ATTR_SSL: self._homeassistant.api_ssl,
+            ATTR_PORT: self.sys_homeassistant.api_port,
-            ATTR_WATCHDOG: self._homeassistant.watchdog,
+            ATTR_SSL: self.sys_homeassistant.api_ssl,
+            ATTR_WATCHDOG: self.sys_homeassistant.watchdog,
+            ATTR_WAIT_BOOT: self.sys_homeassistant.wait_boot,
         }
 
     @api_process
@@ -57,31 +62,34 @@ class APIHomeAssistant(CoreSysAttributes):
         body = await api_validate(SCHEMA_OPTIONS, request)
 
         if ATTR_IMAGE in body and ATTR_LAST_VERSION in body:
-            self._homeassistant.image = body[ATTR_IMAGE]
+            self.sys_homeassistant.image = body[ATTR_IMAGE]
-            self._homeassistant.last_version = body[ATTR_LAST_VERSION]
+            self.sys_homeassistant.last_version = body[ATTR_LAST_VERSION]
 
         if ATTR_BOOT in body:
-            self._homeassistant.boot = body[ATTR_BOOT]
+            self.sys_homeassistant.boot = body[ATTR_BOOT]
 
         if ATTR_PORT in body:
-            self._homeassistant.api_port = body[ATTR_PORT]
+            self.sys_homeassistant.api_port = body[ATTR_PORT]
 
         if ATTR_PASSWORD in body:
-            self._homeassistant.api_password = body[ATTR_PASSWORD]
+            self.sys_homeassistant.api_password = body[ATTR_PASSWORD]
 
         if ATTR_SSL in body:
-            self._homeassistant.api_ssl = body[ATTR_SSL]
+            self.sys_homeassistant.api_ssl = body[ATTR_SSL]
 
         if ATTR_WATCHDOG in body:
-            self._homeassistant.watchdog = body[ATTR_WATCHDOG]
+            self.sys_homeassistant.watchdog = body[ATTR_WATCHDOG]
 
-        self._homeassistant.save()
+        if ATTR_WAIT_BOOT in body:
+            self.sys_homeassistant.wait_boot = body[ATTR_WAIT_BOOT]
+
+        self.sys_homeassistant.save_data()
         return True
 
     @api_process
     async def stats(self, request):
         """Return resource information."""
-        stats = await self._homeassistant.stats()
+        stats = await self.sys_homeassistant.stats()
         if not stats:
             raise RuntimeError("No stats available")
 
@@ -99,39 +107,39 @@ class APIHomeAssistant(CoreSysAttributes):
     async def update(self, request):
         """Update homeassistant."""
         body = await api_validate(SCHEMA_VERSION, request)
-        version = body.get(ATTR_VERSION, self._homeassistant.last_version)
+        version = body.get(ATTR_VERSION, self.sys_homeassistant.last_version)
 
-        if version == self._homeassistant.version:
+        if version == self.sys_homeassistant.version:
             raise RuntimeError("Version {} is already in use".format(version))
 
         return await asyncio.shield(
-            self._homeassistant.update(version), loop=self._loop)
+            self.sys_homeassistant.update(version))
 
     @api_process
     def stop(self, request):
         """Stop homeassistant."""
-        return asyncio.shield(self._homeassistant.stop(), loop=self._loop)
+        return asyncio.shield(self.sys_homeassistant.stop())
 
     @api_process
     def start(self, request):
         """Start homeassistant."""
-        return asyncio.shield(self._homeassistant.run(), loop=self._loop)
+        return asyncio.shield(self.sys_homeassistant.start())
 
     @api_process
     def restart(self, request):
         """Restart homeassistant."""
-        return asyncio.shield(self._homeassistant.restart(), loop=self._loop)
+        return asyncio.shield(self.sys_homeassistant.restart())
 
     @api_process_raw(CONTENT_TYPE_BINARY)
     def logs(self, request):
         """Return homeassistant docker logs."""
-        return self._homeassistant.logs()
+        return self.sys_homeassistant.logs()
 
     @api_process
     async def check(self, request):
         """Check config of homeassistant."""
-        code, message = await self._homeassistant.check_config()
+        result = await self.sys_homeassistant.check_config()
-        if not code:
+        if not result.valid:
-            raise RuntimeError(message)
+            raise RuntimeError(result.log)
 
         return True

hassio/api/host.py

@@ -4,13 +4,11 @@ import logging
 
 import voluptuous as vol
 
-from .utils import api_process_hostcontrol, api_process, api_validate
+from .utils import api_process, api_validate
 from ..const import (
-    ATTR_VERSION, ATTR_LAST_VERSION, ATTR_TYPE, ATTR_HOSTNAME, ATTR_FEATURES,
+    ATTR_VERSION, ATTR_LAST_VERSION, ATTR_HOSTNAME, ATTR_FEATURES, ATTR_KERNEL,
-    ATTR_OS, ATTR_SERIAL, ATTR_INPUT, ATTR_DISK, ATTR_AUDIO, ATTR_AUDIO_INPUT,
+    ATTR_TYPE, ATTR_OPERATING_SYSTEM, ATTR_CHASSIS, ATTR_DEPLOYMENT)
-    ATTR_AUDIO_OUTPUT, ATTR_GPIO)
 from ..coresys import CoreSysAttributes
-from ..validate import ALSA_CHANNEL
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -19,8 +17,7 @@ SCHEMA_VERSION = vol.Schema({
 })
 
 SCHEMA_OPTIONS = vol.Schema({
-    vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_CHANNEL,
+    vol.Optional(ATTR_HOSTNAME): vol.Coerce(str),
-    vol.Optional(ATTR_AUDIO_INPUT): ALSA_CHANNEL,
 })
 
 
@@ -31,61 +28,45 @@ class APIHost(CoreSysAttributes):
     async def info(self, request):
         """Return host information."""
         return {
-            ATTR_TYPE: self._host_control.type,
+            ATTR_CHASSIS: self.sys_host.info.chassis,
-            ATTR_VERSION: self._host_control.version,
+            ATTR_VERSION: None,
-            ATTR_LAST_VERSION: self._host_control.last_version,
+            ATTR_LAST_VERSION: None,
-            ATTR_FEATURES: self._host_control.features,
+            ATTR_TYPE: None,
-            ATTR_HOSTNAME: self._host_control.hostname,
+            ATTR_FEATURES: self.sys_host.supperted_features,
-            ATTR_OS: self._host_control.os_info,
+            ATTR_HOSTNAME: self.sys_host.info.hostname,
+            ATTR_OPERATING_SYSTEM: self.sys_host.info.operating_system,
+            ATTR_DEPLOYMENT: self.sys_host.info.deployment,
+            ATTR_KERNEL: self.sys_host.info.kernel,
         }
 
     @api_process
     async def options(self, request):
-        """Process host options."""
+        """Edit host settings."""
         body = await api_validate(SCHEMA_OPTIONS, request)
 
-        if ATTR_AUDIO_OUTPUT in body:
+        # hostname
-            self._config.audio_output = body[ATTR_AUDIO_OUTPUT]
+        if ATTR_HOSTNAME in body:
-        if ATTR_AUDIO_INPUT in body:
+            await asyncio.shield(
-            self._config.audio_input = body[ATTR_AUDIO_INPUT]
+                self.sys_host.control.set_hostname(body[ATTR_HOSTNAME]))
-
-        return True
-
-    @api_process_hostcontrol
-    def reboot(self, request):
-        """Reboot host."""
-        return self._host_control.reboot()
-
-    @api_process_hostcontrol
-    def shutdown(self, request):
-        """Poweroff host."""
-        return self._host_control.shutdown()
-
-    @api_process_hostcontrol
-    async def reload(self, request):
-        """Reload host data."""
-        await self._host_control.load()
-        return True
-
-    @api_process_hostcontrol
-    async def update(self, request):
-        """Update host OS."""
-        body = await api_validate(SCHEMA_VERSION, request)
-        version = body.get(ATTR_VERSION, self._host_control.last_version)
-
-        if version == self._host_control.version:
-            raise RuntimeError(f"Version {version} is already in use")
-
-        return await asyncio.shield(
-            self._host_control.update(version=version), loop=self._loop)
 
     @api_process
-    async def hardware(self, request):
+    def reboot(self, request):
-        """Return local hardware infos."""
+        """Reboot host."""
-        return {
+        return asyncio.shield(self.sys_host.control.reboot())
-            ATTR_SERIAL: list(self._hardware.serial_devices),
+
-            ATTR_INPUT: list(self._hardware.input_devices),
+    @api_process
-            ATTR_DISK: list(self._hardware.disk_devices),
+    def shutdown(self, request):
-            ATTR_GPIO: list(self._hardware.gpio_devices),
+        """Poweroff host."""
-            ATTR_AUDIO: self._hardware.audio_devices,
+        return asyncio.shield(self.sys_host.control.shutdown())
-        }
+
+    @api_process
+    def reload(self, request):
+        """Reload host data."""
+        return asyncio.shield(self.sys_host.reload())
+
+    @api_process
+    async def update(self, request):
+        """Update host OS."""
+        pass
+        # body = await api_validate(SCHEMA_VERSION, request)
+        # version = body.get(ATTR_VERSION, self.sys_host.last_version)

hassio/api/network.py

@@ -1,38 +0,0 @@
-"""Init file for HassIO network rest api."""
-import logging
-
-import voluptuous as vol
-
-from .utils import api_process, api_process_hostcontrol, api_validate
-from ..const import ATTR_HOSTNAME
-from ..coresys import CoreSysAttributes
-
-_LOGGER = logging.getLogger(__name__)
-
-
-SCHEMA_OPTIONS = vol.Schema({
-    vol.Optional(ATTR_HOSTNAME): vol.Coerce(str),
-})
-
-
-class APINetwork(CoreSysAttributes):
-    """Handle rest api for network functions."""
-
-    @api_process
-    async def info(self, request):
-        """Show network settings."""
-        return {
-            ATTR_HOSTNAME: self._host_control.hostname,
-        }
-
-    @api_process_hostcontrol
-    async def options(self, request):
-        """Edit network settings."""
-        body = await api_validate(SCHEMA_OPTIONS, request)
-
-        # hostname
-        if ATTR_HOSTNAME in body:
-            if self._host_control.hostname != body[ATTR_HOSTNAME]:
-                await self._host_control.set_hostname(body[ATTR_HOSTNAME])
-
-        return True

hassio/api/panel/index.html

@@ -0,0 +1,38 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Hass.io</title>
+    <meta name='viewport' content='width=device-width, user-scalable=no'>
+    <style>
+      body {
+        height: 100vh;
+        margin: 0;
+        padding: 0;
+      }
+    </style>
+    <script src='/frontend_es5/custom-elements-es5-adapter.js'></script>
+  </head>
+  <body>
+    <hassio-app></hassio-app>
+    <script>
+    function addScript(src) {
+      var e = document.createElement('script');
+      e.src = src;
+      document.write(e.outerHTML);
+    }
+    var webComponentsSupported = (
+      'customElements' in window &&
+      'import' in document.createElement('link') &&
+      'content' in document.createElement('template'));
+    if (!webComponentsSupported) {
+      addScript('/static/webcomponents-bundle.js');
+    }
+    </script>
+    <!--
+      Disabled while we make Home Assistant able to serve the right files.
+      <script src="./app.js"></script>
+    -->
+    <link rel='import' href='./hassio-app.html'>
+  </body>
+</html>

hassio/api/proxy.py

@@ -4,7 +4,7 @@ import logging
 
 import aiohttp
 from aiohttp import web
-from aiohttp.web_exceptions import HTTPBadGateway
+from aiohttp.web_exceptions import HTTPBadGateway, HTTPInternalServerError
 from aiohttp.hdrs import CONTENT_TYPE
 import async_timeout
 
@@ -17,32 +17,46 @@ _LOGGER = logging.getLogger(__name__)
 class APIProxy(CoreSysAttributes):
     """API Proxy for Home-Assistant."""
 
+    def _check_access(self, request):
+        """Check the Hass.io token."""
+        hassio_token = request.headers.get(HEADER_HA_ACCESS)
+        addon = self.sys_addons.from_uuid(hassio_token)
+
+        if not addon:
+            _LOGGER.warning("Unknown Home-Assistant API access!")
+        else:
+            _LOGGER.info("%s access from %s", request.path, addon.slug)
+
     async def _api_client(self, request, path, timeout=300):
         """Return a client request with proxy origin for Home-Assistant."""
-        url = f"{self._homeassistant.api_url}/api/{path}"
+        url = f"{self.sys_homeassistant.api_url}/api/{path}"
 
         try:
             data = None
             headers = {}
-            method = getattr(self._websession_ssl, request.method.lower())
+            method = getattr(self.sys_websession_ssl, request.method.lower())
+            params = request.query or None
 
             # read data
-            with async_timeout.timeout(30, loop=self._loop):
+            with async_timeout.timeout(30):
                 data = await request.read()
 
             if data:
                 headers.update({CONTENT_TYPE: request.content_type})
 
             # need api password?
-            if self._homeassistant.api_password:
+            if self.sys_homeassistant.api_password:
-                headers = {HEADER_HA_ACCESS: self._homeassistant.api_password}
+                headers = {
+                    HEADER_HA_ACCESS: self.sys_homeassistant.api_password,
+                }
 
             # reset headers
             if not headers:
                 headers = None
 
             client = await method(
-                url, data=data, headers=headers, timeout=timeout
+                url, data=data, headers=headers, timeout=timeout,
+                params=params
             )
 
             return client
@@ -55,55 +69,57 @@ class APIProxy(CoreSysAttributes):
 
         raise HTTPBadGateway()
 
+    async def stream(self, request):
+        """Proxy HomeAssistant EventStream Requests."""
+        self._check_access(request)
+
+        _LOGGER.info("Home-Assistant EventStream start")
+        client = await self._api_client(request, 'stream', timeout=None)
+
+        response = web.StreamResponse()
+        response.content_type = request.headers.get(CONTENT_TYPE)
+        try:
+            await response.prepare(request)
+            while True:
+                data = await client.content.read(10)
+                if not data:
+                    await response.write_eof()
+                    break
+                await response.write(data)
+
+        except aiohttp.ClientError:
+            await response.write_eof()
+
+        except asyncio.CancelledError:
+            pass
+
+        finally:
+            client.close()
+            _LOGGER.info("Home-Assistant EventStream close")
+
+        return response
+
     async def api(self, request):
         """Proxy HomeAssistant API Requests."""
-        path = request.match_info.get('path', '')
+        self._check_access(request)
-
-        # API stream
-        if path.startswith("stream"):
-            _LOGGER.info("Home-Assistant Event-Stream start")
-            client = await self._api_client(request, path, timeout=None)
-
-            response = web.StreamResponse()
-            response.content_type = request.headers.get(CONTENT_TYPE)
-            try:
-                await response.prepare(request)
-                while True:
-                    data = await client.content.read(10)
-                    if not data:
-                        await response.write_eof()
-                        break
-                    response.write(data)
-
-            except aiohttp.ClientError:
-                await response.write_eof()
-
-            except asyncio.CancelledError:
-                pass
-
-            finally:
-                client.close()
-
-            _LOGGER.info("Home-Assistant Event-Stream close")
 
         # Normal request
-        else:
+        path = request.match_info.get('path', '')
-            _LOGGER.info("Home-Assistant '/api/%s' request", path)
+        client = await self._api_client(request, path)
-            client = await self._api_client(request, path)
 
-            data = await client.read()
+        data = await client.read()
-            return web.Response(
+        return web.Response(
-                body=data,
+            body=data,
-                status=client.status,
+            status=client.status,
-                content_type=client.content_type
+            content_type=client.content_type
-            )
+        )
 
     async def _websocket_client(self):
         """Initialize a websocket api connection."""
-        url = f"{self.homeassistant.api_url}/api/websocket"
+        url = f"{self.sys_homeassistant.api_url}/api/websocket"
 
         try:
-            client = await self._websession_ssl.ws_connect(
+            client = await self.sys_websession_ssl.ws_connect(
                 url, heartbeat=60, verify_ssl=False)
 
             # handle authentication
@@ -114,7 +130,7 @@ class APIProxy(CoreSysAttributes):
                 elif data.get('type') == 'auth_required':
                     await client.send_json({
                         'type': 'auth',
-                        'api_password': self._homeassistant.api_password,
+                        'api_password': self.sys_homeassistant.api_password,
                     })
 
             _LOGGER.error("Authentication to Home-Assistant websocket")
@@ -133,9 +149,29 @@ class APIProxy(CoreSysAttributes):
         await server.prepare(request)
 
         # handle authentication
-        await server.send_json({'type': 'auth_required'})
+        try:
-        await server.receive_json()  # get internal token
+            await server.send_json({
-        await server.send_json({'type': 'auth_ok'})
+                'type': 'auth_required',
+                'ha_version': self.sys_homeassistant.version,
+            })
+
+            # Check API access
+            response = await server.receive_json()
+            hassio_token = response.get('api_password')
+            addon = self.sys_addons.from_uuid(hassio_token)
+
+            if not addon:
+                _LOGGER.warning("Unauthorized websocket access!")
+            else:
+                _LOGGER.info("Websocket access from %s", addon.slug)
+
+            await server.send_json({
+                'type': 'auth_ok',
+                'ha_version': self.sys_homeassistant.version,
+            })
+        except (RuntimeError, ValueError) as err:
+            _LOGGER.error("Can't initialize handshake: %s", err)
+            raise HTTPInternalServerError() from None
 
         # init connection to hass
         client = await self._websocket_client()
@@ -146,16 +182,16 @@ class APIProxy(CoreSysAttributes):
             server_read = None
             while not server.closed and not client.closed:
                 if not client_read:
-                    client_read = asyncio.ensure_future(
+                    client_read = self.sys_create_task(
-                        client.receive_str(), loop=self._loop)
+                        client.receive_str())
                 if not server_read:
-                    server_read = asyncio.ensure_future(
+                    server_read = self.sys_create_task(
-                        server.receive_str(), loop=self._loop)
+                        server.receive_str())
 
                 # wait until data need to be processed
                 await asyncio.wait(
                     [client_read, server_read],
-                    loop=self._loop, return_when=asyncio.FIRST_COMPLETED
+                    return_when=asyncio.FIRST_COMPLETED
                 )
 
                 # server

hassio/api/security.py

@@ -1,98 +1,56 @@
-"""Init file for HassIO security rest api."""
+"""Handle security part of this API."""
-from datetime import datetime, timedelta
-import io
 import logging
-import hashlib
+import re
-import os
 
-from aiohttp import web
+from aiohttp.web import middleware
-import voluptuous as vol
+from aiohttp.web_exceptions import HTTPUnauthorized
-import pyotp
-import pyqrcode
 
-from .utils import api_process, api_validate, hash_password
+from ..const import HEADER_TOKEN, REQUEST_FROM
-from ..const import ATTR_INITIALIZE, ATTR_PASSWORD, ATTR_TOTP, ATTR_SESSION
 from ..coresys import CoreSysAttributes
 
 _LOGGER = logging.getLogger(__name__)
 
-SCHEMA_PASSWORD = vol.Schema({
+NO_SECURITY_CHECK = set((
-    vol.Required(ATTR_PASSWORD): vol.Coerce(str),
+    re.compile(r"^/homeassistant/api/.*$"),
-})
+    re.compile(r"^/homeassistant/websocket$"),
-
+    re.compile(r"^/supervisor/ping$"),
-SCHEMA_SESSION = SCHEMA_PASSWORD.extend({
+))
-    vol.Optional(ATTR_TOTP, default=None): vol.Coerce(str),
-})
 
 
-class APISecurity(CoreSysAttributes):
+class SecurityMiddleware(CoreSysAttributes):
-    """Handle rest api for security functions."""
+    """Security middleware functions."""
 
-    def _check_password(self, body):
+    def __init__(self, coresys):
-        """Check if password is valid and security is initialize."""
+        """Initialize security middleware."""
-        if not self._config.security_initialize:
+        self.coresys = coresys
-            raise RuntimeError("First set a password")
 
-        password = hash_password(body[ATTR_PASSWORD])
+    @middleware
-        if password != self._config.security_password:
+    async def token_validation(self, request, handler):
-            raise RuntimeError("Wrong password")
+        """Check security access of this layer."""
+        hassio_token = request.headers.get(HEADER_TOKEN)
 
-    @api_process
+        # Ignore security check
-    async def info(self, request):
+        for rule in NO_SECURITY_CHECK:
-        """Return host information."""
+            if rule.match(request.path):
-        return {
+                _LOGGER.debug("Passthrough %s", request.path)
-            ATTR_INITIALIZE: self._config.security_initialize,
+                return await handler(request)
-            ATTR_TOTP: self._config.security_totp is not None,
-        }
 
-    @api_process
+        # Unknown API access
-    async def options(self, request):
+        if not hassio_token:
-        """Set options / password."""
+            _LOGGER.warning("Invalid token for access %s", request.path)
-        body = await api_validate(SCHEMA_PASSWORD, request)
+            raise HTTPUnauthorized()
 
-        if self._config.security_initialize:
+        # Home-Assistant
-            raise RuntimeError("Password is already set!")
+        if hassio_token == self.sys_homeassistant.uuid:
+            _LOGGER.debug("%s access from Home-Assistant", request.path)
+            request[REQUEST_FROM] = 'homeassistant'
+            return await handler(request)
 
-        self._config.security_password = hash_password(body[ATTR_PASSWORD])
+        # Add-on
-        self._config.security_initialize = True
+        addon = self.sys_addons.from_uuid(hassio_token)
-        return True
+        if addon:
+            _LOGGER.info("%s access from %s", request.path, addon.slug)
+            request[REQUEST_FROM] = addon.slug
+            return await handler(request)
 
-    @api_process
+        raise HTTPUnauthorized()
-    async def totp(self, request):
-        """Set and initialze TOTP."""
-        body = await api_validate(SCHEMA_PASSWORD, request)
-        self._check_password(body)
-
-        # generate TOTP
-        totp_init_key = pyotp.random_base32()
-        totp = pyotp.TOTP(totp_init_key)
-
-        # init qrcode
-        buff = io.BytesIO()
-
-        qrcode = pyqrcode.create(totp.provisioning_uri("Hass.IO"))
-        qrcode.svg(buff)
-
-        # finish
-        self._config.security_totp = totp_init_key
-        return web.Response(body=buff.getvalue(), content_type='image/svg+xml')
-
-    @api_process
-    async def session(self, request):
-        """Set and initialze session."""
-        body = await api_validate(SCHEMA_SESSION, request)
-        self._check_password(body)
-
-        # check TOTP
-        if self._config.security_totp:
-            totp = pyotp.TOTP(self._config.security_totp)
-            if body[ATTR_TOTP] != totp.now():
-                raise RuntimeError("Invalid TOTP token!")
-
-        # create session
-        valid_until = datetime.now() + timedelta(days=1)
-        session = hashlib.sha256(os.urandom(54)).hexdigest()
-
-        # store session
-        self._config.add_security_session(session, valid_until)
-        return {ATTR_SESSION: session}

hassio/api/services.py

@@ -0,0 +1,55 @@
+"""Init file for HassIO network rest api."""
+
+from .utils import api_process, api_validate
+from ..const import (
+    ATTR_AVAILABLE, ATTR_PROVIDER, ATTR_SLUG, ATTR_SERVICES, REQUEST_FROM)
+from ..coresys import CoreSysAttributes
+
+
+class APIServices(CoreSysAttributes):
+    """Handle rest api for services functions."""
+
+    def _extract_service(self, request):
+        """Return service and if not exists trow a exception."""
+        service = self.sys_services.get(request.match_info.get('service'))
+        if not service:
+            raise RuntimeError("Service not exists")
+
+        return service
+
+    @api_process
+    async def list(self, request):
+        """Show register services."""
+        services = []
+        for service in self.sys_services.list_services:
+            services.append({
+                ATTR_SLUG: service.slug,
+                ATTR_AVAILABLE: service.enabled,
+                ATTR_PROVIDER: service.provider,
+            })
+
+        return {ATTR_SERVICES: services}
+
+    @api_process
+    async def set_service(self, request):
+        """Write data into a service."""
+        service = self._extract_service(request)
+        body = await api_validate(service.schema, request)
+
+        return service.set_service_data(request[REQUEST_FROM], body)
+
+    @api_process
+    async def get_service(self, request):
+        """Read data into a service."""
+        service = self._extract_service(request)
+
+        return {
+            ATTR_AVAILABLE: service.enabled,
+            service.slug: service.get_service_data(),
+        }
+
+    @api_process
+    async def del_service(self, request):
+        """Delete data into a service."""
+        service = self._extract_service(request)
+        return service.del_service_data(request[REQUEST_FROM])

hassio/api/snapshots.py

@@ -1,7 +1,10 @@
 """Init file for HassIO snapshot rest api."""
 import asyncio
 import logging
+from pathlib import Path
+from tempfile import TemporaryDirectory
 
+from aiohttp import web
 import voluptuous as vol
 
 from .utils import api_process, api_validate
@@ -9,7 +12,7 @@ from ..snapshots.validate import ALL_FOLDERS
 from ..const import (
     ATTR_NAME, ATTR_SLUG, ATTR_DATE, ATTR_ADDONS, ATTR_REPOSITORIES,
     ATTR_HOMEASSISTANT, ATTR_VERSION, ATTR_SIZE, ATTR_FOLDERS, ATTR_TYPE,
-    ATTR_SNAPSHOTS)
+    ATTR_SNAPSHOTS, ATTR_PASSWORD, ATTR_PROTECTED, CONTENT_TYPE_TAR)
 from ..coresys import CoreSysAttributes
 
 _LOGGER = logging.getLogger(__name__)
@@ -17,18 +20,28 @@ _LOGGER = logging.getLogger(__name__)
 
 # pylint: disable=no-value-for-parameter
 SCHEMA_RESTORE_PARTIAL = vol.Schema({
+    vol.Optional(ATTR_PASSWORD): vol.Any(None, vol.Coerce(str)),
     vol.Optional(ATTR_HOMEASSISTANT): vol.Boolean(),
-    vol.Optional(ATTR_ADDONS): [vol.Coerce(str)],
+    vol.Optional(ATTR_ADDONS):
-    vol.Optional(ATTR_FOLDERS): [vol.In(ALL_FOLDERS)],
+        vol.All([vol.Coerce(str)], vol.Unique()),
+    vol.Optional(ATTR_FOLDERS):
+        vol.All([vol.In(ALL_FOLDERS)], vol.Unique()),
+})
+
+SCHEMA_RESTORE_FULL = vol.Schema({
+    vol.Optional(ATTR_PASSWORD): vol.Any(None, vol.Coerce(str)),
 })
 
 SCHEMA_SNAPSHOT_FULL = vol.Schema({
     vol.Optional(ATTR_NAME): vol.Coerce(str),
+    vol.Optional(ATTR_PASSWORD): vol.Any(None, vol.Coerce(str)),
 })
 
 SCHEMA_SNAPSHOT_PARTIAL = SCHEMA_SNAPSHOT_FULL.extend({
-    vol.Optional(ATTR_ADDONS): [vol.Coerce(str)],
+    vol.Optional(ATTR_ADDONS):
-    vol.Optional(ATTR_FOLDERS): [vol.In(ALL_FOLDERS)],
+        vol.All([vol.Coerce(str)], vol.Unique()),
+    vol.Optional(ATTR_FOLDERS):
+        vol.All([vol.In(ALL_FOLDERS)], vol.Unique()),
 })
 
 
@@ -37,7 +50,7 @@ class APISnapshots(CoreSysAttributes):
 
     def _extract_snapshot(self, request):
         """Return addon and if not exists trow a exception."""
-        snapshot = self._snapshots.get(request.match_info.get('snapshot'))
+        snapshot = self.sys_snapshots.get(request.match_info.get('snapshot'))
         if not snapshot:
             raise RuntimeError("Snapshot not exists")
         return snapshot
@@ -46,11 +59,13 @@ class APISnapshots(CoreSysAttributes):
     async def list(self, request):
         """Return snapshot list."""
         data_snapshots = []
-        for snapshot in self._snapshots.list_snapshots:
+        for snapshot in self.sys_snapshots.list_snapshots:
             data_snapshots.append({
                 ATTR_SLUG: snapshot.slug,
                 ATTR_NAME: snapshot.name,
                 ATTR_DATE: snapshot.date,
+                ATTR_TYPE: snapshot.sys_type,
+                ATTR_PROTECTED: snapshot.protected,
             })
 
         return {
@@ -60,7 +75,7 @@ class APISnapshots(CoreSysAttributes):
     @api_process
     async def reload(self, request):
         """Reload snapshot list."""
-        await asyncio.shield(self._snapshots.reload(), loop=self._loop)
+        await asyncio.shield(self.sys_snapshots.reload())
         return True
 
     @api_process
@@ -74,6 +89,7 @@ class APISnapshots(CoreSysAttributes):
                 ATTR_SLUG: addon_data[ATTR_SLUG],
                 ATTR_NAME: addon_data[ATTR_NAME],
                 ATTR_VERSION: addon_data[ATTR_VERSION],
+                ATTR_SIZE: addon_data[ATTR_SIZE],
             })
 
         return {
@@ -82,6 +98,7 @@ class APISnapshots(CoreSysAttributes):
             ATTR_NAME: snapshot.name,
             ATTR_DATE: snapshot.date,
             ATTR_SIZE: snapshot.size,
+            ATTR_PROTECTED: snapshot.protected,
             ATTR_HOMEASSISTANT: snapshot.homeassistant_version,
             ATTR_ADDONS: data_addons,
             ATTR_REPOSITORIES: snapshot.repositories,
@@ -92,36 +109,78 @@ class APISnapshots(CoreSysAttributes):
     async def snapshot_full(self, request):
         """Full-Snapshot a snapshot."""
         body = await api_validate(SCHEMA_SNAPSHOT_FULL, request)
-        return await asyncio.shield(
+        snapshot = await asyncio.shield(
-            self._snapshots.do_snapshot_full(**body), loop=self._loop)
+            self.sys_snapshots.do_snapshot_full(**body))
+
+        if snapshot:
+            return {ATTR_SLUG: snapshot.slug}
+        return False
 
     @api_process
     async def snapshot_partial(self, request):
         """Partial-Snapshot a snapshot."""
         body = await api_validate(SCHEMA_SNAPSHOT_PARTIAL, request)
-        return await asyncio.shield(
+        snapshot = await asyncio.shield(
-            self._snapshots.do_snapshot_partial(**body), loop=self._loop)
+            self.sys_snapshots.do_snapshot_partial(**body))
+
+        if snapshot:
+            return {ATTR_SLUG: snapshot.slug}
+        return False
 
     @api_process
-    def restore_full(self, request):
+    async def restore_full(self, request):
         """Full-Restore a snapshot."""
         snapshot = self._extract_snapshot(request)
-        return asyncio.shield(
+        body = await api_validate(SCHEMA_RESTORE_FULL, request)
-            self._snapshots.do_restore_full(snapshot), loop=self._loop)
+
+        return await asyncio.shield(
+            self.sys_snapshots.do_restore_full(snapshot, **body))
 
     @api_process
     async def restore_partial(self, request):
         """Partial-Restore a snapshot."""
         snapshot = self._extract_snapshot(request)
-        body = await api_validate(SCHEMA_SNAPSHOT_PARTIAL, request)
+        body = await api_validate(SCHEMA_RESTORE_PARTIAL, request)
 
         return await asyncio.shield(
-            self._snapshots.do_restore_partial(snapshot, **body),
+            self.sys_snapshots.do_restore_partial(snapshot, **body))
-            loop=self._loop
-        )
 
     @api_process
     async def remove(self, request):
         """Remove a snapshot."""
         snapshot = self._extract_snapshot(request)
-        return self._snapshots.remove(snapshot)
+        return self.sys_snapshots.remove(snapshot)
+
+    async def download(self, request):
+        """Download a snapshot file."""
+        snapshot = self._extract_snapshot(request)
+
+        _LOGGER.info("Download snapshot %s", snapshot.slug)
+        response = web.FileResponse(snapshot.tarfile)
+        response.content_type = CONTENT_TYPE_TAR
+        return response
+
+    @api_process
+    async def upload(self, request):
+        """Upload a snapshot file."""
+        with TemporaryDirectory(dir=str(self.sys_config.path_tmp)) as temp_dir:
+            tar_file = Path(temp_dir, f"snapshot.tar")
+
+            try:
+                with tar_file.open('wb') as snapshot:
+                    async for data in request.content.iter_any():
+                        snapshot.write(data)
+
+            except OSError as err:
+                _LOGGER.error("Can't write new snapshot file: %s", err)
+                return False
+
+            except asyncio.CancelledError:
+                return False
+
+            snapshot = await asyncio.shield(
+                self.sys_snapshots.import_snapshot(tar_file))
+
+            if snapshot:
+                return {ATTR_SLUG: snapshot.slug}
+            return False

hassio/api/supervisor.py

@@ -6,21 +6,20 @@ import voluptuous as vol
 
 from .utils import api_process, api_process_raw, api_validate
 from ..const import (
-    ATTR_ADDONS, ATTR_VERSION, ATTR_LAST_VERSION, ATTR_BETA_CHANNEL, ATTR_ARCH,
+    ATTR_ADDONS, ATTR_VERSION, ATTR_LAST_VERSION, ATTR_CHANNEL, ATTR_ARCH,
     HASSIO_VERSION, ATTR_ADDONS_REPOSITORIES, ATTR_LOGO, ATTR_REPOSITORY,
     ATTR_DESCRIPTON, ATTR_NAME, ATTR_SLUG, ATTR_INSTALLED, ATTR_TIMEZONE,
     ATTR_STATE, ATTR_WAIT_BOOT, ATTR_CPU_PERCENT, ATTR_MEMORY_USAGE,
     ATTR_MEMORY_LIMIT, ATTR_NETWORK_RX, ATTR_NETWORK_TX, ATTR_BLK_READ,
-    ATTR_BLK_WRITE, CONTENT_TYPE_BINARY)
+    ATTR_BLK_WRITE, CONTENT_TYPE_BINARY, ATTR_ICON)
 from ..coresys import CoreSysAttributes
-from ..validate import validate_timezone, WAIT_BOOT
+from ..validate import validate_timezone, WAIT_BOOT, REPOSITORIES, CHANNELS
 
 _LOGGER = logging.getLogger(__name__)
 
 SCHEMA_OPTIONS = vol.Schema({
-    # pylint: disable=no-value-for-parameter
+    vol.Optional(ATTR_CHANNEL): CHANNELS,
-    vol.Optional(ATTR_BETA_CHANNEL): vol.Boolean(),
+    vol.Optional(ATTR_ADDONS_REPOSITORIES): REPOSITORIES,
-    vol.Optional(ATTR_ADDONS_REPOSITORIES): [vol.Url()],
     vol.Optional(ATTR_TIMEZONE): validate_timezone,
     vol.Optional(ATTR_WAIT_BOOT): WAIT_BOOT,
 })
@@ -42,7 +41,7 @@ class APISupervisor(CoreSysAttributes):
     async def info(self, request):
         """Return host information."""
         list_addons = []
-        for addon in self._addons.list_addons:
+        for addon in self.sys_addons.list_addons:
             if addon.is_installed:
                 list_addons.append({
                     ATTR_NAME: addon.name,
@@ -52,18 +51,19 @@ class APISupervisor(CoreSysAttributes):
                     ATTR_VERSION: addon.last_version,
                     ATTR_INSTALLED: addon.version_installed,
                     ATTR_REPOSITORY: addon.repository,
+                    ATTR_ICON: addon.with_icon,
                     ATTR_LOGO: addon.with_logo,
                 })
 
         return {
             ATTR_VERSION: HASSIO_VERSION,
-            ATTR_LAST_VERSION: self._updater.version_hassio,
+            ATTR_LAST_VERSION: self.sys_updater.version_hassio,
-            ATTR_BETA_CHANNEL: self._updater.beta_channel,
+            ATTR_CHANNEL: self.sys_updater.channel,
-            ATTR_ARCH: self._arch,
+            ATTR_ARCH: self.sys_arch,
-            ATTR_WAIT_BOOT: self._config.wait_boot,
+            ATTR_WAIT_BOOT: self.sys_config.wait_boot,
-            ATTR_TIMEZONE: self._config.timezone,
+            ATTR_TIMEZONE: self.sys_config.timezone,
             ATTR_ADDONS: list_addons,
-            ATTR_ADDONS_REPOSITORIES: self._config.addons_repositories,
+            ATTR_ADDONS_REPOSITORIES: self.sys_config.addons_repositories,
         }
 
     @api_process
@@ -71,27 +71,27 @@ class APISupervisor(CoreSysAttributes):
         """Set supervisor options."""
         body = await api_validate(SCHEMA_OPTIONS, request)
 
-        if ATTR_BETA_CHANNEL in body:
+        if ATTR_CHANNEL in body:
-            self._updater.beta_channel = body[ATTR_BETA_CHANNEL]
+            self.sys_updater.channel = body[ATTR_CHANNEL]
 
         if ATTR_TIMEZONE in body:
-            self._config.timezone = body[ATTR_TIMEZONE]
+            self.sys_config.timezone = body[ATTR_TIMEZONE]
 
         if ATTR_WAIT_BOOT in body:
-            self._config.wait_boot = body[ATTR_WAIT_BOOT]
+            self.sys_config.wait_boot = body[ATTR_WAIT_BOOT]
 
         if ATTR_ADDONS_REPOSITORIES in body:
             new = set(body[ATTR_ADDONS_REPOSITORIES])
-            await asyncio.shield(self._addons.load_repositories(new))
+            await asyncio.shield(self.sys_addons.load_repositories(new))
 
-        self._updater.save()
+        self.sys_updater.save_data()
-        self._config.save()
+        self.sys_config.save_data()
         return True
 
     @api_process
     async def stats(self, request):
         """Return resource information."""
-        stats = await self._supervisor.stats()
+        stats = await self.sys_supervisor.stats()
         if not stats:
             raise RuntimeError("No stats available")
 
@@ -109,22 +109,22 @@ class APISupervisor(CoreSysAttributes):
     async def update(self, request):
         """Update supervisor OS."""
         body = await api_validate(SCHEMA_VERSION, request)
-        version = body.get(ATTR_VERSION, self._updater.version_hassio)
+        version = body.get(ATTR_VERSION, self.sys_updater.version_hassio)
 
-        if version == self._supervisor.version:
+        if version == self.sys_supervisor.version:
             raise RuntimeError("Version {} is already in use".format(version))
 
         return await asyncio.shield(
-            self._supervisor.update(version), loop=self._loop)
+            self.sys_supervisor.update(version))
 
     @api_process
     async def reload(self, request):
         """Reload addons, config ect."""
         tasks = [
-            self._updater.reload(),
+            self.sys_updater.reload(),
         ]
         results, _ = await asyncio.shield(
-            asyncio.wait(tasks, loop=self._loop), loop=self._loop)
+            asyncio.wait(tasks))
 
         for result in results:
             if result.exception() is not None:
@@ -135,4 +135,4 @@ class APISupervisor(CoreSysAttributes):
     @api_process_raw(CONTENT_TYPE_BINARY)
     def logs(self, request):
         """Return supervisor docker logs."""
-        return self._supervisor.logs()
+        return self.sys_supervisor.logs()

hassio/api/utils.py

@@ -4,13 +4,13 @@ import hashlib
 import logging
 
 from aiohttp import web
-from aiohttp.web_exceptions import HTTPServiceUnavailable
 import voluptuous as vol
 from voluptuous.humanize import humanize_error
 
 from ..const import (
     JSON_RESULT, JSON_DATA, JSON_MESSAGE, RESULT_OK, RESULT_ERROR,
     CONTENT_TYPE_BINARY)
+from ..exceptions import HassioError
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -33,42 +33,21 @@ def api_process(method):
             answer = await method(api, *args, **kwargs)
         except RuntimeError as err:
             return api_return_error(message=str(err))
+        except HassioError:
+            _LOGGER.exception("Hassio error")
+            return api_return_error()
 
         if isinstance(answer, dict):
             return api_return_ok(data=answer)
         if isinstance(answer, web.Response):
             return answer
-        elif answer:
+        elif isinstance(answer, bool) and not answer:
-            return api_return_ok()
+            return api_return_error()
-        return api_return_error()
+        return api_return_ok()
 
     return wrap_api
 
 
-def api_process_hostcontrol(method):
-    """Wrap HostControl calls to rest api."""
-    async def wrap_hostcontrol(api, *args, **kwargs):
-        """Return host information."""
-        # pylint: disable=protected-access
-        if not api._host_control.active:
-            raise HTTPServiceUnavailable()
-
-        try:
-            answer = await method(api, *args, **kwargs)
-        except RuntimeError as err:
-            return api_return_error(message=str(err))
-
-        if isinstance(answer, dict):
-            return api_return_ok(data=answer)
-        elif answer is None:
-            return api_return_error("Function is not supported")
-        elif answer:
-            return api_return_ok()
-        return api_return_error()
-
-    return wrap_hostcontrol
-
-
 def api_process_raw(content):
     """Wrap content_type into function."""
     def wrap_method(method):
@@ -81,6 +60,9 @@ def api_process_raw(content):
             except RuntimeError as err:
                 msg_data = str(err).encode()
                 msg_type = CONTENT_TYPE_BINARY
+            except HassioError:
+                msg_data = b''
+                msg_type = CONTENT_TYPE_BINARY
 
             return web.Response(body=msg_data, content_type=msg_type)
 

hassio/bootstrap.py

@@ -7,15 +7,20 @@ from pathlib import Path
 
 from colorlog import ColoredFormatter
 
+from .core import HassIO
 from .addons import AddonManager
 from .api import RestAPI
 from .const import SOCKET_DOCKER
 from .coresys import CoreSys
 from .supervisor import Supervisor
 from .homeassistant import HomeAssistant
-from .snapshots import SnapshotsManager
+from .snapshots import SnapshotManager
 from .tasks import Tasks
 from .updater import Updater
+from .services import ServiceManager
+from .services import Discovery
+from .host import HostManager
+from .dbus import DBusManager
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -25,13 +30,18 @@ def initialize_coresys(loop):
     coresys = CoreSys(loop)
 
     # Initialize core objects
+    coresys.core = HassIO(coresys)
     coresys.updater = Updater(coresys)
     coresys.api = RestAPI(coresys)
     coresys.supervisor = Supervisor(coresys)
     coresys.homeassistant = HomeAssistant(coresys)
     coresys.addons = AddonManager(coresys)
-    coresys.snapshots = SnapshotsManager(coresys)
+    coresys.snapshots = SnapshotManager(coresys)
+    coresys.host = HostManager(coresys)
     coresys.tasks = Tasks(coresys)
+    coresys.services = ServiceManager(coresys)
+    coresys.discovery = Discovery(coresys)
+    coresys.dbus = DBusManager(coresys)
 
     # bootstrap config
     initialize_system_data(coresys)
@@ -144,7 +154,12 @@ def check_environment():
 
     # check socat exec
     if not shutil.which('socat'):
-        _LOGGER.fatal("Can0t find socat program!")
+        _LOGGER.fatal("Can't find socat program!")
+        return False
+
+    # check socat exec
+    if not shutil.which('gdbus'):
+        _LOGGER.fatal("Can't find gdbus program!")
         return False
 
     return True

hassio/config.py

@@ -5,9 +5,8 @@ import os
 from pathlib import Path, PurePath
 
 from .const import (
-    FILE_HASSIO_CONFIG, HASSIO_DATA, ATTR_SECURITY, ATTR_SESSIONS,
+    FILE_HASSIO_CONFIG, HASSIO_DATA, ATTR_TIMEZONE, ATTR_ADDONS_CUSTOM_LIST,
-    ATTR_PASSWORD, ATTR_TOTP, ATTR_TIMEZONE, ATTR_ADDONS_CUSTOM_LIST,
+    ATTR_LAST_BOOT, ATTR_WAIT_BOOT)
-    ATTR_AUDIO_INPUT, ATTR_AUDIO_OUTPUT, ATTR_LAST_BOOT, ATTR_WAIT_BOOT)
 from .utils.dt import parse_datetime
 from .utils.json import JsonConfig
 from .validate import SCHEMA_HASSIO_CONFIG
@@ -46,7 +45,6 @@ class CoreConfig(JsonConfig):
     def timezone(self, value):
         """Set system timezone."""
         self._data[ATTR_TIMEZONE] = value
-        self.save()
 
     @property
     def wait_boot(self):
@@ -57,7 +55,6 @@ class CoreConfig(JsonConfig):
     def wait_boot(self, value):
         """Set wait boot time."""
         self._data[ATTR_WAIT_BOOT] = value
-        self.save()
 
     @property
     def last_boot(self):
@@ -73,7 +70,6 @@ class CoreConfig(JsonConfig):
     def last_boot(self, value):
         """Set last boot datetime."""
         self._data[ATTR_LAST_BOOT] = value.isoformat()
-        self.save()
 
     @property
     def path_hassio(self):
@@ -140,6 +136,11 @@ class CoreConfig(JsonConfig):
         """Return hass.io temp folder."""
         return Path(HASSIO_DATA, TMP_DATA)
 
+    @property
+    def path_extern_tmp(self):
+        """Return hass.io temp folder for docker."""
+        return PurePath(self.path_extern_hassio, TMP_DATA)
+
     @property
     def path_backup(self):
         """Return root backup data folder."""
@@ -171,7 +172,6 @@ class CoreConfig(JsonConfig):
             return
 
         self._data[ATTR_ADDONS_CUSTOM_LIST].append(repo)
-        self.save()
 
     def drop_addon_repository(self, repo):
         """Remove a custom repository from list."""
@@ -179,79 +179,3 @@ class CoreConfig(JsonConfig):
             return
 
         self._data[ATTR_ADDONS_CUSTOM_LIST].remove(repo)
-        self.save()
-
-    @property
-    def security_initialize(self):
-        """Return is security was initialize."""
-        return self._data[ATTR_SECURITY]
-
-    @security_initialize.setter
-    def security_initialize(self, value):
-        """Set is security initialize."""
-        self._data[ATTR_SECURITY] = value
-        self.save()
-
-    @property
-    def security_totp(self):
-        """Return the TOTP key."""
-        return self._data.get(ATTR_TOTP)
-
-    @security_totp.setter
-    def security_totp(self, value):
-        """Set the TOTP key."""
-        self._data[ATTR_TOTP] = value
-        self.save()
-
-    @property
-    def security_password(self):
-        """Return the password key."""
-        return self._data.get(ATTR_PASSWORD)
-
-    @security_password.setter
-    def security_password(self, value):
-        """Set the password key."""
-        self._data[ATTR_PASSWORD] = value
-        self.save()
-
-    @property
-    def security_sessions(self):
-        """Return api sessions."""
-        return {
-            session: parse_datetime(until) for
-            session, until in self._data[ATTR_SESSIONS].items()
-        }
-
-    def add_security_session(self, session, valid):
-        """Set the a new session."""
-        self._data[ATTR_SESSIONS].update(
-            {session: valid.isoformat()}
-        )
-        self.save()
-
-    def drop_security_session(self, session):
-        """Delete the a session."""
-        self._data[ATTR_SESSIONS].pop(session, None)
-        self.save()
-
-    @property
-    def audio_output(self):
-        """Return ALSA audio output card,dev."""
-        return self._data.get(ATTR_AUDIO_OUTPUT)
-
-    @audio_output.setter
-    def audio_output(self, value):
-        """Set ALSA audio output card,dev."""
-        self._data[ATTR_AUDIO_OUTPUT] = value
-        self.save()
-
-    @property
-    def audio_input(self):
-        """Return ALSA audio input card,dev."""
-        return self._data.get(ATTR_AUDIO_INPUT)
-
-    @audio_input.setter
-    def audio_input(self, value):
-        """Set ALSA audio input card,dev."""
-        self._data[ATTR_AUDIO_INPUT] = value
-        self.save()

hassio/const.py

@@ -2,12 +2,11 @@
 from pathlib import Path
 from ipaddress import ip_network
 
-HASSIO_VERSION = '0.80'
+HASSIO_VERSION = '105'
 
-URL_HASSIO_VERSION = ('https://raw.githubusercontent.com/home-assistant/'
+URL_HASSIO_ADDONS = "https://github.com/home-assistant/hassio-addons"
-                      'hassio/{}/version.json')
+URL_HASSIO_VERSION = \
-
+  "https://s3.amazonaws.com/hassio-version/{channel}.json"
-URL_HASSIO_ADDONS = 'https://github.com/home-assistant/hassio-addons'
 
 HASSIO_DATA = Path("/data")
 
@@ -15,9 +14,9 @@ FILE_HASSIO_ADDONS = Path(HASSIO_DATA, "addons.json")
 FILE_HASSIO_CONFIG = Path(HASSIO_DATA, "config.json")
 FILE_HASSIO_HOMEASSISTANT = Path(HASSIO_DATA, "homeassistant.json")
 FILE_HASSIO_UPDATER = Path(HASSIO_DATA, "updater.json")
+FILE_HASSIO_SERVICES = Path(HASSIO_DATA, "services.json")
 
 SOCKET_DOCKER = Path("/var/run/docker.sock")
-SOCKET_HC = Path("/var/run/hassio-hc.sock")
 
 DOCKER_NETWORK = 'hassio'
 DOCKER_NETWORK_MASK = ip_network('172.30.32.0/23')
@@ -26,6 +25,7 @@ DOCKER_NETWORK_RANGE = ip_network('172.30.33.0/24')
 LABEL_VERSION = 'io.hass.version'
 LABEL_ARCH = 'io.hass.arch'
 LABEL_TYPE = 'io.hass.type'
+LABEL_MACHINE = 'io.hass.machine'
 
 META_ADDON = 'addon'
 META_SUPERVISOR = 'supervisor'
@@ -42,9 +42,18 @@ CONTENT_TYPE_BINARY = 'application/octet-stream'
 CONTENT_TYPE_PNG = 'image/png'
 CONTENT_TYPE_JSON = 'application/json'
 CONTENT_TYPE_TEXT = 'text/plain'
+CONTENT_TYPE_TAR = 'application/tar'
 HEADER_HA_ACCESS = 'x-ha-access'
+HEADER_TOKEN = 'X-HASSIO-KEY'
 
+ENV_TOKEN = 'HASSIO_TOKEN'
+ENV_TIME = 'TZ'
+
+REQUEST_FROM = 'HASSIO_FROM'
+
+ATTR_MACHINE = 'machine'
 ATTR_WAIT_BOOT = 'wait_boot'
+ATTR_DEPLOYMENT = 'deployment'
 ATTR_WATCHDOG = 'watchdog'
 ATTR_CHANGELOG = 'changelog'
 ATTR_DATE = 'date'
@@ -53,7 +62,8 @@ ATTR_LONG_DESCRIPTION = 'long_description'
 ATTR_HOSTNAME = 'hostname'
 ATTR_TIMEZONE = 'timezone'
 ATTR_ARGS = 'args'
-ATTR_OS = 'os'
+ATTR_OPERATING_SYSTEM = 'operating_system'
+ATTR_CHASSIS = 'chassis'
 ATTR_TYPE = 'type'
 ATTR_SOURCE = 'source'
 ATTR_FEATURES = 'features'
@@ -62,7 +72,7 @@ ATTR_VERSION = 'version'
 ATTR_AUTO_UART = 'auto_uart'
 ATTR_LAST_BOOT = 'last_boot'
 ATTR_LAST_VERSION = 'last_version'
-ATTR_BETA_CHANNEL = 'beta_channel'
+ATTR_CHANNEL = 'channel'
 ATTR_NAME = 'name'
 ATTR_SLUG = 'slug'
 ATTR_DESCRIPTON = 'description'
@@ -79,6 +89,7 @@ ATTR_DETACHED = 'detached'
 ATTR_STATE = 'state'
 ATTR_SCHEMA = 'schema'
 ATTR_IMAGE = 'image'
+ATTR_ICON = 'icon'
 ATTR_LOGO = 'logo'
 ATTR_STDIN = 'stdin'
 ATTR_ADDONS_REPOSITORIES = 'addons_repositories'
@@ -135,6 +146,26 @@ ATTR_MEMORY_LIMIT = 'memory_limit'
 ATTR_MEMORY_USAGE = 'memory_usage'
 ATTR_BLK_READ = 'blk_read'
 ATTR_BLK_WRITE = 'blk_write'
+ATTR_PROVIDER = 'provider'
+ATTR_AVAILABLE = 'available'
+ATTR_HOST = 'host'
+ATTR_USERNAME = 'username'
+ATTR_PROTOCOL = 'protocol'
+ATTR_DISCOVERY = 'discovery'
+ATTR_PLATFORM = 'platform'
+ATTR_COMPONENT = 'component'
+ATTR_CONFIG = 'config'
+ATTR_DISCOVERY_ID = 'discovery_id'
+ATTR_SERVICES = 'services'
+ATTR_DISCOVERY = 'discovery'
+ATTR_PROTECTED = 'protected'
+ATTR_CRYPTO = 'crypto'
+ATTR_BRANCH = 'branch'
+ATTR_KERNEL = 'kernel'
+ATTR_SECCOMP = 'seccomp'
+ATTR_APPARMOR = 'apparmor'
+
+SERVICE_MQTT = 'mqtt'
 
 STARTUP_INITIALIZE = 'initialize'
 STARTUP_SYSTEM = 'system'
@@ -160,6 +191,10 @@ ARCH_AARCH64 = 'aarch64'
 ARCH_AMD64 = 'amd64'
 ARCH_I386 = 'i386'
 
+CHANNEL_STABLE = 'stable'
+CHANNEL_BETA = 'beta'
+CHANNEL_DEV = 'dev'
+
 REPOSITORY_CORE = 'core'
 REPOSITORY_LOCAL = 'local'
 
@@ -170,3 +205,14 @@ FOLDER_SSL = 'ssl'
 
 SNAPSHOT_FULL = 'full'
 SNAPSHOT_PARTIAL = 'partial'
+
+CRYPTO_AES128 = 'aes128'
+
+SECURITY_PROFILE = 'profile'
+SECURITY_DEFAULT = 'default'
+SECURITY_DISABLE = 'disable'
+
+FEATURES_SHUTDOWN = 'shutdown'
+FEATURES_REBOOT = 'reboot'
+FEATURES_UPDATE = 'update'
+FEATURES_HOSTNAME = 'hostname'

hassio/core.py

@@ -1,10 +1,12 @@
 """Main file for HassIO."""
+from contextlib import suppress
 import asyncio
 import logging
 
 from .coresys import CoreSysAttributes
 from .const import (
     STARTUP_SYSTEM, STARTUP_SERVICES, STARTUP_APPLICATION, STARTUP_INITIALIZE)
+from .exceptions import HassioError
 from .utils.dt import fetch_timezone
 
 _LOGGER = logging.getLogger(__name__)
@@ -20,90 +22,114 @@ class HassIO(CoreSysAttributes):
     async def setup(self):
         """Setup HassIO orchestration."""
         # update timezone
-        if self._config.timezone == 'UTC':
+        if self.sys_config.timezone == 'UTC':
-            self._config.timezone = await fetch_timezone(self._websession)
+            self.sys_config.timezone = \
+                await fetch_timezone(self.sys_websession)
 
-        # supervisor
+        # Load DBus
-        await self._supervisor.load()
+        await self.sys_dbus.load()
 
-        # hostcontrol
+        # Load Host
-        await self._host_control.load()
+        await self.sys_host.load()
 
-        # Load homeassistant
+        # Load Supervisor
-        await self._homeassistant.load()
+        await self.sys_supervisor.load()
 
-        # Load addons
+        # Load Home Assistant
-        await self._addons.load()
+        await self.sys_homeassistant.load()
+
+        # Load Add-ons
+        await self.sys_addons.load()
 
         # rest api views
-        await self._api.load()
+        await self.sys_api.load()
 
         # load last available data
-        await self._updater.load()
+        await self.sys_updater.load()
 
         # load last available data
-        await self._snapshots.load()
+        await self.sys_snapshots.load()
+
+        # load services
+        await self.sys_services.load()
 
         # start dns forwarding
-        self._loop.create_task(self._dns.start())
+        self.sys_create_task(self.sys_dns.start())
-
-        # start addon mark as initialize
-        await self._addons.auto_boot(STARTUP_INITIALIZE)
 
     async def start(self):
         """Start HassIO orchestration."""
         # on release channel, try update itself
-        # on beta channel, only read new versions
+        # on dev mode, only read new versions
-        if not self._updater.beta_channel:
+        if not self.sys_dev and self.sys_supervisor.need_update:
-            await self._supervisor.update()
+            if await self.sys_supervisor.update():
+                return
         else:
-            _LOGGER.info("Ignore Hass.io auto updates on beta mode")
+            _LOGGER.info("Ignore Hass.io auto updates on dev channel")
 
         # start api
-        await self._api.start()
+        await self.sys_api.start()
-        _LOGGER.info("Start API on %s", self._docker.network.supervisor)
+        _LOGGER.info("Start API on %s", self.sys_docker.network.supervisor)
+
+        # start addon mark as initialize
+        await self.sys_addons.boot(STARTUP_INITIALIZE)
 
         try:
             # HomeAssistant is already running / supervisor have only reboot
-            if self._hardware.last_boot == self._config.last_boot:
+            if self.sys_hardware.last_boot == self.sys_config.last_boot:
                 _LOGGER.info("Hass.io reboot detected")
                 return
 
+            # reset register services / discovery
+            self.sys_services.reset()
+
             # start addon mark as system
-            await self._addons.auto_boot(STARTUP_SYSTEM)
+            await self.sys_addons.boot(STARTUP_SYSTEM)
 
             # start addon mark as services
-            await self._addons.auto_boot(STARTUP_SERVICES)
+            await self.sys_addons.boot(STARTUP_SERVICES)
 
             # run HomeAssistant
-            if self._homeassistant.boot:
+            if self.sys_homeassistant.boot:
-                await self._homeassistant.run()
+                await self.sys_homeassistant.start()
 
             # start addon mark as application
-            await self._addons.auto_boot(STARTUP_APPLICATION)
+            await self.sys_addons.boot(STARTUP_APPLICATION)
 
             # store new last boot
-            self._config.last_boot = self._hardware.last_boot
+            self.sys_config.last_boot = self.sys_hardware.last_boot
+            self.sys_config.save_data()
 
         finally:
             # Add core tasks into scheduler
-            await self._tasks.load()
+            await self.sys_tasks.load()
 
             # If landingpage / run upgrade in background
-            if self._homeassistant.version == 'landingpage':
+            if self.sys_homeassistant.version == 'landingpage':
-                self._loop.create_task(self._homeassistant.install())
+                self.sys_create_task(self.sys_homeassistant.install())
 
-        _LOGGER.info("Hass.io is up and running")
+            _LOGGER.info("Hass.io is up and running")
 
     async def stop(self):
         """Stop a running orchestration."""
         # don't process scheduler anymore
-        self._scheduler.suspend = True
+        self.sys_scheduler.suspend = True
-
-        # process stop tasks
-        self._websession.close()
-        self._websession_ssl.close()
 
         # process async stop tasks
-        await asyncio.wait(
+        await asyncio.wait([
-            [self._api.stop(), self._dns.stop()], loop=self._loop)
+            self.sys_api.stop(),
+            self.sys_dns.stop(),
+            self.sys_websession.close(),
+            self.sys_websession_ssl.close()
+        ])
+
+    async def shutdown(self):
+        """Shutdown all running containers in correct order."""
+        await self.sys_addons.shutdown(STARTUP_APPLICATION)
+
+        # Close Home Assistant
+        with suppress(HassioError):
+            await self.sys_homeassistant.stop()
+
+        await self.sys_addons.shutdown(STARTUP_SERVICES)
+        await self.sys_addons.shutdown(STARTUP_SYSTEM)
+        await self.sys_addons.shutdown(STARTUP_INITIALIZE)

hassio/coresys.py

@@ -2,15 +2,15 @@
 
 import aiohttp
 
+from .const import CHANNEL_DEV
 from .config import CoreConfig
 from .docker import DockerAPI
 from .misc.dns import DNSForward
 from .misc.hardware import Hardware
-from .misc.host_control import HostControl
 from .misc.scheduler import Scheduler
 
 
-class CoreSys(object):
+class CoreSys:
     """Class that handle all shared data."""
 
     def __init__(self, loop):
@@ -30,9 +30,9 @@ class CoreSys(object):
         self._docker = DockerAPI()
         self._scheduler = Scheduler(loop=loop)
         self._dns = DNSForward(loop=loop)
-        self._host_control = HostControl(loop=loop)
 
         # Internal objects pointers
+        self._core = None
         self._homeassistant = None
         self._supervisor = None
         self._addons = None
@@ -40,6 +40,10 @@ class CoreSys(object):
         self._updater = None
         self._snapshots = None
         self._tasks = None
+        self._host = None
+        self._dbus = None
+        self._services = None
+        self._discovery = None
 
     @property
     def arch(self):
@@ -48,6 +52,18 @@ class CoreSys(object):
             return self._supervisor.arch
         return None
 
+    @property
+    def machine(self):
+        """Return running machine type of hass.io system."""
+        if self._homeassistant:
+            return self._homeassistant.machine
+        return None
+
+    @property
+    def dev(self):
+        """Return True if we run dev modus."""
+        return self._updater.channel == CHANNEL_DEV
+
     @property
     def loop(self):
         """Return loop object."""
@@ -89,9 +105,16 @@ class CoreSys(object):
         return self._dns
 
     @property
-    def host_control(self):
+    def core(self):
-        """Return HostControl object."""
+        """Return HassIO object."""
-        return self._host_control
+        return self._core
+
+    @core.setter
+    def core(self, value):
+        """Set a HassIO object."""
+        if self._core:
+            raise RuntimeError("HassIO already set!")
+        self._core = value
 
     @property
     def homeassistant(self):
@@ -155,19 +178,19 @@ class CoreSys(object):
 
     @property
     def snapshots(self):
-        """Return SnapshotsManager object."""
+        """Return SnapshotManager object."""
         return self._snapshots
 
     @snapshots.setter
     def snapshots(self, value):
-        """Set a SnapshotsManager object."""
+        """Set a SnapshotManager object."""
         if self._snapshots:
             raise RuntimeError("SnapshotsManager already set!")
         self._snapshots = value
 
     @property
     def tasks(self):
-        """Return SnapshotsManager object."""
+        """Return Tasks object."""
         return self._tasks
 
     @tasks.setter
@@ -177,14 +200,70 @@ class CoreSys(object):
             raise RuntimeError("Tasks already set!")
         self._tasks = value
 
+    @property
+    def services(self):
+        """Return ServiceManager object."""
+        return self._services
 
-class CoreSysAttributes(object):
+    @services.setter
+    def services(self, value):
+        """Set a ServiceManager object."""
+        if self._services:
+            raise RuntimeError("Services already set!")
+        self._services = value
+
+    @property
+    def discovery(self):
+        """Return ServiceManager object."""
+        return self._discovery
+
+    @discovery.setter
+    def discovery(self, value):
+        """Set a Discovery object."""
+        if self._discovery:
+            raise RuntimeError("Discovery already set!")
+        self._discovery = value
+
+    @property
+    def dbus(self):
+        """Return DBusManager object."""
+        return self._dbus
+
+    @dbus.setter
+    def dbus(self, value):
+        """Set a DBusManager object."""
+        if self._dbus:
+            raise RuntimeError("DBusManager already set!")
+        self._dbus = value
+
+    @property
+    def host(self):
+        """Return HostManager object."""
+        return self._host
+
+    @host.setter
+    def host(self, value):
+        """Set a HostManager object."""
+        if self._host:
+            raise RuntimeError("HostManager already set!")
+        self._host = value
+
+    def run_in_executor(self, funct, *args):
+        """Wrapper for executor pool."""
+        return self._loop.run_in_executor(None, funct, *args)
+
+    def create_task(self, coroutine):
+        """Wrapper for async task."""
+        return self._loop.create_task(coroutine)
+
+
+class CoreSysAttributes:
     """Inheret basic CoreSysAttributes."""
 
     coresys = None
 
     def __getattr__(self, name):
         """Mapping to coresys."""
-        if hasattr(self.coresys, name[1:]):
+        if name.startswith("sys_") and hasattr(self.coresys, name[4:]):
-            return getattr(self.coresys, name[1:])
+            return getattr(self.coresys, name[4:])
-        raise AttributeError(f"Can't find {name} on {self.__class__}")
+        raise AttributeError()

hassio/dbus/__init__.py

@@ -0,0 +1,30 @@
+"""DBus interface objects."""
+
+from .systemd import Systemd
+from .hostname import Hostname
+from ..coresys import CoreSysAttributes
+
+
+class DBusManager(CoreSysAttributes):
+    """DBus Interface handler."""
+
+    def __init__(self, coresys):
+        """Initialize DBus  Interface."""
+        self.coresys = coresys
+        self._systemd = Systemd()
+        self._hostname = Hostname()
+
+    @property
+    def systemd(self):
+        """Return Systemd Interface."""
+        return self._systemd
+
+    @property
+    def hostname(self):
+        """Return hostname Interface."""
+        return self._hostname
+
+    async def load(self):
+        """Connect interfaces to dbus."""
+        await self.systemd.connect()
+        await self.hostname.connect()

hassio/dbus/hostname.py

@@ -0,0 +1,39 @@
+"""DBus interface for hostname."""
+import logging
+
+from .interface import DBusInterface
+from .utils import dbus_connected
+from ..exceptions import DBusError
+from ..utils.gdbus import DBus
+
+_LOGGER = logging.getLogger(__name__)
+
+DBUS_NAME = 'org.freedesktop.hostname1'
+DBUS_OBJECT = '/org/freedesktop/hostname1'
+
+
+class Hostname(DBusInterface):
+    """Handle DBus interface for hostname/system."""
+
+    async def connect(self):
+        """Connect do bus."""
+        try:
+            self.dbus = await DBus.connect(DBUS_NAME, DBUS_OBJECT)
+        except DBusError:
+            _LOGGER.warning("Can't connect to hostname")
+
+    @dbus_connected
+    def set_static_hostname(self, hostname):
+        """Change local hostname.
+
+        Return a coroutine.
+        """
+        return self.dbus.SetStaticHostname(hostname)
+
+    @dbus_connected
+    def get_properties(self):
+        """Return local host informations.
+
+        Return a coroutine.
+        """
+        return self.dbus.get_properties(DBUS_NAME)

hassio/dbus/interface.py

@@ -0,0 +1,18 @@
+"""Interface class for dbus wrappers."""
+
+
+class DBusInterface:
+    """Handle DBus interface for hostname/system."""
+
+    def __init__(self):
+        """Initialize systemd."""
+        self.dbus = None
+
+    @property
+    def is_connected(self):
+        """Return True, if they is connected to dbus."""
+        return self.dbus is not None
+
+    async def connect(self):
+        """Connect do bus."""
+        raise NotImplementedError()

hassio/dbus/systemd.py

@@ -0,0 +1,39 @@
+"""Interface to Systemd over dbus."""
+import logging
+
+from .interface import DBusInterface
+from .utils import dbus_connected
+from ..exceptions import DBusError
+from ..utils.gdbus import DBus
+
+_LOGGER = logging.getLogger(__name__)
+
+DBUS_NAME = 'org.freedesktop.systemd1'
+DBUS_OBJECT = '/org/freedesktop/systemd1'
+
+
+class Systemd(DBusInterface):
+    """Systemd function handler."""
+
+    async def connect(self):
+        """Connect do bus."""
+        try:
+            self.dbus = await DBus.connect(DBUS_NAME, DBUS_OBJECT)
+        except DBusError:
+            _LOGGER.warning("Can't connect to systemd")
+
+    @dbus_connected
+    def reboot(self):
+        """Reboot host computer.
+
+        Return a coroutine.
+        """
+        return self.dbus.Manager.Reboot()
+
+    @dbus_connected
+    def power_off(self):
+        """Power off host computer.
+
+        Return a coroutine.
+        """
+        return self.dbus.Manager.PowerOff()

hassio/dbus/utils.py

@@ -0,0 +1,14 @@
+"""Utils for dbus."""
+
+from ..exceptions import DBusNotConnectedError
+
+
+def dbus_connected(method):
+    """Wrapper for check if dbus is connected."""
+    def wrap_dbus(api, *args, **kwargs):
+        """Check if dbus is connected before call a method."""
+        if api.dbus is None:
+            raise DBusNotConnectedError()
+        return method(api, *args, **kwargs)
+
+    return wrap_dbus

hassio/docker/__init__.py

@@ -2,6 +2,7 @@
 from contextlib import suppress
 import logging
 
+import attr
 import docker
 
 from .network import DockerNetwork
@@ -9,8 +10,11 @@ from ..const import SOCKET_DOCKER
 
 _LOGGER = logging.getLogger(__name__)
 
+# pylint: disable=invalid-name
+CommandReturn = attr.make_class('CommandReturn', ['exit_code', 'output'])
 
-class DockerAPI(object):
+
+class DockerAPI:
     """Docker hassio wrapper.
 
     This class is not AsyncIO safe!
@@ -19,7 +23,8 @@ class DockerAPI(object):
     def __init__(self):
         """Initialize docker base wrapper."""
         self.docker = docker.DockerClient(
-            base_url="unix:/{}".format(str(SOCKET_DOCKER)), version='auto')
+            base_url="unix:/{}".format(str(SOCKET_DOCKER)),
+            version='auto', timeout=900)
         self.network = DockerNetwork(self.docker)
 
     @property
@@ -47,8 +52,10 @@ class DockerAPI(object):
         hostname = kwargs.get('hostname')
 
         # setup network
+        kwargs['dns_search'] = ["."]
         if network_mode:
             kwargs['dns'] = [str(self.network.supervisor)]
+            kwargs['dns_opt'] = ["ndots:0"]
         else:
             kwargs['network'] = None
 
@@ -94,15 +101,15 @@ class DockerAPI(object):
             )
 
             # wait until command is done
-            exit_code = container.wait()
+            result = container.wait()
             output = container.logs(stdout=stdout, stderr=stderr)
 
         except docker.errors.DockerException as err:
             _LOGGER.error("Can't execute command: %s", err)
-            return (None, b"")
+            return CommandReturn(None, b"")
 
         # cleanup container
         with suppress(docker.errors.DockerException):
             container.remove(force=True)
 
-        return (exit_code, output)
+        return CommandReturn(result.get('StatusCode'), output)

hassio/docker/addon.py

@@ -6,10 +6,11 @@ import docker
 import requests
 
 from .interface import DockerInterface
-from .utils import docker_process
 from ..addons.build import AddonBuild
 from ..const import (
-    MAP_CONFIG, MAP_SSL, MAP_ADDONS, MAP_BACKUP, MAP_SHARE)
+    MAP_CONFIG, MAP_SSL, MAP_ADDONS, MAP_BACKUP, MAP_SHARE, ENV_TOKEN,
+    ENV_TIME, SECURITY_PROFILE, SECURITY_DISABLE)
+from ..utils import process_lock
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -26,8 +27,8 @@ class DockerAddon(DockerInterface):
 
     @property
     def addon(self):
-        """Return name of docker image."""
+        """Return addon of docker image."""
-        return self._addons.get(self._id)
+        return self.sys_addons.get(self._id)
 
     @property
     def image(self):
@@ -51,7 +52,7 @@ class DockerAddon(DockerInterface):
         """Return arch of docker image."""
         if not self.addon.legacy:
             return super().arch
-        return self._arch
+        return self.sys_arch
 
     @property
     def name(self):
@@ -74,19 +75,18 @@ class DockerAddon(DockerInterface):
     def environment(self):
         """Return environment for docker add-on."""
         addon_env = self.addon.environment or {}
+
+        # Need audio settings
         if self.addon.with_audio:
             addon_env.update({
                 'ALSA_OUTPUT': self.addon.audio_output,
                 'ALSA_INPUT': self.addon.audio_input,
             })
 
-        # Set api token if any API access is needed
-        if self.addon.access_hassio_api or self.addon.access_homeassistant_api:
-            addon_env['API_TOKEN'] = self.addon.api_token
-
         return {
             **addon_env,
-            'TZ': self._config.timezone,
+            ENV_TIME: self.sys_config.timezone,
+            ENV_TOKEN: self.addon.uuid,
         }
 
     @property
@@ -100,7 +100,7 @@ class DockerAddon(DockerInterface):
 
         # Auto mapping UART devices
         if self.addon.auto_uart:
-            for device in self._hardware.serial_devices:
+            for device in self.sys_hardware.serial_devices:
                 devices.append(f"{device}:{device}:rwm")
 
         # Return None if no devices is present
@@ -121,14 +121,21 @@ class DockerAddon(DockerInterface):
     @property
     def security_opt(self):
         """Controlling security opt."""
-        privileged = self.addon.privileged or []
+        security = []
 
-        # Disable AppArmor sinse it make troubles wit SYS_ADMIN
+        # AppArmor
-        if 'SYS_ADMIN' in privileged:
+        if self.addon.apparmor == SECURITY_DISABLE:
-            return [
+            security.append("apparmor:unconfined")
-                "apparmor:unconfined",
+        elif self.addon.apparmor == SECURITY_PROFILE:
-            ]
+            security.append(f"apparmor={self.addon.slug}")
-        return None
+
+        # Seccomp
+        if self.addon.seccomp == SECURITY_DISABLE:
+            security.append("seccomp=unconfined")
+        elif self.addon.seccomp == SECURITY_PROFILE:
+            security.append(f"seccomp={self.addon.path_seccomp}")
+
+        return security or None
 
     @property
     def tmpfs(self):
@@ -142,8 +149,8 @@ class DockerAddon(DockerInterface):
     def network_mapping(self):
         """Return hosts mapping."""
         return {
-            'homeassistant': self._docker.network.gateway,
+            'homeassistant': self.sys_docker.network.gateway,
-            'hassio': self._docker.network.supervisor,
+            'hassio': self.sys_docker.network.supervisor,
         }
 
     @property
@@ -166,35 +173,35 @@ class DockerAddon(DockerInterface):
         # setup config mappings
         if MAP_CONFIG in addon_mapping:
             volumes.update({
-                str(self._config.path_extern_config): {
+                str(self.sys_config.path_extern_config): {
                     'bind': "/config", 'mode': addon_mapping[MAP_CONFIG]
                 }})
 
         if MAP_SSL in addon_mapping:
             volumes.update({
-                str(self._config.path_extern_ssl): {
+                str(self.sys_config.path_extern_ssl): {
                     'bind': "/ssl", 'mode': addon_mapping[MAP_SSL]
                 }})
 
         if MAP_ADDONS in addon_mapping:
             volumes.update({
-                str(self._config.path_extern_addons_local): {
+                str(self.sys_config.path_extern_addons_local): {
                     'bind': "/addons", 'mode': addon_mapping[MAP_ADDONS]
                 }})
 
         if MAP_BACKUP in addon_mapping:
             volumes.update({
-                str(self._config.path_extern_backup): {
+                str(self.sys_config.path_extern_backup): {
                     'bind': "/backup", 'mode': addon_mapping[MAP_BACKUP]
                 }})
 
         if MAP_SHARE in addon_mapping:
             volumes.update({
-                str(self._config.path_extern_share): {
+                str(self.sys_config.path_extern_share): {
                     'bind': "/share", 'mode': addon_mapping[MAP_SHARE]
                 }})
 
-        # init other hardware mappings
+        # Init other hardware mappings
         if self.addon.with_gpio:
             volumes.update({
                 "/sys/class/gpio": {
@@ -205,13 +212,20 @@ class DockerAddon(DockerInterface):
                 },
             })
 
-        # host dbus system
+        # Host dbus system
         if self.addon.host_dbus:
             volumes.update({
                 "/var/run/dbus": {
                     'bind': "/var/run/dbus", 'mode': 'rw'
                 }})
 
+        # ALSA configuration
+        if self.addon.with_audio:
+            volumes.update({
+                str(self.addon.path_extern_asound): {
+                    'bind': "/etc/asound.conf", 'mode': 'ro'
+                }})
+
         return volumes
 
     def _run(self):
@@ -225,11 +239,7 @@ class DockerAddon(DockerInterface):
         # cleanup
         self._stop()
 
-        # write config
+        ret = self.sys_docker.run(
-        if not self.addon.write_options():
-            return False
-
-        ret = self._docker.run(
             self.image,
             name=self.name,
             hostname=self.hostname,
@@ -269,13 +279,17 @@ class DockerAddon(DockerInterface):
 
         Need run inside executor.
         """
-        build_env = AddonBuild(self.coresys, self.addon)
+        build_env = AddonBuild(self.coresys, self._id)
 
         _LOGGER.info("Start build %s:%s", self.image, tag)
         try:
-            image = self._docker.images.build(**build_env.get_docker_args(tag))
+            image, log = self.sys_docker.images.build(
+                **build_env.get_docker_args(tag))
 
+            _LOGGER.debug("Build %s:%s done: %s", self.image, tag, log)
             image.tag(self.image, tag='latest')
+
+            # Update meta data
             self._meta = image.attrs
 
         except (docker.errors.DockerException) as err:
@@ -285,10 +299,10 @@ class DockerAddon(DockerInterface):
         _LOGGER.info("Build %s:%s done", self.image, tag)
         return True
 
-    @docker_process
+    @process_lock
     def export_image(self, path):
         """Export current images into a tar file."""
-        return self._loop.run_in_executor(None, self._export_image, path)
+        return self.sys_run_in_executor(self._export_image, path)
 
     def _export_image(self, tar_file):
         """Export current images into a tar file.
@@ -296,26 +310,27 @@ class DockerAddon(DockerInterface):
         Need run inside executor.
         """
         try:
-            image = self._docker.api.get_image(self.image)
+            image = self.sys_docker.api.get_image(self.image)
         except docker.errors.DockerException as err:
             _LOGGER.error("Can't fetch image %s: %s", self.image, err)
             return False
 
+        _LOGGER.info("Export image %s to %s", self.image, tar_file)
         try:
             with tar_file.open("wb") as write_tar:
-                for chunk in image.stream():
+                for chunk in image:
                     write_tar.write(chunk)
         except (OSError, requests.exceptions.ReadTimeout) as err:
             _LOGGER.error("Can't write tar file %s: %s", tar_file, err)
             return False
 
-        _LOGGER.info("Export image %s to %s", self.image, tar_file)
+        _LOGGER.info("Export image %s done", self.image)
         return True
 
-    @docker_process
+    @process_lock
     def import_image(self, path, tag):
         """Import a tar file as image."""
-        return self._loop.run_in_executor(None, self._import_image, path, tag)
+        return self.sys_run_in_executor(self._import_image, path, tag)
 
     def _import_image(self, tar_file, tag):
         """Import a tar file as image.
@@ -324,9 +339,9 @@ class DockerAddon(DockerInterface):
         """
         try:
             with tar_file.open("rb") as read_tar:
-                self._docker.api.load_image(read_tar, quiet=True)
+                self.sys_docker.api.load_image(read_tar, quiet=True)
 
-            image = self._docker.images.get(self.image)
+            image = self.sys_docker.images.get(self.image)
             image.tag(self.image, tag=tag)
         except (docker.errors.DockerException, OSError) as err:
             _LOGGER.error("Can't import image %s: %s", self.image, err)
@@ -337,19 +352,10 @@ class DockerAddon(DockerInterface):
         self._cleanup()
         return True
 
-    def _restart(self):
+    @process_lock
-        """Restart docker container.
-
-        Addons prepare some thing on start and that is normaly not repeatable.
-        Need run inside executor.
-        """
-        self._stop()
-        return self._run()
-
-    @docker_process
     def write_stdin(self, data):
         """Write to add-on stdin."""
-        return self._loop.run_in_executor(None, self._write_stdin, data)
+        return self.sys_run_in_executor(self._write_stdin, data)
 
     def _write_stdin(self, data):
         """Write to add-on stdin.
@@ -361,7 +367,7 @@ class DockerAddon(DockerInterface):
 
         try:
             # load needed docker objects
-            container = self._docker.containers.get(self.name)
+            container = self.sys_docker.containers.get(self.name)
             socket = container.attach_socket(params={'stdin': 1, 'stream': 1})
         except docker.errors.DockerException as err:
             _LOGGER.error("Can't attach to %s stdin: %s", self.name, err)

hassio/docker/homeassistant.py

@@ -4,6 +4,7 @@ import logging
 import docker
 
 from .interface import DockerInterface
+from ..const import ENV_TOKEN, ENV_TIME, LABEL_MACHINE
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -13,10 +14,17 @@ HASS_DOCKER_NAME = 'homeassistant'
 class DockerHomeAssistant(DockerInterface):
     """Docker hassio wrapper for HomeAssistant."""
 
+    @property
+    def machine(self):
+        """Return machine of Home-Assistant docker image."""
+        if self._meta and LABEL_MACHINE in self._meta['Config']['Labels']:
+            return self._meta['Config']['Labels'][LABEL_MACHINE]
+        return None
+
     @property
     def image(self):
         """Return name of docker image."""
-        return self._homeassistant.image
+        return self.sys_homeassistant.image
 
     @property
     def name(self):
@@ -27,7 +35,7 @@ class DockerHomeAssistant(DockerInterface):
     def devices(self):
         """Create list of special device to map into docker."""
         devices = []
-        for device in self._hardware.serial_devices:
+        for device in self.sys_hardware.serial_devices:
             devices.append(f"{device}:{device}:rwm")
         return devices or None
 
@@ -42,7 +50,7 @@ class DockerHomeAssistant(DockerInterface):
         # cleanup
         self._stop()
 
-        ret = self._docker.run(
+        ret = self.sys_docker.run(
             self.image,
             name=self.name,
             hostname=self.name,
@@ -52,15 +60,16 @@ class DockerHomeAssistant(DockerInterface):
             devices=self.devices,
             network_mode='host',
             environment={
-                'HASSIO': self._docker.network.supervisor,
+                'HASSIO': self.sys_docker.network.supervisor,
-                'TZ': self._config.timezone,
+                ENV_TIME: self.sys_config.timezone,
+                ENV_TOKEN: self.sys_homeassistant.uuid,
             },
             volumes={
-                str(self._config.path_extern_config):
+                str(self.sys_config.path_extern_config):
                     {'bind': '/config', 'mode': 'rw'},
-                str(self._config.path_extern_ssl):
+                str(self.sys_config.path_extern_ssl):
                     {'bind': '/ssl', 'mode': 'ro'},
-                str(self._config.path_extern_share):
+                str(self.sys_config.path_extern_share):
                     {'bind': '/share', 'mode': 'rw'},
             }
         )
@@ -76,26 +85,26 @@ class DockerHomeAssistant(DockerInterface):
 
         Need run inside executor.
         """
-        return self._docker.run_command(
+        return self.sys_docker.run_command(
             self.image,
             command,
             detach=True,
             stdout=True,
             stderr=True,
             environment={
-                'TZ': self._config.timezone,
+                ENV_TIME: self.sys_config.timezone,
             },
             volumes={
-                str(self._config.path_extern_config):
+                str(self.sys_config.path_extern_config):
                     {'bind': '/config', 'mode': 'ro'},
-                str(self._config.path_extern_ssl):
+                str(self.sys_config.path_extern_ssl):
                     {'bind': '/ssl', 'mode': 'ro'},
             }
         )
 
     def is_initialize(self):
         """Return True if docker container exists."""
-        return self._loop.run_in_executor(None, self._is_initialize)
+        return self.sys_run_in_executor(self._is_initialize)
 
     def _is_initialize(self):
         """Return True if docker container exists.
@@ -103,7 +112,7 @@ class DockerHomeAssistant(DockerInterface):
         Need run inside executor.
         """
         try:
-            self._docker.containers.get(self.name)
+            self.sys_docker.containers.get(self.name)
         except docker.errors.DockerException:
             return False
 

hassio/docker/interface.py

@@ -5,10 +5,10 @@ import logging
 
 import docker
 
-from .utils import docker_process
 from .stats import DockerStats
 from ..const import LABEL_VERSION, LABEL_ARCH
 from ..coresys import CoreSysAttributes
+from ..utils import process_lock
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -20,7 +20,7 @@ class DockerInterface(CoreSysAttributes):
         """Initialize docker base wrapper."""
         self.coresys = coresys
         self._meta = None
-        self.lock = asyncio.Lock(loop=self._loop)
+        self.lock = asyncio.Lock(loop=coresys.loop)
 
     @property
     def timeout(self):
@@ -58,10 +58,10 @@ class DockerInterface(CoreSysAttributes):
         """Return True if a task is in progress."""
         return self.lock.locked()
 
-    @docker_process
+    @process_lock
     def install(self, tag):
         """Pull docker image."""
-        return self._loop.run_in_executor(None, self._install, tag)
+        return self.sys_run_in_executor(self._install, tag)
 
     def _install(self, tag):
         """Pull docker image.
@@ -70,7 +70,7 @@ class DockerInterface(CoreSysAttributes):
         """
         try:
             _LOGGER.info("Pull image %s tag %s.", self.image, tag)
-            image = self._docker.images.pull(f"{self.image}:{tag}")
+            image = self.sys_docker.images.pull(f"{self.image}:{tag}")
 
             image.tag(self.image, tag='latest')
             self._meta = image.attrs
@@ -83,7 +83,7 @@ class DockerInterface(CoreSysAttributes):
 
     def exists(self):
         """Return True if docker image exists in local repo."""
-        return self._loop.run_in_executor(None, self._exists)
+        return self.sys_run_in_executor(self._exists)
 
     def _exists(self):
         """Return True if docker image exists in local repo.
@@ -91,7 +91,7 @@ class DockerInterface(CoreSysAttributes):
         Need run inside executor.
         """
         try:
-            image = self._docker.images.get(self.image)
+            image = self.sys_docker.images.get(self.image)
             assert f"{self.image}:{self.version}" in image.tags
         except (docker.errors.DockerException, AssertionError):
             return False
@@ -103,7 +103,7 @@ class DockerInterface(CoreSysAttributes):
 
         Return a Future.
         """
-        return self._loop.run_in_executor(None, self._is_running)
+        return self.sys_run_in_executor(self._is_running)
 
     def _is_running(self):
         """Return True if docker is Running.
@@ -111,8 +111,8 @@ class DockerInterface(CoreSysAttributes):
         Need run inside executor.
         """
         try:
-            container = self._docker.containers.get(self.name)
+            container = self.sys_docker.containers.get(self.name)
-            image = self._docker.images.get(self.image)
+            image = self.sys_docker.images.get(self.image)
         except docker.errors.DockerException:
             return False
 
@@ -126,10 +126,10 @@ class DockerInterface(CoreSysAttributes):
 
         return True
 
-    @docker_process
+    @process_lock
     def attach(self):
         """Attach to running docker container."""
-        return self._loop.run_in_executor(None, self._attach)
+        return self.sys_run_in_executor(self._attach)
 
     def _attach(self):
         """Attach to running docker container.
@@ -138,9 +138,9 @@ class DockerInterface(CoreSysAttributes):
         """
         try:
             if self.image:
-                self._meta = self._docker.images.get(self.image).attrs
+                self._meta = self.sys_docker.images.get(self.image).attrs
             else:
-                self._meta = self._docker.containers.get(self.name).attrs
+                self._meta = self.sys_docker.containers.get(self.name).attrs
         except docker.errors.DockerException:
             return False
 
@@ -149,10 +149,10 @@ class DockerInterface(CoreSysAttributes):
 
         return True
 
-    @docker_process
+    @process_lock
     def run(self):
         """Run docker image."""
-        return self._loop.run_in_executor(None, self._run)
+        return self.sys_run_in_executor(self._run)
 
     def _run(self):
         """Run docker image.
@@ -161,10 +161,10 @@ class DockerInterface(CoreSysAttributes):
         """
         raise NotImplementedError()
 
-    @docker_process
+    @process_lock
     def stop(self):
         """Stop/remove docker container."""
-        return self._loop.run_in_executor(None, self._stop)
+        return self.sys_run_in_executor(self._stop)
 
     def _stop(self):
         """Stop/remove and remove docker container.
@@ -172,7 +172,7 @@ class DockerInterface(CoreSysAttributes):
         Need run inside executor.
         """
         try:
-            container = self._docker.containers.get(self.name)
+            container = self.sys_docker.containers.get(self.name)
         except docker.errors.DockerException:
             return False
 
@@ -187,10 +187,10 @@ class DockerInterface(CoreSysAttributes):
 
         return True
 
-    @docker_process
+    @process_lock
     def remove(self):
         """Remove docker images."""
-        return self._loop.run_in_executor(None, self._remove)
+        return self.sys_run_in_executor(self._remove)
 
     def _remove(self):
         """remove docker images.
@@ -205,11 +205,11 @@ class DockerInterface(CoreSysAttributes):
 
         try:
             with suppress(docker.errors.ImageNotFound):
-                self._docker.images.remove(
+                self.sys_docker.images.remove(
                     image=f"{self.image}:latest", force=True)
 
             with suppress(docker.errors.ImageNotFound):
-                self._docker.images.remove(
+                self.sys_docker.images.remove(
                     image=f"{self.image}:{self.version}", force=True)
 
         except docker.errors.DockerException as err:
@@ -219,10 +219,10 @@ class DockerInterface(CoreSysAttributes):
         self._meta = None
         return True
 
-    @docker_process
+    @process_lock
     def update(self, tag):
         """Update a docker image."""
-        return self._loop.run_in_executor(None, self._update, tag)
+        return self.sys_run_in_executor(self._update, tag)
 
     def _update(self, tag):
         """Update a docker image.
@@ -247,7 +247,7 @@ class DockerInterface(CoreSysAttributes):
 
         Return a Future.
         """
-        return self._loop.run_in_executor(None, self._logs)
+        return self.sys_run_in_executor(self._logs)
 
     def _logs(self):
         """Return docker logs of container.
@@ -255,7 +255,7 @@ class DockerInterface(CoreSysAttributes):
         Need run inside executor.
         """
         try:
-            container = self._docker.containers.get(self.name)
+            container = self.sys_docker.containers.get(self.name)
         except docker.errors.DockerException:
             return b""
 
@@ -264,35 +264,10 @@ class DockerInterface(CoreSysAttributes):
         except docker.errors.DockerException as err:
             _LOGGER.warning("Can't grap logs from %s: %s", self.image, err)
 
-    @docker_process
+    @process_lock
-    def restart(self):
-        """Restart docker container."""
-        return self._loop.run_in_executor(None, self._restart)
-
-    def _restart(self):
-        """Restart docker container.
-
-        Need run inside executor.
-        """
-        try:
-            container = self._docker.containers.get(self.name)
-        except docker.errors.DockerException:
-            return False
-
-        _LOGGER.info("Restart %s", self.image)
-
-        try:
-            container.restart(timeout=self.timeout)
-        except docker.errors.DockerException as err:
-            _LOGGER.warning("Can't restart %s: %s", self.image, err)
-            return False
-
-        return True
-
-    @docker_process
     def cleanup(self):
         """Check if old version exists and cleanup."""
-        return self._loop.run_in_executor(None, self._cleanup)
+        return self.sys_run_in_executor(self._cleanup)
 
     def _cleanup(self):
         """Check if old version exists and cleanup.
@@ -300,25 +275,25 @@ class DockerInterface(CoreSysAttributes):
         Need run inside executor.
         """
         try:
-            latest = self._docker.images.get(self.image)
+            latest = self.sys_docker.images.get(self.image)
         except docker.errors.DockerException:
             _LOGGER.warning("Can't find %s for cleanup", self.image)
             return False
 
-        for image in self._docker.images.list(name=self.image):
+        for image in self.sys_docker.images.list(name=self.image):
             if latest.id == image.id:
                 continue
 
             with suppress(docker.errors.DockerException):
                 _LOGGER.info("Cleanup docker images: %s", image.tags)
-                self._docker.images.remove(image.id, force=True)
+                self.sys_docker.images.remove(image.id, force=True)
 
         return True
 
-    @docker_process
+    @process_lock
     def execute_command(self, command):
         """Create a temporary container and run command."""
-        return self._loop.run_in_executor(None, self._execute_command, command)
+        return self.sys_run_in_executor(self._execute_command, command)
 
     def _execute_command(self, command):
         """Create a temporary container and run command.
@@ -329,7 +304,7 @@ class DockerInterface(CoreSysAttributes):
 
     def stats(self):
         """Read and return stats from container."""
-        return self._loop.run_in_executor(None, self._stats)
+        return self.sys_run_in_executor(self._stats)
 
     def _stats(self):
         """Create a temporary container and run command.
@@ -337,7 +312,7 @@ class DockerInterface(CoreSysAttributes):
         Need run inside executor.
         """
         try:
-            container = self._docker.containers.get(self.name)
+            container = self.sys_docker.containers.get(self.name)
         except docker.errors.DockerException:
             return None
 

hassio/docker/network.py

@@ -8,8 +8,11 @@ from ..const import DOCKER_NETWORK_MASK, DOCKER_NETWORK, DOCKER_NETWORK_RANGE
 _LOGGER = logging.getLogger(__name__)
 
 
-class DockerNetwork(object):
+class DockerNetwork:
-    """Internal HassIO Network."""
+    """Internal HassIO Network.
+
+    This class is not AsyncIO safe!
+    """
 
     def __init__(self, dock):
         """Initialize internal hassio network."""
@@ -52,7 +55,8 @@ class DockerNetwork(object):
         ipam_config = docker.types.IPAMConfig(pool_configs=[ipam_pool])
 
         return self.docker.networks.create(
-            DOCKER_NETWORK, driver='bridge', ipam=ipam_config, options={
+            DOCKER_NETWORK, driver='bridge', ipam=ipam_config,
+            enable_ipv6=False, options={
                 "com.docker.network.bridge.name": DOCKER_NETWORK,
             })
 

hassio/docker/stats.py

@@ -2,7 +2,7 @@
 from contextlib import suppress
 
 
-class DockerStats(object):
+class DockerStats:
     """Hold stats data from container inside."""
 
     def __init__(self, stats):

hassio/docker/supervisor.py

@@ -24,7 +24,7 @@ class DockerSupervisor(DockerInterface, CoreSysAttributes):
         Need run inside executor.
         """
         try:
-            container = self._docker.containers.get(self.name)
+            container = self.sys_docker.containers.get(self.name)
         except docker.errors.DockerException:
             return False
 
@@ -33,9 +33,10 @@ class DockerSupervisor(DockerInterface, CoreSysAttributes):
                      self.image, self.version)
 
         # if already attach
-        if container in self._docker.network.containers:
+        if container in self.sys_docker.network.containers:
             return True
 
         # attach to network
-        return self._docker.network.attach_container(
+        return self.sys_docker.network.attach_container(
-            container, alias=['hassio'], ipv4=self._docker.network.supervisor)
+            container, alias=['hassio'],
+            ipv4=self.sys_docker.network.supervisor)

hassio/docker/utils.py

@@ -1,20 +0,0 @@
-"""HassIO docker utilitys."""
-import logging
-
-_LOGGER = logging.getLogger(__name__)
-
-
-# pylint: disable=protected-access
-def docker_process(method):
-    """Wrap function with only run once."""
-    async def wrap_api(api, *args, **kwargs):
-        """Return api wrapper."""
-        if api.lock.locked():
-            _LOGGER.error(
-                "Can't excute %s while a task is in progress", method.__name__)
-            return False
-
-        async with api.lock:
-            return await method(api, *args, **kwargs)
-
-    return wrap_api

hassio/exceptions.py

@@ -0,0 +1,49 @@
+"""Core Exceptions."""
+
+
+class HassioError(Exception):
+    """Root exception."""
+    pass
+
+
+class HassioInternalError(HassioError):
+    """Internal Hass.io error they can't handle."""
+    pass
+
+
+class HassioNotSupportedError(HassioError):
+    """Function is not supported."""
+    pass
+
+
+# Host
+
+class HostError(HassioError):
+    """Internal Host error."""
+    pass
+
+
+class HostNotSupportedError(HassioNotSupportedError):
+    """Host function is not supprted."""
+    pass
+
+
+# utils/gdbus
+
+class DBusError(HassioError):
+    """DBus generic error."""
+    pass
+
+
+class DBusNotConnectedError(HostNotSupportedError):
+    """DBus is not connected and call a method."""
+
+
+class DBusFatalError(DBusError):
+    """DBus call going wrong."""
+    pass
+
+
+class DBusParseError(DBusError):
+    """DBus parse error."""
+    pass

hassio/homeassistant.py

@@ -3,17 +3,20 @@ import asyncio
 import logging
 import os
 import re
+import socket
+import time
 
 import aiohttp
 from aiohttp.hdrs import CONTENT_TYPE
+import attr
 
 from .const import (
-    FILE_HASSIO_HOMEASSISTANT, ATTR_IMAGE, ATTR_LAST_VERSION,
+    FILE_HASSIO_HOMEASSISTANT, ATTR_IMAGE, ATTR_LAST_VERSION, ATTR_UUID,
     ATTR_BOOT, ATTR_PASSWORD, ATTR_PORT, ATTR_SSL, ATTR_WATCHDOG,
-    HEADER_HA_ACCESS, CONTENT_TYPE_JSON)
+    ATTR_WAIT_BOOT, HEADER_HA_ACCESS, CONTENT_TYPE_JSON)
 from .coresys import CoreSysAttributes
 from .docker.homeassistant import DockerHomeAssistant
-from .utils import convert_to_ascii
+from .utils import convert_to_ascii, process_lock
 from .utils.json import JsonConfig
 from .validate import SCHEMA_HASS_CONFIG
 
@@ -21,6 +24,9 @@ _LOGGER = logging.getLogger(__name__)
 
 RE_YAML_ERROR = re.compile(r"homeassistant\.util\.yaml")
 
+# pylint: disable=invalid-name
+ConfigResult = attr.make_class('ConfigResult', ['valid', 'log'])
+
 
 class HomeAssistant(JsonConfig, CoreSysAttributes):
     """Hass core object for handle it."""
@@ -30,6 +36,7 @@ class HomeAssistant(JsonConfig, CoreSysAttributes):
         super().__init__(FILE_HASSIO_HOMEASSISTANT, SCHEMA_HASS_CONFIG)
         self.coresys = coresys
         self.instance = DockerHomeAssistant(coresys)
+        self.lock = asyncio.Lock(loop=coresys.loop)
 
     async def load(self):
         """Prepare HomeAssistant object."""
@@ -39,10 +46,15 @@ class HomeAssistant(JsonConfig, CoreSysAttributes):
         _LOGGER.info("No HomeAssistant docker %s found.", self.image)
         await self.install_landingpage()
 
+    @property
+    def machine(self):
+        """Return System Machines."""
+        return self.instance.machine
+
     @property
     def api_ip(self):
         """Return IP of HomeAssistant instance."""
-        return self._docker.network.gateway
+        return self.sys_docker.network.gateway
 
     @property
     def api_port(self):
@@ -53,7 +65,6 @@ class HomeAssistant(JsonConfig, CoreSysAttributes):
     def api_port(self, value):
         """Set network port for home-assistant instance."""
         self._data[ATTR_PORT] = value
-        self.save()
 
     @property
     def api_password(self):
@@ -92,6 +103,16 @@ class HomeAssistant(JsonConfig, CoreSysAttributes):
         """Return True if the watchdog should protect Home-Assistant."""
         self._data[ATTR_WATCHDOG] = value
 
+    @property
+    def wait_boot(self):
+        """Return time to wait for Home-Assistant startup."""
+        return self._data[ATTR_WAIT_BOOT]
+
+    @wait_boot.setter
+    def wait_boot(self, value):
+        """Set time to wait for Home-Assistant startup."""
+        self._data[ATTR_WAIT_BOOT] = value
+
     @property
     def version(self):
         """Return version of running homeassistant."""
@@ -102,7 +123,7 @@ class HomeAssistant(JsonConfig, CoreSysAttributes):
         """Return last available version of homeassistant."""
         if self.is_custom_image:
             return self._data.get(ATTR_LAST_VERSION)
-        return self._updater.version_homeassistant
+        return self.sys_updater.version_homeassistant
 
     @last_version.setter
     def last_version(self, value):
@@ -143,6 +164,12 @@ class HomeAssistant(JsonConfig, CoreSysAttributes):
         """Set home-assistant boot options."""
         self._data[ATTR_BOOT] = value
 
+    @property
+    def uuid(self):
+        """Return a UUID of this HomeAssistant."""
+        return self._data[ATTR_UUID]
+
+    @process_lock
     async def install_landingpage(self):
         """Install a landingpage."""
         _LOGGER.info("Setup HomeAssistant landingpage")
@@ -150,31 +177,33 @@ class HomeAssistant(JsonConfig, CoreSysAttributes):
             if await self.instance.install('landingpage'):
                 break
             _LOGGER.warning("Fails install landingpage, retry after 60sec")
-            await asyncio.sleep(60, loop=self._loop)
+            await asyncio.sleep(60)
 
-        # run landingpage after installation
+        # Run landingpage after installation
-        await self.instance.run()
+        await self._start()
 
+    @process_lock
     async def install(self):
         """Install a landingpage."""
         _LOGGER.info("Setup HomeAssistant")
         while True:
             # read homeassistant tag and install it
             if not self.last_version:
-                await self._updater.reload()
+                await self.sys_updater.reload()
 
             tag = self.last_version
             if tag and await self.instance.install(tag):
                 break
             _LOGGER.warning("Error on install HomeAssistant. Retry in 60sec")
-            await asyncio.sleep(60, loop=self._loop)
+            await asyncio.sleep(60)
 
         # finishing
         _LOGGER.info("HomeAssistant docker now installed")
         if self.boot:
-            await self.instance.run()
+            await self._start()
         await self.instance.cleanup()
 
+    @process_lock
     async def update(self, version=None):
         """Update HomeAssistant version."""
         version = version or self.last_version
@@ -189,15 +218,23 @@ class HomeAssistant(JsonConfig, CoreSysAttributes):
             return await self.instance.update(version)
         finally:
             if running:
-                await self.instance.run()
+                await self._start()
 
-    def run(self):
+    async def _start(self):
+        """Start HomeAssistant docker & wait."""
+        if not await self.instance.run():
+            return False
+        return await self._block_till_run()
+
+    @process_lock
+    def start(self):
         """Run HomeAssistant docker.
 
         Return a coroutine.
         """
-        return self.instance.run()
+        return self._start()
 
+    @process_lock
     def stop(self):
         """Stop HomeAssistant docker.
 
@@ -205,12 +242,11 @@ class HomeAssistant(JsonConfig, CoreSysAttributes):
         """
         return self.instance.stop()
 
-    def restart(self):
+    @process_lock
-        """Restart HomeAssistant docker.
+    async def restart(self):
-
+        """Restart HomeAssistant docker."""
-        Return a coroutine.
+        await self.instance.stop()
-        """
+        return await self._start()
-        return self.instance.restart()
 
     def logs(self):
         """Get HomeAssistant docker logs.
@@ -243,23 +279,23 @@ class HomeAssistant(JsonConfig, CoreSysAttributes):
     @property
     def in_progress(self):
         """Return True if a task is in progress."""
-        return self.instance.in_progress
+        return self.instance.in_progress or self.lock.locked()
 
     async def check_config(self):
         """Run homeassistant config check."""
-        exit_code, log = await self.instance.execute_command(
+        result = await self.instance.execute_command(
             "python3 -m homeassistant -c /config --script check_config"
         )
 
         # if not valid
-        if exit_code is None:
+        if result.exit_code is None:
-            return (False, "")
+            return ConfigResult(False, "")
 
         # parse output
-        log = convert_to_ascii(log)
+        log = convert_to_ascii(result.output)
-        if exit_code != 0 or RE_YAML_ERROR.search(log):
+        if result.exit_code != 0 or RE_YAML_ERROR.search(log):
-            return (False, log)
+            return ConfigResult(False, log)
-        return (True, log)
+        return ConfigResult(True, log)
 
     async def check_api_state(self):
         """Check if Home-Assistant up and running."""
@@ -271,7 +307,7 @@ class HomeAssistant(JsonConfig, CoreSysAttributes):
 
         try:
             # pylint: disable=bad-continuation
-            async with self._websession_ssl.get(
+            async with self.sys_websession_ssl.get(
                     url, headers=header, timeout=30) as request:
                 status = request.status
 
@@ -281,3 +317,54 @@ class HomeAssistant(JsonConfig, CoreSysAttributes):
         if status not in (200, 201):
             _LOGGER.warning("Home-Assistant API config missmatch")
         return True
+
+    async def send_event(self, event_type, event_data=None):
+        """Send event to Home-Assistant."""
+        url = f"{self.api_url}/api/events/{event_type}"
+        header = {CONTENT_TYPE: CONTENT_TYPE_JSON}
+
+        if self.api_password:
+            header.update({HEADER_HA_ACCESS: self.api_password})
+
+        try:
+            # pylint: disable=bad-continuation
+            async with self.sys_websession_ssl.post(
+                    url, headers=header, timeout=30,
+                    json=event_data) as request:
+                status = request.status
+
+        except (asyncio.TimeoutError, aiohttp.ClientError) as err:
+            _LOGGER.warning(
+                "Home-Assistant event %s fails: %s", event_type, err)
+            return False
+
+        if status not in (200, 201):
+            _LOGGER.warning("Home-Assistant event %s fails", event_type)
+            return False
+        return True
+
+    async def _block_till_run(self):
+        """Block until Home-Assistant is booting up or startup timeout."""
+        start_time = time.monotonic()
+
+        def check_port():
+            """Check if port is mapped."""
+            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            try:
+                result = sock.connect_ex((str(self.api_ip), self.api_port))
+                sock.close()
+
+                if result == 0:
+                    return True
+                return False
+            except OSError:
+                pass
+
+        while time.monotonic() - start_time < self.wait_boot:
+            if await self.sys_run_in_executor(check_port):
+                _LOGGER.info("Detect a running Home-Assistant instance")
+                return True
+            await asyncio.sleep(10)
+
+        _LOGGER.warning("Don't wait anymore of Home-Assistant startup!")
+        return False

hassio/host/__init__.py

@@ -0,0 +1,58 @@
+"""Host function like audio/dbus/systemd."""
+
+from .alsa import AlsaAudio
+from .control import SystemControl
+from .info import InfoCenter
+from ..const import FEATURES_REBOOT, FEATURES_SHUTDOWN, FEATURES_HOSTNAME
+from ..coresys import CoreSysAttributes
+
+
+class HostManager(CoreSysAttributes):
+    """Manage supported function from host."""
+
+    def __init__(self, coresys):
+        """Initialize Host manager."""
+        self.coresys = coresys
+        self._alsa = AlsaAudio(coresys)
+        self._control = SystemControl(coresys)
+        self._info = InfoCenter(coresys)
+
+    @property
+    def alsa(self):
+        """Return host ALSA handler."""
+        return self._alsa
+
+    @property
+    def control(self):
+        """Return host control handler."""
+        return self._control
+
+    @property
+    def info(self):
+        """Return host info handler."""
+        return self._info
+
+    @property
+    def supperted_features(self):
+        """Return a list of supported host features."""
+        features = []
+
+        if self.sys_dbus.systemd.is_connected:
+            features.extend([
+                FEATURES_REBOOT,
+                FEATURES_SHUTDOWN,
+            ])
+
+        if self.sys_dbus.hostname.is_connected:
+            features.append(FEATURES_HOSTNAME)
+
+        return features
+
+    async def load(self):
+        """Load host functions."""
+        if self.sys_dbus.hostname.is_connected:
+            await self.info.update()
+
+    def reload(self):
+        """Reload host information."""
+        return self.load()

hassio/host/alsa.py

@@ -0,0 +1,137 @@
+"""Host Audio-support."""
+import logging
+import json
+from pathlib import Path
+from string import Template
+
+import attr
+
+from ..const import ATTR_INPUT, ATTR_OUTPUT, ATTR_DEVICES, ATTR_NAME
+from ..coresys import CoreSysAttributes
+
+_LOGGER = logging.getLogger(__name__)
+
+# pylint: disable=invalid-name
+DefaultConfig = attr.make_class('DefaultConfig', ['input', 'output'])
+
+
+class AlsaAudio(CoreSysAttributes):
+    """Handle Audio ALSA host data."""
+
+    def __init__(self, coresys):
+        """Initialize Alsa audio system."""
+        self.coresys = coresys
+        self._data = {
+            ATTR_INPUT: {},
+            ATTR_OUTPUT: {},
+        }
+        self._cache = 0
+        self._default = None
+
+    @property
+    def input_devices(self):
+        """Return list of ALSA input devices."""
+        self._update_device()
+        return self._data[ATTR_INPUT]
+
+    @property
+    def output_devices(self):
+        """Return list of ALSA output devices."""
+        self._update_device()
+        return self._data[ATTR_OUTPUT]
+
+    def _update_device(self):
+        """Update Internal device DB."""
+        current_id = hash(frozenset(self.sys_hardware.audio_devices))
+
+        # Need rebuild?
+        if current_id == self._cache:
+            return
+
+        # Clean old stuff
+        self._data[ATTR_INPUT].clear()
+        self._data[ATTR_OUTPUT].clear()
+
+        # Init database
+        _LOGGER.info("Update ALSA device list")
+        database = self._audio_database()
+
+        # Process devices
+        for dev_id, dev_data in self.sys_hardware.audio_devices.items():
+            for chan_id, chan_type in dev_data[ATTR_DEVICES].items():
+                alsa_id = f"{dev_id},{chan_id}"
+                dev_name = dev_data[ATTR_NAME]
+
+                # Lookup type
+                if chan_type.endswith('playback'):
+                    key = ATTR_OUTPUT
+                elif chan_type.endswith('capture'):
+                    key = ATTR_INPUT
+                else:
+                    _LOGGER.warning("Unknown channel type: %s", chan_type)
+                    continue
+
+                # Use name from DB or a generic name
+                self._data[key][alsa_id] = database.get(
+                    self.sys_machine, {}).get(
+                        dev_name, {}).get(alsa_id, f"{dev_name}: {chan_id}")
+
+        self._cache = current_id
+
+    @staticmethod
+    def _audio_database():
+        """Read local json audio data into dict."""
+        json_file = Path(__file__).parent.joinpath('audiodb.json')
+
+        try:
+            # pylint: disable=no-member
+            with json_file.open('r') as database:
+                return json.loads(database.read())
+        except (ValueError, OSError) as err:
+            _LOGGER.warning("Can't read audio DB: %s", err)
+
+        return {}
+
+    @property
+    def default(self):
+        """Generate ALSA default setting."""
+        # Init defaults
+        if self._default is None:
+            database = self._audio_database()
+            alsa_input = database.get(self.sys_machine, {}).get(ATTR_INPUT)
+            alsa_output = database.get(self.sys_machine, {}).get(ATTR_OUTPUT)
+
+            self._default = DefaultConfig(alsa_input, alsa_output)
+
+        # Search exists/new output
+        if self._default.output is None and self.output_devices:
+            self._default.output = next(iter(self.output_devices))
+            _LOGGER.info("Detect output device %s", self._default.output)
+
+        # Search exists/new input
+        if self._default.input is None and self.input_devices:
+            self._default.input = next(iter(self.input_devices))
+            _LOGGER.info("Detect input device %s", self._default.input)
+
+        return self._default
+
+    def asound(self, alsa_input=None, alsa_output=None):
+        """Generate a asound data."""
+        alsa_input = alsa_input or self.default.input
+        alsa_output = alsa_output or self.default.output
+
+        # Read Template
+        asound_file = Path(__file__).parent.joinpath('asound.tmpl')
+        try:
+            # pylint: disable=no-member
+            with asound_file.open('r') as asound:
+                asound_data = asound.read()
+        except OSError as err:
+            _LOGGER.error("Can't read asound.tmpl: %s", err)
+            return ""
+
+        # Process Template
+        asound_template = Template(asound_data)
+        return asound_template.safe_substitute(
+            input=alsa_input, output=alsa_output
+        )

hassio/host/asound.tmpl

@@ -0,0 +1,17 @@
+pcm.!default {
+  type asym
+  capture.pcm "mic"
+  playback.pcm "speaker"
+}
+pcm.mic {
+  type plug
+  slave {
+    pcm "hw:$input"
+  }
+}
+pcm.speaker {
+  type plug
+  slave {
+    pcm "hw:$output"
+  }
+}

hassio/host/audiodb.json

@@ -0,0 +1,18 @@
+{
+    "raspberrypi3": {
+        "bcm2835 - bcm2835 ALSA": {
+            "0,0": "Raspberry Jack",
+            "0,1": "Raspberry HDMI"
+        },
+        "output": "0,0",
+        "input": null
+    },
+    "raspberrypi2": {
+        "output": "0,0",
+        "input": null
+    },
+    "raspberrypi": {
+        "output": "0,0",
+        "input": null
+    }
+}

hassio/host/control.py

@@ -0,0 +1,51 @@
+"""Power control for host."""
+import logging
+
+from ..coresys import CoreSysAttributes
+from ..exceptions import HostNotSupportedError
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class SystemControl(CoreSysAttributes):
+    """Handle host power controls."""
+
+    def __init__(self, coresys):
+        """Initialize host power handling."""
+        self.coresys = coresys
+
+    def _check_systemd(self):
+        """Check if systemd is connect or raise error."""
+        if not self.sys_dbus.systemd.is_connected:
+            _LOGGER.error("No systemd dbus connection available")
+            raise HostNotSupportedError()
+
+    async def reboot(self):
+        """Reboot host system."""
+        self._check_systemd()
+
+        _LOGGER.info("Initialize host reboot over systemd")
+        try:
+            await self.sys_core.shutdown()
+        finally:
+            await self.sys_dbus.systemd.reboot()
+
+    async def shutdown(self):
+        """Shutdown host system."""
+        self._check_systemd()
+
+        _LOGGER.info("Initialize host power off over systemd")
+        try:
+            await self.sys_core.shutdown()
+        finally:
+            await self.sys_dbus.systemd.power_off()
+
+    async def set_hostname(self, hostname):
+        """Set local a new Hostname."""
+        if not self.sys_dbus.systemd.is_connected:
+            _LOGGER.error("No hostname dbus connection available")
+            raise HostNotSupportedError()
+
+        _LOGGER.info("Set Hostname %s", hostname)
+        await self.sys_dbus.hostname.set_static_hostname(hostname)
+        await self.sys_host.info.update()

hassio/host/info.py

@@ -0,0 +1,58 @@
+"""Power control for host."""
+import logging
+
+from ..coresys import CoreSysAttributes
+from ..exceptions import HassioError, HostNotSupportedError
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class InfoCenter(CoreSysAttributes):
+    """Handle local system information controls."""
+
+    def __init__(self, coresys):
+        """Initialize system center handling."""
+        self.coresys = coresys
+        self._data = {}
+
+    @property
+    def hostname(self):
+        """Return local hostname."""
+        return self._data.get('StaticHostname') or None
+
+    @property
+    def chassis(self):
+        """Return local chassis type."""
+        return self._data.get('Chassis') or None
+
+    @property
+    def deployment(self):
+        """Return local deployment type."""
+        return self._data.get('Deployment') or None
+
+    @property
+    def kernel(self):
+        """Return local kernel version."""
+        return self._data.get('KernelRelease') or None
+
+    @property
+    def operating_system(self):
+        """Return local operating system."""
+        return self._data.get('OperatingSystemPrettyName') or None
+
+    @property
+    def cpe(self):
+        """Return local CPE."""
+        return self._data.get('OperatingSystemCPEName') or None
+
+    async def update(self):
+        """Update properties over dbus."""
+        if not self.sys_dbus.systemd.is_connected:
+            _LOGGER.error("No hostname dbus connection available")
+            raise HostNotSupportedError()
+
+        _LOGGER.info("Update local host information")
+        try:
+            self._data = await self.sys_dbus.hostname.get_properties()
+        except HassioError:
+            _LOGGER.warning("Can't update host system information!")

hassio/misc/dns.py

@@ -8,7 +8,7 @@ _LOGGER = logging.getLogger(__name__)
 COMMAND = "socat UDP-RECVFROM:53,fork UDP-SENDTO:127.0.0.11:53"
 
 
-class DNSForward(object):
+class DNSForward:
     """Manage DNS forwarding to internal DNS."""
 
     def __init__(self, loop):

hassio/misc/hardware.py

@@ -23,7 +23,7 @@ GPIO_DEVICES = Path("/sys/class/gpio")
 RE_TTY = re.compile(r"tty[A-Z]+")
 
 
-class Hardware(object):
+class Hardware:
     """Represent a interface to procfs, sysfs and udev."""
 
     def __init__(self):
@@ -63,6 +63,10 @@ class Hardware(object):
     @property
     def audio_devices(self):
         """Return all available audio interfaces."""
+        if not ASOUND_CARDS.exists():
+            _LOGGER.info("No audio devices found")
+            return {}
+
         try:
             with ASOUND_CARDS.open('r') as cards_file:
                 cards = cards_file.read()

hassio/misc/host_control.py

@@ -1,124 +0,0 @@
-"""Host control for HassIO."""
-import asyncio
-import json
-import logging
-
-import async_timeout
-
-from ..const import (
-    SOCKET_HC, ATTR_LAST_VERSION, ATTR_VERSION, ATTR_TYPE, ATTR_FEATURES,
-    ATTR_HOSTNAME, ATTR_OS)
-
-_LOGGER = logging.getLogger(__name__)
-
-TIMEOUT = 15
-UNKNOWN = 'unknown'
-
-FEATURES_SHUTDOWN = 'shutdown'
-FEATURES_REBOOT = 'reboot'
-FEATURES_UPDATE = 'update'
-FEATURES_HOSTNAME = 'hostname'
-FEATURES_NETWORK_INFO = 'network_info'
-FEATURES_NETWORK_CONTROL = 'network_control'
-
-
-class HostControl(object):
-    """Client for host control."""
-
-    def __init__(self, loop):
-        """Initialize HostControl socket client."""
-        self.loop = loop
-        self.active = False
-        self.version = UNKNOWN
-        self.last_version = UNKNOWN
-        self.type = UNKNOWN
-        self.features = []
-        self.hostname = UNKNOWN
-        self.os_info = UNKNOWN
-
-        if SOCKET_HC.is_socket():
-            self.active = True
-
-    async def _send_command(self, command):
-        """Send command to host.
-
-        Is a coroutine.
-        """
-        if not self.active:
-            return
-
-        reader, writer = await asyncio.open_unix_connection(
-            str(SOCKET_HC), loop=self.loop)
-
-        try:
-            # send
-            _LOGGER.info("Send '%s' to HostControl.", command)
-
-            with async_timeout.timeout(TIMEOUT, loop=self.loop):
-                writer.write("{}\n".format(command).encode())
-                data = await reader.readline()
-
-            response = data.decode().rstrip()
-            _LOGGER.info("Receive from HostControl: %s.", response)
-
-            if response == "OK":
-                return True
-            elif response == "ERROR":
-                return False
-            elif response == "WRONG":
-                return None
-            else:
-                try:
-                    return json.loads(response)
-                except json.JSONDecodeError:
-                    _LOGGER.warning("Json parse error from HostControl '%s'.",
-                                    response)
-
-        except asyncio.TimeoutError:
-            _LOGGER.error("Timeout from HostControl!")
-
-        finally:
-            writer.close()
-
-    async def load(self):
-        """Load Info from host.
-
-        Return a coroutine.
-        """
-        info = await self._send_command("info")
-        if not info:
-            return
-
-        self.version = info.get(ATTR_VERSION, UNKNOWN)
-        self.last_version = info.get(ATTR_LAST_VERSION, UNKNOWN)
-        self.type = info.get(ATTR_TYPE, UNKNOWN)
-        self.features = info.get(ATTR_FEATURES, [])
-        self.hostname = info.get(ATTR_HOSTNAME, UNKNOWN)
-        self.os_info = info.get(ATTR_OS, UNKNOWN)
-
-    def reboot(self):
-        """Reboot the host system.
-
-        Return a coroutine.
-        """
-        return self._send_command("reboot")
-
-    def shutdown(self):
-        """Shutdown the host system.
-
-        Return a coroutine.
-        """
-        return self._send_command("shutdown")
-
-    def update(self, version=None):
-        """Update the host system.
-
-        Return a coroutine.
-        """
-        if version:
-            return self._send_command("update {}".format(version))
-        return self._send_command("update")
-
-    def set_hostname(self, hostname):
-        """Update hostname on host."""
-        return self._send_command("hostname {}".format(hostname))

hassio/misc/scheduler.py

@@ -10,7 +10,7 @@ CALL = 'callback'
 TASK = 'task'
 
 
-class Scheduler(object):
+class Scheduler:
     """Schedule task inside HassIO."""
 
     def __init__(self, loop):

hassio/services/__init__.py

@@ -0,0 +1,44 @@
+"""Handle internal services discovery."""
+
+from .discovery import Discovery  # noqa
+from .mqtt import MQTTService
+from .data import ServicesData
+from ..const import SERVICE_MQTT
+from ..coresys import CoreSysAttributes
+
+
+AVAILABLE_SERVICES = {
+    SERVICE_MQTT: MQTTService
+}
+
+
+class ServiceManager(CoreSysAttributes):
+    """Handle internal services discovery."""
+
+    def __init__(self, coresys):
+        """Initialize Services handler."""
+        self.coresys = coresys
+        self.data = ServicesData()
+        self.services_obj = {}
+
+    @property
+    def list_services(self):
+        """Return a list of services."""
+        return list(self.services_obj.values())
+
+    def get(self, slug):
+        """Return service object from slug."""
+        return self.services_obj.get(slug)
+
+    async def load(self):
+        """Load available services."""
+        for slug, service in AVAILABLE_SERVICES.items():
+            self.services_obj[slug] = service(self.coresys)
+
+        # Read exists discovery messages
+        self.sys_discovery.load()
+
+    def reset(self):
+        """Reset available data."""
+        self.data.reset_data()
+        self.sys_discovery.load()

hassio/services/data.py

@@ -0,0 +1,23 @@
+"""Handle service data for persistent supervisor reboot."""
+
+from .validate import SCHEMA_SERVICES_FILE
+from ..const import FILE_HASSIO_SERVICES, ATTR_DISCOVERY, SERVICE_MQTT
+from ..utils.json import JsonConfig
+
+
+class ServicesData(JsonConfig):
+    """Class to handle services data."""
+
+    def __init__(self):
+        """Initialize services data."""
+        super().__init__(FILE_HASSIO_SERVICES, SCHEMA_SERVICES_FILE)
+
+    @property
+    def discovery(self):
+        """Return discovery data for home-assistant."""
+        return self._data[ATTR_DISCOVERY]
+
+    @property
+    def mqtt(self):
+        """Return settings for mqtt service."""
+        return self._data[SERVICE_MQTT]

hassio/services/discovery.py

@@ -0,0 +1,107 @@
+"""Handle discover message for Home-Assistant."""
+import logging
+from uuid import uuid4
+
+from ..const import ATTR_UUID
+from ..coresys import CoreSysAttributes
+
+_LOGGER = logging.getLogger(__name__)
+
+EVENT_DISCOVERY_ADD = 'hassio_discovery_add'
+EVENT_DISCOVERY_DEL = 'hassio_discovery_del'
+
+
+class Discovery(CoreSysAttributes):
+    """Home-Assistant Discovery handler."""
+
+    def __init__(self, coresys):
+        """Initialize discovery handler."""
+        self.coresys = coresys
+        self.message_obj = {}
+
+    def load(self):
+        """Load exists discovery message into storage."""
+        messages = {}
+        for message in self._data:
+            discovery = Message(**message)
+            messages[discovery.uuid] = discovery
+
+        self.message_obj = messages
+
+    def save(self):
+        """Write discovery message into data file."""
+        messages = []
+        for message in self.message_obj.values():
+            messages.append(message.raw())
+
+        self._data.clear()
+        self._data.extend(messages)
+        self.sys_services.data.save_data()
+
+    def get(self, uuid):
+        """Return discovery message."""
+        return self.message_obj.get(uuid)
+
+    @property
+    def _data(self):
+        """Return discovery data."""
+        return self.sys_services.data.discovery
+
+    @property
+    def list_messages(self):
+        """Return list of available discovery messages."""
+        return self.message_obj.values()
+
+    def send(self, provider, component, platform=None, config=None):
+        """Send a discovery message to Home-Assistant."""
+        message = Message(provider, component, platform, config)
+
+        # Allready exists?
+        for exists_message in self.message_obj:
+            if exists_message == message:
+                _LOGGER.warning("Found douplicate discovery message from %s",
+                                provider)
+                return exists_message
+
+        _LOGGER.info("Send discovery to Home-Assistant %s/%s from %s",
+                     component, platform, provider)
+        self.message_obj[message.uuid] = message
+        self.save()
+
+        # send event to Home-Assistant
+        self.sys_create_task(self.sys_homeassistant.send_event(
+            EVENT_DISCOVERY_ADD, {ATTR_UUID: message.uuid}))
+
+        return message
+
+    def remove(self, message):
+        """Remove a discovery message from Home-Assistant."""
+        self.message_obj.pop(message.uuid, None)
+        self.save()
+
+        # send event to Home-Assistant
+        self.sys_create_task(self.sys_homeassistant.send_event(
+            EVENT_DISCOVERY_DEL, {ATTR_UUID: message.uuid}))
+
+
+class Message:
+    """Represent a single Discovery message."""
+
+    def __init__(self, provider, component, platform, config, uuid=None):
+        """Initialize discovery message."""
+        self.provider = provider
+        self.component = component
+        self.platform = platform
+        self.config = config
+        self.uuid = uuid or uuid4().hex
+
+    def raw(self):
+        """Return raw discovery message."""
+        return self.__dict__
+
+    def __eq__(self, other):
+        """Compare with other message."""
+        for attribute in ('provider', 'component', 'platform', 'config'):
+            if getattr(self, attribute) != getattr(other, attribute):
+                return False
+        return True

hassio/services/interface.py

@@ -0,0 +1,54 @@
+"""Interface for single service."""
+
+from ..coresys import CoreSysAttributes
+
+
+class ServiceInterface(CoreSysAttributes):
+    """Interface class for service integration."""
+
+    def __init__(self, coresys):
+        """Initialize service interface."""
+        self.coresys = coresys
+
+    @property
+    def slug(self):
+        """Return slug of this service."""
+        return None
+
+    @property
+    def _data(self):
+        """Return data of this service."""
+        return None
+
+    @property
+    def schema(self):
+        """Return data schema of this service."""
+        return None
+
+    @property
+    def provider(self):
+        """Return name of service provider."""
+        return None
+
+    @property
+    def enabled(self):
+        """Return True if the service is in use."""
+        return bool(self._data)
+
+    def save(self):
+        """Save changes."""
+        self.sys_services.data.save_data()
+
+    def get_service_data(self):
+        """Return the requested service data."""
+        if self.enabled:
+            return self._data
+        return None
+
+    def set_service_data(self, provider, data):
+        """Write the data into service object."""
+        raise NotImplementedError()
+
+    def del_service_data(self, provider):
+        """Remove the data from service object."""
+        raise NotImplementedError()

hassio/services/mqtt.py

@@ -0,0 +1,89 @@
+"""Provide MQTT Service."""
+import logging
+
+from .interface import ServiceInterface
+from .validate import SCHEMA_SERVICE_MQTT
+from ..const import (
+    ATTR_PROVIDER, SERVICE_MQTT, ATTR_HOST, ATTR_PORT, ATTR_USERNAME,
+    ATTR_PASSWORD, ATTR_PROTOCOL, ATTR_DISCOVERY_ID)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class MQTTService(ServiceInterface):
+    """Provide mqtt services."""
+
+    @property
+    def slug(self):
+        """Return slug of this service."""
+        return SERVICE_MQTT
+
+    @property
+    def _data(self):
+        """Return data of this service."""
+        return self.sys_services.data.mqtt
+
+    @property
+    def schema(self):
+        """Return data schema of this service."""
+        return SCHEMA_SERVICE_MQTT
+
+    @property
+    def provider(self):
+        """Return name of service provider."""
+        return self._data.get(ATTR_PROVIDER)
+
+    @property
+    def hass_config(self):
+        """Return Home-Assistant mqtt config."""
+        if not self.enabled:
+            return None
+
+        hass_config = {
+            'host': self._data[ATTR_HOST],
+            'port': self._data[ATTR_PORT],
+            'protocol': self._data[ATTR_PROTOCOL]
+        }
+        if ATTR_USERNAME in self._data:
+            hass_config['user']: self._data[ATTR_USERNAME]
+        if ATTR_PASSWORD in self._data:
+            hass_config['password']: self._data[ATTR_PASSWORD]
+
+        return hass_config
+
+    def set_service_data(self, provider, data):
+        """Write the data into service object."""
+        if self.enabled:
+            _LOGGER.error("It is already a mqtt in use from %s", self.provider)
+            return False
+
+        self._data.update(data)
+        self._data[ATTR_PROVIDER] = provider
+
+        if provider == 'homeassistant':
+            _LOGGER.info("Use mqtt settings from Home-Assistant")
+            self.save()
+            return True
+
+        # discover mqtt to homeassistant
+        message = self.sys_discovery.send(
+            provider, SERVICE_MQTT, None, self.hass_config)
+
+        self._data[ATTR_DISCOVERY_ID] = message.uuid
+        self.save()
+        return True
+
+    def del_service_data(self, provider):
+        """Remove the data from service object."""
+        if not self.enabled:
+            _LOGGER.warning("Can't remove not exists services.")
+            return False
+
+        discovery_id = self._data.get(ATTR_DISCOVERY_ID)
+        if discovery_id:
+            self.sys_discovery.remove(
+                self.sys_discovery.get(discovery_id))
+
+        self._data.clear()
+        self.save()
+        return True

hassio/services/validate.py

@@ -0,0 +1,44 @@
+"""Validate services schema."""
+
+import voluptuous as vol
+
+from ..const import (
+    SERVICE_MQTT, ATTR_HOST, ATTR_PORT, ATTR_PASSWORD, ATTR_USERNAME, ATTR_SSL,
+    ATTR_PROVIDER, ATTR_PROTOCOL, ATTR_DISCOVERY, ATTR_COMPONENT, ATTR_UUID,
+    ATTR_PLATFORM, ATTR_CONFIG, ATTR_DISCOVERY_ID)
+from ..validate import NETWORK_PORT
+
+
+SCHEMA_DISCOVERY = vol.Schema([
+    vol.Schema({
+        vol.Required(ATTR_UUID): vol.Match(r"^[0-9a-f]{32}$"),
+        vol.Required(ATTR_PROVIDER): vol.Coerce(str),
+        vol.Required(ATTR_COMPONENT): vol.Coerce(str),
+        vol.Required(ATTR_PLATFORM): vol.Any(None, vol.Coerce(str)),
+        vol.Required(ATTR_CONFIG): vol.Any(None, dict),
+    }, extra=vol.REMOVE_EXTRA)
+])
+
+
+# pylint: disable=no-value-for-parameter
+SCHEMA_SERVICE_MQTT = vol.Schema({
+    vol.Required(ATTR_HOST): vol.Coerce(str),
+    vol.Required(ATTR_PORT): NETWORK_PORT,
+    vol.Optional(ATTR_USERNAME): vol.Coerce(str),
+    vol.Optional(ATTR_PASSWORD): vol.Coerce(str),
+    vol.Optional(ATTR_SSL, default=False): vol.Boolean(),
+    vol.Optional(ATTR_PROTOCOL, default='3.1.1'):
+        vol.All(vol.Coerce(str), vol.In(['3.1', '3.1.1'])),
+})
+
+
+SCHEMA_CONFIG_MQTT = SCHEMA_SERVICE_MQTT.extend({
+    vol.Required(ATTR_PROVIDER): vol.Coerce(str),
+    vol.Optional(ATTR_DISCOVERY_ID): vol.Match(r"^[0-9a-f]{32}$"),
+})
+
+
+SCHEMA_SERVICES_FILE = vol.Schema({
+    vol.Optional(SERVICE_MQTT, default=dict): vol.Any({}, SCHEMA_CONFIG_MQTT),
+    vol.Optional(ATTR_DISCOVERY, default=list): vol.Any([], SCHEMA_DISCOVERY),
+}, extra=vol.REMOVE_EXTRA)

hassio/snapshots/__init__.py

@@ -1,20 +1,19 @@
 """Snapshot system control."""
 import asyncio
-from datetime import datetime
 import logging
 from pathlib import Path
-import tarfile
 
 from .snapshot import Snapshot
 from .utils import create_slug
 from ..const import (
-    ATTR_SLUG, FOLDER_HOMEASSISTANT, SNAPSHOT_FULL, SNAPSHOT_PARTIAL)
+    FOLDER_HOMEASSISTANT, SNAPSHOT_FULL, SNAPSHOT_PARTIAL)
 from ..coresys import CoreSysAttributes
+from ..utils.dt import utcnow
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class SnapshotsManager(CoreSysAttributes):
+class SnapshotManager(CoreSysAttributes):
     """Manage snapshots."""
 
     def __init__(self, coresys):
@@ -32,15 +31,15 @@ class SnapshotsManager(CoreSysAttributes):
         """Return snapshot object."""
         return self.snapshots_obj.get(slug)
 
-    def _create_snapshot(self, name, sys_type):
+    def _create_snapshot(self, name, sys_type, password):
         """Initialize a new snapshot object from name."""
-        date_str = datetime.utcnow().isoformat()
+        date_str = utcnow().isoformat()
         slug = create_slug(name, date_str)
-        tar_file = Path(self._config.path_backup, "{}.tar".format(slug))
+        tar_file = Path(self.sys_config.path_backup, f"{slug}.tar")
 
         # init object
         snapshot = Snapshot(self.coresys, tar_file)
-        snapshot.create(slug, name, date_str, sys_type)
+        snapshot.new(slug, name, date_str, sys_type, password)
 
         # set general data
         snapshot.store_homeassistant()
@@ -66,255 +65,278 @@ class SnapshotsManager(CoreSysAttributes):
                 self.snapshots_obj[snapshot.slug] = snapshot
 
         tasks = [_load_snapshot(tar_file) for tar_file in
-                 self._config.path_backup.glob("*.tar")]
+                 self.sys_config.path_backup.glob("*.tar")]
 
         _LOGGER.info("Found %d snapshot files", len(tasks))
         if tasks:
-            await asyncio.wait(tasks, loop=self._loop)
+            await asyncio.wait(tasks)
 
     def remove(self, snapshot):
         """Remove a snapshot."""
         try:
-            snapshot.tar_file.unlink()
+            snapshot.tarfile.unlink()
             self.snapshots_obj.pop(snapshot.slug, None)
+            _LOGGER.info("Removed snapshot file %s", snapshot.slug)
+
         except OSError as err:
             _LOGGER.error("Can't remove snapshot %s: %s", snapshot.slug, err)
             return False
 
         return True
 
-    async def do_snapshot_full(self, name=""):
+    async def import_snapshot(self, tar_file):
+        """Check snapshot tarfile and import it."""
+        snapshot = Snapshot(self.coresys, tar_file)
+
+        # Read meta data
+        if not await snapshot.load():
+            return None
+
+        # Allready exists?
+        if snapshot.slug in self.snapshots_obj:
+            _LOGGER.error("Snapshot %s allready exists!", snapshot.slug)
+            return None
+
+        # Move snapshot to backup
+        tar_origin = Path(self.sys_config.path_backup, f"{snapshot.slug}.tar")
+        try:
+            snapshot.tarfile.rename(tar_origin)
+
+        except OSError as err:
+            _LOGGER.error("Can't move snapshot file to storage: %s", err)
+            return None
+
+        # Load new snapshot
+        snapshot = Snapshot(self.coresys, tar_origin)
+        if not await snapshot.load():
+            return None
+        _LOGGER.info("Success import %s", snapshot.slug)
+
+        self.snapshots_obj[snapshot.slug] = snapshot
+        return snapshot
+
+    async def do_snapshot_full(self, name="", password=None):
         """Create a full snapshot."""
         if self.lock.locked():
             _LOGGER.error("It is already a snapshot/restore process running")
-            return False
+            return None
 
-        snapshot = self._create_snapshot(name, SNAPSHOT_FULL)
+        snapshot = self._create_snapshot(name, SNAPSHOT_FULL, password)
         _LOGGER.info("Full-Snapshot %s start", snapshot.slug)
         try:
-            self._scheduler.suspend = True
+            self.sys_scheduler.suspend = True
             await self.lock.acquire()
 
             async with snapshot:
-                # snapshot addons
+                # Snapshot add-ons
-                tasks = []
+                _LOGGER.info("Snapshot %s store Add-ons", snapshot.slug)
-                for addon in self._addons.list_addons:
+                await snapshot.store_addons()
-                    if not addon.is_installed:
-                        continue
-                    tasks.append(snapshot.import_addon(addon))
 
-                if tasks:
+                # Snapshot folders
-                    _LOGGER.info("Full-Snapshot %s run %d addons",
+                _LOGGER.info("Snapshot %s store folders", snapshot.slug)
-                                 snapshot.slug, len(tasks))
-                    await asyncio.wait(tasks, loop=self._loop)
-
-                # snapshot folders
-                _LOGGER.info("Full-Snapshot %s store folders", snapshot.slug)
                 await snapshot.store_folders()
 
+        except Exception:  # pylint: disable=broad-except
+            _LOGGER.exception("Snapshot %s error", snapshot.slug)
+            return None
+
+        else:
             _LOGGER.info("Full-Snapshot %s done", snapshot.slug)
             self.snapshots_obj[snapshot.slug] = snapshot
-            return True
+            return snapshot
-
-        except (OSError, ValueError, tarfile.TarError) as err:
-            _LOGGER.info("Full-Snapshot %s error: %s", snapshot.slug, err)
-            return False
 
         finally:
-            self._scheduler.suspend = False
+            self.sys_scheduler.suspend = False
             self.lock.release()
 
-    async def do_snapshot_partial(self, name="", addons=None, folders=None):
+    async def do_snapshot_partial(self, name="", addons=None, folders=None,
+                                  password=None):
         """Create a partial snapshot."""
         if self.lock.locked():
             _LOGGER.error("It is already a snapshot/restore process running")
-            return False
+            return None
 
         addons = addons or []
         folders = folders or []
-        snapshot = self._create_snapshot(name, SNAPSHOT_PARTIAL)
+        snapshot = self._create_snapshot(name, SNAPSHOT_PARTIAL, password)
 
         _LOGGER.info("Partial-Snapshot %s start", snapshot.slug)
         try:
-            self._scheduler.suspend = True
+            self.sys_scheduler.suspend = True
             await self.lock.acquire()
 
             async with snapshot:
-                # snapshot addons
+                # Snapshot add-ons
-                tasks = []
+                addon_list = []
-                for slug in addons:
+                for addon_slug in addons:
-                    addon = self._addons.get(slug)
+                    addon = self.sys_addons.get(addon_slug)
-                    if addon.is_installed:
+                    if addon and addon.is_installed:
-                        tasks.append(snapshot.import_addon(addon))
+                        addon_list.append(addon)
+                        continue
+                    _LOGGER.warning(
+                        "Add-on %s not found/installed", addon_slug)
 
-                if tasks:
+                if addon_list:
-                    _LOGGER.info("Partial-Snapshot %s run %d addons",
+                    _LOGGER.info("Snapshot %s store Add-ons", snapshot.slug)
-                                 snapshot.slug, len(tasks))
+                    await snapshot.store_addons(addon_list)
-                    await asyncio.wait(tasks, loop=self._loop)
 
-                # snapshot folders
+                # Snapshot folders
-                _LOGGER.info("Partial-Snapshot %s store folders %s",
+                if folders:
-                             snapshot.slug, folders)
+                    _LOGGER.info("Snapshot %s store folders", snapshot.slug)
-                await snapshot.store_folders(folders)
+                    await snapshot.store_folders(folders)
 
+        except Exception:  # pylint: disable=broad-except
+            _LOGGER.exception("Snapshot %s error", snapshot.slug)
+            return None
+
+        else:
             _LOGGER.info("Partial-Snapshot %s done", snapshot.slug)
             self.snapshots_obj[snapshot.slug] = snapshot
-            return True
+            return snapshot
-
-        except (OSError, ValueError, tarfile.TarError) as err:
-            _LOGGER.info("Partial-Snapshot %s error: %s", snapshot.slug, err)
-            return False
 
         finally:
-            self._scheduler.suspend = False
+            self.sys_scheduler.suspend = False
             self.lock.release()
 
-    async def do_restore_full(self, snapshot):
+    async def do_restore_full(self, snapshot, password=None):
         """Restore a snapshot."""
         if self.lock.locked():
             _LOGGER.error("It is already a snapshot/restore process running")
             return False
 
         if snapshot.sys_type != SNAPSHOT_FULL:
-            _LOGGER.error(
+            _LOGGER.error("Restore %s is only a partial snapshot!",
-                "Full-Restore %s is only a partial snapshot!", snapshot.slug)
+                          snapshot.slug)
+            return False
+
+        if snapshot.protected and not snapshot.set_password(password):
+            _LOGGER.error("Invalid password for snapshot %s", snapshot.slug)
             return False
 
         _LOGGER.info("Full-Restore %s start", snapshot.slug)
         try:
-            self._scheduler.suspend = True
+            self.sys_scheduler.suspend = True
             await self.lock.acquire()
 
             async with snapshot:
-                # stop system
                 tasks = []
-                tasks.append(self._homeassistant.stop())
 
-                for addon in self._addons.list_addons:
+                # Stop Home-Assistant / Add-ons
-                    if addon.is_installed:
+                await self.sys_core.shutdown()
-                        tasks.append(addon.stop())
 
-                await asyncio.wait(tasks, loop=self._loop)
+                # Restore folders
-
+                _LOGGER.info("Restore %s run folders", snapshot.slug)
-                # restore folders
-                _LOGGER.info("Full-Restore %s restore folders", snapshot.slug)
                 await snapshot.restore_folders()
 
-                # start homeassistant restore
+                # Start homeassistant restore
-                _LOGGER.info("Full-Restore %s restore Home-Assistant",
+                _LOGGER.info("Restore %s run Home-Assistant", snapshot.slug)
-                             snapshot.slug)
                 snapshot.restore_homeassistant()
-                task_hass = self._loop.create_task(
+                task_hass = self.sys_create_task(self.sys_homeassistant.update(
-                    self._homeassistant.update(snapshot.homeassistant_version))
+                    snapshot.homeassistant_version))
 
-                # restore repositories
+                # Restore repositories
-                _LOGGER.info("Full-Restore %s restore Repositories",
+                _LOGGER.info("Restore %s run Repositories", snapshot.slug)
-                             snapshot.slug)
                 await snapshot.restore_repositories()
 
-                # restore addons
+                # Delete delta add-ons
-                tasks = []
+                tasks.clear()
-                actual_addons = \
+                for addon in self.sys_addons.list_installed:
-                    set(addon.slug for addon in self._addons.list_addons
+                    if addon.slug not in snapshot.addon_list:
-                        if addon.is_installed)
-                restore_addons = \
-                    set(data[ATTR_SLUG] for data in snapshot.addons)
-                remove_addons = actual_addons - restore_addons
-
-                _LOGGER.info("Full-Restore %s restore addons %s, remove %s",
-                             snapshot.slug, restore_addons, remove_addons)
-
-                for slug in remove_addons:
-                    addon = self._addons.get(slug)
-                    if addon:
                         tasks.append(addon.uninstall())
-                    else:
-                        _LOGGER.warning("Can't remove addon %s", slug)
-
-                for slug in restore_addons:
-                    addon = self._addons.get(slug)
-                    if addon:
-                        tasks.append(snapshot.export_addon(addon))
-                    else:
-                        _LOGGER.warning("Can't restore addon %s", slug)
 
                 if tasks:
-                    _LOGGER.info("Full-Restore %s restore addons tasks %d",
+                    _LOGGER.info("Restore %s remove add-ons", snapshot.slug)
-                                 snapshot.slug, len(tasks))
+                    await asyncio.wait(tasks)
-                    await asyncio.wait(tasks, loop=self._loop)
+
+                # Restore add-ons
+                _LOGGER.info("Restore %s old add-ons", snapshot.slug)
+                await snapshot.restore_addons()
 
                 # finish homeassistant task
-                _LOGGER.info("Full-Restore %s wait until homeassistant ready",
+                _LOGGER.info("Restore %s wait until homeassistant ready",
                              snapshot.slug)
                 await task_hass
-                await self._homeassistant.run()
+                await self.sys_homeassistant.start()
 
+        except Exception:  # pylint: disable=broad-except
+            _LOGGER.exception("Restore %s error", snapshot.slug)
+            return False
+
+        else:
             _LOGGER.info("Full-Restore %s done", snapshot.slug)
             return True
 
-        except (OSError, ValueError, tarfile.TarError) as err:
-            _LOGGER.info("Full-Restore %s error: %s", slug, err)
-            return False
-
         finally:
-            self._scheduler.suspend = False
+            self.sys_scheduler.suspend = False
             self.lock.release()
 
     async def do_restore_partial(self, snapshot, homeassistant=False,
-                                 addons=None, folders=None):
+                                 addons=None, folders=None, password=None):
         """Restore a snapshot."""
         if self.lock.locked():
             _LOGGER.error("It is already a snapshot/restore process running")
             return False
 
+        if snapshot.protected and not snapshot.set_password(password):
+            _LOGGER.error("Invalid password for snapshot %s", snapshot.slug)
+            return False
+
         addons = addons or []
         folders = folders or []
 
         _LOGGER.info("Partial-Restore %s start", snapshot.slug)
         try:
-            self._scheduler.suspend = True
+            self.sys_scheduler.suspend = True
             await self.lock.acquire()
 
             async with snapshot:
-                tasks = []
+                # Stop Home-Assistant if they will be restored later
-
+                if homeassistant and FOLDER_HOMEASSISTANT in folders:
-                if FOLDER_HOMEASSISTANT in folders:
+                    await self.sys_homeassistant.stop()
-                    await self._homeassistant.stop()
 
+                # Process folders
                 if folders:
-                    _LOGGER.info("Partial-Restore %s restore folders %s",
+                    _LOGGER.info("Restore %s run folders", snapshot.slug)
-                                 snapshot.slug, folders)
                     await snapshot.restore_folders(folders)
 
+                # Process Home-Assistant
+                task_hass = None
                 if homeassistant:
-                    _LOGGER.info("Partial-Restore %s restore Home-Assistant",
+                    _LOGGER.info("Restore %s run Home-Assistant",
                                  snapshot.slug)
                     snapshot.restore_homeassistant()
-                    tasks.append(self._homeassistant.update(
+                    task_hass = self.sys_create_task(
-                        snapshot.homeassistant_version))
+                        self.sys_homeassistant.update(
+                            snapshot.homeassistant_version))
 
+                # Process Add-ons
+                addon_list = []
                 for slug in addons:
-                    addon = self._addons.get(slug)
+                    addon = self.sys_addons.get(slug)
                     if addon:
-                        tasks.append(snapshot.export_addon(addon))
+                        addon_list.append(addon)
-                    else:
+                        continue
-                        _LOGGER.warning("Can't restore addon %s", slug)
+                    _LOGGER.warning("Can't restore addon %s", snapshot.slug)
 
-                if tasks:
+                if addon_list:
-                    _LOGGER.info("Partial-Restore %s run %d tasks",
+                    _LOGGER.info("Restore %s old add-ons", snapshot.slug)
-                                 snapshot.slug, len(tasks))
+                    await snapshot.restore_addons(addon_list)
-                    await asyncio.wait(tasks, loop=self._loop)
 
                 # make sure homeassistant run agen
-                await self._homeassistant.run()
+                if task_hass:
+                    _LOGGER.info("Restore %s wait for Home-Assistant",
+                                 snapshot.slug)
+                    await task_hass
+                await self.sys_homeassistant.start()
 
+        except Exception:  # pylint: disable=broad-except
+            _LOGGER.exception("Restore %s error", snapshot.slug)
+            return False
+
+        else:
             _LOGGER.info("Partial-Restore %s done", snapshot.slug)
             return True
 
-        except (OSError, ValueError, tarfile.TarError) as err:
-            _LOGGER.info("Partial-Restore %s error: %s", slug, err)
-            return False
-
         finally:
-            self._scheduler.suspend = False
+            self.sys_scheduler.suspend = False
             self.lock.release()

hassio/snapshots/snapshot.py

@@ -1,23 +1,29 @@
 """Represent a snapshot file."""
 import asyncio
+from base64 import b64decode, b64encode
 import json
 import logging
 from pathlib import Path
 import tarfile
 from tempfile import TemporaryDirectory
 
+from Crypto.Cipher import AES
+from Crypto.Util import Padding
 import voluptuous as vol
 from voluptuous.humanize import humanize_error
 
 from .validate import SCHEMA_SNAPSHOT, ALL_FOLDERS
-from .utils import remove_folder
+from .utils import (
+    remove_folder, password_to_key, password_for_validating, key_to_iv)
 from ..const import (
     ATTR_SLUG, ATTR_NAME, ATTR_DATE, ATTR_ADDONS, ATTR_REPOSITORIES,
     ATTR_HOMEASSISTANT, ATTR_FOLDERS, ATTR_VERSION, ATTR_TYPE, ATTR_IMAGE,
-    ATTR_PORT, ATTR_SSL, ATTR_PASSWORD, ATTR_WATCHDOG, ATTR_BOOT,
+    ATTR_PORT, ATTR_SSL, ATTR_PASSWORD, ATTR_WATCHDOG, ATTR_BOOT, ATTR_CRYPTO,
-    ATTR_LAST_VERSION)
+    ATTR_LAST_VERSION, ATTR_PROTECTED, ATTR_WAIT_BOOT, ATTR_SIZE,
+    CRYPTO_AES128)
 from ..coresys import CoreSysAttributes
 from ..utils.json import write_json_file
+from ..utils.tar import SecureTarFile
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -28,9 +34,11 @@ class Snapshot(CoreSysAttributes):
     def __init__(self, coresys, tar_file):
         """Initialize a snapshot."""
         self.coresys = coresys
-        self.tar_file = tar_file
+        self._tarfile = tar_file
         self._data = {}
         self._tmp = None
+        self._key = None
+        self._aes = None
 
     @property
     def slug(self):
@@ -52,11 +60,21 @@ class Snapshot(CoreSysAttributes):
         """Return snapshot date."""
         return self._data[ATTR_DATE]
 
+    @property
+    def protected(self):
+        """Return snapshot date."""
+        return self._data.get(ATTR_PROTECTED) is not None
+
     @property
     def addons(self):
         """Return snapshot date."""
         return self._data[ATTR_ADDONS]
 
+    @property
+    def addon_list(self):
+        """Return a list of addons slugs."""
+        return [addon_data[ATTR_SLUG] for addon_data in self.addons]
+
     @property
     def folders(self):
         """Return list of saved folders."""
@@ -77,89 +95,29 @@ class Snapshot(CoreSysAttributes):
         """Return snapshot homeassistant version."""
         return self._data[ATTR_HOMEASSISTANT].get(ATTR_VERSION)
 
-    @homeassistant_version.setter
-    def homeassistant_version(self, value):
-        """Set snapshot homeassistant version."""
-        self._data[ATTR_HOMEASSISTANT][ATTR_VERSION] = value
-
     @property
-    def homeassistant_last_version(self):
+    def homeassistant(self):
-        """Return snapshot homeassistant last version (custom)."""
+        """Return snapshot homeassistant data."""
-        return self._data[ATTR_HOMEASSISTANT].get(ATTR_LAST_VERSION)
+        return self._data[ATTR_HOMEASSISTANT]
-
-    @homeassistant_last_version.setter
-    def homeassistant_last_version(self, value):
-        """Set snapshot homeassistant last version (custom)."""
-        self._data[ATTR_HOMEASSISTANT][ATTR_LAST_VERSION] = value
-
-    @property
-    def homeassistant_image(self):
-        """Return snapshot homeassistant custom image."""
-        return self._data[ATTR_HOMEASSISTANT].get(ATTR_IMAGE)
-
-    @homeassistant_image.setter
-    def homeassistant_image(self, value):
-        """Set snapshot homeassistant custom image."""
-        self._data[ATTR_HOMEASSISTANT][ATTR_IMAGE] = value
-
-    @property
-    def homeassistant_ssl(self):
-        """Return snapshot homeassistant api ssl."""
-        return self._data[ATTR_HOMEASSISTANT].get(ATTR_SSL)
-
-    @homeassistant_ssl.setter
-    def homeassistant_ssl(self, value):
-        """Set snapshot homeassistant api ssl."""
-        self._data[ATTR_HOMEASSISTANT][ATTR_SSL] = value
-
-    @property
-    def homeassistant_port(self):
-        """Return snapshot homeassistant api port."""
-        return self._data[ATTR_HOMEASSISTANT].get(ATTR_PORT)
-
-    @homeassistant_port.setter
-    def homeassistant_port(self, value):
-        """Set snapshot homeassistant api port."""
-        self._data[ATTR_HOMEASSISTANT][ATTR_PORT] = value
-
-    @property
-    def homeassistant_password(self):
-        """Return snapshot homeassistant api password."""
-        return self._data[ATTR_HOMEASSISTANT].get(ATTR_PASSWORD)
-
-    @homeassistant_password.setter
-    def homeassistant_password(self, value):
-        """Set snapshot homeassistant api password."""
-        self._data[ATTR_HOMEASSISTANT][ATTR_PASSWORD] = value
-
-    @property
-    def homeassistant_watchdog(self):
-        """Return snapshot homeassistant watchdog options."""
-        return self._data[ATTR_HOMEASSISTANT].get(ATTR_WATCHDOG)
-
-    @homeassistant_watchdog.setter
-    def homeassistant_watchdog(self, value):
-        """Set snapshot homeassistant watchdog options."""
-        self._data[ATTR_HOMEASSISTANT][ATTR_WATCHDOG] = value
-
-    @property
-    def homeassistant_boot(self):
-        """Return snapshot homeassistant boot options."""
-        return self._data[ATTR_HOMEASSISTANT].get(ATTR_BOOT)
-
-    @homeassistant_boot.setter
-    def homeassistant_boot(self, value):
-        """Set snapshot homeassistant boot options."""
-        self._data[ATTR_HOMEASSISTANT][ATTR_BOOT] = value
 
     @property
     def size(self):
         """Return snapshot size."""
-        if not self.tar_file.is_file():
+        if not self.tarfile.is_file():
             return 0
-        return self.tar_file.stat().st_size / 1048576  # calc mbyte
+        return round(self.tarfile.stat().st_size / 1048576, 2)  # calc mbyte
 
-    def create(self, slug, name, date, sys_type):
+    @property
+    def is_new(self):
+        """Return True if there is new."""
+        return not self.tarfile.exists()
+
+    @property
+    def tarfile(self):
+        """Return path to Snapshot tarfile."""
+        return self._tarfile
+
+    def new(self, slug, name, date, sys_type, password=None):
         """Initialize a new snapshot."""
         # init metadata
         self._data[ATTR_SLUG] = slug
@@ -170,38 +128,75 @@ class Snapshot(CoreSysAttributes):
         # Add defaults
         self._data = SCHEMA_SNAPSHOT(self._data)
 
+        # Set password
+        if password:
+            self._key = password_to_key(password)
+            self._aes = AES.new(
+                self._key, AES.MODE_CBC, iv=key_to_iv(self._key))
+            self._data[ATTR_PROTECTED] = password_for_validating(password)
+            self._data[ATTR_CRYPTO] = CRYPTO_AES128
+
+    def set_password(self, password):
+        """Set the password for a exists snapshot."""
+        if not password:
+            return False
+
+        validating = password_for_validating(password)
+        if validating != self._data[ATTR_PROTECTED]:
+            return False
+
+        self._key = password_to_key(password)
+        self._aes = AES.new(self._key, AES.MODE_CBC, iv=key_to_iv(self._key))
+        return True
+
+    def _encrypt_data(self, data):
+        """Make data secure."""
+        if not self._key or data is None:
+            return data
+
+        return b64encode(
+            self._aes.encrypt(Padding.pad(data.encode(), 16))).decode()
+
+    def _decrypt_data(self, data):
+        """Make data readable."""
+        if not self._key or data is None:
+            return data
+
+        return Padding.unpad(
+            self._aes.decrypt(b64decode(data)), 16).decode()
+
     async def load(self):
         """Read snapshot.json from tar file."""
-        if not self.tar_file.is_file():
+        if not self.tarfile.is_file():
-            _LOGGER.error("No tarfile %s", self.tar_file)
+            _LOGGER.error("No tarfile %s", self.tarfile)
             return False
 
         def _load_file():
             """Read snapshot.json."""
-            with tarfile.open(self.tar_file, "r:") as snapshot:
+            with tarfile.open(self.tarfile, "r:") as snapshot:
                 json_file = snapshot.extractfile("./snapshot.json")
                 return json_file.read()
 
         # read snapshot.json
         try:
-            raw = await self._loop.run_in_executor(None, _load_file)
+            raw = await self.sys_run_in_executor(_load_file)
         except (tarfile.TarError, KeyError) as err:
             _LOGGER.error(
-                "Can't read snapshot tarfile %s: %s", self.tar_file, err)
+                "Can't read snapshot tarfile %s: %s", self.tarfile, err)
             return False
 
         # parse data
         try:
             raw_dict = json.loads(raw)
         except json.JSONDecodeError as err:
-            _LOGGER.error("Can't read data for %s: %s", self.tar_file, err)
+            _LOGGER.error("Can't read data for %s: %s", self.tarfile, err)
             return False
 
         # validate
         try:
             self._data = SCHEMA_SNAPSHOT(raw_dict)
         except vol.Invalid as err:
-            _LOGGER.error("Can't validate data for %s: %s", self.tar_file,
+            _LOGGER.error("Can't validate data for %s: %s", self.tarfile,
                           humanize_error(raw_dict, err))
             return False
 
@@ -209,24 +204,24 @@ class Snapshot(CoreSysAttributes):
 
     async def __aenter__(self):
         """Async context to open a snapshot."""
-        self._tmp = TemporaryDirectory(dir=str(self._config.path_tmp))
+        self._tmp = TemporaryDirectory(dir=str(self.sys_config.path_tmp))
 
         # create a snapshot
-        if not self.tar_file.is_file():
+        if not self.tarfile.is_file():
             return self
 
         # extract a exists snapshot
         def _extract_snapshot():
             """Extract a snapshot."""
-            with tarfile.open(self.tar_file, "r:") as tar:
+            with tarfile.open(self.tarfile, "r:") as tar:
                 tar.extractall(path=self._tmp.name)
 
-        await self._loop.run_in_executor(None, _extract_snapshot)
+        await self.sys_run_in_executor(_extract_snapshot)
 
     async def __aexit__(self, exception_type, exception_value, traceback):
         """Async context to close a snapshot."""
         # exists snapshot or exception on build
-        if self.tar_file.is_file() or exception_type is not None:
+        if self.tarfile.is_file() or exception_type is not None:
             self._tmp.cleanup()
             return
 
@@ -234,146 +229,195 @@ class Snapshot(CoreSysAttributes):
         try:
             self._data = SCHEMA_SNAPSHOT(self._data)
         except vol.Invalid as err:
-            _LOGGER.error("Invalid data for %s: %s", self.tar_file,
+            _LOGGER.error("Invalid data for %s: %s", self.tarfile,
                           humanize_error(self._data, err))
             raise ValueError("Invalid config") from None
 
         # new snapshot, build it
         def _create_snapshot():
             """Create a new snapshot."""
-            with tarfile.open(self.tar_file, "w:") as tar:
+            with tarfile.open(self.tarfile, "w:") as tar:
                 tar.add(self._tmp.name, arcname=".")
 
-        if write_json_file(Path(self._tmp.name, "snapshot.json"), self._data):
+        try:
-            await self._loop.run_in_executor(None, _create_snapshot)
+            write_json_file(Path(self._tmp.name, "snapshot.json"), self._data)
-        else:
+            await self.sys_run_in_executor(_create_snapshot)
-            _LOGGER.error("Can't write snapshot.json")
+        except (OSError, json.JSONDecodeError) as err:
+            _LOGGER.error("Can't write snapshot: %s", err)
+        finally:
+            self._tmp.cleanup()
 
-        self._tmp.cleanup()
+    async def store_addons(self, addon_list=None):
+        """Add a list of add-ons into snapshot."""
+        addon_list = addon_list or self.sys_addons.list_installed
 
-    async def import_addon(self, addon):
+        async def _addon_save(addon):
-        """Add a addon into snapshot."""
+            """Task to store a add-on into snapshot."""
-        snapshot_file = Path(self._tmp.name, "{}.tar.gz".format(addon.slug))
+            addon_file = SecureTarFile(
+                Path(self._tmp.name, f"{addon.slug}.tar.gz"),
+                'w', key=self._key)
 
-        if not await addon.snapshot(snapshot_file):
+            # Take snapshot
-            _LOGGER.error("Can't make snapshot from %s", addon.slug)
+            if not await addon.snapshot(addon_file):
-            return False
+                _LOGGER.error("Can't make snapshot from %s", addon.slug)
+                return
 
-        # store to config
+            # Store to config
-        self._data[ATTR_ADDONS].append({
+            self._data[ATTR_ADDONS].append({
-            ATTR_SLUG: addon.slug,
+                ATTR_SLUG: addon.slug,
-            ATTR_NAME: addon.name,
+                ATTR_NAME: addon.name,
-            ATTR_VERSION: addon.version_installed,
+                ATTR_VERSION: addon.version_installed,
-        })
+                ATTR_SIZE: addon_file.size,
+            })
 
-        return True
+        # Run tasks
+        tasks = [_addon_save(addon) for addon in addon_list]
+        if tasks:
+            await asyncio.wait(tasks)
 
-    async def export_addon(self, addon):
+    async def restore_addons(self, addon_list=None):
-        """Restore a addon from snapshot."""
+        """Restore a list add-on from snapshot."""
-        snapshot_file = Path(self._tmp.name, "{}.tar.gz".format(addon.slug))
+        if not addon_list:
+            addon_list = []
+            for addon_slug in self.addon_list:
+                addon = self.sys_addons.get(addon_slug)
+                if addon:
+                    addon_list.append(addon)
 
-        if not await addon.restore(snapshot_file):
+        async def _addon_restore(addon):
-            _LOGGER.error("Can't restore snapshot for %s", addon.slug)
+            """Task to restore a add-on into snapshot."""
-            return False
+            addon_file = SecureTarFile(
+                Path(self._tmp.name, f"{addon.slug}.tar.gz"),
+                'r', key=self._key)
 
-        return True
+            # If exists inside snapshot
+            if not addon_file.path.exists():
+                _LOGGER.error("Can't find snapshot for %s", addon.slug)
+                return
+
+            # Performe a restore
+            if not await addon.restore(addon_file):
+                _LOGGER.error("Can't restore snapshot for %s", addon.slug)
+                return
+
+        # Run tasks
+        tasks = [_addon_restore(addon) for addon in addon_list]
+        if tasks:
+            await asyncio.wait(tasks)
 
     async def store_folders(self, folder_list=None):
         """Backup hassio data into snapshot."""
-        folder_list = folder_list or ALL_FOLDERS
+        folder_list = set(folder_list or ALL_FOLDERS)
 
         def _folder_save(name):
             """Intenal function to snapshot a folder."""
             slug_name = name.replace("/", "_")
-            snapshot_tar = Path(self._tmp.name, "{}.tar.gz".format(slug_name))
+            tar_name = Path(self._tmp.name, f"{slug_name}.tar.gz")
-            origin_dir = Path(self._config.path_hassio, name)
+            origin_dir = Path(self.sys_config.path_hassio, name)
 
+            # Check if exsits
+            if not origin_dir.is_dir():
+                _LOGGER.warning("Can't find snapshot folder %s", name)
+                return
+
+            # Take snapshot
             try:
                 _LOGGER.info("Snapshot folder %s", name)
-                with tarfile.open(snapshot_tar, "w:gz",
+                with SecureTarFile(tar_name, 'w', key=self._key) as tar_file:
-                                  compresslevel=1) as tar_file:
                     tar_file.add(origin_dir, arcname=".")
-                    _LOGGER.info("Snapshot folder %s done", name)
 
+                _LOGGER.info("Snapshot folder %s done", name)
                 self._data[ATTR_FOLDERS].append(name)
             except (tarfile.TarError, OSError) as err:
                 _LOGGER.warning("Can't snapshot folder %s: %s", name, err)
 
-        # run tasks
+        # Run tasks
-        tasks = [self._loop.run_in_executor(None, _folder_save, folder)
+        tasks = [self.sys_run_in_executor(_folder_save, folder)
                  for folder in folder_list]
         if tasks:
-            await asyncio.wait(tasks, loop=self._loop)
+            await asyncio.wait(tasks)
 
     async def restore_folders(self, folder_list=None):
         """Backup hassio data into snapshot."""
-        folder_list = folder_list or ALL_FOLDERS
+        folder_list = set(folder_list or self.folders)
 
         def _folder_restore(name):
             """Intenal function to restore a folder."""
             slug_name = name.replace("/", "_")
-            snapshot_tar = Path(self._tmp.name, "{}.tar.gz".format(slug_name))
+            tar_name = Path(self._tmp.name, f"{slug_name}.tar.gz")
-            origin_dir = Path(self._config.path_hassio, name)
+            origin_dir = Path(self.sys_config.path_hassio, name)
 
-            # clean old stuff
+            # Check if exists inside snapshot
+            if not tar_name.exists():
+                _LOGGER.warning("Can't find restore folder %s", name)
+                return
+
+            # Clean old stuff
             if origin_dir.is_dir():
                 remove_folder(origin_dir)
 
+            # Performe a restore
             try:
                 _LOGGER.info("Restore folder %s", name)
-                with tarfile.open(snapshot_tar, "r:gz") as tar_file:
+                with SecureTarFile(tar_name, 'r', key=self._key) as tar_file:
                     tar_file.extractall(path=origin_dir)
-                    _LOGGER.info("Restore folder %s done", name)
+                _LOGGER.info("Restore folder %s done", name)
             except (tarfile.TarError, OSError) as err:
                 _LOGGER.warning("Can't restore folder %s: %s", name, err)
 
-        # run tasks
+        # Run tasks
-        tasks = [self._loop.run_in_executor(None, _folder_restore, folder)
+        tasks = [self.sys_run_in_executor(_folder_restore, folder)
                  for folder in folder_list]
         if tasks:
-            await asyncio.wait(tasks, loop=self._loop)
+            await asyncio.wait(tasks)
 
     def store_homeassistant(self):
         """Read all data from homeassistant object."""
-        self.homeassistant_version = self._homeassistant.version
+        self.homeassistant[ATTR_VERSION] = self.sys_homeassistant.version
-        self.homeassistant_watchdog = self._homeassistant.watchdog
+        self.homeassistant[ATTR_WATCHDOG] = self.sys_homeassistant.watchdog
-        self.homeassistant_boot = self._homeassistant.boot
+        self.homeassistant[ATTR_BOOT] = self.sys_homeassistant.boot
+        self.homeassistant[ATTR_WAIT_BOOT] = self.sys_homeassistant.wait_boot
 
-        # custom image
+        # Custom image
-        if self._homeassistant.is_custom_image:
+        if self.sys_homeassistant.is_custom_image:
-            self.homeassistant_image = self._homeassistant.image
+            self.homeassistant[ATTR_IMAGE] = self.sys_homeassistant.image
-            self.homeassistant_last_version = self._homeassistant.last_version
+            self.homeassistant[ATTR_LAST_VERSION] = \
+                self.sys_homeassistant.last_version
 
-        # api
+        # API/Proxy
-        self.homeassistant_port = self._homeassistant.api_port
+        self.homeassistant[ATTR_PORT] = self.sys_homeassistant.api_port
-        self.homeassistant_ssl = self._homeassistant.api_ssl
+        self.homeassistant[ATTR_SSL] = self.sys_homeassistant.api_ssl
-        self.homeassistant_password = self._homeassistant.api_password
+        self.homeassistant[ATTR_PASSWORD] = \
+            self._encrypt_data(self.sys_homeassistant.api_password)
 
     def restore_homeassistant(self):
         """Write all data to homeassistant object."""
-        self._homeassistant.watchdog = self.homeassistant_watchdog
+        self.sys_homeassistant.watchdog = self.homeassistant[ATTR_WATCHDOG]
-        self._homeassistant.boot = self.homeassistant_boot
+        self.sys_homeassistant.boot = self.homeassistant[ATTR_BOOT]
+        self.sys_homeassistant.wait_boot = self.homeassistant[ATTR_WAIT_BOOT]
 
-        # custom image
+        # Custom image
-        if self.homeassistant_image:
+        if self.homeassistant.get(ATTR_IMAGE):
-            self._homeassistant.image = self.homeassistant_image
+            self.sys_homeassistant.image = self.homeassistant[ATTR_IMAGE]
-            self._homeassistant.last_version = self.homeassistant_last_version
+            self.sys_homeassistant.last_version = \
+                self.homeassistant[ATTR_LAST_VERSION]
 
-        # api
+        # API/Proxy
-        self._homeassistant.api_port = self.homeassistant_port
+        self.sys_homeassistant.api_port = self.homeassistant[ATTR_PORT]
-        self._homeassistant.api_ssl = self.homeassistant_ssl
+        self.sys_homeassistant.api_ssl = self.homeassistant[ATTR_SSL]
-        self._homeassistant.api_password = self.homeassistant_password
+        self.sys_homeassistant.api_password = \
+            self._decrypt_data(self.homeassistant[ATTR_PASSWORD])
 
         # save
-        self._homeassistant.save()
+        self.sys_homeassistant.save_data()
 
     def store_repositories(self):
         """Store repository list into snapshot."""
-        self.repositories = self._config.addons_repositories
+        self.repositories = self.sys_config.addons_repositories
 
     def restore_repositories(self):
         """Restore repositories from snapshot.
 
         Return a coroutine.
         """
-        return self._addons.load_repositories(self.repositories)
+        return self.sys_addons.load_repositories(self.repositories)

hassio/snapshots/utils.py

@@ -1,6 +1,34 @@
 """Util addons functions."""
 import hashlib
 import shutil
+import re
+
+RE_DIGITS = re.compile(r"\d+")
+
+
+def password_to_key(password):
+    """Generate a AES Key from password."""
+    password = password.encode()
+    for _ in range(100):
+        password = hashlib.sha256(password).digest()
+    return password[:16]
+
+
+def password_for_validating(password):
+    """Generate a SHA256 hash from password."""
+    for _ in range(100):
+        password = hashlib.sha256(password.encode()).hexdigest()
+    try:
+        return str(sum(map(int, RE_DIGITS.findall(password))))[0]
+    except (ValueError, IndexError):
+        return "0"
+
+
+def key_to_iv(key):
+    """Generate a iv from Key."""
+    for _ in range(100):
+        key = hashlib.sha256(key).digest()
+    return key[:16]
 
 
 def create_slug(name, date_str):

hassio/snapshots/validate.py

@@ -5,35 +5,52 @@ import voluptuous as vol
 from ..const import (
     ATTR_REPOSITORIES, ATTR_ADDONS, ATTR_NAME, ATTR_SLUG, ATTR_DATE,
     ATTR_VERSION, ATTR_HOMEASSISTANT, ATTR_FOLDERS, ATTR_TYPE, ATTR_IMAGE,
-    ATTR_PASSWORD, ATTR_PORT, ATTR_SSL, ATTR_WATCHDOG, ATTR_BOOT,
+    ATTR_PASSWORD, ATTR_PORT, ATTR_SSL, ATTR_WATCHDOG, ATTR_BOOT, ATTR_SIZE,
-    ATTR_LAST_VERSION,
+    ATTR_LAST_VERSION, ATTR_WAIT_BOOT, ATTR_PROTECTED, ATTR_CRYPTO,
     FOLDER_SHARE, FOLDER_HOMEASSISTANT, FOLDER_ADDONS, FOLDER_SSL,
-    SNAPSHOT_FULL, SNAPSHOT_PARTIAL)
+    SNAPSHOT_FULL, SNAPSHOT_PARTIAL, CRYPTO_AES128)
-from ..validate import NETWORK_PORT
+from ..validate import NETWORK_PORT, REPOSITORIES, DOCKER_IMAGE
 
 ALL_FOLDERS = [FOLDER_HOMEASSISTANT, FOLDER_SHARE, FOLDER_ADDONS, FOLDER_SSL]
 
+
+def unique_addons(addons_list):
+    """Validate that a add-on is unique."""
+    single = set([addon[ATTR_SLUG] for addon in addons_list])
+
+    if len(single) != len(addons_list):
+        raise vol.Invalid("Invalid addon list on snapshot!")
+    return addons_list
+
+
 # pylint: disable=no-value-for-parameter
 SCHEMA_SNAPSHOT = vol.Schema({
     vol.Required(ATTR_SLUG): vol.Coerce(str),
     vol.Required(ATTR_TYPE): vol.In([SNAPSHOT_FULL, SNAPSHOT_PARTIAL]),
     vol.Required(ATTR_NAME): vol.Coerce(str),
     vol.Required(ATTR_DATE): vol.Coerce(str),
-    vol.Optional(ATTR_HOMEASSISTANT, default={}): vol.Schema({
+    vol.Inclusive(ATTR_PROTECTED, 'encrypted'):
-        vol.Required(ATTR_VERSION): vol.Coerce(str),
+        vol.All(vol.Coerce(str), vol.Length(min=1, max=1)),
-        vol.Optional(ATTR_IMAGE): vol.Coerce(str),
+    vol.Inclusive(ATTR_CRYPTO, 'encrypted'): CRYPTO_AES128,
-        vol.Optional(ATTR_LAST_VERSION): vol.Coerce(str),
+    vol.Optional(ATTR_HOMEASSISTANT, default=dict): vol.Schema({
+        vol.Optional(ATTR_VERSION): vol.Coerce(str),
+        vol.Inclusive(ATTR_IMAGE, 'custom_hass'): DOCKER_IMAGE,
+        vol.Inclusive(ATTR_LAST_VERSION, 'custom_hass'): vol.Coerce(str),
         vol.Optional(ATTR_BOOT, default=True): vol.Boolean(),
         vol.Optional(ATTR_SSL, default=False): vol.Boolean(),
         vol.Optional(ATTR_PORT, default=8123): NETWORK_PORT,
         vol.Optional(ATTR_PASSWORD): vol.Any(None, vol.Coerce(str)),
         vol.Optional(ATTR_WATCHDOG, default=True): vol.Boolean(),
+        vol.Optional(ATTR_WAIT_BOOT, default=600):
+            vol.All(vol.Coerce(int), vol.Range(min=60)),
     }, extra=vol.REMOVE_EXTRA),
-    vol.Optional(ATTR_FOLDERS, default=[]): [vol.In(ALL_FOLDERS)],
+    vol.Optional(ATTR_FOLDERS, default=list):
-    vol.Optional(ATTR_ADDONS, default=[]): [vol.Schema({
+        vol.All([vol.In(ALL_FOLDERS)], vol.Unique()),
+    vol.Optional(ATTR_ADDONS, default=list): vol.All([vol.Schema({
         vol.Required(ATTR_SLUG): vol.Coerce(str),
         vol.Required(ATTR_NAME): vol.Coerce(str),
         vol.Required(ATTR_VERSION): vol.Coerce(str),
-    }, extra=vol.REMOVE_EXTRA)],
+        vol.Optional(ATTR_SIZE, default=0): vol.Coerce(float),
-    vol.Optional(ATTR_REPOSITORIES, default=[]): [vol.Url()],
+    }, extra=vol.REMOVE_EXTRA)], unique_addons),
+    vol.Optional(ATTR_REPOSITORIES, default=list): REPOSITORIES,
 }, extra=vol.ALLOW_EXTRA)

hassio/supervisor.py

@@ -21,6 +21,11 @@ class Supervisor(CoreSysAttributes):
             _LOGGER.fatal("Can't setup supervisor docker container!")
         await self.instance.cleanup()
 
+    @property
+    def need_update(self):
+        """Return True if a update is available."""
+        return self.version != self.last_version
+
     @property
     def version(self):
         """Return version of running homeassistant."""
@@ -29,7 +34,7 @@ class Supervisor(CoreSysAttributes):
     @property
     def last_version(self):
         """Return last available version of homeassistant."""
-        return self._updater.version_hassio
+        return self.sys_updater.version_hassio
 
     @property
     def image(self):
@@ -45,13 +50,13 @@ class Supervisor(CoreSysAttributes):
         """Update HomeAssistant version."""
         version = version or self.last_version
 
-        if version == self._supervisor.version:
+        if version == self.sys_supervisor.version:
             _LOGGER.warning("Version %s is already installed", version)
             return
 
         _LOGGER.info("Update supervisor to version %s", version)
         if await self.instance.install(version):
-            self._loop.call_later(1, self._loop.stop)
+            self.sys_loop.call_later(1, self.sys_loop.stop)
             return True
 
         _LOGGER.error("Update of hass.io fails!")

hassio/tasks.py

@@ -1,6 +1,5 @@
 """Multible tasks."""
 import asyncio
-from datetime import datetime
 import logging
 
 from .coresys import CoreSysAttributes
@@ -16,14 +15,12 @@ class Tasks(CoreSysAttributes):
 
     RUN_RELOAD_ADDONS = 21600
     RUN_RELOAD_SNAPSHOTS = 72000
-    RUN_RELOAD_HOST_CONTROL = 72000
+    RUN_RELOAD_HOST = 72000
     RUN_RELOAD_UPDATER = 21600
 
     RUN_WATCHDOG_HOMEASSISTANT_DOCKER = 15
     RUN_WATCHDOG_HOMEASSISTANT_API = 300
 
-    RUN_CLEANUP_API_SESSIONS = 900
-
     def __init__(self, coresys):
         """Initialize Tasks."""
         self.coresys = coresys
@@ -32,39 +29,33 @@ class Tasks(CoreSysAttributes):
 
     async def load(self):
         """Add Tasks to scheduler."""
-
+        self.jobs.add(self.sys_scheduler.register_task(
-        self.jobs.add(self._scheduler.register_task(
             self._update_addons, self.RUN_UPDATE_ADDONS))
-        self.jobs.add(self._scheduler.register_task(
+        self.jobs.add(self.sys_scheduler.register_task(
             self._update_supervisor, self.RUN_UPDATE_SUPERVISOR))
 
-        self.jobs.add(self._scheduler.register_task(
+        self.jobs.add(self.sys_scheduler.register_task(
-            self._addons.reload, self.RUN_RELOAD_ADDONS))
+            self.sys_addons.reload, self.RUN_RELOAD_ADDONS))
-        self.jobs.add(self._scheduler.register_task(
+        self.jobs.add(self.sys_scheduler.register_task(
-            self._updater.reload, self.RUN_RELOAD_UPDATER))
+            self.sys_updater.reload, self.RUN_RELOAD_UPDATER))
-        self.jobs.add(self._scheduler.register_task(
+        self.jobs.add(self.sys_scheduler.register_task(
-            self._snapshots.reload, self.RUN_RELOAD_SNAPSHOTS))
+            self.sys_snapshots.reload, self.RUN_RELOAD_SNAPSHOTS))
-        self.jobs.add(self._scheduler.register_task(
+        self.jobs.add(self.sys_scheduler.register_task(
-            self._host_control.load, self.RUN_RELOAD_HOST_CONTROL))
+            self.sys_host.load, self.RUN_RELOAD_HOST))
 
-        self.jobs.add(self._scheduler.register_task(
+        self.jobs.add(self.sys_scheduler.register_task(
             self._watchdog_homeassistant_docker,
             self.RUN_WATCHDOG_HOMEASSISTANT_DOCKER))
-        self.jobs.add(self._scheduler.register_task(
+        self.jobs.add(self.sys_scheduler.register_task(
             self._watchdog_homeassistant_api,
             self.RUN_WATCHDOG_HOMEASSISTANT_API))
 
-    async def _cleanup_sessions(self):
+        _LOGGER.info("All core tasks are scheduled")
-        """Cleanup old api sessions."""
-        now = datetime.now()
-        for session, until_valid in self._config.security_sessions.items():
-            if now >= until_valid:
-                self._config.drop_security_session(session)
 
     async def _update_addons(self):
         """Check if a update is available of a addon and update it."""
         tasks = []
-        for addon in self._addons.list_addons:
+        for addon in self.sys_addons.list_addons:
             if not addon.is_installed or not addon.auto_update:
                 continue
 
@@ -79,36 +70,35 @@ class Tasks(CoreSysAttributes):
 
         if tasks:
             _LOGGER.info("Addon auto update process %d tasks", len(tasks))
-            await asyncio.wait(tasks, loop=self._loop)
+            await asyncio.wait(tasks)
 
     async def _update_supervisor(self):
         """Check and run update of supervisor hassio."""
-        await self._updater.reload()
+        if not self.sys_supervisor.need_update:
-        if self._supervisor.last_version == self._supervisor.version:
             return
 
         # don't perform a update on beta/dev channel
-        if self._updater.beta_channel:
+        if self.sys_dev:
-            _LOGGER.warning("Ignore Hass.io update on beta upstream!")
+            _LOGGER.warning("Ignore Hass.io update on dev channel!")
             return
 
         _LOGGER.info("Found new Hass.io version")
-        await self._supervisor.update()
+        await self.sys_supervisor.update()
 
     async def _watchdog_homeassistant_docker(self):
         """Check running state of docker and start if they is close."""
         # if Home-Assistant is active
-        if not await self._homeassistant.is_initialize() or \
+        if not await self.sys_homeassistant.is_initialize() or \
-                not self._homeassistant.watchdog:
+                not self.sys_homeassistant.watchdog:
             return
 
         # if Home-Assistant is running
-        if self._homeassistant.in_progress or \
+        if self.sys_homeassistant.in_progress or \
-                await self._homeassistant.is_running():
+                await self.sys_homeassistant.is_running():
             return
 
         _LOGGER.warning("Watchdog found a problem with Home-Assistant docker!")
-        await self._homeassistant.run()
+        await self.sys_homeassistant.start()
 
     async def _watchdog_homeassistant_api(self):
         """Create scheduler task for montoring running state of API.
@@ -119,13 +109,13 @@ class Tasks(CoreSysAttributes):
         retry_scan = self._data.get('HASS_WATCHDOG_API', 0)
 
         # If Home-Assistant is active
-        if not await self._homeassistant.is_initialize() or \
+        if not await self.sys_homeassistant.is_initialize() or \
-                not self._homeassistant.watchdog:
+                not self.sys_homeassistant.watchdog:
             return
 
         # If Home-Assistant API is up
-        if self._homeassistant.in_progress or \
+        if self.sys_homeassistant.in_progress or \
-                await self._homeassistant.check_api_state():
+                await self.sys_homeassistant.check_api_state():
             return
 
         # Look like we run into a problem
@@ -136,5 +126,5 @@ class Tasks(CoreSysAttributes):
             return
 
         _LOGGER.error("Watchdog found a problem with Home-Assistant API!")
-        await self._homeassistant.restart()
+        await self.sys_homeassistant.restart()
         self._data['HASS_WATCHDOG_API'] = 0

hassio/updater.py

@@ -1,15 +1,15 @@
 """Fetch last versions from webserver."""
 import asyncio
+from contextlib import suppress
 from datetime import timedelta
 import json
 import logging
 
 import aiohttp
-import async_timeout
 
 from .const import (
     URL_HASSIO_VERSION, FILE_HASSIO_UPDATER, ATTR_HOMEASSISTANT, ATTR_HASSIO,
-    ATTR_BETA_CHANNEL)
+    ATTR_CHANNEL)
 from .coresys import CoreSysAttributes
 from .utils import AsyncThrottle
 from .utils.json import JsonConfig
@@ -44,21 +44,14 @@ class Updater(JsonConfig, CoreSysAttributes):
         return self._data.get(ATTR_HASSIO)
 
     @property
-    def upstream(self):
+    def channel(self):
-        """Return Upstream branch for version."""
+        """Return upstream channel of hassio instance."""
-        if self.beta_channel:
+        return self._data[ATTR_CHANNEL]
-            return 'dev'
-        return 'master'
 
-    @property
+    @channel.setter
-    def beta_channel(self):
+    def channel(self, value):
-        """Return True if we run in beta upstream."""
+        """Set upstream mode."""
-        return self._data[ATTR_BETA_CHANNEL]
+        self._data[ATTR_CHANNEL] = value
-
-    @beta_channel.setter
-    def beta_channel(self, value):
-        """Set beta upstream mode."""
-        self._data[ATTR_BETA_CHANNEL] = bool(value)
 
     @AsyncThrottle(timedelta(seconds=60))
     async def reload(self):
@@ -66,12 +59,11 @@ class Updater(JsonConfig, CoreSysAttributes):
 
         Is a coroutine.
         """
-        url = URL_HASSIO_VERSION.format(self.upstream)
+        url = URL_HASSIO_VERSION.format(channel=self.channel)
         try:
             _LOGGER.info("Fetch update data from %s", url)
-            with async_timeout.timeout(10, loop=self._loop):
+            async with self.sys_websession.get(url, timeout=10) as request:
-                async with self._websession.get(url) as request:
+                data = await request.json(content_type=None)
-                    data = await request.json(content_type=None)
 
         except (aiohttp.ClientError, asyncio.TimeoutError, KeyError) as err:
             _LOGGER.warning("Can't fetch versions from %s: %s", url, err)
@@ -82,11 +74,18 @@ class Updater(JsonConfig, CoreSysAttributes):
             return
 
         # data valid?
-        if not data:
+        if not data or data.get(ATTR_CHANNEL) != self.channel:
             _LOGGER.warning("Invalid data from %s", url)
             return
 
-        # update versions
+        # update supervisor versions
-        self._data[ATTR_HOMEASSISTANT] = data.get('homeassistant')
+        with suppress(KeyError):
-        self._data[ATTR_HASSIO] = data.get('hassio')
+            self._data[ATTR_HASSIO] = data['supervisor']
-        self.save()
+
+        # update Home Assistant version
+        machine = self.sys_machine or 'default'
+        with suppress(KeyError):
+            self._data[ATTR_HOMEASSISTANT] = \
+                data['homeassistant'][machine]
+
+        self.save_data()

hassio/utils/__init__.py

@@ -1,7 +1,9 @@
 """Tools file for HassIO."""
 from datetime import datetime
+import logging
 import re
 
+_LOGGER = logging.getLogger(__name__)
 RE_STRING = re.compile(r"\x1b(\[.*?[@-~]|\].*?(\x07|\x1b\\))")
 
 
@@ -10,7 +12,22 @@ def convert_to_ascii(raw):
     return RE_STRING.sub("", raw.decode())
 
 
-class AsyncThrottle(object):
+def process_lock(method):
+    """Wrap function with only run once."""
+    async def wrap_api(api, *args, **kwargs):
+        """Return api wrapper."""
+        if api.lock.locked():
+            _LOGGER.error(
+                "Can't excute %s while a task is in progress", method.__name__)
+            return False
+
+        async with api.lock:
+            return await method(api, *args, **kwargs)
+
+    return wrap_api
+
+
+class AsyncThrottle:
     """
     Decorator that prevents a function from being called more than once every
     time period.

hassio/utils/dt.py

@@ -8,9 +8,11 @@ import aiohttp
 import async_timeout
 import pytz
 
+UTC = pytz.utc
+
 _LOGGER = logging.getLogger(__name__)
 
-FREEGEOIP_URL = "https://freegeoip.io/json/"
+FREEGEOIP_URL = "https://freegeoip.net/json/"
 
 # Copyright (c) Django Software Foundation and individual contributors.
 # All rights reserved.
@@ -27,7 +29,7 @@ async def fetch_timezone(websession):
     """Read timezone from freegeoip."""
     data = {}
     try:
-        with async_timeout.timeout(10, loop=websession.loop):
+        with async_timeout.timeout(10):
             async with websession.get(FREEGEOIP_URL) as request:
                 data = await request.json()
 
@@ -61,7 +63,7 @@ def parse_datetime(dt_str):
 
     tzinfo = None  # type: Optional[dt.tzinfo]
     if tzinfo_str == 'Z':
-        tzinfo = pytz.utc
+        tzinfo = UTC
     elif tzinfo_str is not None:
         offset_mins = int(tzinfo_str[-2:]) if len(tzinfo_str) > 3 else 0
         offset_hours = int(tzinfo_str[1:3])
@@ -74,3 +76,8 @@ def parse_datetime(dt_str):
     kws = {k: int(v) for k, v in kws.items() if v is not None}
     kws['tzinfo'] = tzinfo
     return datetime(**kws)
+
+
+def utcnow():
+    """Returns current timestamp including timezone."""
+    return datetime.now(UTC)

hassio/utils/gdbus.py

@@ -0,0 +1,174 @@
+"""DBus implementation with glib."""
+import asyncio
+import logging
+import json
+import shlex
+import re
+import xml.etree.ElementTree as ET
+
+from ..exceptions import DBusFatalError, DBusParseError
+
+_LOGGER = logging.getLogger(__name__)
+
+# Use to convert GVariant into json
+RE_GVARIANT_TYPE = re.compile(
+    r"(?:boolean|byte|int16|uint16|int32|uint32|handle|int64|uint64|double|"
+    r"string|objectpath|signature) ")
+RE_GVARIANT_TULPE = re.compile(r"^\((.*),\)$")
+RE_GVARIANT_VARIANT = re.compile(
+    r"(?<=(?: |{|\[))<((?:'|\").*?(?:'|\")|\d+(?:\.\d+)?)>(?=(?:|]|}|,))")
+RE_GVARIANT_STRING = re.compile(r"(?<=(?: |{|\[))'(.*?)'(?=(?:|]|}|,))")
+
+# Commands for dbus
+INTROSPECT = ("gdbus introspect --system --dest {bus} "
+              "--object-path {object} --xml")
+CALL = ("gdbus call --system --dest {bus} --object-path {object} "
+        "--method {method} {args}")
+
+DBUS_METHOD_GETALL = 'org.freedesktop.DBus.Properties.GetAll'
+
+
+class DBus:
+    """DBus handler."""
+
+    def __init__(self, bus_name, object_path):
+        """Initialize dbus object."""
+        self.bus_name = bus_name
+        self.object_path = object_path
+        self.methods = set()
+
+    @staticmethod
+    async def connect(bus_name, object_path):
+        """Read object data."""
+        self = DBus(bus_name, object_path)
+        await self._init_proxy()  # pylint: disable=protected-access
+
+        _LOGGER.info("Connect to dbus: %s - %s", bus_name, object_path)
+        return self
+
+    async def _init_proxy(self):
+        """Read interface data."""
+        command = shlex.split(INTROSPECT.format(
+            bus=self.bus_name,
+            object=self.object_path
+        ))
+
+        # Ask data
+        _LOGGER.info("Introspect %s on %s", self.bus_name, self.object_path)
+        data = await self._send(command)
+
+        # Parse XML
+        try:
+            xml = ET.fromstring(data)
+        except ET.ParseError as err:
+            _LOGGER.error("Can't parse introspect data: %s", err)
+            raise DBusParseError() from None
+
+        # Read available methods
+        _LOGGER.debug("data: %s", data)
+        for interface in xml.findall("./interface"):
+            interface_name = interface.get('name')
+            for method in interface.findall("./method"):
+                method_name = method.get('name')
+                self.methods.add(f"{interface_name}.{method_name}")
+
+    @staticmethod
+    def _gvariant(raw):
+        """Parse GVariant input to python."""
+        raw = RE_GVARIANT_TYPE.sub("", raw)
+        raw = RE_GVARIANT_TULPE.sub(r"[\1]", raw)
+        raw = RE_GVARIANT_VARIANT.sub(r"\1", raw)
+        raw = RE_GVARIANT_STRING.sub(r'"\1"', raw)
+
+        # No data
+        if raw.startswith("()"):
+            return {}
+
+        try:
+            return json.loads(raw)
+        except json.JSONDecodeError as err:
+            _LOGGER.error("Can't parse '%s': %s", raw, err)
+            raise DBusParseError() from None
+
+    async def call_dbus(self, method, *args):
+        """Call a dbus method."""
+        command = shlex.split(CALL.format(
+            bus=self.bus_name,
+            object=self.object_path,
+            method=method,
+            args=" ".join(map(str, args))
+        ))
+
+        # Run command
+        _LOGGER.info("Call %s on %s", method, self.object_path)
+        data = await self._send(command)
+
+        # Parse and return data
+        return self._gvariant(data)
+
+    async def get_properties(self, interface):
+        """Read all properties from interface."""
+        try:
+            return (await self.call_dbus(DBUS_METHOD_GETALL, interface))[0]
+        except IndexError:
+            _LOGGER.error("No attributes returned for %s", interface)
+            raise DBusFatalError from None
+
+    async def _send(self, command):
+        """Send command over dbus."""
+        # Run command
+        _LOGGER.debug("Send dbus command: %s", command)
+        try:
+            proc = await asyncio.create_subprocess_exec(
+                *command,
+                stdin=asyncio.subprocess.DEVNULL,
+                stdout=asyncio.subprocess.PIPE,
+                stderr=asyncio.subprocess.PIPE
+            )
+
+            data, error = await proc.communicate()
+        except OSError as err:
+            _LOGGER.error("DBus fatal error: %s", err)
+            raise DBusFatalError() from None
+
+        # Success?
+        if proc.returncode != 0:
+            _LOGGER.error("DBus return error: %s", error)
+            raise DBusFatalError()
+
+        # End
+        return data.decode()
+
+    def __getattr__(self, name):
+        """Mapping to dbus method."""
+        return getattr(DBusCallWrapper(self, self.bus_name), name)
+
+
+class DBusCallWrapper:
+    """Wrapper a DBus interface for a call."""
+
+    def __init__(self, dbus, interface):
+        """Initialize wrapper."""
+        self.dbus = dbus
+        self.interface = interface
+
+    def __call__(self):
+        """Should never be called."""
+        _LOGGER.error("DBus method %s not exists!", self.interface)
+        raise DBusFatalError()
+
+    def __getattr__(self, name):
+        """Mapping to dbus method."""
+        interface = f"{self.interface}.{name}"
+
+        if interface not in self.dbus.methods:
+            return DBusCallWrapper(self.dbus, interface)
+
+        def _method_wrapper(*args):
+            """Wrap method.
+
+            Return a coroutine
+            """
+            return self.dbus.call_dbus(interface, *args)
+
+        return _method_wrapper

hassio/utils/json.py

@@ -10,14 +10,9 @@ _LOGGER = logging.getLogger(__name__)
 
 def write_json_file(jsonfile, data):
     """Write a json file."""
-    try:
+    json_str = json.dumps(data, indent=2)
-        json_str = json.dumps(data, indent=2)
+    with jsonfile.open('w') as conf_file:
-        with jsonfile.open('w') as conf_file:
+        conf_file.write(json_str)
-            conf_file.write(json_str)
-    except (OSError, json.JSONDecodeError):
-        return False
-
-    return True
 
 
 def read_json_file(jsonfile):
@@ -26,7 +21,7 @@ def read_json_file(jsonfile):
         return json.loads(cfile.read())
 
 
-class JsonConfig(object):
+class JsonConfig:
     """Hass core object for handle it."""
 
     def __init__(self, json_file, schema):
@@ -35,7 +30,18 @@ class JsonConfig(object):
         self._schema = schema
         self._data = {}
 
-        # init or load data
+        self.read_data()
+
+    def reset_data(self):
+        """Reset json file to default."""
+        try:
+            self._data = self._schema({})
+        except vol.Invalid as ex:
+            _LOGGER.error("Can't reset %s: %s",
+                          self._file, humanize_error(self._data, ex))
+
+    def read_data(self):
+        """Read json file & validate."""
         if self._file.is_file():
             try:
                 self._data = read_json_file(self._file)
@@ -43,27 +49,33 @@ class JsonConfig(object):
                 _LOGGER.warning("Can't read %s", self._file)
                 self._data = {}
 
-        # validate
+        # Validate
         try:
             self._data = self._schema(self._data)
         except vol.Invalid as ex:
             _LOGGER.error("Can't parse %s: %s",
                           self._file, humanize_error(self._data, ex))
-            # reset data to default
+
+            # Reset data to default
+            _LOGGER.warning("Reset %s to default", self._file)
             self._data = self._schema({})
 
-    def save(self):
+    def save_data(self):
         """Store data to config file."""
-        # validate
+        # Validate
         try:
             self._data = self._schema(self._data)
         except vol.Invalid as ex:
             _LOGGER.error("Can't parse data: %s",
                           humanize_error(self._data, ex))
-            return False
+
+            # Load last valid data
+            _LOGGER.warning("Reset %s to last version", self._file)
+            self.read_data()
+            return
 
         # write
-        if not write_json_file(self._file, self._data):
+        try:
-            _LOGGER.error("Can't store config in %s", self._file)
+            write_json_file(self._file, self._data)
-            return False
+        except (OSError, json.JSONDecodeError) as err:
-        return True
+            _LOGGER.error("Can't store config in %s: %s", self._file, err)

hassio/utils/tar.py

@@ -0,0 +1,88 @@
+"""Tarfile fileobject handler for encrypted files."""
+import tarfile
+import hashlib
+
+from Crypto.Cipher import AES
+from Crypto.Random import get_random_bytes
+from Crypto.Util.Padding import pad
+
+BLOCK_SIZE = 16
+
+MOD_READ = 'r'
+MOD_WRITE = 'w'
+
+
+class SecureTarFile:
+    """Handle encrypted files for tarfile library."""
+
+    def __init__(self, name, mode, key=None, gzip=True):
+        """Initialize encryption handler."""
+        self._file = None
+        self._mode = mode
+        self._name = name
+
+        # Tarfile options
+        self._tar = None
+        self._tar_mode = f"{mode}|gz" if gzip else f"{mode}|"
+
+        # Encryption/Decription
+        self._aes = None
+        self._key = key
+
+    def __enter__(self):
+        """Start context manager tarfile."""
+        if not self._key:
+            self._tar = tarfile.open(name=str(self._name), mode=self._tar_mode)
+            return self._tar
+
+        # Encrypted/Decryped Tarfile
+        self._file = self._name.open(f"{self._mode}b")
+
+        # Extract IV for CBC
+        if self._mode == MOD_READ:
+            cbc_rand = self._file.read(16)
+        else:
+            cbc_rand = get_random_bytes(16)
+            self._file.write(cbc_rand)
+        self._aes = AES.new(
+            self._key, AES.MODE_CBC, iv=_generate_iv(self._key, cbc_rand))
+
+        self._tar = tarfile.open(fileobj=self, mode=self._tar_mode)
+        return self._tar
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        """Close file."""
+        if self._tar:
+            self._tar.close()
+        if self._file:
+            self._file.close()
+
+    def write(self, data):
+        """Write data."""
+        if len(data) % BLOCK_SIZE != 0:
+            data = pad(data, BLOCK_SIZE)
+        self._file.write(self._aes.encrypt(data))
+
+    def read(self, size=0):
+        """Read data."""
+        return self._aes.decrypt(self._file.read(size))
+
+    @property
+    def path(self):
+        """Return path object of tarfile."""
+        return self._name
+
+    @property
+    def size(self):
+        """Return snapshot size."""
+        if not self._name.is_file():
+            return 0
+        return round(self._name.stat().st_size / 1048576, 2)  # calc mbyte
+
+
+def _generate_iv(key, salt):
+    """Generate a iv from data."""
+    temp_iv = key + salt
+    for _ in range(100):
+        temp_iv = hashlib.sha256(temp_iv).digest()
+    return temp_iv[:16]

hassio/validate.py

@@ -1,19 +1,41 @@
 """Validate functions."""
-import voluptuous as vol
+import uuid
+import re
 
+import voluptuous as vol
 import pytz
 
 from .const import (
-    ATTR_IMAGE, ATTR_LAST_VERSION, ATTR_SESSIONS, ATTR_PASSWORD, ATTR_TOTP,
+    ATTR_IMAGE, ATTR_LAST_VERSION, ATTR_CHANNEL, ATTR_TIMEZONE,
-    ATTR_SECURITY, ATTR_BETA_CHANNEL, ATTR_TIMEZONE, ATTR_ADDONS_CUSTOM_LIST,
+    ATTR_ADDONS_CUSTOM_LIST, ATTR_PASSWORD, ATTR_HOMEASSISTANT, ATTR_HASSIO,
-    ATTR_AUDIO_OUTPUT, ATTR_AUDIO_INPUT, ATTR_HOMEASSISTANT, ATTR_HASSIO,
     ATTR_BOOT, ATTR_LAST_BOOT, ATTR_SSL, ATTR_PORT, ATTR_WATCHDOG,
-    ATTR_WAIT_BOOT)
+    ATTR_WAIT_BOOT, ATTR_UUID, CHANNEL_STABLE, CHANNEL_BETA, CHANNEL_DEV)
 
 
+RE_REPOSITORY = re.compile(r"^(?P<url>[^#]+)(?:#(?P<branch>[\w\-]+))?$")
+
 NETWORK_PORT = vol.All(vol.Coerce(int), vol.Range(min=1, max=65535))
-ALSA_CHANNEL = vol.Match(r"\d+,\d+")
 WAIT_BOOT = vol.All(vol.Coerce(int), vol.Range(min=1, max=60))
+DOCKER_IMAGE = vol.Match(r"^[\w{}]+/[\-\w{}]+$")
+ALSA_DEVICE = vol.Any(None, vol.Match(r"\d+,\d+"))
+CHANNELS = vol.In([CHANNEL_STABLE, CHANNEL_BETA, CHANNEL_DEV])
+
+
+def validate_repository(repository):
+    """Validate a valide repository."""
+    data = RE_REPOSITORY.match(repository)
+    if not data:
+        raise vol.Invalid("No valid repository format!")
+
+    # Validate URL
+    # pylint: disable=no-value-for-parameter
+    vol.Url()(data.group('url'))
+
+    return repository
+
+
+# pylint: disable=no-value-for-parameter
+REPOSITORIES = vol.All([validate_repository], vol.Unique())
 
 
 def validate_timezone(timezone):
@@ -59,19 +81,22 @@ DOCKER_PORTS = vol.Schema({
 
 # pylint: disable=no-value-for-parameter
 SCHEMA_HASS_CONFIG = vol.Schema({
+    vol.Optional(ATTR_UUID, default=lambda: uuid.uuid4().hex):
+        vol.Match(r"^[0-9a-f]{32}$"),
     vol.Optional(ATTR_BOOT, default=True): vol.Boolean(),
-    vol.Inclusive(ATTR_IMAGE, 'custom_hass'): vol.Coerce(str),
+    vol.Inclusive(ATTR_IMAGE, 'custom_hass'): DOCKER_IMAGE,
     vol.Inclusive(ATTR_LAST_VERSION, 'custom_hass'): vol.Coerce(str),
     vol.Optional(ATTR_PORT, default=8123): NETWORK_PORT,
     vol.Optional(ATTR_PASSWORD): vol.Any(None, vol.Coerce(str)),
     vol.Optional(ATTR_SSL, default=False): vol.Boolean(),
     vol.Optional(ATTR_WATCHDOG, default=True): vol.Boolean(),
+    vol.Optional(ATTR_WAIT_BOOT, default=600):
+        vol.All(vol.Coerce(int), vol.Range(min=60)),
 }, extra=vol.REMOVE_EXTRA)
 
 
-# pylint: disable=no-value-for-parameter
 SCHEMA_UPDATER_CONFIG = vol.Schema({
-    vol.Optional(ATTR_BETA_CHANNEL, default=False): vol.Boolean(),
+    vol.Optional(ATTR_CHANNEL, default=CHANNEL_STABLE): CHANNELS,
     vol.Optional(ATTR_HOMEASSISTANT): vol.Coerce(str),
     vol.Optional(ATTR_HASSIO): vol.Coerce(str),
 }, extra=vol.REMOVE_EXTRA)
@@ -83,13 +108,6 @@ SCHEMA_HASSIO_CONFIG = vol.Schema({
     vol.Optional(ATTR_LAST_BOOT): vol.Coerce(str),
     vol.Optional(ATTR_ADDONS_CUSTOM_LIST, default=[
         "https://github.com/hassio-addons/repository",
-    ]): [vol.Url()],
+    ]): REPOSITORIES,
-    vol.Optional(ATTR_SECURITY, default=False): vol.Boolean(),
-    vol.Optional(ATTR_TOTP): vol.Coerce(str),
-    vol.Optional(ATTR_PASSWORD): vol.Coerce(str),
-    vol.Optional(ATTR_SESSIONS, default={}):
-        vol.Schema({vol.Coerce(str): vol.Coerce(str)}),
-    vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_CHANNEL,
-    vol.Optional(ATTR_AUDIO_INPUT): ALSA_CHANNEL,
     vol.Optional(ATTR_WAIT_BOOT, default=5): WAIT_BOOT,
 }, extra=vol.REMOVE_EXTRA)

misc/hassio.xml

@@ -1 +1 @@
-<mxfile userAgent="Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.81 Safari/537.36" version="6.5.6" editor="www.draw.io" type="device"><diagram name="Page-1">5Vptc6M2EP41/ng3gHj9mPiSy820c5n6Q3sfsVBsNTJyhYid/voKkABZkOBY+KYtmYnR6pVn99ld1l6A5e74laX77a80Q2ThOdlxAb4sPC8OY/G/Erw2At9xG8GG4awR9QQr/DeSQkdKS5yhQhvIKSUc73UhpHmOINdkKWP0oA97okTfdZ9ukCFYwZSY0t9xxrdS6oZJ1/GA8GYrt469sOlYp/B5w2iZy/0WHniqr6Z7l6q15IMW2zSjh54I3C3AklHKm7vdcYlIBa2CrZl3P9LbnpuhnE+Z4DUTXlJSInXikIipt09UrCAOyF8lKOFfJVUdn4paZTdigNjtKD5ERw206DtIYKrenLJdSrrJ4m5TfX5fqX3E2Zqtmg4JS7urd9hijlb7FFbtg7A2MWjLd0S03Oo0mJAlJZTVowXYKIRQyAvO6DPq9Tj1Jc+/kutLvF4Q4+g4CqHbKkbYO6I7xNmrGKImJKCZIm09SKRuD53l+Arobc9oQjkulca6aZfuFCZupM6G9QcM/X3LcaW31WvB0e5CNGGG1vF6CE0QggRkrb7sAhhNBNCzAKBvAPiFwmfELkUOokCQ/trI+SZy3hBywAJyoYHcw9JArXaFqJpRUe9MLscQDXN5HQd+4NjB0A8DHcPQxDBwTAgDCxAmBl4oE3FINinjW7qheUruOumtjmgPPXTE/I9K/DkKZPOH6srFwZq+QDV/yBX+RJy/ygiclpwKUbfxL5Tu5RrNUavzvQ20eBxaMihHRTJ4p2yDeM9uTHUwRFKOX/TVLwFX5RK20fXeQDcB3im+deMRMSweALGfBbp/JdCj0Xxi3UX48xIMN6wSjNMEYlXuEXvBhXAJagOm+h7Sovj2fTTBaMXr0aSjMwP3fbdluKflMgybVEN3aFmA4sy347ZAoLstMJB1uPGA33JtRE3Xm4Nbbo9Yyou13NJ4VbuxeUnkqveOHouiK7EIzOO6NHh1dE/iQtc89VyFwIPfVK9YQgCJYBqGSnyPidpzqm5QnpmLCWFvqcFMfrm0qlgvvlZQUm8cvaxJrPLpRjy6wLByU9dxRSmKn6CtLFR3Rd5A/t56HS1/9224ovDKXHE/O3qQ/+zG8aWBfiKtPmjxwLR4d0Sn1i3enyVUSJ30srCJCPYcTk5zpHmb8xQ2Vl+AJXtp+WpPYdeKPa5ZUrjJMpoXhhqLbbqvbveMQlQU73sn3ZVN9lX34qr9fZMTCt07XhiBxANhEHtx7PhgpqRqyJN5bmB6ssSCI1O1nDmJ0rVOHdWlqYAkU59uc7zoXEAAOfWR4vq9Q5WqneE0Wq3Q0FJO6hdSz1ynobKxTm0U7dNMs5PYJCjk1KxYKX6WO9IMALcVOzAUyKdrRB5pgTmmuRiyppzTnRhAqo7btoitVVbrMna3xg3Bm2oup+fRvCvEnpZu5QYWiHxS0wEDNR0wkJBYqciaNJ5AUifSWOq/x1LX5OgUOk5Ity8PgO97LQshEng/L0SqvXsMPBwOpvcmBO+LWg2SiZDQMrs4Tl6FQInuz3xnIKeP5iovgLcLo9K4P5DEn8mRmTLEXqzt3hyaQ3qj0faDNPFNmjTmaz+S+icmc+pN7YVAMP6tjfNQrkcjIUzZ5fQL62uAfkH1Z4d+CThJJ4boN1TdsxLBopnY17f7yGaWOT9lP8i+YAb2TVZjYJDkK+bbuekxFp2QmwUomocevnppvQo94v9LcEpCnaOR5dgU/idjk/m9+G9oX71qUYbReBXl30s+Vf6dgXyi2f0WqlFG93szcPcP</diagram></mxfile>
+<mxfile userAgent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36" version="7.9.5" editor="www.draw.io" type="device"><diagram name="Page-1" id="535f6c39-9b73-04c2-941c-82630de90f1a">5VrLcqM4FP0aLzsFiOcycefRVTPVqfFippdYKLYmMvII4cd8/QiQDEKQ4Bicnmp7Yevqybk691zJnoH55vDI4u36d5ogMnOs5DADX2eOY1vAER+F5VhZ3DCoDCuGE9moNizwv0j1lNYcJyjTGnJKCcdb3QhpmiLINVvMGN3rzV4o0WfdxitkGBYwJqb1T5zwtbTaflRXPCG8WsupQ8evKpYxfF0xmqdyvpkDXspXVb2J1VjyQbN1nNB9wwTuZ2DOKOXVt81hjkiBrYKt6vfQU3taN0MpH9JB+mkXkxypFftEdL17oWIEsUB+lKD4/+RUVXzJSpfdigZitoP4EBUl0KJuL4EpalPKNjGpO4tvq+Lz+0LNI9ZWTVVVSFhOszr7NeZosY1hUd6L7SYarfmGiJJdrAYTMqeEsrK1ABv5EAp7xhl9RY0aq3zJ9S/k+B14SdMOMY4ODZPE7xHRDeLsKJqo2ghUXeRe9yLp2329c1wF9LqxaXzZLpabdXUaunaY+CJ91u0/YPjvW4oLvy2OGUebC9GECVqGyy40gQ8ikJz8NS6AwUAAnREAdA0Av1L4itilyEHkCdJfGznXRM7pQg6MgJxvIPc0N1ArQyEqehTUO5PLIUTdXF6GnutZ42Do+p6OoW9i6FkmhN4IEEYGXigROiSLlPE1XdE0Jve19U5HtIEeOmD+V2G+CTxZ/KGqUrGwqs5TxR9yhL8R50epwHHOqTDVE/9G6VaO0Qt1RnMG5fKlyvOYrRDXtknxYG+6gyESc7zTBfgScFUuMTa6zhvoRiLxaeFbFp4Rw+IBELsS6O5ngR705hPLWuHPSzBsv0gw2gnEIt8itsOZCAlqAqbqnuIs+/a9N8E4mZe9SUe9Dez3w5YRnuZz369SDT2gJR4KE3ecsAU8PWyBjqzDDjvilj2GatrOFNyyG8RSUezELY1XZRgbSqJMMIPfFqcCYYBEbA4MlfkBE7WKQVyz1WmkQbbgs8gGpolwmhd0J7Tkoy62A9xAzIe6EKWJOZgwNobqTPjn80sc64Sfpl0qHjSSKzHKl1vx6ALDIppdJ2LFKHyBYyWresRyOtL8U3DS0nx3jIjlX5kr9o2l5wI3dhhemg8MpFWDLilNkcaVN9NmjRHAZITal9dnhDuJ4kifNZK5kRAe7tC+awqYs92Jzx922Kdpk2veTHzAgRoIvd4832d9InK52zrx/rjrrqE1pqduk4SmmeGvbB1vi69bRiHKsvd1RhelwarzIF6lcleHAMFSy/EDEDnA90InDC0XTJRFd2mSY3umJkUjSJK6vJsypNWltuRcmtTJsNck2Sgn2/FClez6THF50JQuV2ei9rlJjVDRUnZyGjfnZ45TUdkYp9wUp6cZtk9Ck6CQU/OKUvEz35CqAbgrqIChQD5eIvJMM8wxTUWTJeWcbkQDUlTcnX610K7Sy98t6jFuCV4VfTk9j+b1zXv7rl5OMAKRW5d4oOMSD3SklqNcwZs0HkBSK9BY6r7HUtvk6BA6XkXzztTxQYqofkH8KZIZtZgGA/f7vRm9CcHbrHSDZCIkNE8u1smrECjS45lrdZzOgqnuk8DbN+Fyc3/gOHYmRybK5RtaW58Bq0U6vWo7jCauSRO1WydXUre1ZdrRdDwJBP0/01lP+bJXCWHMLqefX7466OcV73HoF4FWOtFFv67r3FEULJiIfc19H4yZZU5P2WHs867BvsFu9AySPGK+npoefeqE7MRDwTT0cNWh9Sr0CH8VcYp8naPBZdrk/xraZP4R4g+0LY5alGHUf4vy/yWfusifgHyiWP/5rXJG/Q9DcP8f</diagram></mxfile>

misc/security.xml

@@ -1 +0,0 @@
-<mxfile userAgent="Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:53.0) Gecko/20100101 Firefox/53.0" version="6.5.8" editor="www.draw.io" type="device"><diagram name="Page-1">5Vxdd5s4EP01fmwOkgCbx9hp2j7sNrvpnnYfiVFsTjDyghwn++tXGMmAxileEB9O+9BjBhjM3GHmzjXKhCw2L58Sf7v+jQU0mmAreJmQmwnGU4eI/zPDa24gyM0NqyQMchMqDPfhv1QaLWndhQFNKwdyxiIebqvGJYtjuuQVm58kbF897JFF1atu/RUFhvulH0Hr9zDg69w6w25h/0zD1VpdGblevufBXz6tEraL5fUmmDwe/uW7N77yJW80XfsB25dM5OOELBLGeP5p87KgURZaFbb8vNs39h6/d0Jjfs4JOD/h2Y928tZvwyTlwnTP/YTLL8lfVWA4fRF+52u+iYQBiY8pT9gTXbCIJcISs1gcOX8Mo0gz+VG4isXmUnwzKuzzZ5rwUIT8Wu7YhEGQXWa+X4ec3m/9ZXbNvcivzCGL+b38Go7aztMGeWIb3rcMRXYV+lIyyTh8omxDefIqDpF7ySw/Q6asKxHaF/gjS9rWJewVkr5MudXRcRF28UFG/jQKBKDwVypipAe/FPUtC2N+uKIznzg3mYUmobhwFtoblvA1W7HYj+4KawcxQhgGyT0Vo5mBINkgSJ/9NB1hkDAiw0XJAVFaiyhdffk6wkDZ7oCBckGg2JbGh1uKs2b2drT0wvXAOGcbsYPGwXXWfDJbxJZPP4uSqK4ryiuZTYNKU4JhK4VFRSChkc/D52rbOhUW6e0uQ7pAwNOeZ1sLbMp2yZLKk8ptRPMjoNMc4aqj/HaBowNIxzs8C7cpwE2ckdLlLgm5uNPbMH5kvaLnDIYenmrPj9sQPuLUODIH3wzCNxVxFtdz/9llrGcexiEvtibkOiNwfpTS7KjpTVtsD085mQd+uqaBPE/slmRilm29hPyH+PzBurIcuf232LauCFH7S5XwxvpZpuQQVDKlyaPfMlNsy60AjK2mmYJrHJnLFA9kip8+ZfsP+WHdfe8+E856/kk/EOqsApOGECJS48gchGqcK2GYUm4Sw8vss7hpoT5GVDlyvM6wg6NhtdGyLQ9ZLAi4G2WF+kHMK+7qULK1gr4VBHTPkkAv6nrJt7b70iFGir1Kj/K4iC6vsWPPUGMHjgzmCxxiq/mS0jQVCfNGvvyvZOk1VxQdQFcWmlbowNRtRQfsMacc0XWNpikHHL2RcgIG/7V0mJxJWyYlFA306lSk5Rv5Jg94oq+mM66egDSqW31xSm16J9OmGTOrcWSwSEF5xMi43xGSA1FL0rTd6NQSODKIJNRvfmfJxodQvmPJGlfZoN2nZo2gEHMZorWDYJQ6UxkR1DsuRLXuN0xw2L8c2brXSGE4Ug+mW6vkHn6gdpqKIbpw7RDcVcc6JtpolGv11I1g3HAcQ+MGcGQQwBOKyBnaNU/E0XhROY4zvn2fGrfKqUZ1wrDK7TSWTXCNI4NJBWWTXOYejb6tiF7fU4jbVIHQpxDgyCB6UF/IZ4Xete3x9GK3aSnXxW3X7kzcPvHrfzdi5SAypVuVKV3itqros1EzhykyxByAoz6FylOvNbx7obI3XqANbNPG70nMahwZrFBQOBizUjkUSZjqM3VTkgAcGYQSihuXoZR5fQobBAobF6KU9RsmqCJcjlLWb6TguD6YUqaSe3h27plSyrzulDJS9ypB70qZeupGwHc9U0oZcGQQwPqf3dsoZflxFy6UkTZlwrBQ5pkSyoAjgzkFf7ovhLLbb1+/3XWfDGfVCnzubGyYCiPLlGAGPRmEESovZcXMCJAX2pqRZUo5Q1Z30hmpW4DRjXSWdYVDLzgcNcu64gVqaSrZRsotEDIlpkFPfapppH6VyftT03ojD/qqvebLjmZ1ngyWLSjCjFlPG4xEIFOCGvRkDky1TPHEy3+iSooiia2TPOLXeRVw5kqeVWoauKtXAW2oSY1U4LQ1noQ9G4SpuwXsGIRptAqnM2ScoPwzZolz0FBBouMvRTvwOT3WQJ2GywJZEHAzHLrgzIpB54wZ2a0Ys32iOaoHaQDGfHyd+rjQXWld7ZfMqwbaQb+E5Kc6s0mVzeDANsR6LNIy1fCJVDt3CUYXw5lWWWyvYaoRp85Tn8OZA8nbH39+WLCAts2YrtZTnVtuWg9Wem1pysXJTAPcsc8DvAmckPyNHM5z9ZbWo5UOgtvw+UWkzpNBOCFJ/ZKvzv7lJiqtPx8LV3l1lXpNp+VIJTaLv/mWo1b8XT3y8T8=</diagram></mxfile>

setup.py

@@ -40,15 +40,15 @@ setup(
     ],
     include_package_data=True,
     install_requires=[
-        'async_timeout',
+        'attr==0.3.1',
-        'aiohttp',
+        'async_timeout==3.0.0',
-        'docker',
+        'aiohttp==3.2.1',
-        'colorlog',
+        'docker==3.3.0',
-        'voluptuous',
+        'colorlog==3.1.2',
-        'gitpython',
+        'voluptuous==0.11.1',
-        'pyotp',
+        'gitpython==2.1.10',
-        'pyqrcode',
+        'pytz==2018.4',
-        'pytz',
+        'pyudev==0.21.0',
-        'pyudev'
+        'pycryptodome==3.4.11'
     ]
 )

version.json

@@ -1,8 +1,4 @@
 {
-    "hassio": "0.80",
+    "hassio": "105",
-    "homeassistant": "0.60.1",
+    "homeassistant": "0.70.0"
-    "resinos": "1.1",
-    "resinhup": "0.3",
-    "generic": "0.3",
-    "cluster": "0.1"
 }