paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

subdomains: Fix some implicit uses of "" for the root subdomain.

Browse Source 
These are just instances that jumped out at me while working on the
subdomains code, mostly while grepping for get_subdomain call sites.
I haven't attempted a comprehensive search, and there are likely
still others left.
This commit is contained in:
Greg Price
2017-10-19 17:56:49 -07:00
committed by Tim Abbott
parent 27adbe8d79
commit 093bae4bc5
6 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/middleware.py
View File

@@ -16,7 +16,7 @@ from zerver.lib.utils import statsd
from zerver.lib.queue import queue_json_publish
from zerver.lib.cache import get_remote_cache_time, get_remote_cache_requests
from zerver.lib.bugdown import get_bugdown_time, get_bugdown_requests
from zerver.models import flush_per_request_caches, get_realm
from zerver.models import Realm, flush_per_request_caches, get_realm
from zerver.lib.exceptions import RateLimited
from django.contrib.sessions.middleware import SessionMiddleware
from django.views.csrf import csrf_failure as html_csrf_failure
@@ -378,7 +378,7 @@ class SessionHostDomainMiddleware(SessionMiddleware):
if (not request.path.startswith("/static/") and not request.path.startswith("/api/") and
not request.path.startswith("/json/")):
subdomain = get_subdomain(request)
if subdomain != "":
if subdomain != Realm.SUBDOMAIN_FOR_ROOT_DOMAIN:
realm = get_realm(subdomain)
if (realm is None):
return render(request, "zerver/invalid_realm.html")