Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

create exception view before handling Unauthorized #304

Merged
merged 7 commits into from Oct 2, 2018
Merged

create exception view before handling Unauthorized #304

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a3457e0
Re-add support for XML-RPC
davisagli Jun 26, 2018
078c338
Fix a couple cases
davisagli Jun 26, 2018
a45e268
We need a different approach to preserve query string parameters
davisagli Jun 26, 2018
fe246b9
call exception view before triggering _unaothorized, as proposed by l…
tschorr Jul 20, 2018
fd3cbf8
Update CHANGES.rst
tschorr Oct 2, 2018
17fb122
Update CHANGES.rst
tschorr Oct 2, 2018
2bf75dd
Merge branch 'master' into py3_fix_wsgi_unauthorized
tschorr Oct 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/ZPublisher/WSGIPublisher.py
View file
Open in desktop
Expand Up @@ -149,6 +149,10 @@ def transaction_pubevents(request, response, tm=transaction.manager):
if request.environ.get('x-wsgiorg.throw_errors', False):
reraise(*exc_info)

# Handle exception view
exc_view_created = _exc_view_created_response(
exc, request, response)

if isinstance(exc, Unauthorized):
# _unauthorized modifies the response in-place. If this hook
# is used, an exception view for Unauthorized has to merge
Expand All @@ -157,10 +161,6 @@ def transaction_pubevents(request, response, tm=transaction.manager):
response._unauthorized()
response.setStatus(exc.getStatus())

# Handle exception view
exc_view_created = _exc_view_created_response(
exc, request, response)

notify(pubevents.PubBeforeAbort(
request, exc_info, request.supports_retry()))
tm.abort()
Expand Down