Enforce permissions for Websocket API (#18719)

* Handle unauth exceptions in websocket

* Enforce permissions in websocket API
This commit is contained in:
Paulus Schoutsen authored and GitHub committed 2018-11-27 10:12:31 +01:00
1 parent 7248c9cb0e
commit 9d7b1fc3a7
6 files changed
+81 -17

No files matched your search

@@ -2,6 +2,7 @@
import voluptuous as vol
from homeassistant.core import callback, Context
from homeassistant.exceptions import Unauthorized
from . import const, messages
@@ -63,11 +64,8 @@ class ActiveConnection:
try:
handler(self.hass, self, schema(msg))
except Exception: # pylint: disable=broad-except
self.logger.exception('Error handling message: %s', msg)
self.send_message(messages.error_message(
cur_id, const.ERR_UNKNOWN_ERROR,
'Unknown error.'))
except Exception as err: # pylint: disable=broad-except
self.async_handle_exception(msg, err)
self.last_id = cur_id
@@ -76,3 +74,20 @@ class ActiveConnection:
"""Close down connection."""
for unsub in self.event_listeners.values():
unsub()
@callback
def async_handle_exception(self, msg, err):
"""Handle an exception while processing a handler."""
if isinstance(err, Unauthorized):
code = const.ERR_UNAUTHORIZED
err_message = 'Unauthorized'
elif isinstance(err, vol.Invalid):
code = const.ERR_INVALID_FORMAT
err_message = 'Invalid format'
else:
self.logger.exception('Error handling message: %s', msg)
code = const.ERR_UNKNOWN_ERROR
err_message = 'Unknown error'
self.send_message(
messages.error_message(msg['id'], code, err_message))