nakidai
/
whoogle-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor improvement to https enforcement

main
Ben Busby 2020-05-15 16:29:22 -06:00
parent 3123789584
commit b4165f9957
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/routes.py
View File

@ -20,8 +20,10 @@ CONFIG_PATH = os.getenv('CONFIG_VOLUME', app.config['STATIC_FOLDER']) + '/config
@app.before_request @app.before_request
def before_request_func(): def before_request_func():
# Always redirect to https if HTTPS_ONLY is set # Always redirect to https if HTTPS_ONLY is set (otherwise default to false)
if os.getenv('HTTPS_ONLY', False) and request.url.startswith('http://'): https_only = os.getenv('HTTPS_ONLY', False)
if https_only and request.url.startswith('http://'):
url = request.url.replace('http://', 'https://', 1) url = request.url.replace('http://', 'https://', 1)
code = 301 code = 301
return redirect(url, code=code) return redirect(url, code=code)
@ -30,7 +32,7 @@ def before_request_func():
g.user_config = Config(**json_config) g.user_config = Config(**json_config)
if not g.user_config.url: if not g.user_config.url:
g.user_config.url = request.url_root g.user_config.url = request.url_root.replace('http://', 'https://') if https_only else request.url_root
g.user_request = Request(request.headers.get('User-Agent'), language=g.user_config.lang) g.user_request = Request(request.headers.get('User-Agent'), language=g.user_config.lang)
g.app_location = g.user_config.url g.app_location = g.user_config.url
@ -100,7 +102,7 @@ def config():
else: else:
config_data = request.form.to_dict() config_data = request.form.to_dict()
if 'url' not in config_data or not config_data['url']: if 'url' not in config_data or not config_data['url']:
config_data['url'] = request.url_root config_data['url'] = g.user_config.url
with open(CONFIG_PATH, 'w') as config_file: with open(CONFIG_PATH, 'w') as config_file:
config_file.write(json.dumps(config_data, indent=4)) config_file.write(json.dumps(config_data, indent=4))