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

Merge pull request #307 from dbrandenburg/master

Browse Source 
Escaping tags individually for building the describe_tags template
This commit is contained in:
Steve Pulec 2015-02-17 22:17:07 -05:00
commit f7bd9f9f68
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
moto/ec2/responses/tags.py
View File

@ -1,7 +1,10 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from jinja2 import Template
from moto.core.responses import BaseResponse from moto.core.responses import BaseResponse
from moto.ec2.models import validate_resource_ids from moto.ec2.models import validate_resource_ids
from moto.ec2.utils import sequence_from_querystring, tags_from_query_string, filters_from_querystring from moto.ec2.utils import sequence_from_querystring, tags_from_query_string, filters_from_querystring
from xml.sax.saxutils import escape
class TagResponse(BaseResponse): class TagResponse(BaseResponse):
@ -24,7 +27,9 @@ class TagResponse(BaseResponse):
def describe_tags(self): def describe_tags(self):
filters = filters_from_querystring(querystring_dict=self.querystring) filters = filters_from_querystring(querystring_dict=self.querystring)
tags = self.ec2_backend.describe_tags(filters=filters) tags = self.ec2_backend.describe_tags(filters=filters)
template = self.response_template(DESCRIBE_RESPONSE) for tag in tags:
tag['value'] = escape(tag['value'])
template = Template(DESCRIBE_RESPONSE)
return template.render(tags=tags) return template.render(tags=tags)