import 15.2.0 Octopus source

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

diff --git a/ceph/src/rgw/rgw_rest_log.h b/ceph/src/rgw/rgw_rest_log.h
index d5fbf814529a0dee38ee694037b6e43e6009750b..fa2897802bca03128213b894fab627ca18978876 100644 (file)
--- a/ceph/src/rgw/rgw_rest_log.h
+++ b/ceph/src/rgw/rgw_rest_log.h
@@ -1,5 +1,5 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
-// vim: ts=8 sw=2 smarttab
+// vim: ts=8 sw=2 smarttab ft=cpp
 
 /*
  * Ceph - scalable distributed file system
@@ -13,10 +13,10 @@
  *
  */
 
-#ifndef RGW_REST_LOG_H
-#define RGW_REST_LOG_H
+#pragma once
 
 #include "rgw_metadata.h"
+#include "rgw_mdlog.h"
 
 class RGWOp_BILog_List : public RGWRESTOp {
   bool sent_header;
@@ -24,11 +24,11 @@ public:
   RGWOp_BILog_List() : sent_header(false) {}
   ~RGWOp_BILog_List() override {}
 
-  int check_caps(RGWUserCaps& caps) override {
+  int check_caps(const RGWUserCaps& caps) override {
     return caps.check_cap("bilog", RGW_CAP_READ);
   }
   int verify_permission() override {
-    return check_caps(s->user->caps);
+    return check_caps(s->user->get_caps());
   }
   void send_response() override;
   virtual void send_response(list<rgw_bi_log_entry>& entries, string& marker);
@@ -48,11 +48,11 @@ public:
   RGWOp_BILog_Info() : bucket_ver(), master_ver(), syncstopped(false) {}
   ~RGWOp_BILog_Info() override {}
 
-  int check_caps(RGWUserCaps& caps) override {
+  int check_caps(const RGWUserCaps& caps) override {
     return caps.check_cap("bilog", RGW_CAP_READ);
   }
   int verify_permission() override {
-    return check_caps(s->user->caps);
+    return check_caps(s->user->get_caps());
   }
   void send_response() override;
   void execute() override;
@@ -66,7 +66,7 @@ public:
   RGWOp_BILog_Delete() {}
   ~RGWOp_BILog_Delete() override {}
 
-  int check_caps(RGWUserCaps& caps) override {
+  int check_caps(const RGWUserCaps& caps) override {
     return caps.check_cap("bilog", RGW_CAP_WRITE);
   }
   void execute() override;
@@ -83,11 +83,11 @@ public:
   RGWOp_MDLog_List() : truncated(false) {}
   ~RGWOp_MDLog_List() override {}
 
-  int check_caps(RGWUserCaps& caps) override {
+  int check_caps(const RGWUserCaps& caps) override {
     return caps.check_cap("mdlog", RGW_CAP_READ);
   }
   int verify_permission() override {
-    return check_caps(s->user->caps);
+    return check_caps(s->user->get_caps());
   }
   void execute() override;
   void send_response() override;
@@ -103,11 +103,11 @@ public:
   RGWOp_MDLog_Info() : num_objects(0) {}
   ~RGWOp_MDLog_Info() override {}
 
-  int check_caps(RGWUserCaps& caps) override {
+  int check_caps(const RGWUserCaps& caps) override {
     return caps.check_cap("mdlog", RGW_CAP_READ);
   }
   int verify_permission() override {
-    return check_caps(s->user->caps);
+    return check_caps(s->user->get_caps());
   }
   void execute() override;
   void send_response() override;
@@ -122,11 +122,11 @@ public:
   RGWOp_MDLog_ShardInfo() {}
   ~RGWOp_MDLog_ShardInfo() override {}
 
-  int check_caps(RGWUserCaps& caps) override {
+  int check_caps(const RGWUserCaps& caps) override {
     return caps.check_cap("mdlog", RGW_CAP_READ);
   }
   int verify_permission() override {
-    return check_caps(s->user->caps);
+    return check_caps(s->user->get_caps());
   }
   void execute() override;
   void send_response() override;
@@ -140,7 +140,7 @@ public:
   RGWOp_MDLog_Lock() {}
   ~RGWOp_MDLog_Lock() override {}
 
-  int check_caps(RGWUserCaps& caps) override {
+  int check_caps(const RGWUserCaps& caps) override {
     return caps.check_cap("mdlog", RGW_CAP_WRITE);
   }
   void execute() override;
@@ -154,7 +154,7 @@ public:
   RGWOp_MDLog_Unlock() {}
   ~RGWOp_MDLog_Unlock() override {}
 
-  int check_caps(RGWUserCaps& caps) override {
+  int check_caps(const RGWUserCaps& caps) override {
     return caps.check_cap("mdlog", RGW_CAP_WRITE);
   }
   void execute() override;
@@ -168,7 +168,7 @@ public:
   RGWOp_MDLog_Notify() {}
   ~RGWOp_MDLog_Notify() override {}
 
-  int check_caps(RGWUserCaps& caps) override {
+  int check_caps(const RGWUserCaps& caps) override {
     return caps.check_cap("mdlog", RGW_CAP_WRITE);
   }
   void execute() override;
@@ -182,7 +182,7 @@ public:
   RGWOp_MDLog_Delete() {}
   ~RGWOp_MDLog_Delete() override {}
 
-  int check_caps(RGWUserCaps& caps) override {
+  int check_caps(const RGWUserCaps& caps) override {
     return caps.check_cap("mdlog", RGW_CAP_WRITE);
   }
   void execute() override;
@@ -200,11 +200,11 @@ public:
   RGWOp_DATALog_List() : truncated(false), extra_info(false) {}
   ~RGWOp_DATALog_List() override {}
 
-  int check_caps(RGWUserCaps& caps) override {
+  int check_caps(const RGWUserCaps& caps) override {
     return caps.check_cap("datalog", RGW_CAP_READ);
   }
   int verify_permission() override {
-    return check_caps(s->user->caps);
+    return check_caps(s->user->get_caps());
   }
   void execute() override;
   void send_response() override;
@@ -219,11 +219,11 @@ public:
   RGWOp_DATALog_Info() : num_objects(0) {}
   ~RGWOp_DATALog_Info() override {}
 
-  int check_caps(RGWUserCaps& caps) override {
+  int check_caps(const RGWUserCaps& caps) override {
     return caps.check_cap("datalog", RGW_CAP_READ);
   }
   int verify_permission() override {
-    return check_caps(s->user->caps);
+    return check_caps(s->user->get_caps());
   }
   void execute() override;
   void send_response() override;
@@ -238,11 +238,11 @@ public:
   RGWOp_DATALog_ShardInfo() {}
   ~RGWOp_DATALog_ShardInfo() override {}
 
-  int check_caps(RGWUserCaps& caps) override {
+  int check_caps(const RGWUserCaps& caps) override {
     return caps.check_cap("datalog", RGW_CAP_READ);
   }
   int verify_permission() override {
-    return check_caps(s->user->caps);
+    return check_caps(s->user->get_caps());
   }
   void execute() override;
   void send_response() override;
@@ -251,40 +251,12 @@ public:
   }
 };
 
-class RGWOp_DATALog_Lock : public RGWRESTOp {
-public:
-  RGWOp_DATALog_Lock() {}
-  ~RGWOp_DATALog_Lock() override {}
-
-  int check_caps(RGWUserCaps& caps) override {
-    return caps.check_cap("datalog", RGW_CAP_WRITE);
-  }
-  void execute() override;
-  const char* name() const override {
-    return "lock_datalog_object";
-  }
-};
-
-class RGWOp_DATALog_Unlock : public RGWRESTOp {
-public:
-  RGWOp_DATALog_Unlock() {}
-  ~RGWOp_DATALog_Unlock() override {}
-
-  int check_caps(RGWUserCaps& caps) override {
-    return caps.check_cap("datalog", RGW_CAP_WRITE);
-  }
-  void execute() override;
-  const char* name() const override {
-    return "unlock_datalog_object";
-  }
-};
-
 class RGWOp_DATALog_Notify : public RGWRESTOp {
 public:
   RGWOp_DATALog_Notify() {}
   ~RGWOp_DATALog_Notify() override {}
 
-  int check_caps(RGWUserCaps& caps) override {
+  int check_caps(const RGWUserCaps& caps) override {
     return caps.check_cap("datalog", RGW_CAP_WRITE);
   }
   void execute() override;
@@ -298,7 +270,7 @@ public:
   RGWOp_DATALog_Delete() {}
   ~RGWOp_DATALog_Delete() override {}
 
-  int check_caps(RGWUserCaps& caps) override {
+  int check_caps(const RGWUserCaps& caps) override {
     return caps.check_cap("datalog", RGW_CAP_WRITE);
   }
   void execute() override;
@@ -332,5 +304,3 @@ public:
     return new RGWHandler_Log(auth_registry);
   }
 };
-
-#endif /* RGW_REST_LOG_H */