3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

file_manager: normalize path requests 

This resolves an issue where a path is containter two slashes as a separator reports as outside of the root.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2021-10-30 07:28:55 -04:00
parent 28c8bf61da
commit 538c68fc8b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moonraker/components/file_manager/file_manager.py
View File

@ -305,7 +305,7 @@ class FileManager:
def _convert_request_path(self, request_path: str) -> Tuple[str, str]: def _convert_request_path(self, request_path: str) -> Tuple[str, str]:
# Parse the root, relative path, and disk path from a remote request # Parse the root, relative path, and disk path from a remote request
parts = request_path.strip("/").split("/", 1) parts = os.path.normpath(request_path).strip("/").split("/", 1)
if not parts: if not parts:
raise self.server.error(f"Invalid path: {request_path}") raise self.server.error(f"Invalid path: {request_path}")
root = parts[0] root = parts[0]
@ -681,7 +681,7 @@ class FileManager:
async def delete_file(self, path: str) -> Dict[str, Any]: async def delete_file(self, path: str) -> Dict[str, Any]:
async with self.write_mutex: async with self.write_mutex:
parts = path.lstrip("/").split("/", 1) parts = os.path.normpath(path).lstrip("/").split("/", 1)
if len(parts) != 2: if len(parts) != 2:
raise self.server.error( raise self.server.error(
f"Path not available for DELETE: {path}", 405) f"Path not available for DELETE: {path}", 405)