MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-22 10:37:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: reject ilm rule when bucket LockEnabled (#19785)

Browse Source
This commit is contained in:
jiuker
2024-05-22 14:50:03 +08:00
committed by GitHub
parent bf1769d3e0
commit 9906b3ade9
5 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/bucket/lifecycle/lifecycle.go
View File

@@ -27,6 +27,7 @@ import (
"time"
"github.com/google/uuid"
"github.com/minio/minio/internal/bucket/object/lock"
xhttp "github.com/minio/minio/internal/http"
)
@@ -236,7 +237,7 @@ func ParseLifecycleConfig(reader io.Reader) (*Lifecycle, error) {
}
// Validate - validates the lifecycle configuration
func (lc Lifecycle) Validate() error {
func (lc Lifecycle) Validate(lr lock.Retention) error {
// Lifecycle config can't have more than 1000 rules
if len(lc.Rules) > 1000 {
return errLifecycleTooManyRules
@@ -251,6 +252,12 @@ func (lc Lifecycle) Validate() error {
if err := r.Validate(); err != nil {
return err
}
if (r.Expiration.DeleteMarker.val || // DeleteVersionAction
!r.DelMarkerExpiration.Empty() || // DelMarkerDeleteAllVersionsAction
!r.NoncurrentVersionExpiration.IsDaysNull() || // DeleteVersionAction
!r.Expiration.IsDaysNull()) && lr.LockEnabled {
return fmt.Errorf("DeleteAllVersions and DeleteMarkerDeleteAllVersions cannot be set when bucket lock is enabled")
}
}
// Make sure Rule ID is unique
for i := range lc.Rules {