RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 18:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: return appropriate error for unresolvable email in acl

Browse Source
This commit is contained in:
Yehuda Sadeh 2011-04-18 12:54:02 -07:00
parent b8e791bc61
commit 878f4a45ce
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/rgw/rgw_common.h
View File

@ -68,7 +68,8 @@ extern string rgw_root_bucket;
#define ERR_NO_SUCH_BUCKET 2002
#define ERR_METHOD_NOT_ALLOWED 2003
#define ERR_INVALID_DIGEST 2004
#define ERR_BAD_DIGEST 2005
#define ERR_BAD_DIGEST 2005
#define ERR_UNRESOLVABLE_EMAIL 2006
typedef void *RGWAccessHandle;

2
src/rgw/rgw_op.cc
View File

@ -632,7 +632,7 @@ static int rebuild_policy(RGWAccessControlPolicy& src, RGWAccessControlPolicy& d
RGW_LOG(10) << "grant user email=" << email << endl;
if (rgw_get_user_info_by_email(email, grant_user) < 0) {
RGW_LOG(10) << "grant user email not found or other error" << endl;
break;
return -ERR_UNRESOLVABLE_EMAIL;
}
id = grant_user.user_id;
}

1
src/rgw/rgw_rest.cc
View File

@ -44,6 +44,7 @@ const static struct rgw_html_errors RGW_HTML_ERRORS[] = {
{ ERR_BAD_DIGEST, 500, "BadDigest" },
{ ERR_INVALID_BUCKET_NAME, 400, "InvalidBucketName" },
{ ERR_INVALID_OBJECT_NAME, 400, "InvalidObjectName" },
{ ERR_UNRESOLVABLE_EMAIL, 400, "UnresolvableGrantByEmailAddress" },
{ EACCES, 403, "AccessDenied" },
{ EPERM, 403, "AccessDenied" },
{ ENOENT, 404, "NoSuchKey" },