YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #257 from YunoHost/return-additional-error-data-to-api

Browse source 
Support more complex errors (be able to return additional data in a json structure)
This commit is contained in:
Alexandre Aubin 2021-01-23 16:05:45 +01:00 • committed by GitHub
commit ae4087d522
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
moulinette/core.py
View file

@ -377,6 +377,9 @@ class MoulinetteError(Exception):
super(MoulinetteError, self).__init__(msg)
self.strerror = msg
def content(self):
return self.strerror
class MoulinetteLdapIsDownError(MoulinetteError):
"""Used when ldap is down"""

14
moulinette/interfaces/api.py
View file

@ -484,7 +484,7 @@ class _ActionsMapPlugin(object):
try:
ret = self.actionsmap.process(arguments, timeout=30, route=_route)
except MoulinetteError as e:
raise HTTPBadRequestResponse(e.strerror)
raise HTTPBadRequestResponse(e)
except Exception as e:
if isinstance(e, HTTPResponse):
raise e
@ -553,8 +553,16 @@ class HTTPOKResponse(HTTPResponse):
class HTTPBadRequestResponse(HTTPResponse):
def __init__(self, output=""):
super(HTTPBadRequestResponse, self).__init__(output, 400)
def __init__(self, error=""):
if isinstance(error, MoulinetteError):
content = error.content()
if isinstance(content, dict):
super(HTTPBadRequestResponse, self).__init__(json_encode(content), 400, headers={'Content-type': 'application/json'})
else:
super(HTTPBadRequestResponse, self).__init__(content, 400)
else:
super(HTTPBadRequestResponse, self).__init__(error, 400)
class HTTPUnauthorizedResponse(HTTPResponse):