]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Validate S3 tokens against Keystone
authorRoald J. van Loon <roaldvanloon@gmail.com>
Fri, 9 Aug 2013 11:31:10 +0000 (13:31 +0200)
committerSage Weil <sage@inktank.com>
Fri, 13 Dec 2013 22:42:32 +0000 (14:42 -0800)
commite52b9b76844f935daf2dc060905f869248bba60b
tree3a8260e6d6fa17ad02f534f6b9e743a811df1865
parent5df2f35ee5797ffe85e8398b1ecf75f2eefb5031
Validate S3 tokens against Keystone

- Added config option to allow S3 to use Keystone auth
- Implemented JSONDecoder for KeystoneToken
- RGW_Auth_S3::authorize now uses rgw_store_user_info on keystone auth
- Minor fix in get_canon_resource; dout is now after the assignment

Reviewed-by: Yehuda Sadeh<yehuda@inktank.com>
Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
(cherry picked from commit a200e184b15a03a4ca382e94caf01efb41cb9db7)

Conflicts:
src/rgw/rgw_swift.h
src/Makefile.am
src/common/config_opts.h
src/rgw/rgw_auth_s3.cc
src/rgw/rgw_json_enc.cc
src/rgw/rgw_keystone.cc [new file with mode: 0644]
src/rgw/rgw_keystone.h [new file with mode: 0644]
src/rgw/rgw_rest_s3.cc
src/rgw/rgw_rest_s3.h
src/rgw/rgw_swift.cc
src/rgw/rgw_swift.h