RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-14 06:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: lc support Content-MD5 in request headers

Browse Source 
According to AWS S3, this header must be used
as a message integrity check to verify that
the request body was not corrupted in transit.

Content-MD5 is the base64-encoded 128-bit MD5
digest of the data

Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
This commit is contained in:
Enming Zhang 2017-10-25 02:36:47 +08:00
parent 849c21582b
commit 9c0abe6d63
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/rgw/rgw_op.cc
View File

@ -4843,6 +4843,25 @@ void RGWPutLC::execute()
RGWLCXMLParser_S3 parser(s->cct);
RGWLifecycleConfiguration_S3 new_config(s->cct);
content_md5 = s->info.env->get("HTTP_CONTENT_MD5");
if (content_md5 == nullptr) {
op_ret = -ERR_INVALID_REQUEST;
s->err.message = "Missing required header for this request: Content-MD5";
ldout(s->cct, 5) << s->err.message << dendl;
return;
}
std::string content_md5_bin;
try {
content_md5_bin = rgw::from_base64(boost::string_view(content_md5));
} catch (...) {
s->err.message = "Request header Content-MD5 contains character "
"that is not base64 encoded.";
ldout(s->cct, 5) << s->err.message << dendl;
op_ret = -ERR_BAD_DIGEST;
return;
}
if (!parser.init()) {
op_ret = -EINVAL;
return;
@ -4854,6 +4873,21 @@ void RGWPutLC::execute()
ldout(s->cct, 15) << "read len=" << len << " data=" << (data ? data : "") << dendl;
MD5 data_hash;
unsigned char data_hash_res[CEPH_CRYPTO_MD5_DIGESTSIZE];
data_hash.Update(reinterpret_cast<const byte*>(data), len);
data_hash.Final(data_hash_res);
if (memcmp(data_hash_res, content_md5_bin.c_str(), CEPH_CRYPTO_MD5_DIGESTSIZE) != 0) {
op_ret = -ERR_BAD_DIGEST;
s->err.message = "The Content-MD5 you specified did not match what we received.";
ldout(s->cct, 5) << s->err.message
<< " Specified content md5: " << content_md5
<< ", calculated content md5: " << data_hash_res
<< dendl;
return;
}
if (!parser.parse(data, len, 1)) {
op_ret = -ERR_MALFORMED_XML;
return;

4
src/rgw/rgw_op.h
View File

@ -1412,12 +1412,14 @@ class RGWPutLC : public RGWOp {
protected:
int len;
char *data;
const char *content_md5;
string cookie;
public:
RGWPutLC() {
len = 0;
data = NULL;
data = nullptr;
content_md5 = nullptr;
}
~RGWPutLC() override {
free(data);