jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-16 13:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix protocol handling (#1027)

Browse Source
This commit is contained in:
Pascal Vizeli 2019-04-10 15:31:43 +02:00 committed by GitHub
parent d9874c4c3e
commit 113b62ee77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
hassio/api/ingress.py
View File

@ -85,7 +85,17 @@ class APIIngress(CoreSysAttributes):
self, request: web.Request, addon: Addon, path: str self, request: web.Request, addon: Addon, path: str
) -> web.WebSocketResponse: ) -> web.WebSocketResponse:
"""Ingress route for websocket.""" """Ingress route for websocket."""
ws_server = web.WebSocketResponse() if hdrs.SEC_WEBSOCKET_PROTOCOL in request.headers:
req_protocols = [
str(proto.strip())
for proto in request.headers[hdrs.SEC_WEBSOCKET_PROTOCOL].split(",")
]
else:
req_protocols = ()
ws_server = web.WebSocketResponse(
protocols=req_protocols, autoclose=False, autoping=False
)
await ws_server.prepare(request) await ws_server.prepare(request)
# Preparing # Preparing
@ -98,7 +108,11 @@ class APIIngress(CoreSysAttributes):
# Start proxy # Start proxy
async with self.sys_websession.ws_connect( async with self.sys_websession.ws_connect(
url, headers=source_header url,
headers=source_header,
protocols=req_protocols,
autoclose=False,
autoping=False,
) as ws_client: ) as ws_client:
# Proxy requests # Proxy requests
await asyncio.wait( await asyncio.wait(
@ -204,14 +218,17 @@ def _is_websocket(request: web.Request) -> bool:
async def _websocket_forward(ws_from, ws_to): async def _websocket_forward(ws_from, ws_to):
"""Handle websocket message directly.""" """Handle websocket message directly."""
async for msg in ws_from: try:
if msg.type == aiohttp.WSMsgType.TEXT: async for msg in ws_from:
await ws_to.send_str(msg.data) if msg.type == aiohttp.WSMsgType.TEXT:
elif msg.type == aiohttp.WSMsgType.BINARY: await ws_to.send_str(msg.data)
await ws_to.send_bytes(msg.data) elif msg.type == aiohttp.WSMsgType.BINARY:
elif msg.type == aiohttp.WSMsgType.PING: await ws_to.send_bytes(msg.data)
await ws_to.ping() elif msg.type == aiohttp.WSMsgType.PING:
elif msg.type == aiohttp.WSMsgType.PONG: await ws_to.ping()
await ws_to.pong() elif msg.type == aiohttp.WSMsgType.PONG:
elif ws_to.closed: await ws_to.pong()
await ws_to.close(code=ws_to.close_code, message=msg.extra) elif ws_to.closed:
await ws_to.close(code=ws_to.close_code, message=msg.extra)
except RuntimeError:
_LOGGER.warning("Ingress Websocket runtime error")