From 3b9811000cca42704a66ee1a944e6f500d66cefb Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Sun, 17 Dec 2023 20:25:17 -0500 Subject: [PATCH] rgw/auth: use switch for is_non_s3_op() Signed-off-by: Casey Bodley (cherry picked from commit 31f4c6231a6d6328570d913572b6aa6496dfef9a) --- src/rgw/rgw_auth_s3.cc | 62 ++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/src/rgw/rgw_auth_s3.cc b/src/rgw/rgw_auth_s3.cc index fd7fd07a54e..54dcbec50f9 100644 --- a/src/rgw/rgw_auth_s3.cc +++ b/src/rgw/rgw_auth_s3.cc @@ -468,38 +468,40 @@ static inline int parse_v4_auth_header(const req_info& info, /* in bool is_non_s3_op(RGWOpType op_type) { - if (op_type == RGW_STS_GET_SESSION_TOKEN || - op_type == RGW_STS_ASSUME_ROLE || - op_type == RGW_STS_ASSUME_ROLE_WEB_IDENTITY || - op_type == RGW_OP_CREATE_ROLE || - op_type == RGW_OP_DELETE_ROLE || - op_type == RGW_OP_GET_ROLE || - op_type == RGW_OP_MODIFY_ROLE_TRUST_POLICY || - op_type == RGW_OP_LIST_ROLES || - op_type == RGW_OP_PUT_ROLE_POLICY || - op_type == RGW_OP_GET_ROLE_POLICY || - op_type == RGW_OP_LIST_ROLE_POLICIES || - op_type == RGW_OP_DELETE_ROLE_POLICY || - op_type == RGW_OP_PUT_USER_POLICY || - op_type == RGW_OP_GET_USER_POLICY || - op_type == RGW_OP_LIST_USER_POLICIES || - op_type == RGW_OP_DELETE_USER_POLICY || - op_type == RGW_OP_CREATE_OIDC_PROVIDER || - op_type == RGW_OP_DELETE_OIDC_PROVIDER || - op_type == RGW_OP_GET_OIDC_PROVIDER || - op_type == RGW_OP_LIST_OIDC_PROVIDERS || - op_type == RGW_OP_PUBSUB_TOPIC_CREATE || - op_type == RGW_OP_PUBSUB_TOPICS_LIST || - op_type == RGW_OP_PUBSUB_TOPIC_GET || - op_type == RGW_OP_PUBSUB_TOPIC_SET || - op_type == RGW_OP_PUBSUB_TOPIC_DELETE || - op_type == RGW_OP_TAG_ROLE || - op_type == RGW_OP_LIST_ROLE_TAGS || - op_type == RGW_OP_UNTAG_ROLE || - op_type == RGW_OP_UPDATE_ROLE) { + switch (op_type) { + case RGW_STS_GET_SESSION_TOKEN: + case RGW_STS_ASSUME_ROLE: + case RGW_STS_ASSUME_ROLE_WEB_IDENTITY: + case RGW_OP_CREATE_ROLE: + case RGW_OP_DELETE_ROLE: + case RGW_OP_GET_ROLE: + case RGW_OP_MODIFY_ROLE_TRUST_POLICY: + case RGW_OP_LIST_ROLES: + case RGW_OP_PUT_ROLE_POLICY: + case RGW_OP_GET_ROLE_POLICY: + case RGW_OP_LIST_ROLE_POLICIES: + case RGW_OP_DELETE_ROLE_POLICY: + case RGW_OP_PUT_USER_POLICY: + case RGW_OP_GET_USER_POLICY: + case RGW_OP_LIST_USER_POLICIES: + case RGW_OP_DELETE_USER_POLICY: + case RGW_OP_CREATE_OIDC_PROVIDER: + case RGW_OP_DELETE_OIDC_PROVIDER: + case RGW_OP_GET_OIDC_PROVIDER: + case RGW_OP_LIST_OIDC_PROVIDERS: + case RGW_OP_PUBSUB_TOPIC_CREATE: + case RGW_OP_PUBSUB_TOPICS_LIST: + case RGW_OP_PUBSUB_TOPIC_GET: + case RGW_OP_PUBSUB_TOPIC_SET: + case RGW_OP_PUBSUB_TOPIC_DELETE: + case RGW_OP_TAG_ROLE: + case RGW_OP_LIST_ROLE_TAGS: + case RGW_OP_UNTAG_ROLE: + case RGW_OP_UPDATE_ROLE: return true; + default: + return false; } - return false; } int parse_v4_credentials(const req_info& info, /* in */ -- 2.39.5