Fix exceptions raised by decode_request

Kozea · Sep 14, 2020 · 8008b36 · 8008b36
1 parent 6f3a952
commit 8008b36
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/radicale/httputils.py b/radicale/httputils.py
@@ -80,14 +80,19 @@ def decode_request(configuration, environ, text):
     # Then append various fallbacks
     charsets.append("utf-8")
     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
     for charset in charsets:
         try:
             return text.decode(charset)
         except UnicodeDecodeError:
             pass
-    raise UnicodeDecodeError
+    raise UnicodeDecodeError("decode_request", text, 0, len(text),
+                             "all codecs failed [%s]" % ", ".join(charsets))
 
 
 def read_raw_request_body(configuration, environ):