From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Wed, 11 Jan 2017 18:31:26 +0000 (+0100)
Subject: rgw: apply the new filters over appliers in the Swift's auth strategy.
X-Git-Tag: v12.0.2~305^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=764ba0a49ad7e50ee23645fca513b8ae897aff06;p=ceph-ci.git

rgw: apply the new filters over appliers in the Swift's auth strategy.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---

diff --git a/src/rgw/rgw_swift_auth.h b/src/rgw/rgw_swift_auth.h
index e11e87f19a9..a05ae3233b9 100644
--- a/src/rgw/rgw_swift_auth.h
+++ b/src/rgw/rgw_swift_auth.h
@@ -165,15 +165,25 @@ class DefaultStrategy : public rgw::auth::Strategy,
                              const req_state* const s,
                              acl_strategy_t&& extra_acl_strategy,
                              const rgw::auth::RemoteApplier::AuthInfo info) const override {
-    return aplptr_t(
-      new rgw::auth::RemoteApplier(cct, store, std::move(extra_acl_strategy), info));
+    auto apl = \
+      rgw::auth::add_3rdparty(store, s->account_name,
+        rgw::auth::add_sysreq(cct, store, s,
+          rgw::auth::RemoteApplier(cct, store, std::move(extra_acl_strategy),
+                                   info)));
+    /* TODO(rzarzynski): replace with static_ptr. */
+    return aplptr_t(new decltype(apl)(std::move(apl)));
   }
 
   aplptr_t create_apl_local(CephContext* const cct,
                             const req_state* const s,
                             const RGWUserInfo& user_info,
                             const std::string& subuser) const override {
-    return aplptr_t(new rgw::auth::LocalApplier(cct, user_info, subuser));
+    auto apl = \
+      rgw::auth::add_3rdparty(store, s->account_name,
+        rgw::auth::add_sysreq(cct, store, s,
+          rgw::auth::LocalApplier(cct, user_info, subuser)));
+    /* TODO(rzarzynski): replace with static_ptr. */
+    return aplptr_t(new decltype(apl)(std::move(apl)));
   }
 
   aplptr_t create_apl_turl(CephContext* const cct,