From a179062527ce4772b00b1b8a20440449c39cd5c0 Mon Sep 17 00:00:00 2001 From: nadav mizrahi Date: Mon, 17 Apr 2023 17:09:14 +0300 Subject: [PATCH] change error for invalid algorithm to invalidArgument Signed-off-by: nadav mizrahi --- src/endpoint/s3/s3_utils.js | 4 ++-- .../ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/endpoint/s3/s3_utils.js b/src/endpoint/s3/s3_utils.js index eb6e1f4b50..78261832e4 100644 --- a/src/endpoint/s3/s3_utils.js +++ b/src/endpoint/s3/s3_utils.js @@ -226,9 +226,9 @@ function parse_sse(req) { } } - if (algorithm !== 'AES256' && algorithm !== 'aws:kms') throw new S3Error(S3Error.InvalidDigest); + if (algorithm !== 'AES256' && algorithm !== 'aws:kms') throw new S3Error(S3Error.InvalidArgument); - if (algorithm === 'aws:kms' && !kms_key_id) throw new S3Error(S3Error.InvalidDigest); + if (algorithm === 'aws:kms' && !kms_key_id) throw new S3Error(S3Error.InvalidArgument); // const md5_regex = new RegExp('/^[a-f0-9]{32}$/'); // if (kms_key_id && !md5_regex.test(kms_key_id)) throw new S3Error(S3Error.InvalidDigest); diff --git a/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt b/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt index e3ba158d18..06dd0477a5 100644 --- a/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt +++ b/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt @@ -32,7 +32,6 @@ s3tests_boto3.functional.test_s3.test_lifecycle_expiration_header_tags_head s3tests_boto3.functional.test_s3.test_put_obj_enc_conflict_c_s3 s3tests_boto3.functional.test_s3.test_put_obj_enc_conflict_c_kms s3tests_boto3.functional.test_s3.test_put_obj_enc_conflict_s3_kms -s3tests_boto3.functional.test_s3.test_put_obj_enc_conflict_bad_enc_kms s3tests_boto3.functional.test_s3.test_bucket_policy_put_obj_s3_noenc s3tests_boto3.functional.test_s3.test_bucket_policy_put_obj_s3_kms s3tests_boto3.functional.test_s3.test_bucket_policy_put_obj_kms_noenc