diff options
| author | Radoslaw Zarzynski <rzarzynski@mirantis.com> | 2017-03-20 04:35:42 +0100 |
|---|---|---|
| committer | Radoslaw Zarzynski <rzarzynski@mirantis.com> | 2017-03-24 22:45:28 +0100 |
| commit | 9888ec33d54613dd91fac05d30567daf14c6b31b (patch) | |
| tree | ee04ecbfcb7b3498b781c5cc13b3f93cadaec0f1 /src/rgw/rgw_rest_swift.h | |
| parent | rgw: the S3's local v2 auth engine becomes a fallback conditionally. (diff) | |
| download | ceph-9888ec33d54613dd91fac05d30567daf14c6b31b.tar.xz ceph-9888ec33d54613dd91fac05d30567daf14c6b31b.zip | |
rgw: implement the dynamic reconfiguration of auth strategies.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Diffstat (limited to 'src/rgw/rgw_rest_swift.h')
| -rw-r--r-- | src/rgw/rgw_rest_swift.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/rgw/rgw_rest_swift.h b/src/rgw/rgw_rest_swift.h index a28fc2836c0..d2a1d72d8f1 100644 --- a/src/rgw/rgw_rest_swift.h +++ b/src/rgw/rgw_rest_swift.h @@ -368,8 +368,6 @@ public: }; class RGWRESTMgr_SWIFT : public RGWRESTMgr { - const rgw::auth::Strategy& auth_strategy; - protected: RGWRESTMgr* get_resource_mgr_as_default(struct req_state* const s, const std::string& uri, @@ -378,12 +376,11 @@ protected: } public: - RGWRESTMgr_SWIFT(const rgw::auth::Strategy* const auth_strategy) - : auth_strategy(*auth_strategy) { - } + RGWRESTMgr_SWIFT() = default; ~RGWRESTMgr_SWIFT() override = default; RGWHandler_REST *get_handler(struct req_state *s, + const rgw::auth::StrategyRegistry& auth_registry, const std::string& frontend_prefix) override; }; @@ -454,6 +451,7 @@ public: ~RGWRESTMgr_SWIFT_CrossDomain() override = default; RGWHandler_REST* get_handler(struct req_state* const s, + const rgw::auth::StrategyRegistry&, const std::string&) override { s->prot_flags |= RGW_REST_SWIFT; return new RGWHandler_SWIFT_CrossDomain; @@ -509,6 +507,7 @@ public: ~RGWRESTMgr_SWIFT_HealthCheck() override = default; RGWHandler_REST* get_handler(struct req_state* const s, + const rgw::auth::StrategyRegistry&, const std::string&) override { s->prot_flags |= RGW_REST_SWIFT; return new RGWHandler_SWIFT_HealthCheck; @@ -518,10 +517,7 @@ public: class RGWHandler_REST_SWIFT_Info : public RGWHandler_REST_SWIFT { public: - //using RGWHandler_REST_SWIFT::RGWHandler_REST_SWIFT; - RGWHandler_REST_SWIFT_Info(const rgw::auth::Strategy& auth_strategy) - : RGWHandler_REST_SWIFT(auth_strategy) { - } + using RGWHandler_REST_SWIFT::RGWHandler_REST_SWIFT; ~RGWHandler_REST_SWIFT_Info() override = default; RGWOp *op_get() override { @@ -552,15 +548,12 @@ public: }; class RGWRESTMgr_SWIFT_Info : public RGWRESTMgr { - const rgw::auth::Strategy& auth_strategy; - public: - RGWRESTMgr_SWIFT_Info(const rgw::auth::Strategy* const auth_strategy) - : auth_strategy(*auth_strategy) { - } + RGWRESTMgr_SWIFT_Info() = default; ~RGWRESTMgr_SWIFT_Info() override = default; RGWHandler_REST *get_handler(struct req_state* s, + const rgw::auth::StrategyRegistry& auth_registry, const std::string& frontend_prefix) override; }; |