MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

do not assume invalid buf to be non-xl.meta (#15843)

This commit is contained in:
Harshavardhana 2022-10-17 09:39:21 -07:00 committed by GitHub
parent 196fab6834
commit 58a8275e84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/xl-storage.go
View File

@ -899,6 +899,7 @@ func (s *xlStorage) ListDir(ctx context.Context, volume, dirPath string, count i
} }
func (s *xlStorage) deleteVersions(ctx context.Context, volume, path string, fis ...FileInfo) error { func (s *xlStorage) deleteVersions(ctx context.Context, volume, path string, fis ...FileInfo) error {
var legacyJSON bool
buf, err := s.ReadAll(ctx, volume, pathJoin(path, xlStorageFormatFile)) buf, err := s.ReadAll(ctx, volume, pathJoin(path, xlStorageFormatFile))
if err != nil { if err != nil {
if err != errFileNotFound { if err != errFileNotFound {
@ -910,6 +911,7 @@ func (s *xlStorage) deleteVersions(ctx context.Context, volume, path string, fis
if err != nil { if err != nil {
return err return err
} }
legacyJSON = true
} }
if len(buf) == 0 { if len(buf) == 0 {
@ -921,14 +923,14 @@ func (s *xlStorage) deleteVersions(ctx context.Context, volume, path string, fis
return err return err
} }
if !isXL2V1Format(buf) { if legacyJSON {
// Delete the meta file, if there are no more versions the // Delete the meta file, if there are no more versions the
// top level parent is automatically removed. // top level parent is automatically removed.
return s.deleteFile(volumeDir, pathJoin(volumeDir, path), true, false) return s.deleteFile(volumeDir, pathJoin(volumeDir, path), true, false)
} }
var xlMeta xlMetaV2 var xlMeta xlMetaV2
if err = xlMeta.Load(buf); err != nil { if err = xlMeta.LoadOrConvert(buf); err != nil {
return err return err
} }
@ -1038,6 +1040,7 @@ func (s *xlStorage) DeleteVersion(ctx context.Context, volume, path string, fi F
}) })
} }
var legacyJSON bool
buf, err := s.ReadAll(ctx, volume, pathJoin(path, xlStorageFormatFile)) buf, err := s.ReadAll(ctx, volume, pathJoin(path, xlStorageFormatFile))
if err != nil { if err != nil {
if err != errFileNotFound { if err != errFileNotFound {
@ -1056,6 +1059,7 @@ func (s *xlStorage) DeleteVersion(ctx context.Context, volume, path string, fi F
} }
return err return err
} }
legacyJSON = true
} }
if len(buf) == 0 { if len(buf) == 0 {
@ -1070,14 +1074,14 @@ func (s *xlStorage) DeleteVersion(ctx context.Context, volume, path string, fi F
return err return err
} }
if !isXL2V1Format(buf) { if legacyJSON {
// Delete the meta file, if there are no more versions the // Delete the meta file, if there are no more versions the
// top level parent is automatically removed. // top level parent is automatically removed.
return s.deleteFile(volumeDir, pathJoin(volumeDir, path), true, false) return s.deleteFile(volumeDir, pathJoin(volumeDir, path), true, false)
} }
var xlMeta xlMetaV2 var xlMeta xlMetaV2
if err := xlMeta.Load(buf); err != nil { if err = xlMeta.LoadOrConvert(buf); err != nil {
return err return err
} }