Handle source objects used client side encryption for compose object. #739
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
api-compose-object.go
Outdated
| @@ -315,6 +315,12 @@ func (c Client) ComposeObject(dst DestinationInfo, srcs []SourceInfo) error { | |||
| return fmt.Errorf("Could not get source props for %s/%s: %v", src.bucket, src.object, err) | |||
| } | |||
|
|
|||
| // Error out if client side encryption is used in this source object. | |||
| if src.Headers.Get("x-amz-meta-x-amz-key") != "" { | |||
There was a problem hiding this comment.
Did you verify what is the AWS S3 behavior in this scenario? @balamurugana
balamurugana
changed the title
harshavardhana
previously approved these changes
Jul 4, 2017
krisis
requested changes
Jul 4, 2017
api-compose-object.go
Outdated
| @@ -315,6 +315,13 @@ func (c Client) ComposeObject(dst DestinationInfo, srcs []SourceInfo) error { | |||
| return fmt.Errorf("Could not get source props for %s/%s: %v", src.bucket, src.object, err) | |||
| } | |||
|
|
|||
| // Error out if client side encryption is used in this source object when | |||
| // more than one source objects are given. | |||
| if i > 0 && src.Headers.Get("x-amz-meta-x-amz-key") != "" { | |||
There was a problem hiding this comment.
This check won't catch the case where the first source object is encrypted while others are not. I.e, i == 0 && src.Headers.Get("x-amz-meta-x-amz-key") != "" is true.
There was a problem hiding this comment.
Come to think of it i think this code needs to loop through an validates all sourceInfos.
When multiple source objects are used for compose object, errors out if client side encryption is used in source object. Fixes minio#738
krisis
approved these changes
Jul 4, 2017
harshavardhana
approved these changes
Jul 4, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When multiple source objects are used for compose object, errors out
if client side encryption is used in source object.
Fixes #738