Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Raising MalformedXML exception when using boto3 client and s3.delete_objects()

Browse Source
This commit is contained in:
Mariusz Strzelecki 2019-06-18 12:36:32 +00:00
parent 108dc6b049
commit f32db6e64a
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moto/s3/responses.py
View File

@ -566,6 +566,8 @@ class ResponseObject(_TemplateEnvironmentMixin):
keys = minidom.parseString(body).getElementsByTagName('Key') keys = minidom.parseString(body).getElementsByTagName('Key')
deleted_names = [] deleted_names = []
error_names = [] error_names = []
if len(keys) == 0:
raise MalformedXML()
for k in keys: for k in keys:
key_name = k.firstChild.nodeValue key_name = k.firstChild.nodeValue

12
tests/test_s3/test_s3.py
View File

@ -648,6 +648,7 @@ def test_delete_keys_with_invalid():
Key(bucket=bucket, name='file3').set_contents_from_string('abc') Key(bucket=bucket, name='file3').set_contents_from_string('abc')
Key(bucket=bucket, name='file4').set_contents_from_string('abc') Key(bucket=bucket, name='file4').set_contents_from_string('abc')
# non-existing key case
result = bucket.delete_keys(['abc', 'file3']) result = bucket.delete_keys(['abc', 'file3'])
result.deleted.should.have.length_of(1) result.deleted.should.have.length_of(1)
@ -656,6 +657,17 @@ def test_delete_keys_with_invalid():
keys.should.have.length_of(3) keys.should.have.length_of(3)
keys[0].name.should.equal('file1') keys[0].name.should.equal('file1')
# empty keys and boto2 client
result = bucket.delete_keys([])
result.deleted.should.have.length_of(0)
result.errors.should.have.length_of(0)
# empty keys and boto3 client
with assert_raises(ClientError) as err:
boto3.client('s3').delete_objects(Bucket='foobar', Delete={'Objects': []})
assert err.exception.response["Error"]["Code"] == "MalformedXML"
@mock_s3_deprecated @mock_s3_deprecated
def test_bucket_name_with_dot(): def test_bucket_name_with_dot():