Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wip: rgw: rest_admin/user avoid double checking input args #13460

Merged
merged 1 commit into from Feb 22, 2017
Merged

wip: rgw: rest_admin/user avoid double checking input args #13460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
133 changes: 34 additions & 99 deletions src/rgw/rgw_rest_user.cc
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down