Validate object lock when setting replication config. (#10200)

Check if object lock is enabled on destination bucket while setting replication configuration on a object lock enabled bucket.

poornas committed 6 years ago

Commit 88daaef1 parent 1cdaced3 files · +23 −0Browse files

Unified · Split

3 files

 	ErrNoSuchWebsiteConfiguration
 	ErrReplicationConfigurationNotFoundError
 	ErrReplicationDestinationNotFoundError
+	ErrReplicationDestinationMissingLock
 	ErrReplicationTargetNotFoundError
 	ErrBucketRemoteIdenticalToSource
 	ErrBucketRemoteAlreadyExists
 		Description:    "The replication destination bucket does not exist",
 		HTTPStatusCode: http.StatusNotFound,
 	},
+	ErrReplicationDestinationMissingLock: {
+		Code:           "ReplicationDestinationMissingLockError",
+		Description:    "The replication destination bucket does not have object locking enabled",
+		HTTPStatusCode: http.StatusBadRequest,
+	},
 	ErrReplicationTargetNotFoundError: {
 		Code:           "XminioAdminReplicationTargetNotFoundError",
 		Description:    "The replication target does not exist",
 		apiErr = ErrReplicationConfigurationNotFoundError
 	case BucketReplicationDestinationNotFound:
 		apiErr = ErrReplicationDestinationNotFoundError
+	case BucketReplicationDestinationMissingLock:
+		apiErr = ErrReplicationDestinationMissingLock
 	case BucketRemoteTargetNotFound:
 		apiErr = ErrReplicationTargetNotFoundError
 	case BucketRemoteAlreadyExists:

@@ -56,6 +56,14 @@ func validateReplicationDestination(ctx context.Context, bucket string, rCfg *re · 55 unmodified lines
56	if found, _ := clnt.BucketExists(ctx, rCfg.GetDestination().Bucket); !found {	56	if found, _ := clnt.BucketExists(ctx, rCfg.GetDestination().Bucket); !found {
57	return false, BucketReplicationDestinationNotFound{Bucket: rCfg.GetDestination().Bucket}	57	return false, BucketReplicationDestinationNotFound{Bucket: rCfg.GetDestination().Bucket}
58	}	58	}
		59	if ret, err := globalBucketObjectLockSys.Get(bucket); err == nil {
		60	if ret.LockEnabled {
		61	lock, _, _, _, err := clnt.GetObjectLockConfig(ctx, rCfg.GetDestination().Bucket)
		62	if err != nil \|\| lock != "Enabled" {
		63	return false, BucketReplicationDestinationMissingLock{Bucket: rCfg.GetDestination().Bucket}
		64	}
		65	}
		66	}
59	// validate replication ARN against target endpoint	67	// validate replication ARN against target endpoint
60	c, ok := globalBucketTargetSys.arnRemotesMap[rCfg.ReplicationArn]	68	c, ok := globalBucketTargetSys.arnRemotesMap[rCfg.ReplicationArn]
61	if ok {	69	if ok {

@@ -362,6 +362,13 @@ func (e BucketReplicationDestinationNotFound) Error() string { · 361 unmodified lines
362	return "Destination bucket does not exist: " + e.Bucket	362	return "Destination bucket does not exist: " + e.Bucket
363	}	363	}
364		364
		365	// BucketReplicationDestinationMissingLock bucket does not have object lock enabled.
		366	type BucketReplicationDestinationMissingLock GenericError
		367
		368	func (e BucketReplicationDestinationMissingLock) Error() string {
		369	return "Destination bucket does not have object lock enabled: " + e.Bucket
		370	}
		371
365	// BucketRemoteTargetNotFound remote target does not exist.	372	// BucketRemoteTargetNotFound remote target does not exist.
366	type BucketRemoteTargetNotFound GenericError	373	type BucketRemoteTargetNotFound GenericError
367		374

Keyboard shortcuts