swift 2.23.2__py3-none-any.whl → 2.35.0__py3-none-any.whl

swift/common/middleware/s3api/controllers/bucket.py

@@ -16,21 +16,25 @@
 from base64 import standard_b64encode as b64encode
 from base64 import standard_b64decode as b64decode
 
-import six
-from six.moves.urllib.parse import quote
+from urllib.parse import quote
 
 from swift.common import swob
 from swift.common.http import HTTP_OK
-from swift.common.utils import json, public, config_true_value
+from swift.common.middleware.versioned_writes.object_versioning import \
+    DELETE_MARKER_CONTENT_TYPE
+from swift.common.utils import json, public, config_true_value, Timestamp, \
+    cap_length
+from swift.common.registry import get_swift_info
 
 from swift.common.middleware.s3api.controllers.base import Controller
-from swift.common.middleware.s3api.etree import Element, SubElement, tostring, \
-    fromstring, XMLSyntaxError, DocumentInvalid
-from swift.common.middleware.s3api.s3response import HTTPOk, S3NotImplemented, \
-    InvalidArgument, \
+from swift.common.middleware.s3api.etree import Element, SubElement, \
+    tostring, fromstring, XMLSyntaxError, DocumentInvalid
+from swift.common.middleware.s3api.s3response import \
+    HTTPOk, S3NotImplemented, InvalidArgument, \
     MalformedXML, InvalidLocationConstraint, NoSuchBucket, \
-    BucketNotEmpty, InternalError, ServiceUnavailable, NoSuchKey
-from swift.common.middleware.s3api.utils import MULTIUPLOAD_SUFFIX
+    BucketNotEmpty, VersionedBucketNotEmpty, InternalError, \
+    ServiceUnavailable, NoSuchKey
+from swift.common.middleware.s3api.utils import MULTIUPLOAD_SUFFIX, S3Timestamp
 
 MAX_PUT_BUCKET_BODY_SIZE = 10240
 
@@ -50,7 +54,10 @@ class BucketController(Controller):
         try:
             resp = req.get_response(self.app, 'HEAD')
             if int(resp.sw_headers['X-Container-Object-Count']) > 0:
-                raise BucketNotEmpty()
+                if resp.sw_headers.get('X-Container-Sysmeta-Versions-Enabled'):
+                    raise VersionedBucketNotEmpty()
+                else:
+                    raise BucketNotEmpty()
             # FIXME: This extra HEAD saves unexpected segment deletion
             # but if a complete multipart upload happen while cleanup
             # segment container below, completed object may be missing its
@@ -94,170 +101,266 @@ class BucketController(Controller):
 
         return HTTPOk(headers=resp.headers)
 
-    @public
-    def GET(self, req):
-        """
-        Handle GET Bucket (List Objects) request
-        """
-
-        max_keys = req.get_validated_param(
-            'max-keys', self.conf.max_bucket_listing)
-        # TODO: Separate max_bucket_listing and default_bucket_listing
-        tag_max_keys = max_keys
-        max_keys = min(max_keys, self.conf.max_bucket_listing)
-
+    def _parse_request_options(self, req, max_keys):
         encoding_type = req.params.get('encoding-type')
         if encoding_type is not None and encoding_type != 'url':
             err_msg = 'Invalid Encoding Method specified in Request'
             raise InvalidArgument('encoding-type', encoding_type, err_msg)
 
+        # in order to judge that truncated is valid, check whether
+        # max_keys + 1 th element exists in swift.
         query = {
-            'format': 'json',
             'limit': max_keys + 1,
         }
         if 'prefix' in req.params:
-            query.update({'prefix': req.params['prefix']})
+            query['prefix'] = swob.wsgi_to_str(req.params['prefix'])
         if 'delimiter' in req.params:
-            query.update({'delimiter': req.params['delimiter']})
+            query['delimiter'] = swob.wsgi_to_str(req.params['delimiter'])
         fetch_owner = False
         if 'versions' in req.params:
+            query['versions'] = swob.wsgi_to_str(req.params['versions'])
             listing_type = 'object-versions'
+            version_marker = swob.wsgi_to_str(req.params.get(
+                'version-id-marker'))
             if 'key-marker' in req.params:
-                query.update({'marker': req.params['key-marker']})
-            elif 'version-id-marker' in req.params:
+                query['marker'] = swob.wsgi_to_str(req.params['key-marker'])
+                if version_marker is not None:
+                    if version_marker != 'null':
+                        try:
+                            Timestamp(version_marker)
+                        except ValueError:
+                            raise InvalidArgument(
+                                'version-id-marker', version_marker,
+                                'Invalid version id specified')
+                    query['version_marker'] = version_marker
+            elif version_marker is not None:
                 err_msg = ('A version-id marker cannot be specified without '
                            'a key marker.')
                 raise InvalidArgument('version-id-marker',
-                                      req.params['version-id-marker'], err_msg)
+                                      version_marker, err_msg)
         elif int(req.params.get('list-type', '1')) == 2:
             listing_type = 'version-2'
             if 'start-after' in req.params:
-                query.update({'marker': req.params['start-after']})
+                query['marker'] = swob.wsgi_to_str(req.params['start-after'])
             # continuation-token overrides start-after
             if 'continuation-token' in req.params:
-                decoded = b64decode(req.params['continuation-token'])
-                if not six.PY2:
-                    decoded = decoded.decode('utf8')
-                query.update({'marker': decoded})
+                decoded = b64decode(
+                    req.params['continuation-token']).decode('utf8')
+                query['marker'] = decoded
             if 'fetch-owner' in req.params:
                 fetch_owner = config_true_value(req.params['fetch-owner'])
         else:
             listing_type = 'version-1'
             if 'marker' in req.params:
-                query.update({'marker': req.params['marker']})
-
-        resp = req.get_response(self.app, query=query)
+                query['marker'] = swob.wsgi_to_str(req.params['marker'])
+
+        return encoding_type, query, listing_type, fetch_owner
+
+    def _build_versions_result(self, req, objects, encoding_type,
+                               tag_max_keys, is_truncated):
+        elem = Element('ListVersionsResult')
+        SubElement(elem, 'Name').text = req.container_name
+        prefix = swob.wsgi_to_str(req.params.get('prefix'))
+        if prefix and encoding_type == 'url':
+            prefix = quote(prefix)
+        SubElement(elem, 'Prefix').text = prefix
+        key_marker = swob.wsgi_to_str(req.params.get('key-marker'))
+        if key_marker and encoding_type == 'url':
+            key_marker = quote(key_marker)
+        SubElement(elem, 'KeyMarker').text = key_marker
+        SubElement(elem, 'VersionIdMarker').text = swob.wsgi_to_str(
+            req.params.get('version-id-marker'))
+        if is_truncated:
+            if 'name' in objects[-1]:
+                SubElement(elem, 'NextKeyMarker').text = \
+                    objects[-1]['name']
+                SubElement(elem, 'NextVersionIdMarker').text = \
+                    objects[-1].get('version') or 'null'
+            if 'subdir' in objects[-1]:
+                SubElement(elem, 'NextKeyMarker').text = \
+                    objects[-1]['subdir']
+                SubElement(elem, 'NextVersionIdMarker').text = 'null'
+        SubElement(elem, 'MaxKeys').text = str(tag_max_keys)
+        delimiter = swob.wsgi_to_str(req.params.get('delimiter'))
+        if delimiter is not None:
+            if encoding_type == 'url':
+                delimiter = quote(delimiter)
+            SubElement(elem, 'Delimiter').text = delimiter
+        if encoding_type == 'url':
+            SubElement(elem, 'EncodingType').text = encoding_type
+        SubElement(elem, 'IsTruncated').text = \
+            'true' if is_truncated else 'false'
+        return elem
+
+    def _build_base_listing_element(self, req, encoding_type):
+        elem = Element('ListBucketResult')
+        SubElement(elem, 'Name').text = req.container_name
+        prefix = swob.wsgi_to_str(req.params.get('prefix'))
+        if prefix and encoding_type == 'url':
+            prefix = quote(prefix)
+        SubElement(elem, 'Prefix').text = prefix
+        return elem
+
+    def _build_list_bucket_result_type_one(self, req, objects, encoding_type,
+                                           tag_max_keys, is_truncated):
+        elem = self._build_base_listing_element(req, encoding_type)
+        marker = swob.wsgi_to_str(req.params.get('marker'))
+        if marker and encoding_type == 'url':
+            marker = quote(marker)
+        SubElement(elem, 'Marker').text = marker
+        if is_truncated and 'delimiter' in req.params:
+            if 'name' in objects[-1]:
+                name = objects[-1]['name']
+            else:
+                name = objects[-1]['subdir']
+            if encoding_type == 'url':
+                name = quote(name.encode('utf-8'))
+            SubElement(elem, 'NextMarker').text = name
+        # XXX: really? no NextMarker when no delimiter??
+        SubElement(elem, 'MaxKeys').text = str(tag_max_keys)
+        delimiter = swob.wsgi_to_str(req.params.get('delimiter'))
+        if delimiter:
+            if encoding_type == 'url':
+                delimiter = quote(delimiter)
+            SubElement(elem, 'Delimiter').text = delimiter
+        if encoding_type == 'url':
+            SubElement(elem, 'EncodingType').text = encoding_type
+        SubElement(elem, 'IsTruncated').text = \
+            'true' if is_truncated else 'false'
+        return elem
+
+    def _build_list_bucket_result_type_two(self, req, objects, encoding_type,
+                                           tag_max_keys, is_truncated):
+        elem = self._build_base_listing_element(req, encoding_type)
+        if is_truncated:
+            if 'name' in objects[-1]:
+                SubElement(elem, 'NextContinuationToken').text = \
+                    b64encode(objects[-1]['name'].encode('utf8'))
+            if 'subdir' in objects[-1]:
+                SubElement(elem, 'NextContinuationToken').text = \
+                    b64encode(objects[-1]['subdir'].encode('utf8'))
+        if 'continuation-token' in req.params:
+            SubElement(elem, 'ContinuationToken').text = \
+                swob.wsgi_to_str(req.params['continuation-token'])
+        start_after = swob.wsgi_to_str(req.params.get('start-after'))
+        if start_after is not None:
+            if encoding_type == 'url':
+                start_after = quote(start_after)
+            SubElement(elem, 'StartAfter').text = start_after
+        SubElement(elem, 'KeyCount').text = str(len(objects))
+        SubElement(elem, 'MaxKeys').text = str(tag_max_keys)
+        delimiter = swob.wsgi_to_str(req.params.get('delimiter'))
+        if delimiter:
+            if encoding_type == 'url':
+                delimiter = quote(delimiter)
+            SubElement(elem, 'Delimiter').text = delimiter
+        if encoding_type == 'url':
+            SubElement(elem, 'EncodingType').text = encoding_type
+        SubElement(elem, 'IsTruncated').text = \
+            'true' if is_truncated else 'false'
+        return elem
 
-        objects = json.loads(resp.body)
+    def _add_subdir(self, elem, o, encoding_type):
+        common_prefixes = SubElement(elem, 'CommonPrefixes')
+        name = o['subdir']
+        if encoding_type == 'url':
+            name = quote(name.encode('utf-8'))
+        SubElement(common_prefixes, 'Prefix').text = name
 
-        # in order to judge that truncated is valid, check whether
-        # max_keys + 1 th element exists in swift.
-        is_truncated = max_keys > 0 and len(objects) > max_keys
-        objects = objects[:max_keys]
+    def _add_object(self, req, elem, o, encoding_type, listing_type,
+                    fetch_owner):
+        name = o['name']
+        if encoding_type == 'url':
+            name = quote(name.encode('utf-8'))
 
         if listing_type == 'object-versions':
-            elem = Element('ListVersionsResult')
-            SubElement(elem, 'Name').text = req.container_name
-            SubElement(elem, 'Prefix').text = req.params.get('prefix')
-            SubElement(elem, 'KeyMarker').text = req.params.get('key-marker')
-            SubElement(elem, 'VersionIdMarker').text = req.params.get(
-                'version-id-marker')
-            if is_truncated:
-                if 'name' in objects[-1]:
-                    SubElement(elem, 'NextKeyMarker').text = \
-                        objects[-1]['name']
-                if 'subdir' in objects[-1]:
-                    SubElement(elem, 'NextKeyMarker').text = \
-                        objects[-1]['subdir']
-                SubElement(elem, 'NextVersionIdMarker').text = 'null'
+            if o['content_type'] == DELETE_MARKER_CONTENT_TYPE:
+                contents = SubElement(elem, 'DeleteMarker')
+            else:
+                contents = SubElement(elem, 'Version')
+            SubElement(contents, 'Key').text = name
+            SubElement(contents, 'VersionId').text = o.get(
+                'version_id') or 'null'
+            if 'object_versioning' in get_swift_info():
+                SubElement(contents, 'IsLatest').text = (
+                    'true' if o['is_latest'] else 'false')
+            else:
+                SubElement(contents, 'IsLatest').text = 'true'
         else:
-            elem = Element('ListBucketResult')
-            SubElement(elem, 'Name').text = req.container_name
-            SubElement(elem, 'Prefix').text = req.params.get('prefix')
-            if listing_type == 'version-1':
-                SubElement(elem, 'Marker').text = req.params.get('marker')
-                if is_truncated and 'delimiter' in req.params:
-                    if 'name' in objects[-1]:
-                        name = objects[-1]['name']
-                    else:
-                        name = objects[-1]['subdir']
-                    if encoding_type == 'url':
-                        name = quote(name.encode('utf-8'))
-                    SubElement(elem, 'NextMarker').text = name
-            elif listing_type == 'version-2':
-                if is_truncated:
-                    if 'name' in objects[-1]:
-                        SubElement(elem, 'NextContinuationToken').text = \
-                            b64encode(objects[-1]['name'].encode('utf-8'))
-                    if 'subdir' in objects[-1]:
-                        SubElement(elem, 'NextContinuationToken').text = \
-                            b64encode(objects[-1]['subdir'].encode('utf-8'))
-                if 'continuation-token' in req.params:
-                    SubElement(elem, 'ContinuationToken').text = \
-                        req.params['continuation-token']
-                if 'start-after' in req.params:
-                    SubElement(elem, 'StartAfter').text = \
-                        req.params['start-after']
-                SubElement(elem, 'KeyCount').text = str(len(objects))
+            contents = SubElement(elem, 'Contents')
+            SubElement(contents, 'Key').text = name
+        SubElement(contents, 'LastModified').text = \
+            S3Timestamp.from_isoformat(o['last_modified']).s3xmlformat
+        if contents.tag != 'DeleteMarker':
+            if 's3_etag' in o:
+                # New-enough MUs are already in the right format
+                etag = o['s3_etag']
+            elif 'slo_etag' in o:
+                # SLOs may be in something *close* to the MU format
+                etag = '"%s-N"' % o['slo_etag'].strip('"')
+            else:
+                # Normal objects just use the MD5
+                etag = o['hash']
+                if len(etag) < 2 or etag[::len(etag) - 1] != '""':
+                    # Normal objects just use the MD5
+                    etag = '"%s"' % o['hash']
+                    # This also catches sufficiently-old SLOs, but we have
+                    # no way to identify those from container listings
+                # Otherwise, somebody somewhere (proxyfs, maybe?) made this
+                # look like an RFC-compliant ETag; we don't need to
+                # quote-wrap.
+            SubElement(contents, 'ETag').text = etag
+            SubElement(contents, 'Size').text = str(o['bytes'])
+        if fetch_owner or listing_type != 'version-2':
+            owner = SubElement(contents, 'Owner')
+            SubElement(owner, 'ID').text = req.user_id
+            SubElement(owner, 'DisplayName').text = req.user_id
+        if contents.tag != 'DeleteMarker':
+            SubElement(contents, 'StorageClass').text = 'STANDARD'
+
+    def _add_objects_to_result(self, req, elem, objects, encoding_type,
+                               listing_type, fetch_owner):
+        for o in objects:
+            if 'subdir' in o:
+                self._add_subdir(elem, o, encoding_type)
+            else:
+                self._add_object(req, elem, o, encoding_type, listing_type,
+                                 fetch_owner)
 
-        SubElement(elem, 'MaxKeys').text = str(tag_max_keys)
+    @public
+    def GET(self, req):
+        """
+        Handle GET Bucket (List Objects) request
+        """
+        tag_max_keys = req.get_validated_param(
+            'max-keys', self.conf.max_bucket_listing)
+        # TODO: Separate max_bucket_listing and default_bucket_listing
+        max_keys = min(tag_max_keys, self.conf.max_bucket_listing)
 
-        if 'delimiter' in req.params:
-            SubElement(elem, 'Delimiter').text = req.params['delimiter']
+        encoding_type, query, listing_type, fetch_owner = \
+            self._parse_request_options(req, max_keys)
 
-        if encoding_type == 'url':
-            SubElement(elem, 'EncodingType').text = encoding_type
+        resp = req.get_response(self.app, query=query)
 
-        SubElement(elem, 'IsTruncated').text = \
-            'true' if is_truncated else 'false'
+        try:
+            objects = json.loads(resp.body)
+        except (TypeError, ValueError):
+            self.logger.error('Got non-JSON response trying to list %s: %r',
+                              req.path, cap_length(resp.body, 60))
+            raise
 
-        for o in objects:
-            if 'subdir' not in o:
-                name = o['name']
-                if encoding_type == 'url':
-                    name = quote(name.encode('utf-8'))
-
-                if listing_type == 'object-versions':
-                    contents = SubElement(elem, 'Version')
-                    SubElement(contents, 'Key').text = name
-                    SubElement(contents, 'VersionId').text = 'null'
-                    SubElement(contents, 'IsLatest').text = 'true'
-                else:
-                    contents = SubElement(elem, 'Contents')
-                    SubElement(contents, 'Key').text = name
-                SubElement(contents, 'LastModified').text = \
-                    o['last_modified'][:-3] + 'Z'
-                if 's3_etag' in o:
-                    # New-enough MUs are already in the right format
-                    etag = o['s3_etag']
-                elif 'slo_etag' in o:
-                    # SLOs may be in something *close* to the MU format
-                    etag = '"%s-N"' % o['slo_etag'].strip('"')
-                else:
-                    etag = o['hash']
-                    if len(etag) < 2 or etag[::len(etag) - 1] != '""':
-                        # Normal objects just use the MD5
-                        etag = '"%s"' % o['hash']
-                        # This also catches sufficiently-old SLOs, but we have
-                        # no way to identify those from container listings
-                    # Otherwise, somebody somewhere (proxyfs, maybe?) made this
-                    # look like an RFC-compliant ETag; we don't need to
-                    # quote-wrap.
-                SubElement(contents, 'ETag').text = etag
-                SubElement(contents, 'Size').text = str(o['bytes'])
-                if fetch_owner or listing_type != 'version-2':
-                    owner = SubElement(contents, 'Owner')
-                    SubElement(owner, 'ID').text = req.user_id
-                    SubElement(owner, 'DisplayName').text = req.user_id
-                SubElement(contents, 'StorageClass').text = 'STANDARD'
+        is_truncated = max_keys > 0 and len(objects) > max_keys
+        objects = objects[:max_keys]
 
-        for o in objects:
-            if 'subdir' in o:
-                common_prefixes = SubElement(elem, 'CommonPrefixes')
-                name = o['subdir']
-                if encoding_type == 'url':
-                    name = quote(name.encode('utf-8'))
-                SubElement(common_prefixes, 'Prefix').text = name
+        if listing_type == 'object-versions':
+            func = self._build_versions_result
+        elif listing_type == 'version-2':
+            func = self._build_list_bucket_result_type_two
+        else:
+            func = self._build_list_bucket_result_type_one
+        elem = func(req, objects, encoding_type, tag_max_keys, is_truncated)
+        self._add_objects_to_result(
+            req, elem, objects, encoding_type, listing_type, fetch_owner)
 
         body = tostring(elem)
 
@@ -281,7 +384,8 @@ class BucketController(Controller):
                 self.logger.error(e)
                 raise
 
-            if location != self.conf.location:
+            if location not in (self.conf.location,
+                                self.conf.location.lower()):
                 # s3api cannot support multiple regions currently.
                 raise InvalidLocationConstraint()
 
@@ -297,6 +401,7 @@ class BucketController(Controller):
         """
         Handle DELETE Bucket request
         """
+        # NB: object_versioning is responsible for cleaning up its container
         if self.conf.allow_multipart_uploads:
             self._delete_segments_bucket(req)
         resp = req.get_response(self.app)

swift/common/middleware/s3api/controllers/logging.py

@@ -18,8 +18,8 @@ from swift.common.utils import public
 from swift.common.middleware.s3api.controllers.base import Controller, \
     bucket_operation
 from swift.common.middleware.s3api.etree import Element, tostring
-from swift.common.middleware.s3api.s3response import HTTPOk, S3NotImplemented, \
-    NoLoggingStatusForKey
+from swift.common.middleware.s3api.s3response import (
+    HTTPOk, S3NotImplemented, NoLoggingStatusForKey)
 
 
 class LoggingStatusController(Controller):

swift/common/middleware/s3api/controllers/multi_delete.py

@@ -17,15 +17,18 @@ import copy
 import json
 
 from swift.common.constraints import MAX_OBJECT_NAME_LENGTH
+from swift.common.http import HTTP_NO_CONTENT
+from swift.common.swob import str_to_wsgi
 from swift.common.utils import public, StreamingPile
+from swift.common.registry import get_swift_info
 
 from swift.common.middleware.s3api.controllers.base import Controller, \
     bucket_operation
 from swift.common.middleware.s3api.etree import Element, SubElement, \
     fromstring, tostring, XMLSyntaxError, DocumentInvalid
-from swift.common.middleware.s3api.s3response import HTTPOk, S3NotImplemented, \
-    NoSuchKey, ErrorResponse, MalformedXML, UserKeyMustBeSpecified, \
-    AccessDenied, MissingRequestBodyError
+from swift.common.middleware.s3api.s3response import HTTPOk, \
+    S3NotImplemented, NoSuchKey, ErrorResponse, MalformedXML, \
+    UserKeyMustBeSpecified, AccessDenied, MissingRequestBodyError
 
 
 class MultiObjectDeleteController(Controller):
@@ -35,12 +38,10 @@ class MultiObjectDeleteController(Controller):
     """
     def _gen_error_body(self, error, elem, delete_list):
         for key, version in delete_list:
-            if version is not None:
-                # TODO: delete the specific version of the object
-                raise S3NotImplemented()
-
             error_elem = SubElement(elem, 'Error')
             SubElement(error_elem, 'Key').text = key
+            if version is not None:
+                SubElement(error_elem, 'VersionId').text = version
             SubElement(error_elem, 'Code').text = error.__class__.__name__
             SubElement(error_elem, 'Message').text = error._msg
 
@@ -76,14 +77,16 @@ class MultiObjectDeleteController(Controller):
             if not xml:
                 raise MissingRequestBodyError()
 
-            req.check_md5(xml)
+            if 'x-amz-content-sha256' not in req.headers:
+                # SHA256 got checked when we read the body, so there's at
+                # least *some* verification. Recent versions of boto3 stopped
+                # sending Content-MD5, so it can't *always* be required.
+                # See https://bugs.launchpad.net/swift/+bug/2098529
+                req.check_md5(xml)
             elem = fromstring(xml, 'Delete', self.logger)
 
             quiet = elem.find('./Quiet')
-            if quiet is not None and quiet.text.lower() == 'true':
-                self.quiet = True
-            else:
-                self.quiet = False
+            self.quiet = quiet is not None and quiet.text.lower() == 'true'
 
             delete_list = list(object_key_iter(elem))
             if len(delete_list) > self.conf.max_multi_delete_objects:
@@ -105,21 +108,35 @@ class MultiObjectDeleteController(Controller):
             body = self._gen_error_body(error, elem, delete_list)
             return HTTPOk(body=body)
 
-        if any(version is not None for _key, version in delete_list):
-            # TODO: support deleting specific versions of objects
+        if 'object_versioning' not in get_swift_info() and any(
+                version not in ('null', None)
+                for _key, version in delete_list):
             raise S3NotImplemented()
 
         def do_delete(base_req, key, version):
             req = copy.copy(base_req)
             req.environ = copy.copy(base_req.environ)
-            req.object_name = key
+            req.object_name = str_to_wsgi(key)
+            if version:
+                req.params = {'version-id': version, 'symlink': 'get'}
 
             try:
-                query = req.gen_multipart_manifest_delete_query(self.app)
+                try:
+                    query = req.gen_multipart_manifest_delete_query(
+                        self.app, version=version)
+                except NoSuchKey:
+                    query = {}
+                if version:
+                    query['version-id'] = version
+                    query['symlink'] = 'get'
+
                 resp = req.get_response(self.app, method='DELETE', query=query,
                                         headers={'Accept': 'application/json'})
-                # Have to read the response to actually do the SLO delete
-                if query:
+                # If async segment cleanup is available, we expect to get
+                # back a 204; otherwise, the delete is synchronous and we
+                # have to read the response to actually do the SLO delete
+                if query.get('multipart-manifest') and \
+                        resp.status_int != HTTP_NO_CONTENT:
                     try:
                         delete_result = json.loads(resp.body)
                         if delete_result['Errors']:
@@ -135,8 +152,8 @@ class MultiObjectDeleteController(Controller):
                     except (ValueError, TypeError, KeyError):
                         # Logs get all the gory details
                         self.logger.exception(
-                            'Could not parse SLO delete response: %r',
-                            resp.body)
+                            'Could not parse SLO delete response (%s): %s',
+                            resp.status, resp.body)
                         # Client gets something more generic
                         return key, {'code': 'SLODeleteError',
                                      'message': 'Unexpected swift response'}
@@ -144,6 +161,12 @@ class MultiObjectDeleteController(Controller):
                 pass
             except ErrorResponse as e:
                 return key, {'code': e.__class__.__name__, 'message': e._msg}
+            except Exception:
+                self.logger.exception(
+                    'Unexpected Error handling DELETE of %r %r' % (
+                        req.container_name, key))
+                return key, {'code': 'Server Error', 'message': 'Server Error'}
+
             return key, None
 
         with StreamingPile(self.conf.multi_delete_concurrency) as pile: