Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix INF-341 refactor name of resource pool to region id"
[pti/o2.git]
/
o2common
/
authmw
/
authmiddleware.py
diff --git
a/o2common/authmw/authmiddleware.py
b/o2common/authmw/authmiddleware.py
index
c70adfc
..
13be910
100644
(file)
--- a/
o2common/authmw/authmiddleware.py
+++ b/
o2common/authmw/authmiddleware.py
@@
-43,6
+43,11
@@
def _response_wrapper(environ, start_response, header):
return res(environ, start_response)
return res(environ, start_response)
+def _internal_err_response_wrapper(environ, start_response):
+ res = Response(mimetype='text/plain', status=500)
+ return res(environ, start_response)
+
+
class authmiddleware():
'''
class authmiddleware():
'''
@@
-67,7
+72,15
@@
class authmiddleware():
if ret is True:
logger.info(
"auth success with oauth token: " + auth_token)
if ret is True:
logger.info(
"auth success with oauth token: " + auth_token)
- return self.app(environ, start_response)
+ try:
+ return self.app(environ, start_response)
+ except Exception as ex:
+ logger.error(
+ 'Internal exception happend \
+ ed {}'.format(str(ex)), exc_info=True)
+ return \
+ _internal_err_response_wrapper(environ,
+ start_response)
else:
raise AuthFailureExp(
'Bearer realm="Authentication Failed"')
else:
raise AuthFailureExp(
'Bearer realm="Authentication Failed"')
@@
-77,7
+90,7
@@
class authmiddleware():
return _response_wrapper(environ, start_response, ex.dictize())
except AuthFailureExp as ex:
return _response_wrapper(environ, start_response, ex.dictize())
return _response_wrapper(environ, start_response, ex.dictize())
except AuthFailureExp as ex:
return _response_wrapper(environ, start_response, ex.dictize())
- except Exception:
- hint = 'Bearer realm="Authentication Required"'
- return _response_wrapper(environ, start_response,
-
AuthRequiredExp(hint).dictize()
)
+ except Exception
as ex
:
+ logger.error('Internal exception happended {}'.format(
+ str(ex)), exc_info=True)
+
return _internal_err_response_wrapper(environ, start_response
)