rgw: The error reported in the "rgw_s3_prepare_decrypt" function is unreasonable

When decrypting the data encrypted with the "SSE-KMS" method, the "InvalidAccessKeyId" error is reported when the KMS key is unavailable, which is unreasonable.So we replaced it with EINVAL

Fixes: https://tracker.ceph.com/issues/55799
Signed-off-by: wangyingbin <ybwang0211@163.com>

diff --git a/src/rgw/rgw_crypt.cc b/src/rgw/rgw_crypt.cc
index 515a5ba78c0e0b0cba1ab9f6c971442da3411777..a740431fb8dc70ff09216b793736c1dc9ce751f4 100644 (file)
--- a/src/rgw/rgw_crypt.cc
+++ b/src/rgw/rgw_crypt.cc
@@ -1387,7 +1387,7 @@ int rgw_s3_prepare_decrypt(struct req_state* s,
       ldpp_dout(s, 0) << "ERROR: key obtained from key_id:" <<
           key_id << " is not 256 bit size" << dendl;
       s->err.message = "KMS provided an invalid key for the given kms-keyid.";
-      return -ERR_INVALID_ACCESS_KEY;
+      return -EINVAL;
     }
 
     auto aes = std::unique_ptr<AES_256_CBC>(new AES_256_CBC(s, s->cct));
@@ -1457,7 +1457,7 @@ int rgw_s3_prepare_decrypt(struct req_state* s,
       ldpp_dout(s, 0) << "ERROR: key obtained " <<
           "is not 256 bit size" << dendl;
       s->err.message = "SSE-S3 provided an invalid key for the given keyid.";
-      return -ERR_INVALID_ACCESS_KEY;
+      return -EINVAL;
     }
 
     auto aes = std::unique_ptr<AES_256_CBC>(new AES_256_CBC(s, s->cct));

diff --git a/src/rgw/rgw_kms.cc b/src/rgw/rgw_kms.cc
index 8d11a3248e0e79f31b0a14e431b162bf69ebf384..eec5d80daab136f1b140afeecfa13ead2cdd6714 100644 (file)
--- a/src/rgw/rgw_kms.cc
+++ b/src/rgw/rgw_kms.cc
@@ -873,7 +873,7 @@ static int get_actual_key_from_conf(const DoutPrefixProvider* dpp,
 
   map<string, string>::iterator it = str_map.find(std::string(key_id));
   if (it == str_map.end())
-    return -ERR_INVALID_ACCESS_KEY;
+    return -EINVAL;
 
   std::string master_key;
   try {