Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

Fix: reject move to current location request (#18234)

Lynn58abab50ccd6
diff --git a/api/apps/services/file_api_service.py b/api/apps/services/file_api_service.py
index 966ee61a9f..8bff299055 100644
--- a/api/apps/services/file_api_service.py
+++ b/api/apps/services/file_api_service.py
@@ -509,11 +509,15 @@ async def move_files(uid: str, src_file_ids: list, dest_file_id: str = None, new
return False, "Cannot move a folder into its own subfolder."
def _move_entry_recursive(source_file_entry, dest_folder_entry, override_name=None):
+ if source_file_entry.id == dest_folder_entry.id:
+ raise RuntimeError("The folder is already in the target location. There is no need to move it.")
effective_name = override_name or source_file_entry.name
if source_file_entry.type == FileType.FOLDER.value:
existing_folder = FileService.query(name=effective_name, parent_id=dest_folder_entry.id)
if existing_folder:
+ if existing_folder[0].id == source_file_entry.id:
+ raise RuntimeError("The folder is already in the target location. There is no need to move it.")
new_folder = existing_folder[0]
else:
new_folder = FileService.insert(
@@ -588,7 +592,10 @@ async def move_files(uid: str, src_file_ids: list, dest_file_id: str = None, new
return False, str(e)
return True, True
- return await thread_pool_exec(_move_or_rename_sync)
+ try:
+ return await thread_pool_exec(_move_or_rename_sync)
+ except RuntimeError as e:
+ return False, str(e)
def get_file_content(uid: str, file_id: str):
diff --git a/test/testcases/restful_api/test_file_routes_unit.py b/test/testcases/restful_api/test_file_routes_unit.py
index 83e9c04d3d..5813de2fd8 100644
--- a/test/testcases/restful_api/test_file_routes_unit.py
+++ b/test/testcases/restful_api/test_file_routes_unit.py
@@ -999,3 +999,48 @@ def test_get_file_content_checks_permission(monkeypatch):
ok, file = module.get_file_content("tenant1", "file1")
assert ok is True
assert file.id == "file1"
+
+
+def test_move_folder_to_its_current_parent_does_not_delete_it(monkeypatch):
+ """Moving a folder into its current parent (i.e. to its current location)
+ must not delete the folder: _move_entry_recursive used to reuse the source
+ folder itself as the target and then delete it, making the folder vanish."""
+ module = _load_file_api_service(monkeypatch)
+ deleted = []
+
+ src = _DummyFile("folder-a", module.FileType.FOLDER.value, name="A", parent_id="parent")
+ dest = SimpleNamespace(id="parent", name="parent")
+
+ monkeypatch.setattr(module.FileService, "get_by_ids", lambda _ids: [src])
+ monkeypatch.setattr(module.FileService, "get_by_id", lambda _file_id: (True, dest))
+ # The folder already sits in the destination folder under the same name.
+ monkeypatch.setattr(module.FileService, "query", lambda **_kwargs: [src])
+ monkeypatch.setattr(
+ module.FileService,
+ "delete_by_id",
+ lambda file_id: deleted.append(file_id) or True,
+ )
+
+ ok, message = _run(module.move_files("tenant1", ["folder-a"], "parent"))
+ assert ok is False
+ assert message == "The folder is already in the target location. There is no need to move it."
+ assert deleted == []
+
+
+def test_move_folder_to_itself_is_rejected(monkeypatch):
+ module = _load_file_api_service(monkeypatch)
+ src = _DummyFile("folder-a", module.FileType.FOLDER.value, name="A", parent_id="parent")
+
+ monkeypatch.setattr(module.FileService, "get_by_ids", lambda _ids: [src])
+ monkeypatch.setattr(
+ module.FileService,
+ "get_by_id",
+ lambda _file_id: (True, SimpleNamespace(id="folder-a")),
+ )
+ monkeypatch.setattr(module.FileService, "get_all_parent_folders", lambda _file_id: [])
+
+ ok, message = _run(module.move_files("tenant1", ["folder-a"], "folder-a"))
+ assert ok is False
+ assert message == "Cannot move a folder to itself."