paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-20 06:28:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

middleware: Fix recursive DisallowedHost exceptions.

Browse Source
This commit is contained in:
Tim Abbott
2017-01-29 20:17:48 -08:00
parent 20f3705c00
commit de3e96162e
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zerver/middleware.py
View File

@@ -4,6 +4,7 @@ from six import binary_type
from typing import Any, AnyStr, Callable, Iterable, MutableMapping, Optional, Text from typing import Any, AnyStr, Callable, Iterable, MutableMapping, Optional, Text
from django.conf import settings from django.conf import settings
from django.core.exceptions import DisallowedHost
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from zerver.lib.response import json_error from zerver.lib.response import json_error
@@ -349,6 +350,16 @@ class FlushDisplayRecipientCache(object):
class SessionHostDomainMiddleware(SessionMiddleware): class SessionHostDomainMiddleware(SessionMiddleware):
def process_response(self, request, response): def process_response(self, request, response):
# type: (HttpRequest, HttpResponse) -> HttpResponse # type: (HttpRequest, HttpResponse) -> HttpResponse
try:
request.get_host()
except DisallowedHost:
# If we get a DisallowedHost exception trying to access
# the host, (1) the request is failed anyway and so the
# below code will do nothing, and (2) the below will
# trigger a recursive exception, breaking things, so we
# just return here.
return response
if settings.REALMS_HAVE_SUBDOMAINS: if settings.REALMS_HAVE_SUBDOMAINS:
if (not request.path.startswith("/static/") and not request.path.startswith("/api/") and if (not request.path.startswith("/static/") and not request.path.startswith("/api/") and
not request.path.startswith("/json/")): not request.path.startswith("/json/")):