Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions agent/app/service/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,12 @@ func (f *FileService) buildChildNode(childNode *response.FileTree, fileInfo *fil
return f.buildFileTree(childNode, subInfo.Items, op, level-1)
}

func hasInvalidFileName(fullPath string) bool {
return files.IsInvalidChar(filepath.Base(fullPath))
}

func (f *FileService) Create(op request.FileCreate) error {
if files.IsInvalidChar(op.Path) {
if hasInvalidFileName(op.Path) {
return buserr.New("ErrInvalidChar")
}
fo := files.NewFileOp()
Expand Down Expand Up @@ -301,6 +305,9 @@ func (f *FileService) Delete(op request.FileDelete) error {
if err != nil {
return err
}
if err := cleanupTrashInfoByEntryPath(op.Path); err != nil {
global.LOG.Warnf("cleanup trashinfo failed for %s: %v", op.Path, err)
}
f.cleanupPermanentDeleteHistory(historyTargets)
return nil
}
Expand Down Expand Up @@ -330,13 +337,19 @@ func (f *FileService) BatchDelete(op request.FileBatchDelete) error {
if err := fo.DeleteDir(file); err != nil {
return err
}
if err := cleanupTrashInfoByEntryPath(file); err != nil {
global.LOG.Warnf("cleanup trashinfo failed for %s: %v", file, err)
}
f.cleanupPermanentDeleteHistory(targets)
}
} else {
for _, file := range op.Paths {
if err := fo.DeleteFile(file); err != nil {
return err
}
if err := cleanupTrashInfoByEntryPath(file); err != nil {
global.LOG.Warnf("cleanup trashinfo failed for %s: %v", file, err)
}
f.cleanupPermanentDeleteHistory([]string{file})
}
}
Expand Down Expand Up @@ -560,7 +573,7 @@ func (f *FileService) SaveContent(edit request.FileEdit) error {
}

func (f *FileService) ChangeName(req request.FileRename) error {
if files.IsInvalidChar(req.NewName) {
if hasInvalidFileName(req.NewName) {
return buserr.New("ErrInvalidChar")
}
fo := files.NewFileOp()
Expand Down
Loading
Loading