Merge pull request #410 from home-assistant/dev

Release 0.97

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/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():
@@ -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(
-                    None, ft.partial(
+                self.repo = await self._loop.run_in_executor(None, ft.partial(
                     git.Repo.clone_from, self.url, str(self.path),
-                        recursive=True))
+                    **git_args
+                ))
 
             except (git.InvalidGitRepositoryError, git.NoSuchPathError,
                     git.GitCommandError) as err:

hassio/addons/validate.py

@@ -60,6 +60,7 @@ PRIVILEGED_ALL = [
     "NET_ADMIN",
     "SYS_ADMIN",
     "SYS_RAWIO",
+    "IPC_LOCK",
     "SYS_TIME",
     "SYS_NICE"
 ]

hassio/api/__init__.py

@@ -13,7 +13,7 @@ from .proxy import APIProxy
 from .supervisor import APISupervisor
 from .snapshots import APISnapshots
 from .services import APIServices
-from .security import security_layer
+from .security import SecurityMiddleware
 from ..coresys import CoreSysAttributes
 
 _LOGGER = logging.getLogger(__name__)
@@ -25,16 +25,14 @@ class RestAPI(CoreSysAttributes):
     def __init__(self, coresys):
         """Initialize docker base wrapper."""
         self.coresys = coresys
+        self.security = SecurityMiddleware(coresys)
         self.webapp = web.Application(
-            middlewares=[security_layer], loop=self._loop)
+            middlewares=[self.security.token_validation], loop=self._loop)
 
         # service stuff
         self._handler = None
         self.server = None
 
-        # middleware
-        self.webapp['coresys'] = coresys
-
     async def load(self):
         """Register REST API Calls."""
         self._register_supervisor()

hassio/api/proxy.py

@@ -83,7 +83,7 @@ class APIProxy(CoreSysAttributes):
                 if not data:
                     await response.write_eof()
                     break
-                response.write(data)
+                await response.write(data)
 
         except aiohttp.ClientError:
             await response.write_eof()

hassio/api/security.py

@@ -6,6 +6,7 @@ from aiohttp.web import middleware
 from aiohttp.web_exceptions import HTTPUnauthorized
 
 from ..const import HEADER_TOKEN, REQUEST_FROM
+from ..coresys import CoreSysAttributes
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -16,10 +17,16 @@ NO_SECURITY_CHECK = set((
 ))
 
 
+class SecurityMiddleware(CoreSysAttributes):
+    """Security middleware functions."""
+
+    def __init__(self, coresys):
+        """Initialize security middleware."""
+        self.coresys = coresys
+
     @middleware
-async def security_layer(request, handler):
+    async def token_validation(self, request, handler):
         """Check security access of this layer."""
-    coresys = request.app['coresys']
         hassio_token = request.headers.get(HEADER_TOKEN)
 
         # Ignore security check
@@ -35,13 +42,13 @@ async def security_layer(request, handler):
             return await handler(request)
 
         # Home-Assistant
-    if hassio_token == coresys.homeassistant.uuid:
+        if hassio_token == self._homeassistant.uuid:
             _LOGGER.debug("%s access from Home-Assistant", request.path)
             request[REQUEST_FROM] = 'homeassistant'
             return await handler(request)
 
         # Add-on
-    addon = coresys.addons.from_uuid(hassio_token)
+        addon = self._addons.from_uuid(hassio_token)
         if addon:
             _LOGGER.info("%s access from %s", request.path, addon.slug)
             request[REQUEST_FROM] = addon.slug

hassio/const.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 from ipaddress import ip_network
 
-HASSIO_VERSION = '0.93'
+HASSIO_VERSION = '0.97'
 
 URL_HASSIO_VERSION = ('https://raw.githubusercontent.com/home-assistant/'
                       'hassio/{}/version.json')
@@ -158,6 +158,7 @@ ATTR_SERVICES = 'services'
 ATTR_DISCOVERY = 'discovery'
 ATTR_PROTECTED = 'protected'
 ATTR_CRYPTO = 'crypto'
+ATTR_BRANCH = 'branch'
 
 SERVICE_MQTT = 'mqtt'
 

hassio/core.py

@@ -108,10 +108,10 @@ class HassIO(CoreSysAttributes):
         # don't process scheduler anymore
         self._scheduler.suspend = True
 
-        # process stop tasks
-        self._websession.close()
-        self._websession_ssl.close()
-
         # process async stop tasks
-        await asyncio.wait(
-            [self._api.stop(), self._dns.stop()], loop=self._loop)
+        await asyncio.wait([
+            self._api.stop(),
+            self._dns.stop(),
+            self._websession.close(),
+            self._websession_ssl.close()
+        ], loop=self._loop)

hassio/snapshots/__init__.py

@@ -173,12 +173,15 @@ class SnapshotManager(CoreSysAttributes):
                     if addon and addon.is_installed:
                         addon_list.append(addon)
                         continue
-                    _LOGGER.warning("Add-on %s not found", addon_slug)
+                    _LOGGER.warning(
+                        "Add-on %s not found/installed", addon_slug)
 
+                if addon_list:
                     _LOGGER.info("Snapshot %s store Add-ons", snapshot.slug)
                     await snapshot.store_addons(addon_list)
 
-                # snapshot folders
+                # Snapshot folders
+                if folders:
                     _LOGGER.info("Snapshot %s store folders", snapshot.slug)
                     await snapshot.store_folders(folders)
 

hassio/snapshots/snapshot.py

@@ -151,7 +151,7 @@ class Snapshot(CoreSysAttributes):
 
     def _encrypt_data(self, data):
         """Make data secure."""
-        if not self._key:
+        if not self._key or data is None:
             return data
 
         return b64encode(
@@ -159,7 +159,7 @@ class Snapshot(CoreSysAttributes):
 
     def _decrypt_data(self, data):
         """Make data readable."""
-        if not self._key:
+        if not self._key or data is None:
             return data
 
         return Padding.unpad(

hassio/validate.py

@@ -1,5 +1,6 @@
 """Validate functions."""
 import uuid
+import re
 
 import voluptuous as vol
 import pytz
@@ -11,13 +12,29 @@ from .const import (
     ATTR_SSL, ATTR_PORT, ATTR_WATCHDOG, ATTR_WAIT_BOOT, ATTR_UUID)
 
 
+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{}]+$")
 
+
+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
-REPOSITORIES = vol.All([vol.Url()], vol.Unique())
+    vol.Url()(data.group('url'))
+
+    return repository
+
+
+# pylint: disable=no-value-for-parameter
+REPOSITORIES = vol.All([validate_repository], vol.Unique())
 
 
 def validate_timezone(timezone):

setup.py

@@ -41,8 +41,8 @@ setup(
     include_package_data=True,
     install_requires=[
         'async_timeout==2.0.0',
-        'aiohttp==2.3.10',
-        'docker==3.1.0',
+        'aiohttp==3.0.7',
+        'docker==3.1.1',
         'colorlog==3.1.2',
         'voluptuous==0.11.1',
         'gitpython==2.1.8',

version.json

@@ -1,7 +1,7 @@
 {
-    "hassio": "0.93",
-    "homeassistant": "0.63.3",
-    "resinos": "1.1",
+    "hassio": "0.97",
+    "homeassistant": "0.65.4",
+    "resinos": "1.3",
     "resinhup": "0.3",
     "generic": "0.3",
     "cluster": "0.1"