Check for wrong media types (notice 1282)

plain/text actually happened to us at work,
and I know of text/json from
http://stackoverflow.com/posts/30741120/revisions

CHANGELOG.rst

@@ -15,10 +15,13 @@ Added
 - Python 3.6 compatibility.
 - Decompression of `brotli`_ compressed payloads (``Content-Encoding: br``).
 - Checks for JSON charsets (notices `1280`_ and `1281`_).
+- Checks for some wrong media types,
+  currently ``plain/text`` and ``text/json`` (notice `1282`_).
 
 .. _brotli: https://tools.ietf.org/html/rfc7932
 .. _1280: http://pythonhosted.org/HTTPolice/notices.html#1280
 .. _1281: http://pythonhosted.org/HTTPolice/notices.html#1281
+.. _1282: http://pythonhosted.org/HTTPolice/notices.html#1282
 
 Removed
 -------

httpolice/notices.xml

@@ -2059,4 +2059,9 @@ One non-obvious thing is how references work
     <ref to="msg.displayable_body"/>
   </error>
 
+  <error id="1282">
+    <title>Wrong media type ‘<var ref="bad"/>’ in <var ref="place"/></title>
+    <explain>There is no such media type ‘<var ref="bad"/>’. Probably ‘<var ref="good"/>’ was intended.</explain>
+  </error>
+
 </notices>

httpolice/syntax/rfc7231.py

@@ -24,6 +24,18 @@
               u'Saturady', u'Sunday']
 
 
+_BAD_MEDIA_TYPES = {
+    MediaType(u'plain/text'): MediaType(u'text/plain'),
+    MediaType(u'text/json'): MediaType(u'application/json'),
+}
+
+@can_complain
+def _check_media_type(complain, mtype):
+    if mtype in _BAD_MEDIA_TYPES:
+        complain(1282, bad=mtype, good=_BAD_MEDIA_TYPES[mtype])
+    return mtype
+
+
 def parameter(exclude=None):
     return (
         (CaseInsensitive << token__excluding(exclude or [])) *
@@ -33,7 +45,7 @@ def parameter(exclude=None):
 type_ = token                                                           > pivot
 subtype = token                                                         > pivot
 media_type = Parametrized << (
-    (MediaType << type_ + '/' + subtype) *
+    (_check_media_type << (MediaType << type_ + '/' + subtype)) *
     (MultiDict << many(skip(OWS * ';' * OWS) * parameter())))           > pivot
 
 content_coding = ContentCoding << token                                 > pivot
@@ -175,7 +187,7 @@ def media_range(no_q=False):
         (
             literal('*/*') |
             type_ + '/' + '*' |
-            MediaType << type_ + '/' + subtype
+            _check_media_type << (MediaType << type_ + '/' + subtype)
         ) *
         (
             MultiDict << many(

test/combined_data/1282_1

@@ -0,0 +1,14 @@
+1282
+
+======== BEGIN INBOUND STREAM ========
+GET / HTTP/1.1
+Host: example.com
+User-Agent: demo
+
+======== BEGIN OUTBOUND STREAM ========
+HTTP/1.1 200 OK
+Date: Thu, 31 Dec 2015 18:26:56 GMT
+Content-Type: plain/text
+Content-Length: 14
+
+Hello world!

test/combined_data/1282_2

@@ -0,0 +1,15 @@
+1282
+
+======== BEGIN INBOUND STREAM ========
+GET / HTTP/1.1
+Host: example.com
+User-Agent: demo
+Accept: application/xml, plain/text;q=0.5
+
+======== BEGIN OUTBOUND STREAM ========
+HTTP/1.1 200 OK
+Date: Thu, 31 Dec 2015 18:26:56 GMT
+Content-Type: text/plain
+Content-Length: 14
+
+Hello world!

test/combined_data/1282_3

@@ -0,0 +1,14 @@
+1282
+
+======== BEGIN INBOUND STREAM ========
+OPTIONS /articles/123/ HTTP/1.1
+Host: example.com
+User-Agent: demo
+
+======== BEGIN OUTBOUND STREAM ========
+HTTP/1.1 200 OK
+Date: Thu, 31 Dec 2015 18:26:56 GMT
+Content-Length: 0
+Allow: GET, HEAD, PUT, PATCH, DELETE, OPTIONS
+Accept-Patch: text/json
+