]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw: include SSE-KMS headers in encrypted upload response
authorCasey Bodley <cbodley@redhat.com>
Wed, 27 Sep 2017 18:26:25 +0000 (14:26 -0400)
committerCasey Bodley <cbodley@redhat.com>
Wed, 27 Sep 2017 18:26:29 +0000 (14:26 -0400)
Fixes: http://tracker.ceph.com/issues/21576
Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/rgw/rgw_crypt.cc

index 60a8861246c964eb3f592892dde67fdf210a6444..1af9782bd38a462bd429e5a62fb58933ac082be3 100644 (file)
@@ -1105,6 +1105,9 @@ int rgw_s3_prepare_encrypt(struct req_state* s,
         *block_crypt = std::move(aes);
       }
       actual_key.replace(0, actual_key.length(), actual_key.length(), '\000');
+
+      crypt_http_responses["x-amz-server-side-encryption"] = "aws:kms";
+      crypt_http_responses["x-amz-server-side-encryption-aws-kms-key-id"] = key_id.to_string();
       return 0;
     }