Update aioHttp3 (#403)

* Update aioHttp3

* fix line ending

* fix close session

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/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(
+        await asyncio.wait([
-            [self._api.stop(), self._dns.stop()], loop=self._loop)
+            self._api.stop(),
+            self._dns.stop(),
+            self._websession.close(),
+            self._websession_ssl.close()
+        ], loop=self._loop)

setup.py

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