armbian/dl-router
0
0
Fork 0
mirror of https://github.com/armbian/dl-router.git synced 2026-01-06 10:32:39 -08:00
Code Issues Packages Projects Releases Wiki Activity

pass scheme to get_redirect function instead of checking request object

Browse Source
This commit is contained in:
Lane Jennison
2021-12-04 20:58:26 -05:00
parent 442e7f40d3
commit 48704d9865
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/main.py
View File

@@ -83,7 +83,7 @@ def get_region(client_ip, reader=geolite_reader, continents=mirror.continents):
else:
return None
def get_redirect(path, client_ip, mirror_class=mirror, dl_map=DL_MAP):
def get_redirect(path, client_ip, scheme, mirror_class=mirror, dl_map=DL_MAP):
""" get redirect based on path and IP """
region = get_region(client_ip)
split_path = path.split('/')
@@ -98,7 +98,7 @@ def get_redirect(path, client_ip, mirror_class=mirror, dl_map=DL_MAP):
allow schemes from 3 (ftp) to 5 (https) character length """
mirror_url = mirror_class.next(region)
if mirror_url.find('://', 3, 8) == -1:
mirror_url = get_scheme() + '://' + mirror_url
mirror_url = scheme + '://' + mirror_url
if mirror_class.mode == "dl_map" and len(split_path) == 2:
key = "{}/{}".format(split_path[0], split_path[1])
@@ -163,7 +163,7 @@ def show_geoip(reader=geolite_reader):
@app.route('/<path:path>')
def catch_all(path):
""" default app route for redirect """
resp = redirect(get_redirect(path, get_ip()), 302)
resp = redirect(get_redirect(path, get_ip(), get_scheme()), 302)
resp.headers['X-Request-Scheme'] = get_scheme()
return resp