From 7ecda8894273f3d0419edbb93f819837aa04ace5 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sat, 28 Mar 2020 15:40:32 +0300 Subject: [PATCH] Web UI: correctly redirect using https when ssl is on. Flask was returning full urls for the redirects and they had http, which was causing page loads to fail. --- etesync_dav/radicale/web.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/etesync_dav/radicale/web.py b/etesync_dav/radicale/web.py index 55d21d7e..dcda28a0 100644 --- a/etesync_dav/radicale/web.py +++ b/etesync_dav/radicale/web.py @@ -18,6 +18,7 @@ from radicale import web +from etesync_dav.mac_helpers import has_ssl class Web(web.BaseWeb): def __init__(self, configuration, logger): @@ -32,6 +33,8 @@ def start_response(status, headers): ret_response.append(int(status.split()[0])) ret_response.append(dict(headers)) + if has_ssl(): + environ['wsgi.url_scheme'] = 'https' body = list(app(environ, start_response))[0] ret_response.append(body) return tuple(ret_response)