Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

luminous: rgw: handle S3 version 2 pre-signed urls with meta-data #25901

Merged
merged 2 commits into from Feb 25, 2019
Merged

luminous: rgw: handle S3 version 2 pre-signed urls with meta-data #25901

merged 2 commits into from Feb 25, 2019

Conversation

ashishkumsingh
Copy link
Contributor

@mattbenjamin @ashishkumsingh
rgw: distinguish parse_v4_credentials
dd7d957 
The caller and callees of this method are v4-specific, and their
names contain a v4 infix.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit aa8c686)

Conflicts:
	src/rgw/rgw_auth_s3.cc
	src/rgw/rgw_auth_s3.h
	src/rgw/rgw_rest_s3.cc
	   - Included v4 infix in 'parse_credentials()' and removed
	    "session_token" param from definition, declaration and call
	    of 'parse_v4_credentials()'.
@mattbenjamin @ashishkumsingh
rgw: handle S3 version 2 pre-signed urls with meta-data
966c6dc 
Add CanonicalizedAmzHeaders to the v2 signing document, as required
in https://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html

Also lift qs metadata into x_meta_map in RGWPutObj_ObjStore_S3::get_parms(),
so they are applied to the stored object.

Fixes: https://tracker.ceph.com/issues/23470
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 3b0480e)

Conflicts:
	src/rgw/rgw_rest_client.cc
	   - Used 'method()' instead of 'method.c_str()' and
	     'new_url.c_str()' instead of 'url.c_str()'
@ashishkumsingh ashishkumsingh added this to the luminous milestone Jan 10, 2019
@mattbenjamin mattbenjamin self-requested a review January 10, 2019 20:53
mattbenjamin
mattbenjamin approved these changes Jan 10, 2019
View reviewed changes
Copy link
Contributor

@mattbenjamin mattbenjamin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@smithfarm smithfarm changed the title luminous : rgw: handle S3 version 2 pre-signed urls with meta-data luminous: rgw: handle S3 version 2 pre-signed urls with meta-data Jan 17, 2019
@yuriw
Copy link
Contributor

yuriw commented Feb 21, 2019

wip-yuri5-testing-2019-02-21-1810-luminous

@yuriw yuriw merged commit cdd61f4 into ceph:luminous Feb 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattbenjamin mattbenjamin mattbenjamin approved these changes

Assignees
No one assigned
Labels
bug-fix luminous-batch-1 needs-qa rgw wip-yuri5-testing
Projects
None yet
Milestone
luminous
4 participants
@ashishkumsingh @yuriw @mattbenjamin @smithfarm