cjw/Oxicloud
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix/security: move_folder(): check that target belongs to caller

Browse Source
This commit is contained in:
Edouard Vanbelle
2026-05-11 23:12:30 +02:00
parent 3a18507158
commit b4d4056a15
1 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/application/services/folder_service.rs
+15 -22
View File
@@ -404,12 +404,7 @@ impl FolderUseCase for FolderService {
} }
// Verify the folder exists and belongs to the caller // Verify the folder exists and belongs to the caller
let existing_folder = self.folder_storage.get_folder(id).await.map_err(|e| { let existing_folder = self.folder_storage.get_folder(id).await?;
DomainError::internal_error(
"FolderStorage",
format!("Failed to get folder with ID: {} for renaming: {}", id, e),
)
})?;
if existing_folder.owner_id() != Some(caller_id) { if existing_folder.owner_id() != Some(caller_id) {
tracing::warn!( tracing::warn!(
@@ -444,12 +439,7 @@ impl FolderUseCase for FolderService {
caller_id: Uuid, caller_id: Uuid,
) -> Result<FolderDto, DomainError> { ) -> Result<FolderDto, DomainError> {
// Verify the source folder exists and belongs to the caller // Verify the source folder exists and belongs to the caller
let source_folder = self.folder_storage.get_folder(id).await.map_err(|e| { let source_folder = self.folder_storage.get_folder(id).await?;
DomainError::internal_error(
"FolderStorage",
format!("Failed to get folder with ID: {} for moving: {}", id, e),
)
})?;
if source_folder.owner_id() != Some(caller_id) { if source_folder.owner_id() != Some(caller_id) {
tracing::warn!( tracing::warn!(
@@ -461,7 +451,7 @@ impl FolderUseCase for FolderService {
return Err(DomainError::not_found("Folder", id)); return Err(DomainError::not_found("Folder", id));
} }
// If a parent_id is specified, verify it exists // If a parent_id is specified, verify it exists and belongs to the caller
if let Some(parent_id) = &dto.parent_id { if let Some(parent_id) = &dto.parent_id {
// Verify we are not trying to move the folder into itself or one of its descendants // Verify we are not trying to move the folder into itself or one of its descendants
if parent_id == id { if parent_id == id {
@@ -472,9 +462,17 @@ impl FolderUseCase for FolderService {
)); ));
} }
// Verify the destination exists // Verify the destination exists and is owned by the caller
let parent_exists = self.folder_storage.get_folder(parent_id).await.is_ok(); let parent = self.folder_storage.get_folder(parent_id).await.map_err(|_| {
if !parent_exists { DomainError::not_found("Folder", parent_id)
})?;
if parent.owner_id() != Some(caller_id) {
tracing::warn!(
"move_folder: user '{}' attempted to move into folder '{}' owned by '{:?}'",
caller_id,
parent_id,
parent.owner_id()
);
return Err(DomainError::not_found("Folder", parent_id)); return Err(DomainError::not_found("Folder", parent_id));
} }
@@ -500,12 +498,7 @@ impl FolderUseCase for FolderService {
/// Deletes a folder after verifying ownership. /// Deletes a folder after verifying ownership.
async fn delete_folder(&self, id: &str, caller_id: Uuid) -> Result<(), DomainError> { async fn delete_folder(&self, id: &str, caller_id: Uuid) -> Result<(), DomainError> {
// Verify the folder exists and belongs to the caller // Verify the folder exists and belongs to the caller
let folder = self.folder_storage.get_folder(id).await.map_err(|e| { let folder = self.folder_storage.get_folder(id).await?;
DomainError::internal_error(
"FolderStorage",
format!("Failed to get folder with ID: {} for deletion: {}", id, e),
)
})?;
if folder.owner_id() != Some(caller_id) { if folder.owner_id() != Some(caller_id) {
tracing::warn!( tracing::warn!(