rgw: remove rgw/rgw_auth_decoimpl.h as it isn't necessary anymore.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

diff --git a/src/rgw/rgw_auth_decoimpl.h b/src/rgw/rgw_auth_decoimpl.h
deleted file mode 100644 (file)
index bd37426..0000000
--- a/src/rgw/rgw_auth_decoimpl.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-
-
-#ifndef CEPH_RGW_AUTH_DECOIMPL_H
-#define CEPH_RGW_AUTH_DECOIMPL_H
-
-#include "rgw_auth.h"
-
-
-/* Abstract decorator over any implementation of RGWAuthApplier. */
-template <typename DecorateeT>
-class RGWDecoratingAuthApplier : public RGWAuthApplier {
-  static_assert(std::is_base_of<RGWAuthApplier, DecorateeT>::value,
-                "DecorateeT must be a subclass of RGWAuthApplier");
-  DecorateeT decoratee;
-
-public:
-  RGWDecoratingAuthApplier(const DecorateeT& decoratee)
-    : RGWAuthApplier(decoratee.cct),
-      decoratee(decoratee) {
-  }
-
-  uint32_t get_perms_from_aclspec(const aclspec_t& aclspec) const override {
-    return decoratee.get_perms_from_aclspec(aclspec);
-  }
-
-  bool is_admin_of(const rgw_user& uid) const override {
-    return decoratee.is_admin_of(uid);
-  }
-
-  bool is_owner_of(const rgw_user& uid) const override {
-    return decoratee.is_owner_of(uid);
-  }
-
-  uint32_t get_perm_mask() const override {
-    return decoratee.get_perm_mask();
-  }
-
-  void to_str(std::ostream& out) const override {
-    decoratee.to_str(out);
-  }
-
-  void load_acct_info(RGWUserInfo& user_info) const override {  /* out */
-    return decoratee.load_acct_info(user_info);
-  }
-
-  void modify_request_state(req_state * s) const override {     /* in/out */
-    return decoratee.modify_request_state(s);
-  }
-};
-
-
-/* Decorator specialization for dealing with pointers to an applier. Useful
- * for decorating the applier returned after successfull authenication. */
-template <>
-class RGWDecoratingAuthApplier<RGWAuthApplier::aplptr_t> : public RGWAuthApplier {
-  aplptr_t decoratee;
-
-public:
-  RGWDecoratingAuthApplier(aplptr_t&& decoratee)
-    : RGWAuthApplier(decoratee->cct),
-      decoratee(std::move(decoratee)) {
-  }
-
-  uint32_t get_perms_from_aclspec(const aclspec_t& aclspec) const override {
-    return decoratee->get_perms_from_aclspec(aclspec);
-  }
-
-  bool is_admin_of(const rgw_user& uid) const override {
-    return decoratee->is_admin_of(uid);
-  }
-
-  bool is_owner_of(const rgw_user& uid) const override {
-    return decoratee->is_owner_of(uid);
-  }
-
-  uint32_t get_perm_mask() const override {
-    return decoratee->get_perm_mask();
-  }
-
-  void to_str(std::ostream& out) const override {
-    decoratee->to_str(out);
-  }
-
-  void load_acct_info(RGWUserInfo& user_info) const override {  /* out */
-    return decoratee->load_acct_info(user_info);
-  }
-
-  void modify_request_state(req_state * s) const override {     /* in/out */
-    return decoratee->modify_request_state(s);
-  }
-};
-
-
-template <typename T>
-class RGWThirdPartyAccountAuthApplier : public RGWDecoratingAuthApplier<T> {
-  /* const */RGWRados * const store;
-  const rgw_user acct_user_override;
-public:
-  /* A value representing situations where there is no requested account
-   * override. In other words, acct_user_override will be equal to this
-   * constant where the request isn't a cross-tenant one. */
-  static const rgw_user UNKNOWN_ACCT;
-
-  template <typename U>
-  RGWThirdPartyAccountAuthApplier(U&& decoratee,
-                                  RGWRados * const store,
-                                  const rgw_user acct_user_override)
-    : RGWDecoratingAuthApplier<T>(std::move(decoratee)),
-      store(store),
-      acct_user_override(acct_user_override) {
-  }
-
-  void to_str(std::ostream& out) const override;
-  void load_acct_info(RGWUserInfo& user_info) const override;   /* out */
-};
-
-/* static declaration: UNKNOWN_ACCT will be an empty rgw_user that is a result
- * of the default construction. */
-template <typename T>
-const rgw_user RGWThirdPartyAccountAuthApplier<T>::UNKNOWN_ACCT;
-
-template <typename T>
-void RGWThirdPartyAccountAuthApplier<T>::to_str(std::ostream& out) const
-{
-  out << "RGWThirdPartyAccountAuthApplier(" + acct_user_override.to_str() + ")"
-      <<   " -> ";
-  RGWDecoratingAuthApplier<T>::to_str(out);
-}
-
-template <typename T>
-void RGWThirdPartyAccountAuthApplier<T>::load_acct_info(RGWUserInfo& user_info) const
-{
-  if (UNKNOWN_ACCT == acct_user_override) {
-    /* There is no override specified by the upper layer. This means that we'll
-     * load the account owned by the authenticated identity (aka auth_user). */
-    RGWDecoratingAuthApplier<T>::load_acct_info(user_info);
-  } else if (RGWDecoratingAuthApplier<T>::is_owner_of(acct_user_override)) {
-    /* The override has been specified but the account belongs to the authenticated
-     * identity. We may safely forward the call to a next stage. */
-    RGWDecoratingAuthApplier<T>::load_acct_info(user_info);
-  } else {
-    /* Compatibility mechanism for multi-tenancy. For more details refer to
-     * load_acct_info method of RGWRemoteAuthApplier. */
-    if (acct_user_override.tenant.empty()) {
-      const rgw_user tenanted_uid(acct_user_override.id, acct_user_override.id);
-
-      if (rgw_get_user_info_by_uid(store, tenanted_uid, user_info) >= 0) {
-        /* Succeeded. */
-        return;
-      }
-    }
-
-    int ret = rgw_get_user_info_by_uid(store, acct_user_override, user_info);
-    if (ret < 0) {
-      /* We aren't trying to recover from ENOENT here. It's supposed that creating
-       * someone else's account isn't a thing we want to support in this filter. */
-      if (ret == -ENOENT) {
-        throw -EACCES;
-      } else {
-        throw ret;
-      }
-    }
-
-  }
-}
-
-#endif /* CEPH_RGW_AUTH_DECOIMPL_H */

diff --git a/src/rgw/rgw_rest_s3.h b/src/rgw/rgw_rest_s3.h
index 1ba7242be846652ef4ad51c317285fa57d93234b..edc93966d39919b7c7d44a39bd18c64ad92a8bb5 100644 (file)
--- a/src/rgw/rgw_rest_s3.h
+++ b/src/rgw/rgw_rest_s3.h
@@ -22,7 +22,6 @@
 #include "include/assert.h"
 
 #include "rgw_auth.h"
-#include "rgw_auth_decoimpl.h"
 #include "rgw_auth_filters.h"
 
 #define RGW_AUTH_GRACE_MINS 15

diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index 94f31cd61c02d4d647bc678e26c70231edecedc5..3bcd7bf58bf2203cd332229af2d145ca54b5575c 100644 (file)
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -19,7 +19,6 @@
 #include "rgw_client_io.h"
 
 #include "rgw_auth.h"
-#include "rgw_auth_decoimpl.h"
 #include "rgw_swift_auth.h"
 
 #include "rgw_request.h"