tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix exceptions raised by decode_request

Browse Source
This commit is contained in:
Unrud 2020-09-14 21:20:39 +02:00
parent 0ce90d6b34
commit a3ca887a37
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
radicale/httputils.py
View File

@ -80,6 +80,10 @@ def decode_request(configuration, environ, text):
# Then append various fallbacks # Then append various fallbacks
charsets.append("utf-8") charsets.append("utf-8")
charsets.append("iso8859-1") charsets.append("iso8859-1")
# Remove duplicates
for i, s in reversed(list(enumerate(charsets))):
if s in charsets[:i]:
del charsets[i]
# Try to decode # Try to decode
for charset in charsets: for charset in charsets:
@ -87,7 +91,8 @@ def decode_request(configuration, environ, text):
return text.decode(charset) return text.decode(charset)
except UnicodeDecodeError: except UnicodeDecodeError:
pass pass
raise UnicodeDecodeError raise UnicodeDecodeError("decode_request", text, 0, len(text),
"all codecs failed [%s]" % ", ".join(charsets))
def read_raw_request_body(configuration, environ): def read_raw_request_body(configuration, environ):