gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adjust fix

Browse Source 
fix https://github.com/seaweedfs/seaweedfs/issues/6497
This commit is contained in:
chrislu
2025-02-01 14:11:57 -08:00
parent a75271dd43
commit 42efade0dc
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
weed/filer/filer.go
View File

@@ -248,7 +248,7 @@ func (f *Filer) ensureParentDirectoryEntry(ctx context.Context, entry *Entry, di
}
dirPath := "/" + util.Join(dirParts[:level]...)
// fmt.Printf("%d directory: %+v\n", i, dirPath)
// fmt.Printf("%d dirPath: %+v\n", level, dirPath)
// check the store directly
glog.V(4).Infof("find uncached directory: %s", dirPath)
@@ -257,9 +257,11 @@ func (f *Filer) ensureParentDirectoryEntry(ctx context.Context, entry *Entry, di
// no such existing directory
if dirEntry == nil {
if len(dirParts) >= 2 && level == 2 && dirParts[0] == "buckets" {
if err := s3bucket.VerifyS3BucketName(dirParts[1]); err != nil {
return fmt.Errorf("invalid bucket name %s: %v", dirParts[1], err)
// fmt.Printf("dirParts: %v %v %v\n", dirParts[0], dirParts[1], dirParts[2])
// dirParts[0] == "" and dirParts[1] == "buckets"
if len(dirParts) >= 3 && dirParts[1] == "buckets" {
if err := s3bucket.VerifyS3BucketName(dirParts[2]); err != nil {
return fmt.Errorf("invalid bucket name %s: %v", dirParts[2], err)
}
}

1
weed/s3api/s3bucket/s3api_bucket_test.go
View File

@@ -11,6 +11,7 @@ func Test_verifyBucketName(t *testing.T) {
"123.12.153.10",
"abc214..2",
"d",
"aa",
".ewfs3253543",
"grehtrry-",
"----------",