Avii/Radicale
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Use X-Forwarded-* for server netloc when available

Browse Source 
Closes #1271
This commit is contained in:
Unrud
2023-03-08 15:49:46 +01:00
parent 1a78114a56
commit 360484e2d5
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
radicale/app/move.py
View File

@@ -28,9 +28,14 @@ from radicale.log import logger
def get_server_netloc(environ: types.WSGIEnviron, force_port: bool = False): def get_server_netloc(environ: types.WSGIEnviron, force_port: bool = False):
host = environ.get("HTTP_HOST") or environ["SERVER_NAME"] if environ.get("HTTP_X_FORWARDED_HOST"):
proto = environ["wsgi.url_scheme"] host = environ["HTTP_X_FORWARDED_HOST"]
port = environ["SERVER_PORT"] proto = environ.get("HTTP_X_FORWARDED_PROTO") or "http"
port = "443" if proto == "https" else "80"
else:
host = environ.get("HTTP_HOST") or environ["SERVER_NAME"]
proto = environ["wsgi.url_scheme"]
port = environ["SERVER_PORT"]
if (not force_port and port == ("443" if proto == "https" else "80") or if (not force_port and port == ("443" if proto == "https" else "80") or
re.search(r":\d+$", host)): re.search(r":\d+$", host)):
return host return host