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

file_manager: only run the operation check for files in the "gcodes" root 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-04-22 06:18:13 -04:00 committed by Eric Callahan
parent ebaf355878
commit 55941b106b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
moonraker/components/file_manager.py
View File

@ -212,6 +212,9 @@ class FileManager:
return "ok" return "ok"
async def _handle_operation_check(self, requested_path): async def _handle_operation_check(self, requested_path):
if not self.get_relative_path("gcodes", requested_path):
# Path not in the gcodes path
return True
# Get virtual_sdcard status # Get virtual_sdcard status
klippy_apis = self.server.lookup_component('klippy_apis') klippy_apis = self.server.lookup_component('klippy_apis')
result = await klippy_apis.query_objects({'print_stats': None}) result = await klippy_apis.query_objects({'print_stats': None})
@ -547,12 +550,11 @@ class FileManager:
full_path = os.path.join(root_path, filename) full_path = os.path.join(root_path, filename)
if not os.path.isfile(full_path): if not os.path.isfile(full_path):
raise self.server.error(f"Invalid file path: {path}") raise self.server.error(f"Invalid file path: {path}")
if root == "gcodes": try:
try: await self._handle_operation_check(full_path)
await self._handle_operation_check(full_path) except self.server.error as e:
except self.server.error as e: if e.status_code == 403:
if e.status_code == 403: raise
raise
os.remove(full_path) os.remove(full_path)
return filename return filename