backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-15 00:03:28 +01:00
Code Issues Projects Releases Activity

errors: ensure err msgs are properly encoded for jinja2 or raw text response

Browse Source
This commit is contained in:
Ilya Kreymer 2014-09-07 01:07:58 -07:00
parent a95e74dc7d
commit aeb247939d
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pywb/framework/wsgi_wrappers.py
View File

@ -121,17 +121,11 @@ class WSGIApp(object):
status = '400 Bad Request'
if hasattr(exc, 'url'):
try:
err_url = exc.url.decode('utf-8', 'ignore')
except Exception:
err_url = None
err_url = exc.url
else:
err_url = None
try:
err_msg = exc.message.decode('utf-8', 'ignore')
except Exception:
err_msg = exc.message
err_msg = exc.message
if print_trace:
import traceback
@ -142,6 +136,11 @@ class WSGIApp(object):
err_details = None
if error_view:
if err_url:
err_url = err_url.decode('utf-8', 'ignore')
if err_msg:
err_msg = err_msg.decode('utf-8', 'ignore')
return error_view.render_response(exc_type=type(exc).__name__,
err_msg=err_msg,
err_details=err_details,
@ -149,7 +148,12 @@ class WSGIApp(object):
env=env,
err_url=err_url)
else:
return WbResponse.text_response(status + ' Error: ' + err_msg,
msg = status + ' Error: '
if err_msg:
msg += err_msg
msg = msg.encode('utf-8', 'ignore')
return WbResponse.text_response(msg,
status=status)
#=================================================================