bhetherman/open-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: keep folder parent references acyclic (#28748)

Browse Source 
Moving a folder under one of its own subfolders was accepted. A folder in a parent loop is never a root, so it and everything under it silently disappeared from the sidebar, and there was no way to get it back from the UI.

The move is now rejected with a 400, folders whose parent chain loops are put back at the root on the next folder list, and the folder tree traversals skip ids they have already visited so existing data in that state stays workable.
This commit is contained in:
Classic298
2026-08-24 17:06:19 -04:00
committed by GitHub
parent 18edfff2d6
commit 23b3a69bc2
3 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/open_webui/routers/folders.py
+20 -2
View File
@@ -97,7 +97,15 @@ async def get_folders(
await check_folders_permission(request, user, db=db)
folders = await Folders.get_folders_by_user_id(user.id, db=db)
folder_ids = {folder.id for folder in folders}
parent_by_id = {folder.id: folder.parent_id for folder in folders}
def is_in_parent_cycle(folder_id):
seen_ids = {folder_id}
current_id = parent_by_id.get(folder_id)
while current_id and current_id not in seen_ids:
seen_ids.add(current_id)
current_id = parent_by_id.get(current_id)
return current_id == folder_id
user_group_ids = None
if user.role != 'admin' and any(folder.data and 'files' in folder.data for folder in folders):
@@ -106,7 +114,9 @@ async def get_folders(
# Verify folder data integrity
folder_list = []
for folder in folders:
if folder.parent_id and folder.parent_id not in folder_ids:
# A missing or looping parent hides the folder from the tree, so put it back at the root
if folder.parent_id and (folder.parent_id not in parent_by_id or is_in_parent_cycle(folder.id)):
parent_by_id[folder.id] = None
folder = await Folders.update_folder_parent_id_by_id_and_user_id(folder.id, user.id, None, db=db)
if folder.data and 'files' in folder.data:
@@ -397,6 +407,14 @@ async def update_folder_parent_id_by_id(
detail=ERROR_MESSAGES.DEFAULT('Folder already exists'),
)
if form_data.parent_id and form_data.parent_id in await Folders.get_folder_ids_by_id_and_user_id_in_subtree(
id, user.id, db=db
):
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail=ERROR_MESSAGES.DEFAULT('Cannot move a folder into itself or one of its subfolders'),
)
try:
folder = await Folders.update_folder_parent_id_by_id_and_user_id(id, user.id, form_data.parent_id, db=db)
await publish_event(