298977887/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-04-16 00:23:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge a476e4c5e5 into 98bdca4cb2

Browse Source
This commit is contained in:
Dr.Lt.Data 2025-04-10 08:50:37 -04:00 committed by GitHub
commit e18046d606
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/user_manager.py
View File

@ -63,7 +63,7 @@ class UserManager():
return user
def get_request_user_filepath(self, request, file, type="userdata", create_dir=True):
def get_request_user_filepath(self, request, target, type="userdata", create_dir=True, target_is_file=True):
user_directory = folder_paths.get_user_directory()
if type == "userdata":
@ -78,20 +78,23 @@ class UserManager():
if os.path.commonpath((root_dir, user_root)) != root_dir:
return None
if file is not None:
if target is not None:
# Check if filename is url encoded
if "%" in file:
file = parse.unquote(file)
if "%" in target:
target = parse.unquote(target)
# prevent leaving /{type}/{user}
path = os.path.abspath(os.path.join(user_root, file))
path = os.path.abspath(os.path.join(user_root, target))
if os.path.commonpath((user_root, path)) != user_root:
return None
parent = os.path.split(path)[0]
if target_is_file:
dir_path = os.path.dirname(path)
else:
dir_path = path
if create_dir and not os.path.exists(parent):
os.makedirs(parent, exist_ok=True)
if create_dir and not os.path.exists(dir_path):
os.makedirs(dir_path, exist_ok=True)
return path
@ -162,7 +165,7 @@ class UserManager():
if not directory:
return web.Response(status=400, text="Directory not provided")
path = self.get_request_user_filepath(request, directory)
path = self.get_request_user_filepath(request, directory, target_is_file=False)
if not path:
return web.Response(status=403, text="Invalid directory")