Merge pull request #17956 from zhangsw/fix-rgw-encry-torrent-bug

rgw: Torrents are not supported for objects encrypted using SSE-C
ceph · Oct 18, 2017 · fee8a8e · fee8a8e
2 parents 5283449 + 9a8ae66
commit fee8a8e
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
@@ -1640,6 +1640,11 @@ void RGWGetObj::execute()
   /* start gettorrent */
   if (torrent.get_flag())
   {
+    attr_iter = attrs.find(RGW_ATTR_CRYPT_MODE);
+    if (attr_iter != attrs.end() && attr_iter->second.to_str() == "SSE-C-AES256") {
+      op_ret = -ERR_INVALID_REQUEST;
+      goto done_err;
+    }
     torrent.init(s, store);
     op_ret = torrent.get_torrent_file(read_op, total_len, bl, obj);
     if (op_ret < 0)