Fixed S3 lifecycle error message. (#1110)
Fixes #1109 Also added PutBucketTagging support Also added Bucket CORS support
This commit is contained in:
Mike Grima
Jack Danger
parent
b922af8ab7
commit
5d8cd22b01
4 changed files with 523 additions and 1 deletions
|
|
@ -188,7 +188,8 @@ class ResponseObject(_TemplateEnvironmentMixin):
|
|||
elif 'lifecycle' in querystring:
|
||||
bucket = self.backend.get_bucket(bucket_name)
|
||||
if not bucket.rules:
|
||||
return 404, {}, "NoSuchLifecycleConfiguration"
|
||||
template = self.response_template(S3_NO_LIFECYCLE)
|
||||
return 404, {}, template.render(bucket_name=bucket_name)
|
||||
template = self.response_template(
|
||||
S3_BUCKET_LIFECYCLE_CONFIGURATION)
|
||||
return template.render(rules=bucket.rules)
|
||||
|
|
@ -205,11 +206,29 @@ class ResponseObject(_TemplateEnvironmentMixin):
|
|||
elif 'website' in querystring:
|
||||
website_configuration = self.backend.get_bucket_website_configuration(
|
||||
bucket_name)
|
||||
if not website_configuration:
|
||||
template = self.response_template(S3_NO_BUCKET_WEBSITE_CONFIG)
|
||||
return 404, {}, template.render(bucket_name=bucket_name)
|
||||
return website_configuration
|
||||
elif 'acl' in querystring:
|
||||
bucket = self.backend.get_bucket(bucket_name)
|
||||
template = self.response_template(S3_OBJECT_ACL_RESPONSE)
|
||||
return template.render(obj=bucket)
|
||||
elif 'tagging' in querystring:
|
||||
bucket = self.backend.get_bucket(bucket_name)
|
||||
# "Special Error" if no tags:
|
||||
if len(bucket.tagging.tag_set.tags) == 0:
|
||||
template = self.response_template(S3_NO_BUCKET_TAGGING)
|
||||
return 404, {}, template.render(bucket_name=bucket_name)
|
||||
template = self.response_template(S3_BUCKET_TAGGING_RESPONSE)
|
||||
return template.render(bucket=bucket)
|
||||
elif "cors" in querystring:
|
||||
bucket = self.backend.get_bucket(bucket_name)
|
||||
if len(bucket.cors) == 0:
|
||||
template = self.response_template(S3_NO_CORS_CONFIG)
|
||||
return 404, {}, template.render(bucket_name=bucket_name)
|
||||
template = self.response_template(S3_BUCKET_CORS_RESPONSE)
|
||||
return template.render(bucket=bucket)
|
||||
elif 'versions' in querystring:
|
||||
delimiter = querystring.get('delimiter', [None])[0]
|
||||
encoding_type = querystring.get('encoding-type', [None])[0]
|
||||
|
|
@ -340,9 +359,20 @@ class ResponseObject(_TemplateEnvironmentMixin):
|
|||
# TODO: Support the XML-based ACL format
|
||||
self.backend.set_bucket_acl(bucket_name, acl)
|
||||
return ""
|
||||
elif "tagging" in querystring:
|
||||
tagging = self._bucket_tagging_from_xml(body)
|
||||
self.backend.put_bucket_tagging(bucket_name, tagging)
|
||||
return ""
|
||||
elif 'website' in querystring:
|
||||
self.backend.set_bucket_website_configuration(bucket_name, body)
|
||||
return ""
|
||||
elif "cors" in querystring:
|
||||
from moto.s3.exceptions import MalformedXML
|
||||
try:
|
||||
self.backend.put_bucket_cors(bucket_name, self._cors_from_xml(body))
|
||||
return ""
|
||||
except KeyError:
|
||||
raise MalformedXML()
|
||||
else:
|
||||
if body:
|
||||
try:
|
||||
|
|
@ -366,6 +396,12 @@ class ResponseObject(_TemplateEnvironmentMixin):
|
|||
if 'policy' in querystring:
|
||||
self.backend.delete_bucket_policy(bucket_name, body)
|
||||
return 204, {}, ""
|
||||
elif "tagging" in querystring:
|
||||
self.backend.delete_bucket_tagging(bucket_name)
|
||||
return 204, {}, ""
|
||||
elif "cors" in querystring:
|
||||
self.backend.delete_bucket_cors(bucket_name)
|
||||
return 204, {}, ""
|
||||
elif 'lifecycle' in querystring:
|
||||
bucket = self.backend.get_bucket(bucket_name)
|
||||
bucket.delete_lifecycle()
|
||||
|
|
@ -697,6 +733,27 @@ class ResponseObject(_TemplateEnvironmentMixin):
|
|||
tagging = FakeTagging(tag_set)
|
||||
return tagging
|
||||
|
||||
def _bucket_tagging_from_xml(self, xml):
|
||||
parsed_xml = xmltodict.parse(xml)
|
||||
|
||||
tags = []
|
||||
# Optional if no tags are being sent:
|
||||
if parsed_xml['Tagging'].get('TagSet'):
|
||||
for tag in parsed_xml['Tagging']['TagSet']['Tag']:
|
||||
tags.append(FakeTag(tag['Key'], tag['Value']))
|
||||
|
||||
tag_set = FakeTagSet(tags)
|
||||
tagging = FakeTagging(tag_set)
|
||||
return tagging
|
||||
|
||||
def _cors_from_xml(self, xml):
|
||||
parsed_xml = xmltodict.parse(xml)
|
||||
|
||||
if isinstance(parsed_xml["CORSConfiguration"]["CORSRule"], list):
|
||||
return [cors for cors in parsed_xml["CORSConfiguration"]["CORSRule"]]
|
||||
|
||||
return [parsed_xml["CORSConfiguration"]["CORSRule"]]
|
||||
|
||||
def _key_response_delete(self, bucket_name, query, key_name, headers):
|
||||
if query.get('uploadId'):
|
||||
upload_id = query['uploadId'][0]
|
||||
|
|
@ -1023,6 +1080,46 @@ S3_OBJECT_TAGGING_RESPONSE = """\
|
|||
</TagSet>
|
||||
</Tagging>"""
|
||||
|
||||
S3_BUCKET_TAGGING_RESPONSE = """<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Tagging>
|
||||
<TagSet>
|
||||
{% for tag in bucket.tagging.tag_set.tags %}
|
||||
<Tag>
|
||||
<Key>{{ tag.key }}</Key>
|
||||
<Value>{{ tag.value }}</Value>
|
||||
</Tag>
|
||||
{% endfor %}
|
||||
</TagSet>
|
||||
</Tagging>"""
|
||||
|
||||
S3_BUCKET_CORS_RESPONSE = """<?xml version="1.0" encoding="UTF-8"?>
|
||||
<CORSConfiguration>
|
||||
{% for cors in bucket.cors %}
|
||||
<CORSRule>
|
||||
{% for origin in cors.allowed_origins %}
|
||||
<AllowedOrigin>{{ origin }}</AllowedOrigin>
|
||||
{% endfor %}
|
||||
{% for method in cors.allowed_methods %}
|
||||
<AllowedMethod>{{ method }}</AllowedMethod>
|
||||
{% endfor %}
|
||||
{% if cors.allowed_headers is not none %}
|
||||
{% for header in cors.allowed_headers %}
|
||||
<AllowedHeader>{{ header }}</AllowedHeader>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% if cors.exposed_headers is not none %}
|
||||
{% for header in cors.exposed_headers %}
|
||||
<ExposedHeader>{{ header }}</ExposedHeader>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% if cors.max_age_seconds is not none %}
|
||||
<MaxAgeSeconds>{{ cors.max_age_seconds }}</MaxAgeSeconds>
|
||||
{% endif %}
|
||||
</CORSRule>
|
||||
{% endfor %}
|
||||
</CORSConfiguration>
|
||||
"""
|
||||
|
||||
S3_OBJECT_COPY_RESPONSE = """\
|
||||
<CopyObjectResult xmlns="http://doc.s3.amazonaws.com/2006-03-01">
|
||||
<ETag>{{ key.etag }}</ETag>
|
||||
|
|
@ -1115,3 +1212,53 @@ S3_NO_POLICY = """<?xml version="1.0" encoding="UTF-8"?>
|
|||
<HostId>9Gjjt1m+cjU4OPvX9O9/8RuvnG41MRb/18Oux2o5H5MY7ISNTlXN+Dz9IG62/ILVxhAGI0qyPfg=</HostId>
|
||||
</Error>
|
||||
"""
|
||||
|
||||
S3_NO_LIFECYCLE = """<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Error>
|
||||
<Code>NoSuchLifecycleConfiguration</Code>
|
||||
<Message>The lifecycle configuration does not exist</Message>
|
||||
<BucketName>{{ bucket_name }}</BucketName>
|
||||
<RequestId>44425877V1D0A2F9</RequestId>
|
||||
<HostId>9Gjjt1m+cjU4OPvX9O9/8RuvnG41MRb/18Oux2o5H5MY7ISNTlXN+Dz9IG62/ILVxhAGI0qyPfg=</HostId>
|
||||
</Error>
|
||||
"""
|
||||
|
||||
S3_NO_BUCKET_TAGGING = """<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Error>
|
||||
<Code>NoSuchTagSet</Code>
|
||||
<Message>The TagSet does not exist</Message>
|
||||
<BucketName>{{ bucket_name }}</BucketName>
|
||||
<RequestId>44425877V1D0A2F9</RequestId>
|
||||
<HostId>9Gjjt1m+cjU4OPvX9O9/8RuvnG41MRb/18Oux2o5H5MY7ISNTlXN+Dz9IG62/ILVxhAGI0qyPfg=</HostId>
|
||||
</Error>
|
||||
"""
|
||||
|
||||
S3_NO_BUCKET_WEBSITE_CONFIG = """<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Error>
|
||||
<Code>NoSuchWebsiteConfiguration</Code>
|
||||
<Message>The specified bucket does not have a website configuration</Message>
|
||||
<BucketName>{{ bucket_name }}</BucketName>
|
||||
<RequestId>44425877V1D0A2F9</RequestId>
|
||||
<HostId>9Gjjt1m+cjU4OPvX9O9/8RuvnG41MRb/18Oux2o5H5MY7ISNTlXN+Dz9IG62/ILVxhAGI0qyPfg=</HostId>
|
||||
</Error>
|
||||
"""
|
||||
|
||||
S3_INVALID_CORS_REQUEST = """<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Error>
|
||||
<Code>NoSuchWebsiteConfiguration</Code>
|
||||
<Message>The specified bucket does not have a website configuration</Message>
|
||||
<BucketName>{{ bucket_name }}</BucketName>
|
||||
<RequestId>44425877V1D0A2F9</RequestId>
|
||||
<HostId>9Gjjt1m+cjU4OPvX9O9/8RuvnG41MRb/18Oux2o5H5MY7ISNTlXN+Dz9IG62/ILVxhAGI0qyPfg=</HostId>
|
||||
</Error>
|
||||
"""
|
||||
|
||||
S3_NO_CORS_CONFIG = """<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Error>
|
||||
<Code>NoSuchCORSConfiguration</Code>
|
||||
<Message>The CORS configuration does not exist</Message>
|
||||
<BucketName>{{ bucket_name }}</BucketName>
|
||||
<RequestId>44425877V1D0A2F9</RequestId>
|
||||
<HostId>9Gjjt1m+cjU4OPvX9O9/8RuvnG41MRb/18Oux2o5H5MY7ISNTlXN+Dz9IG62/ILVxhAGI0qyPfg=</HostId>
|
||||
</Error>
|
||||
"""
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue