rgw/auth: strategies take ImplicitTenants by const ref

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/rgw/rgw_auth.h b/src/rgw/rgw_auth.h
index 23dbc46aa5726830b30a3e4ce12c1d7facfe18a4..b0beb185bac1223ab54d5ce4efed4e751414b1e4 100644 (file)
--- 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 01ba057acec10254af3606864c35c823579744b1..003c32d87ebdaf07d2c361bcc9d8fa183028df03 100644 (file)
--- 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<StrategyRegistry>
   create(CephContext* const cct,
-         ImplicitTenants& implicit_tenant_context,
+         const ImplicitTenants& implicit_tenant_context,
          rgw::sal::Driver* driver) {
     return std::make_shared<StrategyRegistry>(cct, implicit_tenant_context, driver);
   }

diff --git a/src/rgw/rgw_auth_s3.h b/src/rgw/rgw_auth_s3.h
index 241bc6858fbfc33ca24ba70879882b91ac161c8c..2984c051662ddc47e08e81e411d2a042fa27499a 100644 (file)
--- 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 9083bf64533f8297818874cbed22e928763e4511..9c9488c6c171c525b693af75c4a7c00b26728d1a 100644 (file)
--- 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 8ff731e061f6a46f4805d1749d2ba8e401866010..1d5a54dde6003e29d117d11e3f9aad978706e451 100644 (file)
--- 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),