RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 09:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13460 from theanalyst/fix/rgw-rest-user-fixme

Browse Source 
wip: rgw: rest_admin/user avoid double checking input args

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2017-02-22 11:45:42 -05:00 committed by GitHub
commit e7d7b8d035
1 changed files with 34 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
src/rgw/rgw_rest_user.cc
View File

@ -108,24 +108,13 @@ void RGWOp_User_Create::execute()
return;
}
// FIXME: don't do double argument checking
if (!uid.empty())
op_state.set_user_id(uid);
if (!display_name.empty())
op_state.set_display_name(display_name);
if (!email.empty())
op_state.set_user_email(email);
if (!caps.empty())
op_state.set_caps(caps);
if (!access_key.empty())
op_state.set_access_key(access_key);
if (!secret_key.empty())
op_state.set_secret_key(secret_key);
// TODO: validate required args are passed in. (for eg. uid and display_name here)
op_state.set_user_id(uid);
op_state.set_display_name(display_name);
op_state.set_user_email(email);
op_state.set_caps(caps);
op_state.set_access_key(access_key);
op_state.set_secret_key(secret_key);
if (!key_type_str.empty()) {
int32_t key_type = KEY_TYPE_UNDEFINED;
@ -239,23 +228,12 @@ void RGWOp_User_Modify::execute()
return;
}
if (!uid.empty())
op_state.set_user_id(uid);
if (!display_name.empty())
op_state.set_display_name(display_name);
if (!email.empty())
op_state.set_user_email(email);
if (!caps.empty())
op_state.set_caps(caps);
if (!access_key.empty())
op_state.set_access_key(access_key);
if (!secret_key.empty())
op_state.set_secret_key(secret_key);
op_state.set_user_id(uid);
op_state.set_display_name(display_name);
op_state.set_user_email(email);
op_state.set_caps(caps);
op_state.set_access_key(access_key);
op_state.set_secret_key(secret_key);
if (max_buckets != RGW_DEFAULT_MAX_BUCKETS)
op_state.set_max_buckets(max_buckets);
@ -364,19 +342,10 @@ void RGWOp_Subuser_Create::execute()
perm_mask = rgw_str_to_perm(perm_str.c_str());
op_state.set_perm(perm_mask);
// FIXME: no double checking
if (!uid.empty())
op_state.set_user_id(uid);
if (!subuser.empty())
op_state.set_subuser(subuser);
if (!access_key.empty())
op_state.set_access_key(access_key);
if (!secret_key.empty())
op_state.set_secret_key(secret_key);
op_state.set_user_id(uid);
op_state.set_subuser(subuser);
op_state.set_access_key(access_key);
op_state.set_secret_key(secret_key);
op_state.set_generate_subuser(gen_subuser);
if (gen_access)
@ -437,18 +406,10 @@ void RGWOp_Subuser_Modify::execute()
perm_mask = rgw_str_to_perm(perm_str.c_str());
op_state.set_perm(perm_mask);
// FIXME: no double checking
if (!uid.empty())
op_state.set_user_id(uid);
if (!subuser.empty())
op_state.set_subuser(subuser);
if (!secret_key.empty())
op_state.set_secret_key(secret_key);
if (gen_secret)
op_state.set_gen_secret();
op_state.set_user_id(uid);
op_state.set_subuser(subuser);
op_state.set_secret_key(secret_key);
op_state.set_gen_secret();
if (!key_type_str.empty()) {
if (key_type_str.compare("swift") == 0)
@ -489,12 +450,8 @@ void RGWOp_Subuser_Remove::execute()
RESTArgs::get_string(s, "subuser", subuser, &subuser);
RESTArgs::get_bool(s, "purge-keys", true, &purge_keys);
// FIXME: no double checking
if (!uid.empty())
op_state.set_user_id(uid);
if (!subuser.empty())
op_state.set_subuser(subuser);
op_state.set_user_id(uid);
op_state.set_subuser(subuser);
if (purge_keys)
op_state.set_purge_keys();
@ -537,18 +494,10 @@ void RGWOp_Key_Create::execute()
RESTArgs::get_string(s, "key-type", key_type_str, &key_type_str);
RESTArgs::get_bool(s, "generate-key", true, &gen_key);
// FIXME: no double checking
if (!uid.empty())
op_state.set_user_id(uid);
if (!subuser.empty())
op_state.set_subuser(subuser);
if (!access_key.empty())
op_state.set_access_key(access_key);
if (!secret_key.empty())
op_state.set_secret_key(secret_key);
op_state.set_user_id(uid);
op_state.set_subuser(subuser);
op_state.set_access_key(access_key);
op_state.set_secret_key(secret_key);
if (gen_key)
op_state.set_generate_key();
@ -596,15 +545,9 @@ void RGWOp_Key_Remove::execute()
RESTArgs::get_string(s, "access-key", access_key, &access_key);
RESTArgs::get_string(s, "key-type", key_type_str, &key_type_str);
// FIXME: no double checking
if (!uid.empty())
op_state.set_user_id(uid);
if (!subuser.empty())
op_state.set_subuser(subuser);
if (!access_key.empty())
op_state.set_access_key(access_key);
op_state.set_user_id(uid);
op_state.set_subuser(subuser);
op_state.set_access_key(access_key);
if (!key_type_str.empty()) {
int32_t key_type = KEY_TYPE_UNDEFINED;
@ -645,12 +588,8 @@ void RGWOp_Caps_Add::execute()
RESTArgs::get_string(s, "user-caps", caps, &caps);
// FIXME: no double checking
if (!uid.empty())
op_state.set_user_id(uid);
if (!caps.empty())
op_state.set_caps(caps);
op_state.set_user_id(uid);
op_state.set_caps(caps);
http_ret = RGWUserAdminOp_Caps::add(store, op_state, flusher);
}
@ -681,12 +620,8 @@ void RGWOp_Caps_Remove::execute()
RESTArgs::get_string(s, "user-caps", caps, &caps);
// FIXME: no double checking
if (!uid.empty())
op_state.set_user_id(uid);
if (!caps.empty())
op_state.set_caps(caps);
op_state.set_user_id(uid);
op_state.set_caps(caps);
http_ret = RGWUserAdminOp_Caps::remove(store, op_state, flusher);
}