From 5d550d4c7a8bba8257626ff292cc0429a0e9b39a Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 18 Oct 2022 12:56:06 +0200 Subject: [PATCH] redirect to proper host instead of giving an error --- files/__main__.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/files/__main__.py b/files/__main__.py index 92e1158b1b..10bf3d6db1 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -84,7 +84,9 @@ def before_request(): with open('/site_settings.json', 'r', encoding='utf_8') as f: app.config['SETTINGS'] = json.load(f) - if request.host != app.config["SERVER_NAME"]: return {"error": "Unauthorized host provided."}, 403 + if request.host != app.config["SERVER_NAME"]: + return redirect(app.config["SERVER_NAME"] + request.full_path) + if request.headers.get("CF-Worker"): return {"error": "Cloudflare workers are not allowed to access this website."}, 403 if not app.config['SETTINGS']['Bots'] and request.headers.get("Authorization"): abort(403) @@ -93,13 +95,6 @@ def before_request(): g.webview = '; wv) ' in ua g.inferior_browser = 'iphone' in ua or 'ipad' in ua or 'ipod' in ua or 'mac os' in ua or ' firefox/' in ua - #### WPD TEMP #### temporary WPD migration logic: redirect to / - if request.host == 'watchpeopledie.co' and app.config["SERVER_NAME"] == "watchpeopledie.co": - request.path = request.path.rstrip('/') - if not request.path: request.path = '/' - if request.path != '/': - return redirect('/') - #### END WPD TEMP #### request.path = request.path.rstrip('/') if not request.path: request.path = '/' request.full_path = request.full_path.rstrip('?').rstrip('/')