diff options
| author | Casey Bodley <cbodley@users.noreply.github.com> | 2024-12-10 18:07:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-10 18:07:40 +0100 |
| commit | d03901b4cde6f3a55f7537961e6c62ffe4dd96b6 (patch) | |
| tree | 8b792f7c7d0924d8e29997a356805b8e5b896646 /src/rgw/rgw_rest_s3.cc | |
| parent | Merge pull request #60968 from cbodley/wip-69134 (diff) | |
| parent | qa/rgw/sts: run s3tests against both auth orders (diff) | |
| download | ceph-d03901b4cde6f3a55f7537961e6c62ffe4dd96b6.tar.xz ceph-d03901b4cde6f3a55f7537961e6c62ffe4dd96b6.zip | |
Merge pull request #60773 from pritha-srivastava/wip-rgw-revert-auth-code
Revert "rgw/auth: Fix the return code returned by AuthStrategy,"
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Diffstat (limited to 'src/rgw/rgw_rest_s3.cc')
| -rw-r--r-- | src/rgw/rgw_rest_s3.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index b7fe66924d3..b7046118ef3 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -6494,7 +6494,7 @@ rgw::auth::s3::LocalEngine::authenticate( if (driver->get_user_by_access_key(dpp, access_key_id, y, &user) < 0) { ldpp_dout(dpp, 5) << "error reading user info, uid=" << access_key_id << " can't authenticate" << dendl; - return result_t::reject(-ERR_INVALID_ACCESS_KEY); + return result_t::deny(-ERR_INVALID_ACCESS_KEY); } //TODO: Uncomment, when we have a migration plan in place. /*else { @@ -6516,7 +6516,7 @@ rgw::auth::s3::LocalEngine::authenticate( const auto iter = user->get_info().access_keys.find(access_key_id); if (iter == std::end(user->get_info().access_keys)) { ldpp_dout(dpp, 0) << "ERROR: access key not encoded in user info" << dendl; - return result_t::reject(-EPERM); + return result_t::deny(-EPERM); } const RGWAccessKey& k = iter->second; @@ -6540,7 +6540,7 @@ rgw::auth::s3::LocalEngine::authenticate( ldpp_dout(dpp, 15) << "compare=" << compare << dendl; if (compare != 0) { - return result_t::reject(-ERR_SIGNATURE_NO_MATCH); + return result_t::deny(-ERR_SIGNATURE_NO_MATCH); } auto apl = apl_factory->create_apl_local( |