summaryrefslogtreecommitdiff
path: root/src/rgw/rgw_main.cc
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@inktank.com>2013-05-02 21:05:21 -0700
committerYehuda Sadeh <yehuda@inktank.com>2013-05-02 22:08:37 -0700
commitaab390529df56cabc75cc8fff2707b32c35aaaec (patch)
tree566c87c77e022fc657408faab598ab56c1b130c6 /src/rgw/rgw_main.cc
parentdebbc79e2756a48636508d43941976531df68f23 (diff)
downloadceph-wip-4716.tar.gz
rgw: user operation maskwip-4716
Fixes: #4716 add user operation mask for controlling user permissions. Also add admin controls for it. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Diffstat (limited to 'src/rgw/rgw_main.cc')
-rw-r--r--src/rgw/rgw_main.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index c80037520b3..3d6bfb908f0 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -336,6 +336,13 @@ void RGWProcess::handle_request(RGWRequest *req)
req->log(s, "reading the cors attr");
handler->read_cors_config();
+ req->log(s, "verifying op mask");
+ ret = op->verify_op_mask();
+ if (ret < 0) {
+ abort_early(s, ret);
+ goto done;
+ }
+
req->log(s, "verifying op permissions");
ret = op->verify_permission();
if (ret < 0) {