ar0c/xiaomusic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug: fix redirect (#223)

Browse Source
This commit is contained in:
Gao, Ruiyuan 2024-10-09 15:05:27 +08:00 committed by GitHub
parent c9384aac08
commit e60dc12a12
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xiaomusic/httpserver.py
View File

@ -499,13 +499,13 @@ def access_key_verification(file_path, key, code):
range_pattern = re.compile(r"bytes=(\d+)-(\d*)") range_pattern = re.compile(r"bytes=(\d+)-(\d*)")
def safe_redirect(config, url): def safe_redirect(url):
url = try_add_access_control_param(config, url) url = try_add_access_control_param(config, url)
url = url.replace("\\", "") url = url.replace("\\", "")
if not urllib.parse.urlparse(url).netloc and not urllib.parse.urlparse(url).scheme: if not urllib.parse.urlparse(url).netloc and not urllib.parse.urlparse(url).scheme:
RedirectResponse(url=url) log.debug(f"redirect to {url}")
return True return RedirectResponse(url=url)
return False return None
@app.get("/music/{file_path:path}") @app.get("/music/{file_path:path}")
@ -526,8 +526,9 @@ async def music_file(request: Request, file_path: str, key: str = "", code: str
temp_mp3_file = remove_id3_tags(absolute_file_path, config) temp_mp3_file = remove_id3_tags(absolute_file_path, config)
if temp_mp3_file: if temp_mp3_file:
log.info(f"ID3 tag removed {absolute_file_path} to {temp_mp3_file}") log.info(f"ID3 tag removed {absolute_file_path} to {temp_mp3_file}")
if safe_redirect(f"/music/{temp_mp3_file}"): redirect = safe_redirect(f"/music/{temp_mp3_file}")
return if redirect:
return redirect
else: else:
log.info(f"No ID3 tag remove needed: {absolute_file_path}") log.info(f"No ID3 tag remove needed: {absolute_file_path}")
@ -535,8 +536,9 @@ async def music_file(request: Request, file_path: str, key: str = "", code: str
temp_mp3_file = convert_file_to_mp3(absolute_file_path, config) temp_mp3_file = convert_file_to_mp3(absolute_file_path, config)
if temp_mp3_file: if temp_mp3_file:
log.info(f"Converted file: {absolute_file_path} to {temp_mp3_file}") log.info(f"Converted file: {absolute_file_path} to {temp_mp3_file}")
if safe_redirect(f"/music/{temp_mp3_file}"): redirect = safe_redirect(f"/music/{temp_mp3_file}")
return if redirect:
return redirect
else: else:
log.warning(f"Failed to convert file to MP3 format: {absolute_file_path}") log.warning(f"Failed to convert file to MP3 format: {absolute_file_path}")