import quincy beta 17.1.0

[ceph.git] / ceph / src / rgw / rgw_tools.h

diff --git a/ceph/src/rgw/rgw_tools.h b/ceph/src/rgw/rgw_tools.h
index c1da97c890892b827cbb7ab95711b7388842bc72..b842916fd876781ad0b970402ef81c0c0ec800c0 100644 (file)
--- a/ceph/src/rgw/rgw_tools.h
+++ b/ceph/src/rgw/rgw_tools.h
@@ -20,7 +20,7 @@ class RGWSysObjectCtx;
 struct RGWObjVersionTracker;
 class optional_yield;
 namespace rgw { namespace sal {
-  class RGWRadosStore;
+  class Store;
 } }
 
 struct obj_version;
@@ -54,15 +54,15 @@ static inline int rgw_shards_mod(unsigned hval, int max_shards)
 }
 
 // used for logging and tagging
-inline int rgw_shard_id(const string& key, int max_shards)
+inline int rgw_shard_id(const std::string& key, int max_shards)
 {
   return rgw_shards_mod(ceph_str_hash_linux(key.c_str(), key.size()),
                        max_shards);
 }
 
-void rgw_shard_name(const string& prefix, unsigned max_shards, const string& key, string& name, int *shard_id);
-void rgw_shard_name(const string& prefix, unsigned max_shards, const string& section, const string& key, string& name);
-void rgw_shard_name(const string& prefix, unsigned shard_id, string& name);
+void rgw_shard_name(const std::string& prefix, unsigned max_shards, const std::string& key, std::string& name, int *shard_id);
+void rgw_shard_name(const std::string& prefix, unsigned max_shards, const std::string& section, const std::string& key, std::string& name);
+void rgw_shard_name(const std::string& prefix, unsigned shard_id, std::string& name);
 
 struct rgw_name_to_flag {
   const char *type_name;
@@ -70,22 +70,22 @@ struct rgw_name_to_flag {
 };
 
 int rgw_parse_list_of_flags(struct rgw_name_to_flag *mapping,
-                           const string& str, uint32_t *perm);
+                           const std::string& str, uint32_t *perm);
 
-int rgw_put_system_obj(const DoutPrefixProvider *dpp, RGWSysObjectCtx& obj_ctx, const rgw_pool& pool, const string& oid, bufferlist& data, bool exclusive,
-                       RGWObjVersionTracker *objv_tracker, real_time set_mtime, optional_yield y, map<string, bufferlist> *pattrs = NULL);
-int rgw_get_system_obj(RGWSysObjectCtx& obj_ctx, const rgw_pool& pool, const string& key, bufferlist& bl,
-                       RGWObjVersionTracker *objv_tracker, real_time *pmtime, optional_yield y, const DoutPrefixProvider *dpp, map<string, bufferlist> *pattrs = NULL,
+int rgw_put_system_obj(const DoutPrefixProvider *dpp, RGWSysObjectCtx& obj_ctx, const rgw_pool& pool, const std::string& oid, bufferlist& data, bool exclusive,
+                       RGWObjVersionTracker *objv_tracker, real_time set_mtime, optional_yield y, std::map<std::string, bufferlist> *pattrs = NULL);
+int rgw_get_system_obj(RGWSysObjectCtx& obj_ctx, const rgw_pool& pool, const std::string& key, bufferlist& bl,
+                       RGWObjVersionTracker *objv_tracker, real_time *pmtime, optional_yield y, const DoutPrefixProvider *dpp, std::map<std::string, bufferlist> *pattrs = NULL,
                        rgw_cache_entry_info *cache_info = NULL,
-                      boost::optional<obj_version> refresh_version = boost::none);
+                      boost::optional<obj_version> refresh_version = boost::none, bool raw_attrs=false);
 int rgw_delete_system_obj(const DoutPrefixProvider *dpp, 
-                          RGWSI_SysObj *sysobj_svc, const rgw_pool& pool, const string& oid,
+                          RGWSI_SysObj *sysobj_svc, const rgw_pool& pool, const std::string& oid,
                           RGWObjVersionTracker *objv_tracker, optional_yield y);
 
-const char *rgw_find_mime_by_ext(string& ext);
+const char *rgw_find_mime_by_ext(std::string& ext);
 
-void rgw_filter_attrset(map<string, bufferlist>& unfiltered_attrset, const string& check_prefix,
-                        map<string, bufferlist> *attrset);
+void rgw_filter_attrset(std::map<std::string, bufferlist>& unfiltered_attrset, const std::string& check_prefix,
+                        std::map<std::string, bufferlist> *attrset);
 
 /// indicates whether the current thread is in boost::asio::io_context::run(),
 /// used to log warnings if synchronous librados calls are made
@@ -102,7 +102,7 @@ int rgw_rados_notify(const DoutPrefixProvider *dpp, librados::IoCtx& ioctx, cons
                      bufferlist& bl, uint64_t timeout_ms, bufferlist* pbl,
                      optional_yield y);
 
-int rgw_tools_init(CephContext *cct);
+int rgw_tools_init(const DoutPrefixProvider *dpp, CephContext *cct);
 void rgw_tools_cleanup();
 
 template<class H, size_t S>
@@ -111,7 +111,12 @@ class RGWEtag
   H hash;
 
 public:
-  RGWEtag() {}
+  RGWEtag() {
+    if constexpr (std::is_same_v<H, MD5>) {
+      // Allow use of MD5 digest in FIPS mode for non-cryptographic purposes
+      hash.SetFlags(EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+    }
+  }
 
   void update(const char *buf, size_t len) {
     hash.Update((const unsigned char *)buf, len);
@@ -123,12 +128,12 @@ public:
     }
   }
 
-  void update(const string& s) {
+  void update(const std::string& s) {
     if (!s.empty()) {
       update(s.c_str(), s.size());
     }
   }
-  void finish(string *etag) {
+  void finish(std::string *etag) {
     char etag_buf[S];
     char etag_buf_str[S * 2 + 16];
 
@@ -144,11 +149,10 @@ using RGWMD5Etag = RGWEtag<MD5, CEPH_CRYPTO_MD5_DIGESTSIZE>;
 
 class RGWDataAccess
 {
-  rgw::sal::RGWRadosStore *store;
-  std::unique_ptr<RGWSysObjectCtx> sysobj_ctx;
+  rgw::sal::Store* store;
 
 public:
-  RGWDataAccess(rgw::sal::RGWRadosStore *_store);
+  RGWDataAccess(rgw::sal::Store* _store);
 
   class Object;
   class Bucket;
@@ -156,31 +160,31 @@ public:
   using BucketRef = std::shared_ptr<Bucket>;
   using ObjectRef = std::shared_ptr<Object>;
 
-  class Bucket : public enable_shared_from_this<Bucket> {
+  class Bucket : public std::enable_shared_from_this<Bucket> {
     friend class RGWDataAccess;
     friend class Object;
 
     RGWDataAccess *sd{nullptr};
     RGWBucketInfo bucket_info;
-    string tenant;
-    string name;
-    string bucket_id;
+    std::string tenant;
+    std::string name;
+    std::string bucket_id;
     ceph::real_time mtime;
-    map<std::string, bufferlist> attrs;
+    std::map<std::string, bufferlist> attrs;
 
     RGWAccessControlPolicy policy;
     int finish_init();
     
     Bucket(RGWDataAccess *_sd,
-          const string& _tenant,
-          const string& _name,
-          const string& _bucket_id) : sd(_sd),
+          const std::string& _tenant,
+          const std::string& _name,
+          const std::string& _bucket_id) : sd(_sd),
                                        tenant(_tenant),
                                        name(_name),
                                       bucket_id(_bucket_id) {}
     Bucket(RGWDataAccess *_sd) : sd(_sd) {}
     int init(const DoutPrefixProvider *dpp, optional_yield y);
-    int init(const RGWBucketInfo& _bucket_info, const map<string, bufferlist>& _attrs);
+    int init(const RGWBucketInfo& _bucket_info, const std::map<std::string, bufferlist>& _attrs);
   public:
     int get_object(const rgw_obj_key& key,
                   ObjectRef *obj);
@@ -194,10 +198,10 @@ public:
     rgw_obj_key key;
 
     ceph::real_time mtime;
-    string etag;
-    std::optional<uint64_t> olh_epoch;
+    std::string etag;
+    uint64_t olh_epoch{0};
     ceph::real_time delete_at;
-    std::optional<string> user_data;
+    std::optional<std::string> user_data;
 
     std::optional<bufferlist> aclbl;
 
@@ -207,13 +211,13 @@ public:
                                       bucket(_bucket),
                                       key(_key) {}
   public:
-    int put(bufferlist& data, map<string, bufferlist>& attrs, const DoutPrefixProvider *dpp, optional_yield y); /* might modify attrs */
+    int put(bufferlist& data, std::map<std::string, bufferlist>& attrs, const DoutPrefixProvider *dpp, optional_yield y); /* might modify attrs */
 
     void set_mtime(const ceph::real_time& _mtime) {
       mtime = _mtime;
     }
 
-    void set_etag(const string& _etag) {
+    void set_etag(const std::string& _etag) {
       etag = _etag;
     }
 
@@ -225,7 +229,7 @@ public:
       delete_at = _delete_at;
     }
 
-    void set_user_data(const string& _user_data) {
+    void set_user_data(const std::string& _user_data) {
       user_data = _user_data;
     }
 
@@ -235,9 +239,9 @@ public:
   };
 
   int get_bucket(const DoutPrefixProvider *dpp, 
-                 const string& tenant,
-                const string name,
-                const string bucket_id,
+                 const std::string& tenant,
+                const std::string name,
+                const std::string bucket_id,
                 BucketRef *bucket,
                 optional_yield y) {
     bucket->reset(new Bucket(this, tenant, name, bucket_id));
@@ -245,7 +249,7 @@ public:
   }
 
   int get_bucket(const RGWBucketInfo& bucket_info,
-                const map<string, bufferlist>& attrs,
+                const std::map<std::string, bufferlist>& attrs,
                 BucketRef *bucket) {
     bucket->reset(new Bucket(this));
     return (*bucket)->init(bucket_info, attrs);