From: Casey Bodley Date: Mon, 24 Oct 2022 19:03:07 +0000 (-0400) Subject: rgw/auth: strategies take ImplicitTenants by const ref X-Git-Tag: v18.1.0~650^2~9 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=26c600bf3c870d6ff322a3c5788561b1c6dd2e0b;p=ceph-ci.git rgw/auth: strategies take ImplicitTenants by const ref Signed-off-by: Casey Bodley --- diff --git a/src/rgw/rgw_auth.h b/src/rgw/rgw_auth.h index 23dbc46aa57..b0beb185bac 100644 --- a/src/rgw/rgw_auth.h +++ b/src/rgw/rgw_auth.h @@ -518,7 +518,7 @@ private: }; public: ImplicitTenants(const ConfigProxy& c) { recompute_value(c);} - ImplicitTenantValue get_value() { + ImplicitTenantValue get_value() const { return ImplicitTenantValue(saved); } private: @@ -591,7 +591,7 @@ protected: const acl_strategy_t extra_acl_strategy; const AuthInfo info; - rgw::auth::ImplicitTenants& implicit_tenant_context; + const rgw::auth::ImplicitTenants& implicit_tenant_context; const rgw::auth::ImplicitTenants::implicit_tenant_flag_bits implicit_tenant_bit; virtual void create_account(const DoutPrefixProvider* dpp, @@ -604,7 +604,7 @@ public: rgw::sal::Driver* driver, acl_strategy_t&& extra_acl_strategy, const AuthInfo& info, - rgw::auth::ImplicitTenants& implicit_tenant_context, + const rgw::auth::ImplicitTenants& implicit_tenant_context, rgw::auth::ImplicitTenants::implicit_tenant_flag_bits implicit_tenant_bit) : cct(cct), driver(driver), diff --git a/src/rgw/rgw_auth_registry.h b/src/rgw/rgw_auth_registry.h index 01ba057acec..003c32d87eb 100644 --- a/src/rgw/rgw_auth_registry.h +++ b/src/rgw/rgw_auth_registry.h @@ -37,7 +37,7 @@ class StrategyRegistry { s3_main_strategy_boto2_t s3_main_strategy_boto2; s3_main_strategy_t(CephContext* const cct, - ImplicitTenants& implicit_tenant_context, + const ImplicitTenants& implicit_tenant_context, rgw::sal::Driver* driver) : s3_main_strategy_plain(cct, implicit_tenant_context, driver), s3_main_strategy_boto2(cct, implicit_tenant_context, driver) { @@ -60,7 +60,7 @@ class StrategyRegistry { public: StrategyRegistry(CephContext* const cct, - ImplicitTenants& implicit_tenant_context, + const ImplicitTenants& implicit_tenant_context, rgw::sal::Driver* driver) : s3_main_strategy(cct, implicit_tenant_context, driver), s3_post_strategy(cct, implicit_tenant_context, driver), @@ -86,7 +86,7 @@ public: static std::shared_ptr create(CephContext* const cct, - ImplicitTenants& implicit_tenant_context, + const ImplicitTenants& implicit_tenant_context, rgw::sal::Driver* driver) { return std::make_shared(cct, implicit_tenant_context, driver); } diff --git a/src/rgw/rgw_auth_s3.h b/src/rgw/rgw_auth_s3.h index 241bc6858fb..2984c051662 100644 --- a/src/rgw/rgw_auth_s3.h +++ b/src/rgw/rgw_auth_s3.h @@ -36,7 +36,7 @@ class STSAuthStrategy : public rgw::auth::Strategy, public rgw::auth::RoleApplier::Factory { typedef rgw::auth::IdentityApplier::aplptr_t aplptr_t; rgw::sal::Driver* driver; - rgw::auth::ImplicitTenants& implicit_tenant_context; + const rgw::auth::ImplicitTenants& implicit_tenant_context; STSEngine sts_engine; @@ -74,7 +74,7 @@ class STSAuthStrategy : public rgw::auth::Strategy, public: STSAuthStrategy(CephContext* const cct, rgw::sal::Driver* driver, - rgw::auth::ImplicitTenants& implicit_tenant_context, + const rgw::auth::ImplicitTenants& implicit_tenant_context, AWSEngine::VersionAbstractor* const ver_abstractor) : driver(driver), implicit_tenant_context(implicit_tenant_context), @@ -96,7 +96,7 @@ class ExternalAuthStrategy : public rgw::auth::Strategy, public rgw::auth::RemoteApplier::Factory { typedef rgw::auth::IdentityApplier::aplptr_t aplptr_t; rgw::sal::Driver* driver; - rgw::auth::ImplicitTenants& implicit_tenant_context; + const rgw::auth::ImplicitTenants& implicit_tenant_context; using keystone_config_t = rgw::keystone::CephCtxConfig; using keystone_cache_t = rgw::keystone::TokenCache; @@ -121,7 +121,7 @@ class ExternalAuthStrategy : public rgw::auth::Strategy, public: ExternalAuthStrategy(CephContext* const cct, rgw::sal::Driver* driver, - rgw::auth::ImplicitTenants& implicit_tenant_context, + const rgw::auth::ImplicitTenants& implicit_tenant_context, AWSEngine::VersionAbstractor* const ver_abstractor) : driver(driver), implicit_tenant_context(implicit_tenant_context), @@ -219,7 +219,7 @@ public: } AWSAuthStrategy(CephContext* const cct, - rgw::auth::ImplicitTenants& implicit_tenant_context, + const rgw::auth::ImplicitTenants& implicit_tenant_context, rgw::sal::Driver* driver) : driver(driver), ver_abstractor(cct), diff --git a/src/rgw/rgw_rest_sts.h b/src/rgw/rgw_rest_sts.h index 9083bf64533..9c9488c6c17 100644 --- a/src/rgw/rgw_rest_sts.h +++ b/src/rgw/rgw_rest_sts.h @@ -85,7 +85,7 @@ class DefaultStrategy : public rgw::auth::Strategy, public rgw::auth::TokenExtractor, public rgw::auth::WebIdentityApplier::Factory { rgw::sal::Driver* driver; - ImplicitTenants& implicit_tenant_context; + const ImplicitTenants& implicit_tenant_context; /* The engine. */ const WebTokenEngine web_token_engine; @@ -111,7 +111,7 @@ class DefaultStrategy : public rgw::auth::Strategy, public: DefaultStrategy(CephContext* const cct, - ImplicitTenants& implicit_tenant_context, + const ImplicitTenants& implicit_tenant_context, rgw::sal::Driver* driver) : driver(driver), implicit_tenant_context(implicit_tenant_context), diff --git a/src/rgw/rgw_swift_auth.h b/src/rgw/rgw_swift_auth.h index 8ff731e061f..1d5a54dde60 100644 --- a/src/rgw/rgw_swift_auth.h +++ b/src/rgw/rgw_swift_auth.h @@ -186,7 +186,7 @@ class DefaultStrategy : public rgw::auth::Strategy, public rgw::auth::LocalApplier::Factory, public rgw::auth::swift::TempURLApplier::Factory { rgw::sal::Driver* driver; - ImplicitTenants& implicit_tenant_context; + const ImplicitTenants& implicit_tenant_context; /* The engines. */ const rgw::auth::swift::TempURLEngine tempurl_engine; @@ -255,7 +255,7 @@ class DefaultStrategy : public rgw::auth::Strategy, public: DefaultStrategy(CephContext* const cct, - ImplicitTenants& implicit_tenant_context, + const ImplicitTenants& implicit_tenant_context, rgw::sal::Driver* _driver) : driver(_driver), implicit_tenant_context(implicit_tenant_context),