aboutsummaryrefslogtreecommitdiff
path: root/weed/filer/filer_rename.go
diff options
context:
space:
mode:
authorwusong <75450248+wusongANKANG@users.noreply.github.com>2023-04-27 11:54:36 +0800
committerGitHub <noreply@github.com>2023-04-26 20:54:36 -0700
commit4867aa03ab9b9bbeee5b326f520544c2977f74da (patch)
tree6940ea6591cbe9fb3578d63ececa2d51579b1753 /weed/filer/filer_rename.go
parentd75a7b7f624910e6b0c8be293483ad13b52d1aa5 (diff)
downloadseaweedfs-4867aa03ab9b9bbeee5b326f520544c2977f74da.tar.xz
seaweedfs-4867aa03ab9b9bbeee5b326f520544c2977f74da.zip
Fix: http rename move dir to subdir (#4432)
Co-authored-by: wang wusong <wangwusong@virtaitech.com>
Diffstat (limited to 'weed/filer/filer_rename.go')
-rw-r--r--weed/filer/filer_rename.go11
1 files changed, 9 insertions, 2 deletions
diff --git a/weed/filer/filer_rename.go b/weed/filer/filer_rename.go
index fdd6051a8..cf4a2b79f 100644
--- a/weed/filer/filer_rename.go
+++ b/weed/filer/filer_rename.go
@@ -2,16 +2,23 @@ package filer
import (
"fmt"
- "github.com/seaweedfs/seaweedfs/weed/util"
"strings"
+
+ "github.com/seaweedfs/seaweedfs/weed/util"
)
-func (f *Filer) CanRename(source, target util.FullPath) error {
+func (f *Filer) CanRename(source, target util.FullPath, oldName string) error {
+ sourcePath := source.Child(oldName)
+ if strings.HasPrefix(string(target), string(sourcePath)) {
+ return fmt.Errorf("mv: can not move directory to a subdirectory of itself")
+ }
+
sourceBucket := f.DetectBucket(source)
targetBucket := f.DetectBucket(target)
if sourceBucket != targetBucket {
return fmt.Errorf("can not move across collection %s => %s", sourceBucket, targetBucket)
}
+
return nil
}