forked from MarseyWorld/MarseyWorld
Fix unbound ORM object erroring during 500 handler.
The 500 fixed in 71738b05fc
revealed that attempting to access g.v at
all during an error handler can potentially cause its own error.
In particular, html_head L111 accessing v.themecolor errored because
we roll back the database session during 500 handling. There's no good
solution other than specifically not passing v to 500 error pages.
However, in the interest of failing fast and ensuring error handlers
always complete, we instead go back to the previous behavior of not
treating users as logged in for error pages.
master
parent
71738b05fc
commit
27506b36c2
|
@ -36,9 +36,7 @@ def error(e):
|
|||
if request.headers.get("Authorization") or request.headers.get("xhr"):
|
||||
return {"error": title, "code": e.code, "description": msg, "details": details}, e.code
|
||||
img = ERROR_MARSEYS.get(e.code, 'marseyl')
|
||||
if hasattr(g, "v"): v = g.v
|
||||
else: v = None
|
||||
return render_template('errors/error.html', title=title, msg=msg, details=details, img=img, v=v), e.code
|
||||
return render_template('errors/error.html', title=title, msg=msg, details=details, img=img), e.code
|
||||
|
||||
@app.errorhandler(401)
|
||||
def error_401(e):
|
||||
|
|
Loading…
Reference in New Issue