danvics/ytptube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

validating user supplied filename.

Browse source
This commit is contained in:
ArabCoders 2024-11-03 17:23:56 +03:00
parent d837fb7d1b
commit 0cd36ea4be
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/main.py
View file

@ -519,9 +519,11 @@ class Main:
sd: int = request.query.get('sd') sd: int = request.query.get('sd')
vc: int = int(request.query.get('vc', 0)) vc: int = int(request.query.get('vc', 0))
ac: int = int(request.query.get('ac', 0)) ac: int = int(request.query.get('ac', 0))
file_path: str = os.path.normpath(os.path.join(self.config.download_path, file))
if not file_path.startswith(self.config.download_path):
raise web.HTTPBadRequest(reason='Invalid file path.')
if request.if_modified_since: if request.if_modified_since:
file_path = os.path.join(self.config.download_path, file)
if os.path.exists(file_path) and request.if_modified_since.timestamp() == os.path.getmtime(file_path): if os.path.exists(file_path) and request.if_modified_since.timestamp() == os.path.getmtime(file_path):
return web.Response(status=304) return web.Response(status=304)
@ -546,9 +548,7 @@ class Main:
'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Origin': '*',
'Pragma': 'public', 'Pragma': 'public',
'Cache-Control': f'public, max-age={time.time() + 31536000}', 'Cache-Control': f'public, max-age={time.time() + 31536000}',
'Last-Modified': time.strftime('%a, %d %b %Y %H:%M:%S GMT', datetime.fromtimestamp( 'Last-Modified': time.strftime('%a, %d %b %Y %H:%M:%S GMT', datetime.fromtimestamp(os.path.getmtime(file_path)).timetuple()),
os.path.getmtime(os.path.join(self.config.download_path, file))).timetuple()
),
'Expires': time.strftime('%a, %d %b %Y %H:%M:%S GMT', datetime.fromtimestamp(time.time() + 31536000).timetuple()), 'Expires': time.strftime('%a, %d %b %Y %H:%M:%S GMT', datetime.fromtimestamp(time.time() + 31536000).timetuple()),
} }
) )
@ -556,12 +556,13 @@ class Main:
@self.routes.get(self.config.url_prefix + 'player/subtitle/{file:.*}.vtt') @self.routes.get(self.config.url_prefix + 'player/subtitle/{file:.*}.vtt')
async def subtitles(request: Request) -> Response: async def subtitles(request: Request) -> Response:
file: str = request.match_info.get('file') file: str = request.match_info.get('file')
file_path: str = os.path.normpath(os.path.join(self.config.download_path, file))
if not file_path.startswith(self.config.download_path):
raise web.HTTPBadRequest(reason='Invalid file path.')
if request.if_modified_since: if request.if_modified_since:
file_path = os.path.join(self.config.download_path, file)
lastMod = time.strftime('%a, %d %b %Y %H:%M:%S GMT', datetime.fromtimestamp( lastMod = time.strftime('%a, %d %b %Y %H:%M:%S GMT', datetime.fromtimestamp(
os.path.getmtime(os.path.join(self.config.download_path, file))).timetuple() os.path.getmtime(file_path)).timetuple())
)
if os.path.exists(file_path) and request.if_modified_since.timestamp() == os.path.getmtime(file_path): if os.path.exists(file_path) and request.if_modified_since.timestamp() == os.path.getmtime(file_path):
return web.Response(status=304, headers={'Last-Modified': lastMod}) return web.Response(status=304, headers={'Last-Modified': lastMod})
@ -576,9 +577,7 @@ class Main:
'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Origin': '*',
'Pragma': 'public', 'Pragma': 'public',
'Cache-Control': f'public, max-age={time.time() + 31536000}', 'Cache-Control': f'public, max-age={time.time() + 31536000}',
'Last-Modified': time.strftime('%a, %d %b %Y %H:%M:%S GMT', datetime.fromtimestamp( 'Last-Modified': time.strftime('%a, %d %b %Y %H:%M:%S GMT', datetime.fromtimestamp(os.path.getmtime(file_path)).timetuple()),
os.path.getmtime(os.path.join(self.config.download_path, file))).timetuple()
),
'Expires': time.strftime('%a, %d %b %Y %H:%M:%S GMT', datetime.fromtimestamp(time.time() + 31536000).timetuple()), 'Expires': time.strftime('%a, %d %b %Y %H:%M:%S GMT', datetime.fromtimestamp(time.time() + 31536000).timetuple()),
} }
) )

2
frontend/src/main.js
View file

@ -41,7 +41,7 @@ app.config.globalProperties.makeDownload = (config, item, base = 'download') =>
let baseDir = 'download' === base ? `${base}/` : 'player/playlist/'; let baseDir = 'download' === base ? `${base}/` : 'player/playlist/';
if (item.folder) { if (item.folder) {
item.folder = item.folder.replace('#', '%23'); item.folder = item.folder.replace(/#/g, '%23');
baseDir += item.folder + '/'; baseDir += item.folder + '/';
} }