Skip to content

Commit

Permalink
Return empty response when include fails
Browse files Browse the repository at this point in the history
If the client side include fails for some reason, return an empty
response. For example, if there is a permissions error, don't redirect
to the login page, just show an empty view.
  • Loading branch information
di committed Jan 26, 2018
1 parent d61cf86 commit ea0844d
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
15 changes: 14 additions & 1 deletion tests/unit/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from warehouse.views import (
SEARCH_BOOSTS, SEARCH_FIELDS, current_user_indicator, forbidden, health,
httpexception_view, index, robotstxt, opensearchxml, search, force_status,
flash_messages
flash_messages, forbidden_include
)

from ..common.db.accounts import UserFactory
Expand Down Expand Up @@ -147,6 +147,19 @@ def test_logged_out_redirects_login(self):
"/accounts/login/?next=/foo/bar/%3Fb%3Ds"


class TestForbiddenIncludeView:

def test_forbidden_include(self):
exc = pretend.stub()
request = pretend.stub()

resp = forbidden_include(exc, request)

assert resp.status_code == 200
assert resp.content_type == 'text/html'
assert resp.content_length == 0


def test_robotstxt(pyramid_request):
assert robotstxt(pyramid_request) == {}
assert pyramid_request.response.content_type == "text/plain"
Expand Down
8 changes: 8 additions & 0 deletions warehouse/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,14 @@ def forbidden(exc, request, redirect_to="accounts.login"):
return httpexception_view(exc, request)


@forbidden_view_config(path_info=r"^/_includes/")
@exception_view_config(PredicateMismatch, path_info=r"^/_includes/")
def forbidden_include(exc, request):
# If the forbidden error is for a client-side-include, just return an empty
# response instead of redirecting
return Response()


@view_config(
route_name="robots.txt",
renderer="robots.txt",
Expand Down

0 comments on commit ea0844d

Please sign in to comment.