| Message ID | 1366460060-3341-1-git-send-email-liwang@ubuntukylin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Apr 20, 2013 at 5:14 AM, Li Wang <liwang@ubuntukylin.com> wrote: > This patch fixes a bug in radosgw swift compatibility code, > that is, if a not-owner but authorized user access a non-existing > object in a container, he wiil receive unexpected error code, > to repeat this bug, do the following steps, > > 1 User1 creates a container, and grants the read/write permission to user2 > > curl -X PUT -i -k -H "X-Auth-Token: $user1_token" $url/$container > curl -X POST -i -k -H "X-Auth-Token: $user1_token" -H "X-Container-Read: > $user2" -H "X-Container-Write: $user2" $url/$container > > 2 User2 queries the object 'obj' in the newly created container > by using HEAD instruction, note the container currently is empty > > curl -X HEAD -i -k -H "X-Auth-Token: $user2_token" $url/$container/obj > > 3 The response received by user2 is '401 Authorization Required', > rather than the expected '404 Not Found', the details are as follows, > > HTTP/1.1 401 Authorization Required > Date: Tue, 16 Apr 2013 01:52:49 GMT > Server: Apache/2.2.22 (Ubuntu) > Accept-Ranges: bytes > Content-Length: 12 > Vary: Accept-Encoding > Content-Type: text/plain; charset=utf-8 > > Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com> > Signed-off-by: Li Wang <liwang@ubuntukylin.com> > Reviewed-by: Yehuda Sadeh <yehuda@inktank.com> > --- > Changes from v1: > Simplify the revision to RGWAccessControlPolicy::verify_permission() > according to Yehuda's suggestion > --- > src/rgw/rgw_acl.cc | 5 ++--- > src/rgw/rgw_common.cc | 20 +------------------- > 2 files changed, 3 insertions(+), 22 deletions(-) > > diff --git a/src/rgw/rgw_acl.cc b/src/rgw/rgw_acl.cc > index 1a90649..e3dcd9b 100644 > --- a/src/rgw/rgw_acl.cc > +++ b/src/rgw/rgw_acl.cc > @@ -92,8 +92,7 @@ int RGWAccessControlPolicy::get_perm(string& id, int perm_mask) { > > bool RGWAccessControlPolicy::verify_permission(string& uid, int user_perm_mask, int perm) > { > - int test_perm = perm; > - > + int test_perm = perm | RGW_PERM_WRITE_OBJS | RGW_PERM_READ_OBJS; > int policy_perm = get_perm(uid, test_perm); > > /* the swift WRITE_OBJS perm is equivalent to the WRITE obj, just > @@ -107,7 +106,7 @@ bool RGWAccessControlPolicy::verify_permission(string& uid, int user_perm_mask, > policy_perm |= (RGW_PERM_READ | RGW_PERM_READ_ACP); > } > > - int acl_perm = policy_perm & user_perm_mask; > + int acl_perm = policy_perm & perm & user_perm_mask; > > ldout(cct, 10) << " uid=" << uid << " requested perm (type)=" << perm << ", policy perm=" << policy_perm << ", user_perm_mask=" << user_perm_mask << ", acl perm=" << acl_perm << dendl; > > diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc > index d9c0a80..139a00e 100644 > --- a/src/rgw/rgw_common.cc > +++ b/src/rgw/rgw_common.cc > @@ -515,14 +515,6 @@ bool verify_bucket_permission(struct req_state *s, int perm) > if ((perm & (int)s->perm_mask) != perm) > return false; > > - if (s->bucket_acl->verify_permission(s->user.user_id, perm, perm)) > - return true; > - > - if (perm & (RGW_PERM_READ | RGW_PERM_READ_ACP)) > - perm |= RGW_PERM_READ_OBJS; > - if (perm & RGW_PERM_WRITE) > - perm |= RGW_PERM_WRITE_OBJS; > - > return s->bucket_acl->verify_permission(s->user.user_id, perm, perm); > } > > @@ -541,17 +533,7 @@ bool verify_object_permission(struct req_state *s, RGWAccessControlPolicy *bucke > if ((perm & (int)s->perm_mask) != perm) > return false; > > - int swift_perm = 0; > - if (perm & (RGW_PERM_READ | RGW_PERM_READ_ACP)) > - swift_perm |= RGW_PERM_READ_OBJS; > - if (perm & RGW_PERM_WRITE) > - swift_perm |= RGW_PERM_WRITE_OBJS; > - > - if (!swift_perm) > - return false; > - /* we already verified the user mask above, so we pass swift_perm as the mask here, > - otherwise the mask might not cover the swift permissions bits */ > - return bucket_acl->verify_permission(s->user.user_id, swift_perm, swift_perm); > + return bucket_acl->verify_permission(s->user.user_id, s->perm_mask, swift_perm); This doesn't compile, the declaration of swift_perm was removed. But I think we shouldn't remove this specific block, we still need the test to be as is when checking the object permissions. Otherwise we'd have to check against perm, but note that we want to explicitly check for RGW_PERM_READ_OBJS. RGW_PERM_READ on the bucket does not provide objects access, it just allows objects listing. > } > > bool verify_object_permission(struct req_state *s, int perm) > -- > 1.7.9.5 > > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/src/rgw/rgw_acl.cc b/src/rgw/rgw_acl.cc index 1a90649..e3dcd9b 100644 --- a/src/rgw/rgw_acl.cc +++ b/src/rgw/rgw_acl.cc @@ -92,8 +92,7 @@ int RGWAccessControlPolicy::get_perm(string& id, int perm_mask) { bool RGWAccessControlPolicy::verify_permission(string& uid, int user_perm_mask, int perm) { - int test_perm = perm; - + int test_perm = perm | RGW_PERM_WRITE_OBJS | RGW_PERM_READ_OBJS; int policy_perm = get_perm(uid, test_perm); /* the swift WRITE_OBJS perm is equivalent to the WRITE obj, just @@ -107,7 +106,7 @@ bool RGWAccessControlPolicy::verify_permission(string& uid, int user_perm_mask, policy_perm |= (RGW_PERM_READ | RGW_PERM_READ_ACP); } - int acl_perm = policy_perm & user_perm_mask; + int acl_perm = policy_perm & perm & user_perm_mask; ldout(cct, 10) << " uid=" << uid << " requested perm (type)=" << perm << ", policy perm=" << policy_perm << ", user_perm_mask=" << user_perm_mask << ", acl perm=" << acl_perm << dendl; diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc index d9c0a80..139a00e 100644 --- a/src/rgw/rgw_common.cc +++ b/src/rgw/rgw_common.cc @@ -515,14 +515,6 @@ bool verify_bucket_permission(struct req_state *s, int perm) if ((perm & (int)s->perm_mask) != perm) return false; - if (s->bucket_acl->verify_permission(s->user.user_id, perm, perm)) - return true; - - if (perm & (RGW_PERM_READ | RGW_PERM_READ_ACP)) - perm |= RGW_PERM_READ_OBJS; - if (perm & RGW_PERM_WRITE) - perm |= RGW_PERM_WRITE_OBJS; - return s->bucket_acl->verify_permission(s->user.user_id, perm, perm); } @@ -541,17 +533,7 @@ bool verify_object_permission(struct req_state *s, RGWAccessControlPolicy *bucke if ((perm & (int)s->perm_mask) != perm) return false; - int swift_perm = 0; - if (perm & (RGW_PERM_READ | RGW_PERM_READ_ACP)) - swift_perm |= RGW_PERM_READ_OBJS; - if (perm & RGW_PERM_WRITE) - swift_perm |= RGW_PERM_WRITE_OBJS; - - if (!swift_perm) - return false; - /* we already verified the user mask above, so we pass swift_perm as the mask here, - otherwise the mask might not cover the swift permissions bits */ - return bucket_acl->verify_permission(s->user.user_id, swift_perm, swift_perm); + return bucket_acl->verify_permission(s->user.user_id, s->perm_mask, swift_perm); } bool verify_object_permission(struct req_state *s, int perm)