diff options
author | Tomaz Muraus <tomaz@tomaz.me> | 2014-01-04 04:06:42 +0100 |
---|---|---|
committer | Tomaz Muraus <tomaz@tomaz.me> | 2014-01-04 04:49:50 +0100 |
commit | e9f6302ec7dacb55f83bf1c283963c7a35fa0f6b (patch) | |
tree | 9a024c47406b5e578cfaf27fd403723f7a6ad523 | |
parent | b9d4eb103e6b45cc331b0fc3cd5a0c693f1b669e (diff) | |
download | mitmproxy-e9f6302ec7dacb55f83bf1c283963c7a35fa0f6b.tar.gz mitmproxy-e9f6302ec7dacb55f83bf1c283963c7a35fa0f6b.tar.bz2 mitmproxy-e9f6302ec7dacb55f83bf1c283963c7a35fa0f6b.zip |
Add CSS view which beautifies CSS files if cssutils library is available,
otherwise it acts as a no-op.
-rw-r--r-- | libmproxy/console/contentview.py | 27 | ||||
-rw-r--r-- | requirements.txt | 3 | ||||
-rw-r--r-- | test/data/1.css | 1 | ||||
-rw-r--r-- | test/test_console_contentview.py | 25 |
4 files changed, 54 insertions, 2 deletions
diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py index 8dd8ad1d..d6601045 100644 --- a/libmproxy/console/contentview.py +++ b/libmproxy/console/contentview.py @@ -1,3 +1,4 @@ +import logging import re, cStringIO, traceback, json import urwid @@ -19,6 +20,13 @@ try: except ImportError: # pragma nocover pyamf = None +try: + import cssutils +except ImportError: # pragma nocover + cssutils = None +else: + cssutils.log.setLevel(logging.CRITICAL) + VIEW_CUTOFF = 1024*50 @@ -318,7 +326,23 @@ class ViewJavaScript: opts = jsbeautifier.default_options() opts.indent_size = 2 res = jsbeautifier.beautify(content[:limit], opts) - return "JavaScript", _view_text(res, len(content), limit) + return "JavaScript", _view_text(res, len(res), limit) + +class ViewCSS: + name = "CSS" + prompt = ("CSS", "c") + content_types = [ + "text/css" + ] + + def __call__(self, hdrs, content, limit): + if cssutils: + sheet = cssutils.parseString(content) + beautified = sheet.cssText + else: + beautified = content + + return "CSS", _view_text(beautified, len(beautified), limit) class ViewImage: @@ -409,6 +433,7 @@ views = [ ViewHTML(), ViewHTMLOutline(), ViewJavaScript(), + ViewCSS(), ViewURLEncoded(), ViewMultipart(), ViewImage(), diff --git a/requirements.txt b/requirements.txt index ff149240..db34e4b6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,4 +13,5 @@ pyasn1>=0.1.7 requests>=1.2.2 urwid>=1.1.1 wsgiref>=0.1.2 -jsbeautifier>=1.4.0
\ No newline at end of file +jsbeautifier>=1.4.0 +cssutils>=1.0,<1.1 diff --git a/test/data/1.css b/test/data/1.css new file mode 100644 index 00000000..33387ca7 --- /dev/null +++ b/test/data/1.css @@ -0,0 +1 @@ +body,html{height:100%}body{font-family:'Open Sans',sans-serif;font-size:1.5em;padding-top:80px} diff --git a/test/test_console_contentview.py b/test/test_console_contentview.py index ef44f834..b982aff3 100644 --- a/test/test_console_contentview.py +++ b/test/test_console_contentview.py @@ -13,6 +13,11 @@ try: except ImportError: pyamf = None +try: + import cssutils +except: + cssutils = None + class TestContentView: def test_trailer(self): @@ -112,6 +117,26 @@ class TestContentView: assert v([], "[1, 2, 3", 100) assert v([], "function(a){[1, 2, 3]}", 100) + def test_view_css(self): + v = cv.ViewCSS() + + with open('./test/data/1.css', 'r') as fp: + fixture_1 = fp.read() + + result = v([], 'a', 100) + + if cssutils: + assert len(result[1]) == 0 + else: + assert len(result[1]) == 1 + + result = v([], fixture_1, 100) + + if cssutils: + assert len(result[1]) > 1 + else: + assert len(result[1]) == 1 + def test_view_hex(self): v = cv.ViewHex() assert v([], "foo", 1000) |