]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'master' into wip-19739 14961/head
authorOrit Wasserman <owasserm@redhat.com>
Tue, 13 Jun 2017 12:42:00 +0000 (15:42 +0300)
committerGitHub <noreply@github.com>
Tue, 13 Jun 2017 12:42:00 +0000 (15:42 +0300)
1  2 
src/rgw/rgw_op.cc

index 7a3378cac8571f7842f08cecb95661f698a0a4a7,29adbc58aa48e7841bf9acc7328273a0f0fef0fb..487c8dbc64af6e1611ee90c94da705fb58494cd4
@@@ -3488,21 -3499,11 +3500,26 @@@ void RGWPostObj::execute(
        return;
      }
  
+     op_ret = store->check_bucket_shards(s->bucket_info, s->bucket, bucket_quota);
+     if (op_ret < 0) {
+       return;
+     }
 +    if (supplied_md5_b64) {
 +      char supplied_md5_bin[CEPH_CRYPTO_MD5_DIGESTSIZE + 1];
 +      ldout(s->cct, 15) << "supplied_md5_b64=" << supplied_md5_b64 << dendl;
 +      op_ret = ceph_unarmor(supplied_md5_bin, &supplied_md5_bin[CEPH_CRYPTO_MD5_DIGESTSIZE + 1],
 +                            supplied_md5_b64, supplied_md5_b64 + strlen(supplied_md5_b64));
 +      ldout(s->cct, 15) << "ceph_armor ret=" << op_ret << dendl;
 +      if (op_ret != CEPH_CRYPTO_MD5_DIGESTSIZE) {
 +        op_ret = -ERR_INVALID_DIGEST;
 +        return;
 +      }
 +
 +      buf_to_hex((const unsigned char *)supplied_md5_bin, CEPH_CRYPTO_MD5_DIGESTSIZE, supplied_md5);
 +      ldout(s->cct, 15) << "supplied_md5=" << supplied_md5 << dendl;
 +    }
 +
      RGWPutObjProcessor_Atomic processor(*static_cast<RGWObjectCtx *>(s->obj_ctx),
                                          s->bucket_info,
                                          s->bucket,