wsgi: limit supported mimetypes & return actual mimetype

morss/crawler.py

@@ -59,7 +59,9 @@ except NameError:
 MIMETYPE = {
     'xml': ['text/xml', 'application/xml', 'application/rss+xml', 'application/rdf+xml', 'application/atom+xml', 'application/xhtml+xml'],
     'rss': ['application/rss+xml', 'application/rdf+xml', 'application/atom+xml'],
-    'html': ['text/html', 'application/xhtml+xml', 'application/xml']}
+    'html': ['text/html', 'application/xhtml+xml', 'application/xml'],
+    'json': ['application/json'],
+    }
 
 
 DEFAULT_UAS = [

morss/readabilite.py

@@ -207,8 +207,10 @@ def clean_root(root, keep_threshold=None):
 def clean_node(node, keep_threshold=None):
     parent = node.getparent()
 
+    # remove comments
     if (isinstance(node, lxml.html.HtmlComment)
             or isinstance(node, lxml.html.HtmlProcessingInstruction)):
+        parent.remove(node)
         return
 
     if parent is None:
@@ -242,11 +244,6 @@ def clean_node(node, keep_threshold=None):
         parent.remove(node)
         return
 
-    # remove comments
-    if isinstance(node, lxml.html.HtmlComment) or isinstance(node, lxml.html.HtmlProcessingInstruction):
-        parent.remove(node)
-        return
-
     # remove if too many kids & too high link density
     wc = count_words(node.text_content())
     if wc != 0 and len(list(node.iter())) > 3:

morss/wsgi.py

@@ -192,9 +192,10 @@ def cgi_get(environ, start_response):
     url, options = cgi_parse_environ(environ)
 
     # get page
+    if options['get'] in ('page', 'article'):
         req = crawler.adv_get(url=url, timeout=TIMEOUT)
 
-    if req['contenttype'] in ['text/html', 'application/xhtml+xml', 'application/xml']:
+        if req['contenttype'] in crawler.MIMETYPE['html']:
             if options['get'] == 'page':
                 html = readabilite.parse(req['data'], encoding=req['encoding'])
                 html.make_links_absolute(req['url'])
@@ -207,17 +208,20 @@ def cgi_get(environ, start_response):
 
                 output = lxml.etree.tostring(html.getroottree(), encoding='utf-8', method='html')
 
-        elif options['get'] == 'article':
+            else: # i.e. options['get'] == 'article'
                 output = readabilite.get_article(req['data'], url=req['url'], encoding_in=req['encoding'], encoding_out='utf-8', debug=options.debug)
 
+        elif req['contenttype'] in crawler.MIMETYPE['xml'] + crawler.MIMETYPE['rss'] + crawler.MIMETYPE['json']:
+            output = req['data']
+
+        else:
+            raise MorssException('unsupported mimetype')
+
     else:
         raise MorssException('no :get option passed')
 
-    else:
-        output = req['data']
-
     # return html page
-    headers = {'status': '200 OK', 'content-type': 'text/html; charset=utf-8', 'X-Frame-Options': 'SAMEORIGIN'} # SAMEORIGIN to avoid potential abuse
+    headers = {'status': '200 OK', 'content-type': req['contenttype'], 'X-Frame-Options': 'SAMEORIGIN'} # SAMEORIGIN to avoid potential abuse
     start_response(headers['status'], list(headers.items()))
     return [output]