jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-25 22:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Json api fix (#10017)

Browse Source 
* Dont let json parsing errors result in a 500

* Fixed error description
This commit is contained in:
Alan Fischer 2017-10-22 01:44:46 -06:00 committed by Paulus Schoutsen
parent 796a3ff49d
commit 9f62d5e3cf
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/components/api.py
View File

@ -262,7 +262,11 @@ class APIEventView(HomeAssistantView):
def post(self, request, event_type): def post(self, request, event_type):
"""Fire events.""" """Fire events."""
body = yield from request.text() body = yield from request.text()
try:
event_data = json.loads(body) if body else None event_data = json.loads(body) if body else None
except ValueError:
return self.json_message('Event data should be valid JSON',
HTTP_BAD_REQUEST)
if event_data is not None and not isinstance(event_data, dict): if event_data is not None and not isinstance(event_data, dict):
return self.json_message('Event data should be a JSON object', return self.json_message('Event data should be a JSON object',
@ -309,7 +313,11 @@ class APIDomainServicesView(HomeAssistantView):
""" """
hass = request.app['hass'] hass = request.app['hass']
body = yield from request.text() body = yield from request.text()
try:
data = json.loads(body) if body else None data = json.loads(body) if body else None
except ValueError:
return self.json_message('Data should be valid JSON',
HTTP_BAD_REQUEST)
with AsyncTrackStates(hass) as changed_states: with AsyncTrackStates(hass) as changed_states:
yield from hass.services.async_call(domain, service, data, True) yield from hass.services.async_call(domain, service, data, True)