tweak media type parsing to accept trailing semicolon

MattiasBilaj · Jan 31, 2022 · 3927f98 · 3927f98
1 parent 02a0e75
commit 3927f98
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/spyne/model/primitive/string.py b/spyne/model/primitive/string.py
@@ -38,6 +38,8 @@
 LTREE_MAXIMUM_SIZE = 65536
 
 
+'[0-9A-Za-z!#$%&\'*+.^_`|~-]+/([0-9A-Za-z!#$%&\'*+.^_`|~-]+);[ \\t]*[0-9A-Za-z!#$%&\'*+.^_`|~-]+=(?:[0-9A-Za-z!#$%&\'*+.^_`|~-]+|"(?:[^"\\\\]|\\.)*");?[ \\t]*([0-9A-Za-z!#$%&\'*+.^_`|~-]+=(?:[0-9A-Za-z!#$%&\'*+.^_`|~-]+|"(?:[^"\\\\]|\\.)*");?[ \\t]*)*'
+
 def _gen_mime_type_pattern(strict, with_params):
     ows = "[ \\t]*"  # Optional WhiteSpace
     token = "[0-9A-Za-z!#$%&'*+.^_`|~-]+"
@@ -51,13 +53,16 @@ def _gen_mime_type_pattern(strict, with_params):
     else:
         main_type = token
 
-    param = token + "=" + "(?:" + token + "|" + quotedString + ");?" + ows
-    params = ";" + ows + param + "(" + param + ")*"
-
     if not with_params:
         return main_type + "/" + "(" + token + ")"
-    else:
-        return main_type + "/" + "(" + token + ")" + params
+
+    param = token + "=" + "(?:" + token + "|" + quotedString + ");?" + ows
+    params = \
+        "(" + ";" \
+             + "(" + ows + param + "(" + param + ")*" + ")?" \
+        + ")?"
+
+    return main_type + "/" + "(" + token + ")" + params
 
 
 MIME_TYPE_PATTERN_STRICT = \

diff --git a/spyne/test/model/test_primitive.py b/spyne/test/model/test_primitive.py
@@ -67,10 +67,13 @@ def test_mime_type_family(self):
 
         print(media_attr.pattern)
 
+        assert     rmws(media_attr, u'text/plain')
+        assert not rmws(media_attr, u' text/plain')
+        assert     rmws(media_attr, u'text/plain;')
+        assert     rmws(media_attr, u'text/plain;charset=utf-8')
         assert     rmws(media_attr, u'text/plain; charset="utf-8"')
         assert     rmws(media_attr, u'text/plain; charset=utf-8')
         assert     rmws(media_attr, u'text/plain; charset=utf-8 ')
-        assert     rmws(media_attr, u'text/plain; charset=utf-8')
         assert     rmws(media_attr, u'text/plain; charset=utf-8;')
         assert     rmws(media_attr, u'text/plain; charset=utf-8; ')
         assert not rmws(media_attr, u'text/plain; charset=utf-8; foo')
@@ -85,9 +88,8 @@ def test_mime_type_family(self):
         assert not rmws(media_attr, u'text/plain; charset=utf-8;;; foo=""')
         assert not rmws(media_attr, u'text/plain; charset=utf-8;;; foo="";')
         assert not rmws(media_attr, u'text/plain; charset=utf-8;;; foo=""; ; ')
-        assert not rmws(media_strict_attr, u'foo/bar;')
+
         assert not rmws(media_strict_attr, u' applicaton/json;')
-        assert not rmws(media_strict_attr, u'applicaton/json;')
 
         assert MediaType