MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-03-30 01:03:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

batch-repl: Do not allow both source/target to be remote (#19434)

Browse Source 
Return an error when the user specifies endpoints for both source
and target. This can generate many type of errors as the code considers
a deployment remote if its endpoint is specified.
This commit is contained in:
Anis Eleuch 2024-04-08 15:11:38 +01:00 committed by GitHub
parent f06fee0364
commit 787c44c39d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/batch-handlers.go
View File

@ -1247,9 +1247,18 @@ func (r *BatchJobReplicateV1) Validate(ctx context.Context, job BatchJobRequest,
return errInvalidArgument return errInvalidArgument
} }
if r.Source.Bucket == "" { if r.Source.Endpoint != "" && r.Target.Endpoint != "" {
return errInvalidArgument return errInvalidArgument
} }
if r.Source.Creds.Empty() && r.Target.Creds.Empty() {
return errInvalidArgument
}
if r.Source.Bucket == "" || r.Target.Bucket == "" {
return errInvalidArgument
}
var isRemoteToLocal bool var isRemoteToLocal bool
localBkt := r.Source.Bucket localBkt := r.Source.Bucket
if r.Source.Endpoint != "" { if r.Source.Endpoint != "" {
@ -1274,9 +1283,6 @@ func (r *BatchJobReplicateV1) Validate(ctx context.Context, job BatchJobRequest,
if err := r.Source.Snowball.Validate(); err != nil { if err := r.Source.Snowball.Validate(); err != nil {
return err return err
} }
if r.Source.Creds.Empty() && r.Target.Creds.Empty() {
return errInvalidArgument
}
if !r.Source.Creds.Empty() { if !r.Source.Creds.Empty() {
if err := r.Source.Creds.Validate(); err != nil { if err := r.Source.Creds.Validate(); err != nil {
@ -1298,9 +1304,6 @@ func (r *BatchJobReplicateV1) Validate(ctx context.Context, job BatchJobRequest,
if r.Target.Endpoint != "" && !r.Target.Type.isMinio() && !r.Target.ValidPath() { if r.Target.Endpoint != "" && !r.Target.Type.isMinio() && !r.Target.ValidPath() {
return errInvalidArgument return errInvalidArgument
} }
if r.Target.Bucket == "" {
return errInvalidArgument
}
if !r.Target.Creds.Empty() { if !r.Target.Creds.Empty() {
if err := r.Target.Creds.Validate(); err != nil { if err := r.Target.Creds.Validate(); err != nil {
@ -1308,10 +1311,6 @@ func (r *BatchJobReplicateV1) Validate(ctx context.Context, job BatchJobRequest,
} }
} }
if r.Source.Creds.Empty() && r.Target.Creds.Empty() {
return errInvalidArgument
}
if err := r.Target.Type.Validate(); err != nil { if err := r.Target.Type.Validate(); err != nil {
return err return err
} }