diff options
Diffstat (limited to 'weed/s3api/s3api_bucket_handlers.go')
| -rw-r--r-- | weed/s3api/s3api_bucket_handlers.go | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/weed/s3api/s3api_bucket_handlers.go b/weed/s3api/s3api_bucket_handlers.go index e30f172a7..591aaafb3 100644 --- a/weed/s3api/s3api_bucket_handlers.go +++ b/weed/s3api/s3api_bucket_handlers.go @@ -753,11 +753,22 @@ func (s3a *S3ApiServer) PutBucketVersioningHandler(w http.ResponseWriter, r *htt } status := *versioningConfig.Status - if status != "Enabled" && status != "Suspended" { + if status != s3_constants.VersioningEnabled && status != s3_constants.VersioningSuspended { s3err.WriteErrorResponse(w, r, s3err.ErrInvalidRequest) return } + // Check if trying to suspend versioning on a bucket with object lock enabled + if status == s3_constants.VersioningSuspended { + // Get bucket configuration to check for object lock + bucketConfig, errCode := s3a.getBucketConfig(bucket) + if errCode == s3err.ErrNone && bucketConfig.ObjectLockConfig != nil { + // Object lock is enabled, cannot suspend versioning + s3err.WriteErrorResponse(w, r, s3err.ErrInvalidBucketState) + return + } + } + // Update bucket versioning configuration using new bucket config system if errCode := s3a.setBucketVersioningStatus(bucket, status); errCode != s3err.ErrNone { glog.Errorf("PutBucketVersioningHandler save config: %d", errCode) |