From: Radoslaw Zarzynski Date: Mon, 17 Apr 2017 20:13:23 +0000 (+0200) Subject: rgw: ONLY change names due to AWSv4 adoption in the auth infra. X-Git-Tag: v12.1.0~155^2~45 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8b4e14274d36c9282f71a3e01201fa1d53e821b3;p=ceph.git rgw: ONLY change names due to AWSv4 adoption in the auth infra. Signed-off-by: Radoslaw Zarzynski --- diff --git a/src/rgw/rgw_auth_keystone.h b/src/rgw/rgw_auth_keystone.h index 3645c07ef537..9bffa4362b30 100644 --- a/src/rgw/rgw_auth_keystone.h +++ b/src/rgw/rgw_auth_keystone.h @@ -71,7 +71,7 @@ public: }; /* class TokenEngine */ -class EC2Engine : public rgw::auth::s3::Version2ndEngine { +class EC2Engine : public rgw::auth::s3::AWSEngine { using acl_strategy_t = rgw::auth::RemoteApplier::acl_strategy_t; using auth_info_t = rgw::auth::RemoteApplier::AuthInfo; using result_t = rgw::auth::Engine::result_t; @@ -96,20 +96,20 @@ class EC2Engine : public rgw::auth::s3::Version2ndEngine { const req_state* s) const override; public: EC2Engine(CephContext* const cct, - const rgw::auth::s3::Version2ndEngine::Extractor* const extractor, + const rgw::auth::s3::AWSEngine::VersionAbstractor* const ver_abstractor, const rgw::auth::RemoteApplier::Factory* const apl_factory, rgw::keystone::Config& config, /* The token cache is used ONLY for the retrieving admin token. * Due to the architecture of AWS Auth S3 credentials cannot be * cached at all. */ rgw::keystone::TokenCache& token_cache) - : Version2ndEngine(cct, *extractor), + : AWSEngine(cct, *ver_abstractor), apl_factory(apl_factory), config(config), token_cache(token_cache) { } - using Version2ndEngine::authenticate; + using AWSEngine::authenticate; const char* get_name() const noexcept override { return "rgw::auth::keystone::EC2Engine"; diff --git a/src/rgw/rgw_auth_registry.h b/src/rgw/rgw_auth_registry.h index 18add9ae3a40..34da8873b10b 100644 --- a/src/rgw/rgw_auth_registry.h +++ b/src/rgw/rgw_auth_registry.h @@ -25,9 +25,9 @@ class StrategyRegistry { using s3_strategy_t = rgw::auth::s3::AWSv2AuthStrategy; using s3_main_strategy_t = \ - s3_strategy_t; + s3_strategy_t; using s3_post_strategy_t = \ - s3_strategy_t; + s3_strategy_t; s3_main_strategy_t s3_main_strategy; s3_post_strategy_t s3_post_strategy; diff --git a/src/rgw/rgw_auth_s3.h b/src/rgw/rgw_auth_s3.h index 262906f079ff..239047d4bf5f 100644 --- a/src/rgw/rgw_auth_s3.h +++ b/src/rgw/rgw_auth_s3.h @@ -47,13 +47,13 @@ class ExternalAuthStrategy : public rgw::auth::Strategy, public: ExternalAuthStrategy(CephContext* const cct, RGWRados* const store, - Version2ndEngine::Extractor* const extractor) + AWSEngine::VersionAbstractor* const ver_abstractor) : store(store), - keystone_engine(cct, extractor, + keystone_engine(cct, ver_abstractor, static_cast(this), keystone_config_t::get_instance(), keystone_cache_t::get_instance()), - ldap_engine(cct, store, *extractor, + ldap_engine(cct, store, *ver_abstractor, static_cast(this)) { if (cct->_conf->rgw_s3_auth_use_keystone && @@ -73,20 +73,20 @@ public: }; -template +template class AWSv2AuthStrategy : public rgw::auth::Strategy, public rgw::auth::LocalApplier::Factory { typedef rgw::auth::IdentityApplier::aplptr_t aplptr_t; - static_assert(std::is_base_of::value, - "ExtractorT must be a subclass of rgw::auth::s3::ExtractorT"); + static_assert(std::is_base_of::value, + "AbstractorT must be a subclass of rgw::auth::s3::VersionAbstractor"); RGWRados* const store; - ExtractorT extractor; + AbstractorT ver_abstractor; ExternalAuthStrategy external_engines; - LocalVersion2ndEngine local_engine; + LocalEngine local_engine; aplptr_t create_apl_local(CephContext* const cct, const req_state* const s, @@ -102,9 +102,9 @@ public: AWSv2AuthStrategy(CephContext* const cct, RGWRados* const store) : store(store), - extractor(cct), - external_engines(cct, store, &extractor), - local_engine(cct, store, extractor, + ver_abstractor(cct), + external_engines(cct, store, &ver_abstractor), + local_engine(cct, store, ver_abstractor, static_cast(this)) { Control local_engine_mode; diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h index 43f85ee5f944..a0de9b33a2c9 100644 --- a/src/rgw/rgw_common.h +++ b/src/rgw/rgw_common.h @@ -1383,7 +1383,7 @@ class RGWEnv; namespace rgw { namespace auth { namespace s3 { - class RGWGetPolicyV2Extractor; + class AWSBrowserUploadAbstractor; } class Completer; } @@ -1786,7 +1786,7 @@ struct req_state { /* Writer. */ friend class RGWPostObj_ObjStore_S3; /* Reader. */ - friend class rgw::auth::s3::RGWGetPolicyV2Extractor; + friend class rgw::auth::s3::AWSBrowserUploadAbstractor; std::string access_key; std::string signature; diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index 25fb01687a1e..f88d91f8c012 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -4035,8 +4035,8 @@ namespace rgw { namespace auth { namespace s3 { -bool rgw::auth::s3::RGWS3V2Extractor::is_time_skew_ok(const utime_t& header_time, - const bool qsr) const +bool AWSGeneralAbstractor::is_time_skew_ok(const utime_t& header_time, + const bool qsr) const { /* Check for time skew first. */ const time_t req_sec = header_time.sec(); @@ -4068,12 +4068,14 @@ static rgw::auth::Completer::cmplptr_t null_completer_factory() return nullptr; } -std::tuple -rgw::auth::s3::RGWS3V2Extractor::get_auth_data(const req_state* const s) const +using AWSVerAbstractor = AWSEngine::VersionAbstractor; + +std::tuple +AWSGeneralAbstractor::get_auth_data(const req_state* const s) const { std::string access_key_id; std::string signature; @@ -4131,12 +4133,12 @@ rgw::auth::s3::RGWS3V2Extractor::get_auth_data(const req_state* const s) const null_completer_factory); } -std::tuple -RGWGetPolicyV2Extractor::get_auth_data(const req_state* const s) const +std::tuple +AWSBrowserUploadAbstractor::get_auth_data(const req_state* const s) const { return std::make_tuple(s->auth.s3_postobj_creds.access_key, s->auth.s3_postobj_creds.signature, @@ -4238,12 +4240,12 @@ rgw::auth::s3::LDAPEngine::authenticate(const std::string& access_key_id, } -/* LocalVersion2ndEngine */ +/* LocalEndgine */ rgw::auth::Engine::result_t -rgw::auth::s3::LocalVersion2ndEngine::authenticate(const std::string& access_key_id, - const std::string& signature, - const std::string& string_to_sign, - const req_state* const s) const +rgw::auth::s3::LocalEngine::authenticate(const std::string& access_key_id, + const std::string& signature, + const std::string& string_to_sign, + const req_state* const s) const { /* get the user info */ RGWUserInfo user_info; diff --git a/src/rgw/rgw_rest_s3.h b/src/rgw/rgw_rest_s3.h index 5c4b6777aecb..3c563f0254f0 100644 --- a/src/rgw/rgw_rest_s3.h +++ b/src/rgw/rgw_rest_s3.h @@ -670,11 +670,11 @@ namespace auth { namespace s3 { -class Version2ndEngine : public rgw::auth::Engine { +class AWSEngine : public rgw::auth::Engine { public: - class Extractor { + class VersionAbstractor { public: - virtual ~Extractor() {}; + virtual ~VersionAbstractor() {}; using access_key_id_t = std::string; using signature_t = std::string; @@ -703,11 +703,11 @@ public: protected: CephContext* cct; - const Extractor& extractor; + const VersionAbstractor& ver_abstractor; - Version2ndEngine(CephContext* const cct, const Extractor& extractor) + AWSEngine(CephContext* const cct, const VersionAbstractor& ver_abstractor) : cct(cct), - extractor(extractor) { + ver_abstractor(ver_abstractor) { } using result_t = rgw::auth::Engine::result_t; @@ -723,15 +723,15 @@ public: std::string signature; std::string string_to_sign; - Extractor::signature_factory_t signing_key_factory; - Extractor::completer_factory_t completer_factory; + VersionAbstractor::signature_factory_t signature_factory; + VersionAbstractor::completer_factory_t completer_factory; - /* Small reminder: an extractor is allowed to throw! */ + /* Small reminder: an ver_abstractor is allowed to throw! */ std::tie(access_key_id, signature, string_to_sign, - signing_key_factory, - completer_factory) = extractor.get_auth_data(s); + signature_factory, + completer_factory) = ver_abstractor.get_auth_data(s); if (access_key_id.empty() || signature.empty()) { return result_t::deny(-EINVAL); @@ -741,14 +741,14 @@ public: } }; -class RGWS3V2Extractor : public Version2ndEngine::Extractor { +class AWSGeneralAbstractor : public AWSEngine::VersionAbstractor { CephContext* const cct; bool is_time_skew_ok(const utime_t& header_time, const bool qsr) const; public: - RGWS3V2Extractor(CephContext* const cct) + AWSGeneralAbstractor(CephContext* const cct) : cct(cct) { } @@ -761,14 +761,14 @@ public: }; -class RGWGetPolicyV2Extractor : public Version2ndEngine::Extractor { +class AWSBrowserUploadAbstractor : public AWSEngine::VersionAbstractor { static std::string to_string(ceph::bufferlist bl) { return std::string(bl.c_str(), static_cast(bl.length())); } public: - RGWGetPolicyV2Extractor(CephContext*) { + AWSBrowserUploadAbstractor(CephContext*) { } std::tuple