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

auth: Only automatically redirect for same domain redirects.

Browse Source 
If the `deactivated_redirect` belongs to the same domain as
`EXTERNAL_HOST`, automatically redirect, otherwise just point
user to the new URL.
This commit is contained in:
Aman Agrawal
2025-06-18 19:38:48 +05:30
committed by Tim Abbott
parent ba32e732c7
commit 9b15dce1b2
6 changed files with 71 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
zerver/lib/subdomains.py
View File

@@ -22,22 +22,27 @@ def get_subdomain(request: HttpRequest) -> str:
# compatibility with older versions of Zulip, so that's a start.
host = request.get_host().lower()
return get_subdomain_from_hostname(host)
subdomain = get_subdomain_from_hostname(host)
assert subdomain is not None
return subdomain
def get_subdomain_from_hostname(host: str) -> str:
def get_subdomain_from_hostname(
host: str, default_subdomain: str | None = Realm.SUBDOMAIN_FOR_ROOT_DOMAIN
) -> str | None:
# Set `default_subdomain` as None to check if a valid subdomain was found.
m = re.search(rf"\.{settings.EXTERNAL_HOST}(:\d+)?$", host)
if m:
subdomain = host[: m.start()]
if subdomain in settings.ROOT_SUBDOMAIN_ALIASES:
return Realm.SUBDOMAIN_FOR_ROOT_DOMAIN
return default_subdomain
return subdomain
for subdomain, realm_host in settings.REALM_HOSTS.items():
if re.search(rf"^{realm_host}(:\d+)?$", host):
return subdomain
return Realm.SUBDOMAIN_FOR_ROOT_DOMAIN
return default_subdomain
def is_subdomain_root_or_alias(request: HttpRequest) -> bool: