From 7cb03b2009794d5f25e1e5f8200079a2f1bf4017 Mon Sep 17 00:00:00 2001 From: Soumya Koduri Date: Fri, 14 Jul 2023 11:08:18 +0530 Subject: [PATCH] rgw/sync-policy: Do not allow empty group names Fixes: https://tracker.ceph.com/issues/62015 Signed-off-by: Soumya Koduri (cherry picked from commit fa5759922f28f5cd638744117d233a1f51250628) --- src/rgw/rgw_admin.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 9fd01ecc61381..24754ee747ffc 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -8929,7 +8929,7 @@ next: if (opt_cmd == OPT::SYNC_GROUP_CREATE || opt_cmd == OPT::SYNC_GROUP_MODIFY) { - CHECK_TRUE(require_opt(opt_group_id), "ERROR: --group-id not specified", EINVAL); + CHECK_TRUE(require_non_empty_opt(opt_group_id), "ERROR: --group-id not specified", EINVAL); CHECK_TRUE(require_opt(opt_status), "ERROR: --status is not specified (options: forbidden, allowed, enabled)", EINVAL); SyncPolicyContext sync_policy_ctx(zonegroup_id, zonegroup_name, opt_bucket); @@ -8989,7 +8989,7 @@ next: } if (opt_cmd == OPT::SYNC_GROUP_REMOVE) { - CHECK_TRUE(require_opt(opt_group_id), "ERROR: --group-id not specified", EINVAL); + CHECK_TRUE(require_non_empty_opt(opt_group_id), "ERROR: --group-id not specified", EINVAL); SyncPolicyContext sync_policy_ctx(zonegroup_id, zonegroup_name, opt_bucket); ret = sync_policy_ctx.init(); @@ -9014,8 +9014,8 @@ next: } if (opt_cmd == OPT::SYNC_GROUP_FLOW_CREATE) { - CHECK_TRUE(require_opt(opt_group_id), "ERROR: --group-id not specified", EINVAL); - CHECK_TRUE(require_opt(opt_flow_id), "ERROR: --flow-id not specified", EINVAL); + CHECK_TRUE(require_non_empty_opt(opt_group_id), "ERROR: --group-id not specified", EINVAL); + CHECK_TRUE(require_non_empty_opt(opt_flow_id), "ERROR: --flow-id not specified", EINVAL); CHECK_TRUE(require_opt(opt_flow_type), "ERROR: --flow-type not specified (options: symmetrical, directional)", EINVAL); CHECK_TRUE((symmetrical_flow_opt(*opt_flow_type) || @@ -9065,8 +9065,8 @@ next: } if (opt_cmd == OPT::SYNC_GROUP_FLOW_REMOVE) { - CHECK_TRUE(require_opt(opt_group_id), "ERROR: --group-id not specified", EINVAL); - CHECK_TRUE(require_opt(opt_flow_id), "ERROR: --flow-id not specified", EINVAL); + CHECK_TRUE(require_non_empty_opt(opt_group_id), "ERROR: --group-id not specified", EINVAL); + CHECK_TRUE(require_non_empty_opt(opt_flow_id), "ERROR: --flow-id not specified", EINVAL); CHECK_TRUE(require_opt(opt_flow_type), "ERROR: --flow-type not specified (options: symmetrical, directional)", EINVAL); CHECK_TRUE((symmetrical_flow_opt(*opt_flow_type) || @@ -9107,8 +9107,8 @@ next: if (opt_cmd == OPT::SYNC_GROUP_PIPE_CREATE || opt_cmd == OPT::SYNC_GROUP_PIPE_MODIFY) { - CHECK_TRUE(require_opt(opt_group_id), "ERROR: --group-id not specified", EINVAL); - CHECK_TRUE(require_opt(opt_pipe_id), "ERROR: --pipe-id not specified", EINVAL); + CHECK_TRUE(require_non_empty_opt(opt_group_id), "ERROR: --group-id not specified", EINVAL); + CHECK_TRUE(require_non_empty_opt(opt_pipe_id), "ERROR: --pipe-id not specified", EINVAL); if (opt_cmd == OPT::SYNC_GROUP_PIPE_CREATE) { CHECK_TRUE(require_non_empty_opt(opt_source_zone_ids), "ERROR: --source-zones not provided or is empty; should be list of zones or '*'", EINVAL); CHECK_TRUE(require_non_empty_opt(opt_dest_zone_ids), "ERROR: --dest-zones not provided or is empty; should be list of zones or '*'", EINVAL); @@ -9189,8 +9189,8 @@ next: } if (opt_cmd == OPT::SYNC_GROUP_PIPE_REMOVE) { - CHECK_TRUE(require_opt(opt_group_id), "ERROR: --group-id not specified", EINVAL); - CHECK_TRUE(require_opt(opt_pipe_id), "ERROR: --pipe-id not specified", EINVAL); + CHECK_TRUE(require_non_empty_opt(opt_group_id), "ERROR: --group-id not specified", EINVAL); + CHECK_TRUE(require_non_empty_opt(opt_pipe_id), "ERROR: --pipe-id not specified", EINVAL); SyncPolicyContext sync_policy_ctx(zonegroup_id, zonegroup_name, opt_bucket); ret = sync_policy_ctx.init(); -- 2.39.5