catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Handle UnicodeEncodeError when parsing querystring (#2170)

Browse source
This commit is contained in:
Garrett 2019-05-25 13:34:47 -04:00 • committed by Terry Cain
commit c739c5331e
2 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
moto/core/responses.py
View file

@ -152,11 +152,18 @@ class BaseResponse(_TemplateEnvironmentMixin):
for key, value in flat.items():
querystring[key] = [value]
elif self.body:
querystring.update(parse_qs(raw_body, keep_blank_values=True))
try:
querystring.update(parse_qs(raw_body, keep_blank_values=True))
except UnicodeEncodeError:
pass # ignore encoding errors, as the body may not contain a legitimate querystring
if not querystring:
querystring.update(headers)
querystring = _decode_dict(querystring)
try:
querystring = _decode_dict(querystring)
except UnicodeDecodeError:
pass # ignore decoding errors, as the body may not contain a legitimate querystring
self.uri = full_url
self.path = urlparse(full_url).path
self.querystring = querystring