From 8feebcbf8e7b915c8f5ec82b4e5dd58204dcd1ea Mon Sep 17 00:00:00 2001 From: Marcelo Glezer Date: Wed, 18 Mar 2015 12:56:12 -0300 Subject: fix for #522 --- libmproxy/console/flowdetailview.py | 2 +- libmproxy/console/help.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libmproxy/console/flowdetailview.py b/libmproxy/console/flowdetailview.py index 4164c416..f351bff1 100644 --- a/libmproxy/console/flowdetailview.py +++ b/libmproxy/console/flowdetailview.py @@ -21,7 +21,7 @@ class FlowDetailsView(urwid.ListBox): self.master.statusbar = self.state[0] self.master.body = self.state[1] self.master.header = self.state[2] - self.master.make_view() + self.master.loop.widget = self.master.make_view() return None elif key == "?": key = None diff --git a/libmproxy/console/help.py b/libmproxy/console/help.py index fddab537..6bb49a92 100644 --- a/libmproxy/console/help.py +++ b/libmproxy/console/help.py @@ -183,7 +183,7 @@ class HelpView(urwid.ListBox): self.master.statusbar = self.state[0] self.master.body = self.state[1] self.master.header = self.state[2] - self.master.make_view() + self.master.loop.widget = self.master.make_view() return None elif key == "?": key = None -- cgit v1.2.3 From 7c75f4d0db3c78116cb14e1912708f7751de3f21 Mon Sep 17 00:00:00 2001 From: Marcelo Glezer Date: Wed, 18 Mar 2015 13:49:33 -0300 Subject: test/test_console_help.py fixed --- test/test_console_help.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/test/test_console_help.py b/test/test_console_help.py index 6e1f9fad..a410bd2e 100644 --- a/test/test_console_help.py +++ b/test/test_console_help.py @@ -5,7 +5,14 @@ if os.name == "nt": import libmproxy.console.help as help +class DummyLoop: + def __init__(self): + self.widget = None + class DummyMaster: + def __init__(self): + self.loop = DummyLoop() + def make_view(self): pass @@ -16,7 +23,8 @@ class TestHelp: assert h.helptext() def test_keypress(self): - h = help.HelpView(DummyMaster(), "foo", [1, 2, 3]) + master = DummyMaster() + h = help.HelpView(master, "foo", [1, 2, 3]) assert not h.keypress((0, 0), "q") assert not h.keypress((0, 0), "?") assert h.keypress((0, 0), "o") == "o" -- cgit v1.2.3 From 1d5fcc6e0eb050b67ff743b3428ed1de3700fbd5 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 19 Mar 2015 18:05:30 +1300 Subject: Revamp palette specification - Split low-color and high-color specifications in palettes. - Split off light, dark, lowlight and lowdark palettes. Lowlight and lowdark will be the low-color base for most subsequent palettes. - Add a small script that makes test pattern requests to pathod. --- libmproxy/console/__init__.py | 2 +- libmproxy/console/palettes.py | 439 ++++++++++++++++++++++++------------------ test/test_console_palettes.py | 11 ++ test/tools/testpatt | 9 + 4 files changed, 271 insertions(+), 190 deletions(-) create mode 100644 test/test_console_palettes.py create mode 100755 test/tools/testpatt diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 1b65ae68..198b7bbe 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -765,7 +765,7 @@ class ConsoleMaster(flow.FlowMaster): def run(self): self.ui = urwid.raw_display.Screen() self.ui.set_terminal_properties(256) - self.ui.register_palette(self.palette) + self.ui.register_palette(self.palette.palette()) self.flow_list_walker = flowlist.FlowListWalker(self, self.state) self.view = None self.statusbar = None diff --git a/libmproxy/console/palettes.py b/libmproxy/console/palettes.py index 650cf261..b8a66bec 100644 --- a/libmproxy/console/palettes.py +++ b/libmproxy/console/palettes.py @@ -1,192 +1,253 @@ -palettes = { -# Default palette for dark background - 'dark': [ - # name, foreground, background, mono, foreground_high, background_high - # For details on the meaning of the elements refer to - # http://excess.org/urwid/reference.html#Screen-register_palette - - ('body', 'black', 'dark cyan'), - ('foot', 'light gray', 'default'), - ('title', 'white,bold', 'default',), - ('editline', 'white', 'default',), - - # Status bar & heading - ('heading', 'light gray', 'dark blue', None, 'g85', 'dark blue'), - ('heading_key', 'light cyan', 'dark blue', None, 'light cyan', 'dark blue'), - ('heading_inactive', 'white', 'dark gray', None, 'g58', 'g11'), - - # Help - ('key', 'light cyan', 'default'), - ('head', 'white,bold', 'default'), - ('text', 'light gray', 'default'), - - # List and Connections - ('method', 'dark cyan', 'default'), - ('focus', 'yellow', 'default'), - - ('code_200', 'light green', 'default'), - ('code_300', 'light blue', 'default'), - ('code_400', 'light red', 'default', None, '#f60', 'default'), - ('code_500', 'light red', 'default'), - ('code_other', 'dark red', 'default'), - - ('error', 'light red', 'default'), - - ('header', 'dark cyan', 'default'), - ('highlight', 'white,bold', 'default'), - ('intercept', 'brown', 'default', None, '#f60', 'default'), - ('replay', 'light green', 'default', None, '#0f0', 'default'), - ('ack', 'light red', 'default'), - - # Hex view - ('offset', 'dark cyan', 'default'), - - # Grid Editor - ('focusfield', 'black', 'light gray'), - ('focusfield_error', 'dark red', 'light gray'), - ('field_error', 'dark red', 'black'), - ('editfield', 'black', 'light cyan'), - ], - -# Palette for light background - 'light': [ - ('body', 'black', 'dark cyan'), - ('foot', 'dark gray', 'default'), - ('title', 'white,bold', 'light blue',), - ('editline', 'white', 'default',), - - # Status bar & heading - ('heading', 'white', 'light gray', None, 'g85', 'dark blue'), - ('heading_key', 'dark blue', 'light gray', None, 'light cyan', 'dark blue'), - ('heading_inactive', 'light gray', 'dark gray', None, 'dark gray', 'dark blue'), - - # Help - ('key', 'dark blue,bold', 'default'), - ('head', 'black,bold', 'default'), - ('text', 'dark gray', 'default'), - - # List and Connections - ('method', 'dark cyan', 'default'), - ('focus', 'black', 'default'), - - ('code_200', 'dark green', 'default'), - ('code_300', 'light blue', 'default'), - ('code_400', 'dark red', 'default', None, '#f60', 'default'), - ('code_500', 'dark red', 'default'), - ('code_other', 'light red', 'default'), - - ('error', 'light red', 'default'), - - ('header', 'dark blue', 'default'), - ('highlight', 'black,bold', 'default'), - ('intercept', 'brown', 'default', None, '#f60', 'default'), - ('replay', 'dark green', 'default', None, '#0f0', 'default'), - ('ack', 'dark red', 'default'), - - # Hex view - ('offset', 'dark blue', 'default'), - - # Grid Editor - ('focusfield', 'black', 'light gray'), - ('focusfield_error', 'dark red', 'light gray'), - ('field_error', 'dark red', 'black'), - ('editfield', 'black', 'light cyan'), - ], - -# Palettes for terminals that use the Solarized precision colors -# (http://ethanschoonover.com/solarized#the-values) - -# For dark backgrounds - 'solarized_dark': [ - ('body', 'dark cyan', 'default'), - ('foot', 'dark gray', 'default'), - ('title', 'white,bold', 'default',), - ('editline', 'white', 'default',), - - # Status bar & heading - ('heading', 'light gray', 'light cyan',), - ('heading_key', 'dark blue', 'white',), - ('heading_inactive', 'light cyan', 'light gray',), - - # Help - ('key', 'dark blue', 'default',), - ('head', 'white,underline', 'default'), - ('text', 'light cyan', 'default'), - - # List and Connections - ('method', 'dark cyan', 'default'), - ('focus', 'white', 'default'), - - ('code_200', 'dark green', 'default'), - ('code_300', 'light blue', 'default'), - ('code_400', 'dark red', 'default',), - ('code_500', 'dark red', 'default'), - ('code_other', 'light red', 'default'), - - ('error', 'light red', 'default'), - - ('header', 'yellow', 'default'), - ('highlight', 'white', 'default'), - ('intercept', 'brown', 'default',), - ('replay', 'dark green', 'default',), - ('ack', 'dark red', 'default'), - - # Hex view - ('offset', 'yellow', 'default'), - ('text', 'light cyan', 'default'), - - # Grid Editor - ('focusfield', 'white', 'light cyan'), - ('focusfield_error', 'dark red', 'light gray'), - ('field_error', 'dark red', 'black'), - ('editfield', 'black', 'light gray'), - ], - -# For light backgrounds - 'solarized_light': [ - ('body', 'dark cyan', 'default'), - ('foot', 'dark gray', 'default'), - ('title', 'white,bold', 'light cyan',), - ('editline', 'white', 'default',), - - # Status bar & heading - ('heading', 'light cyan', 'light gray',), - ('heading_key', 'dark blue', 'white',), - ('heading_inactive', 'white', 'light gray',), - - # Help - ('key', 'dark blue', 'default',), - ('head', 'black,underline', 'default'), - ('text', 'light cyan', 'default'), - - # List and Connections - ('method', 'dark cyan', 'default'), - ('focus', 'black', 'default'), - - ('code_200', 'dark green', 'default'), - ('code_300', 'light blue', 'default'), - ('code_400', 'dark red', 'default',), - ('code_500', 'dark red', 'default'), - ('code_other', 'light red', 'default'), - - ('error', 'light red', 'default'), - - ('header', 'light cyan', 'default'), - ('highlight', 'black,bold', 'default'), - ('intercept', 'brown', 'default',), - ('replay', 'dark green', 'default',), - ('ack', 'dark red', 'default'), - - # Hex view - ('offset', 'light cyan', 'default'), - ('text', 'yellow', 'default'), - - # Grid Editor - ('focusfield', 'black', 'light gray'), - ('focusfield_error', 'dark red', 'light gray'), - ('field_error', 'dark red', 'black'), - ('editfield', 'white', 'light cyan'), - ], +# Low-color themes should ONLY use the standard foreground and background +# colours listed here: +# +# http://urwid.org/manual/displayattributes.html +# + + + +class Palette: + _fields = [ + 'body', 'foot', 'title', 'editline', + + # Status bar & heading + 'heading', 'heading_key', 'heading_inactive', + + # Help + 'key', 'head', 'text', + + # List and Connections + 'method', 'focus', + 'code_200', 'code_300', 'code_400', 'code_500', 'code_other', + 'error', + 'header', 'highlight', 'intercept', 'replay', 'ack', + + # Hex view + 'offset', + + # Grid Editor + 'focusfield', 'focusfield_error', 'field_error', 'editfield', + ] + high = None + + def palette(self): + l = [] + for i in self._fields: + v = [i] + v.extend(self.low[i]) + if self.high and i in self.high: + v.append(None) + v.extend(self.high[i]) + l.append(tuple(v)) + return l + + +class LowDark(Palette): + """ + Low-color dark background + """ + low = dict( + body = ('black', 'dark cyan'), + foot = ('light gray', 'default'), + title = ('white,bold', 'default'), + editline = ('white', 'default'), + + # Status bar & heading + heading = ('light gray', 'dark blue'), + heading_key = ('light cyan', 'dark blue'), + heading_inactive = ('white', 'dark gray'), + + # Help + key = ('light cyan', 'default'), + head = ('white,bold', 'default'), + text = ('light gray', 'default'), + + # List and Connections + method = ('dark cyan', 'default'), + focus = ('yellow', 'default'), + + code_200 = ('dark green', 'default'), + code_300 = ('light blue', 'default'), + code_400 = ('light red', 'default'), + code_500 = ('light red', 'default'), + code_other = ('dark red', 'default'), + + error = ('light red', 'default'), + + header = ('dark cyan', 'default'), + highlight = ('white,bold', 'default'), + intercept = ('brown', 'default'), + replay = ('light green', 'default'), + ack = ('light red', 'default'), + + # Hex view + offset = ('dark cyan', 'default'), + + # Grid Editor + focusfield = ('black', 'light gray'), + focusfield_error = ('dark red', 'light gray'), + field_error = ('dark red', 'default'), + editfield = ('white', 'default'), + ) + + +class Dark(LowDark): + high = dict( + heading_inactive = ('g58', 'g11'), + intercept = ('#f60', 'default'), + ) + + +class LowLight(Palette): + """ + Low-color light background + """ + low = dict( + body = ('black', 'dark cyan'), + foot = ('dark gray', 'default'), + title = ('dark magenta,bold', 'light blue'), + editline = ('white', 'default'), + + # Status bar & heading + heading = ('light gray', 'dark blue'), + heading_key = ('light cyan', 'black'), + heading_inactive = ('black', 'light gray'), + + # Help + key = ('dark blue,bold', 'default'), + head = ('black,bold', 'default'), + text = ('dark gray', 'default'), + + # List and Connections + method = ('dark cyan', 'default'), + focus = ('black', 'default'), + + code_200 = ('dark green', 'default'), + code_300 = ('light blue', 'default'), + code_400 = ('dark red', 'default'), + code_500 = ('dark red', 'default'), + code_other = ('light red', 'default'), + + error = ('light red', 'default'), + + header = ('dark blue', 'default'), + highlight = ('black,bold', 'default'), + intercept = ('brown', 'default'), + replay = ('dark green', 'default'), + ack = ('dark red', 'default'), + + # Hex view + offset = ('dark blue', 'default'), + + # Grid Editor + focusfield = ('black', 'light gray'), + focusfield_error = ('dark red', 'light gray'), + field_error = ('dark red', 'black'), + editfield = ('black', 'default'), + ) + + +class Light(LowLight): + pass + + +palettes = { + "lowlight": LowLight(), + "lowdark": LowDark(), + "light": Light(), + "dark": Dark(), + +# # For dark backgrounds +# 'solarized_dark': [ +# ('body', 'dark cyan', 'default'), +# ('foot', 'dark gray', 'default'), +# ('title', 'white,bold', 'default',), +# ('editline', 'white', 'default',), +# +# # Status bar & heading +# ('heading', 'light gray', 'light cyan',), +# ('heading_key', 'dark blue', 'white',), +# ('heading_inactive', 'light cyan', 'light gray',), +# +# # Help +# ('key', 'dark blue', 'default',), +# ('head', 'white,underline', 'default'), +# ('text', 'light cyan', 'default'), +# +# # List and Connections +# ('method', 'dark cyan', 'default'), +# ('focus', 'white', 'default'), +# +# ('code_200', 'dark green', 'default'), +# ('code_300', 'light blue', 'default'), +# ('code_400', 'dark red', 'default',), +# ('code_500', 'dark red', 'default'), +# ('code_other', 'light red', 'default'), +# +# ('error', 'light red', 'default'), +# +# ('header', 'yellow', 'default'), +# ('highlight', 'white', 'default'), +# ('intercept', 'brown', 'default',), +# ('replay', 'dark green', 'default',), +# ('ack', 'dark red', 'default'), +# +# # Hex view +# ('offset', 'yellow', 'default'), +# ('text', 'light cyan', 'default'), +# +# # Grid Editor +# ('focusfield', 'white', 'light cyan'), +# ('focusfield_error', 'dark red', 'light gray'), +# ('field_error', 'dark red', 'black'), +# ('editfield', 'black', 'light gray'), +# ], +# +# # For light backgrounds +# 'solarized_light': [ +# ('body', 'dark cyan', 'default'), +# ('foot', 'dark gray', 'default'), +# ('title', 'white,bold', 'light cyan',), +# ('editline', 'white', 'default',), +# +# # Status bar & heading +# ('heading', 'light cyan', 'light gray',), +# ('heading_key', 'dark blue', 'white',), +# ('heading_inactive', 'white', 'light gray',), +# +# # Help +# ('key', 'dark blue', 'default',), +# ('head', 'black,underline', 'default'), +# ('text', 'light cyan', 'default'), +# +# # List and Connections +# ('method', 'dark cyan', 'default'), +# ('focus', 'black', 'default'), +# +# ('code_200', 'dark green', 'default'), +# ('code_300', 'light blue', 'default'), +# ('code_400', 'dark red', 'default',), +# ('code_500', 'dark red', 'default'), +# ('code_other', 'light red', 'default'), +# +# ('error', 'light red', 'default'), +# +# ('header', 'light cyan', 'default'), +# ('highlight', 'black,bold', 'default'), +# ('intercept', 'brown', 'default',), +# ('replay', 'dark green', 'default',), +# ('ack', 'dark red', 'default'), +# +# # Hex view +# ('offset', 'light cyan', 'default'), +# ('text', 'yellow', 'default'), +# +# # Grid Editor +# ('focusfield', 'black', 'light gray'), +# ('focusfield_error', 'dark red', 'light gray'), +# ('field_error', 'dark red', 'black'), +# ('editfield', 'white', 'light cyan'), +# ], } diff --git a/test/test_console_palettes.py b/test/test_console_palettes.py new file mode 100644 index 00000000..3f8e280a --- /dev/null +++ b/test/test_console_palettes.py @@ -0,0 +1,11 @@ +import os +from nose.plugins.skip import SkipTest +if os.name == "nt": + raise SkipTest("Skipped on Windows.") +import libmproxy.console.palettes as palettes + + +class TestPalette: + def test_helptext(self): + for i in palettes.palettes.values(): + assert i.palette() diff --git a/test/tools/testpatt b/test/tools/testpatt new file mode 100755 index 00000000..3b79e3ee --- /dev/null +++ b/test/tools/testpatt @@ -0,0 +1,9 @@ +#!/bin/bash + +# Generate a test pattern with pathoc +PATHOD=http://localhost:9999 +pathoc localhost:8080 "get:'$PATHOD/p/200:p0,1'" +pathoc localhost:8080 "get:'$PATHOD/p/300:p0,1'" +pathoc localhost:8080 "get:'$PATHOD/p/400:p0,1'" +pathoc localhost:8080 "get:'$PATHOD/p/500:p0,1'" +pathoc localhost:8080 "get:'$PATHOD/p/600:p0,1'" -- cgit v1.2.3 From 05d1b990435a61f27936fa44bcdc498941da1966 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 19 Mar 2015 18:10:21 +1300 Subject: No output to stdout in the test suite, please. --- test/test_dump.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/test_dump.py b/test/test_dump.py index 11a024e3..48eeb244 100644 --- a/test/test_dump.py +++ b/test/test_dump.py @@ -131,14 +131,16 @@ class TestDumpMaster: assert len(m.apps.apps) == 1 def test_replacements(self): + cs = StringIO() o = dump.Options(replacements=[(".*", "content", "foo")]) - m = dump.DumpMaster(None, o) + m = dump.DumpMaster(None, o, outfile=cs) f = self._cycle(m, "content") assert f.request.content == "foo" def test_setheader(self): + cs = StringIO() o = dump.Options(setheaders=[(".*", "one", "two")]) - m = dump.DumpMaster(None, o) + m = dump.DumpMaster(None, o, outfile=cs) f = self._cycle(m, "content") assert f.request.headers["one"] == ["two"] @@ -195,4 +197,3 @@ class TestDumpMaster: def test_stickyauth(self): self._dummy_cycle(1, None, "", stickyauth = ".*") - -- cgit v1.2.3 From 32a674948f198bd891720725a9503365bc57e261 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 19 Mar 2015 18:29:06 +1300 Subject: Less painful light heading bar palette lowlight remains painful due to background color restrictions. --- libmproxy/console/palettes.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libmproxy/console/palettes.py b/libmproxy/console/palettes.py index b8a66bec..f4ae55d1 100644 --- a/libmproxy/console/palettes.py +++ b/libmproxy/console/palettes.py @@ -111,7 +111,7 @@ class LowLight(Palette): # Status bar & heading heading = ('light gray', 'dark blue'), - heading_key = ('light cyan', 'black'), + heading_key = ('light cyan', 'dark blue'), heading_inactive = ('black', 'light gray'), # Help @@ -149,7 +149,12 @@ class LowLight(Palette): class Light(LowLight): - pass + high = dict( + heading = ('g99', '#08f'), + heading_key = ('#0ff,bold', '#08f'), + heading_inactive = ('g35', 'g85'), + replay = ('#0a0,bold', 'default'), + ) palettes = { -- cgit v1.2.3 From 7e9a5e66fef6fcd3bda5c245be4c9b7d62daf2d6 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 19 Mar 2015 18:42:03 +1300 Subject: Reinstate solarized_dark and solarized_light palettes. --- libmproxy/console/palettes.py | 186 +++++++++++++++++++++--------------------- 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/libmproxy/console/palettes.py b/libmproxy/console/palettes.py index f4ae55d1..228766bc 100644 --- a/libmproxy/console/palettes.py +++ b/libmproxy/console/palettes.py @@ -157,102 +157,102 @@ class Light(LowLight): ) +class SolarizedLight(LowLight): + high = dict( + body = ('dark cyan', 'default'), + food = ('dark gray', 'default'), + title = ('white,bold', 'light cyan'), + editline = ('white', 'default'), + + # Status bar & heading + heading = ('light cyan', 'light gray'), + heading_key = ('dark blue', 'white'), + heading_inactive = ('white', 'light gray'), + + # Help + key = ('dark blue', 'default',), + head = ('black,underline', 'default'), + text = ('light cyan', 'default'), + + # List and Connections + method = ('dark cyan', 'default'), + focus = ('black', 'default'), + + code_200 = ('dark green', 'default'), + code_300 = ('light blue', 'default'), + code_400 = ('dark red', 'default',), + code_500 = ('dark red', 'default'), + code_other = ('light red', 'default'), + + error = ('light red', 'default'), + + header = ('light cyan', 'default'), + highlight = ('black,bold', 'default'), + intercept = ('brown', 'default',), + replay = ('dark green', 'default',), + ack = ('dark red', 'default'), + + # Hex view + offset = ('light cyan', 'default'), + + # Grid Editor + focusfield = ('black', 'light gray'), + focusfield_error = ('dark red', 'light gray'), + field_error = ('dark red', 'black'), + editfield = ('white', 'light cyan'), + ) + +class SolarizedDark(LowDark): + high = dict( + body = ('dark cyan', 'default'), + foot = ('dark gray', 'default'), + title = ('white,bold', 'default',), + editline = ('white', 'default',), + + # Status bar & heading + heading = ('light gray', 'light cyan',), + heading_key = ('dark blue', 'white',), + heading_inactive = ('light cyan', 'light gray',), + + # Help + key = ('dark blue', 'default',), + head = ('white,underline', 'default'), + text = ('light cyan', 'default'), + + # List and Connections + method = ('dark cyan', 'default'), + focus = ('white', 'default'), + + code_200 = ('dark green', 'default'), + code_300 = ('light blue', 'default'), + code_400 = ('dark red', 'default',), + code_500 = ('dark red', 'default'), + code_other = ('light red', 'default'), + + error = ('light red', 'default'), + + header = ('yellow', 'default'), + highlight = ('white', 'default'), + intercept = ('brown', 'default',), + replay = ('dark green', 'default',), + ack = ('dark red', 'default'), + + # Hex view + offset = ('yellow', 'default'), + + # Grid Editor + focusfield = ('white', 'light cyan'), + focusfield_error = ('dark red', 'light gray'), + field_error = ('dark red', 'black'), + editfiled = ('black', 'light gray'), + ) + + palettes = { "lowlight": LowLight(), "lowdark": LowDark(), "light": Light(), "dark": Dark(), - -# # For dark backgrounds -# 'solarized_dark': [ -# ('body', 'dark cyan', 'default'), -# ('foot', 'dark gray', 'default'), -# ('title', 'white,bold', 'default',), -# ('editline', 'white', 'default',), -# -# # Status bar & heading -# ('heading', 'light gray', 'light cyan',), -# ('heading_key', 'dark blue', 'white',), -# ('heading_inactive', 'light cyan', 'light gray',), -# -# # Help -# ('key', 'dark blue', 'default',), -# ('head', 'white,underline', 'default'), -# ('text', 'light cyan', 'default'), -# -# # List and Connections -# ('method', 'dark cyan', 'default'), -# ('focus', 'white', 'default'), -# -# ('code_200', 'dark green', 'default'), -# ('code_300', 'light blue', 'default'), -# ('code_400', 'dark red', 'default',), -# ('code_500', 'dark red', 'default'), -# ('code_other', 'light red', 'default'), -# -# ('error', 'light red', 'default'), -# -# ('header', 'yellow', 'default'), -# ('highlight', 'white', 'default'), -# ('intercept', 'brown', 'default',), -# ('replay', 'dark green', 'default',), -# ('ack', 'dark red', 'default'), -# -# # Hex view -# ('offset', 'yellow', 'default'), -# ('text', 'light cyan', 'default'), -# -# # Grid Editor -# ('focusfield', 'white', 'light cyan'), -# ('focusfield_error', 'dark red', 'light gray'), -# ('field_error', 'dark red', 'black'), -# ('editfield', 'black', 'light gray'), -# ], -# -# # For light backgrounds -# 'solarized_light': [ -# ('body', 'dark cyan', 'default'), -# ('foot', 'dark gray', 'default'), -# ('title', 'white,bold', 'light cyan',), -# ('editline', 'white', 'default',), -# -# # Status bar & heading -# ('heading', 'light cyan', 'light gray',), -# ('heading_key', 'dark blue', 'white',), -# ('heading_inactive', 'white', 'light gray',), -# -# # Help -# ('key', 'dark blue', 'default',), -# ('head', 'black,underline', 'default'), -# ('text', 'light cyan', 'default'), -# -# # List and Connections -# ('method', 'dark cyan', 'default'), -# ('focus', 'black', 'default'), -# -# ('code_200', 'dark green', 'default'), -# ('code_300', 'light blue', 'default'), -# ('code_400', 'dark red', 'default',), -# ('code_500', 'dark red', 'default'), -# ('code_other', 'light red', 'default'), -# -# ('error', 'light red', 'default'), -# -# ('header', 'light cyan', 'default'), -# ('highlight', 'black,bold', 'default'), -# ('intercept', 'brown', 'default',), -# ('replay', 'dark green', 'default',), -# ('ack', 'dark red', 'default'), -# -# # Hex view -# ('offset', 'light cyan', 'default'), -# ('text', 'yellow', 'default'), -# -# # Grid Editor -# ('focusfield', 'black', 'light gray'), -# ('focusfield_error', 'dark red', 'light gray'), -# ('field_error', 'dark red', 'black'), -# ('editfield', 'white', 'light cyan'), -# ], - + "solarized_light": SolarizedLight(), + "solarized_dark": SolarizedDark(), } -- cgit v1.2.3 From b47019293e49f85186bc7a7c8e71ab4c253b7d99 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 19 Mar 2015 20:49:43 +1300 Subject: Nicer Solarized palettes, using the correct terminal values --- libmproxy/console/palettes.py | 135 +++++++++++++++++++++--------------------- test/tools/testpatt | 10 ++-- 2 files changed, 74 insertions(+), 71 deletions(-) diff --git a/libmproxy/console/palettes.py b/libmproxy/console/palettes.py index 228766bc..cfb2702c 100644 --- a/libmproxy/console/palettes.py +++ b/libmproxy/console/palettes.py @@ -9,7 +9,7 @@ class Palette: _fields = [ - 'body', 'foot', 'title', 'editline', + 'title', # Status bar & heading 'heading', 'heading_key', 'heading_inactive', @@ -21,7 +21,7 @@ class Palette: 'method', 'focus', 'code_200', 'code_300', 'code_400', 'code_500', 'code_other', 'error', - 'header', 'highlight', 'intercept', 'replay', 'ack', + 'header', 'highlight', 'intercept', 'replay', # Hex view 'offset', @@ -48,10 +48,7 @@ class LowDark(Palette): Low-color dark background """ low = dict( - body = ('black', 'dark cyan'), - foot = ('light gray', 'default'), title = ('white,bold', 'default'), - editline = ('white', 'default'), # Status bar & heading heading = ('light gray', 'dark blue'), @@ -79,7 +76,6 @@ class LowDark(Palette): highlight = ('white,bold', 'default'), intercept = ('brown', 'default'), replay = ('light green', 'default'), - ack = ('light red', 'default'), # Hex view offset = ('dark cyan', 'default'), @@ -104,10 +100,7 @@ class LowLight(Palette): Low-color light background """ low = dict( - body = ('black', 'dark cyan'), - foot = ('dark gray', 'default'), title = ('dark magenta,bold', 'light blue'), - editline = ('white', 'default'), # Status bar & heading heading = ('light gray', 'dark blue'), @@ -135,7 +128,6 @@ class LowLight(Palette): highlight = ('black,bold', 'default'), intercept = ('brown', 'default'), replay = ('dark green', 'default'), - ack = ('dark red', 'default'), # Hex view offset = ('dark blue', 'default'), @@ -157,94 +149,105 @@ class Light(LowLight): ) +# Solarized palette in Urwid-style terminal high-colour offsets +# See: http://ethanschoonover.com/solarized +sol_base03 = "h234" +sol_base02 = "h235" +sol_base01 = "h240" +sol_base00 = "h241" +sol_base0 = "h244" +sol_base1 = "h245" +sol_base2 = "h254" +sol_base3 = "h230" +sol_yellow = "h136" +sol_orange = "h166" +sol_red = "h160" +sol_magenta = "h125" +sol_violet = "h61" +sol_blue = "h33" +sol_cyan = "h37" +sol_green = "h64" class SolarizedLight(LowLight): high = dict( - body = ('dark cyan', 'default'), - food = ('dark gray', 'default'), - title = ('white,bold', 'light cyan'), - editline = ('white', 'default'), + title = (sol_blue, 'default'), + text = (sol_base00, 'default'), # Status bar & heading - heading = ('light cyan', 'light gray'), - heading_key = ('dark blue', 'white'), - heading_inactive = ('white', 'light gray'), + heading = (sol_base2, sol_base02), + heading_key = (sol_blue, sol_base03), + heading_inactive = (sol_base03, sol_base1), # Help - key = ('dark blue', 'default',), - head = ('black,underline', 'default'), - text = ('light cyan', 'default'), + key = (sol_blue, 'default',), + head = (sol_base00, 'default'), # List and Connections - method = ('dark cyan', 'default'), - focus = ('black', 'default'), + method = (sol_cyan, 'default'), + focus = (sol_base01, 'default'), - code_200 = ('dark green', 'default'), - code_300 = ('light blue', 'default'), - code_400 = ('dark red', 'default',), - code_500 = ('dark red', 'default'), - code_other = ('light red', 'default'), + code_200 = (sol_green, 'default'), + code_300 = (sol_blue, 'default'), + code_400 = (sol_orange, 'default',), + code_500 = (sol_red, 'default'), + code_other = (sol_magenta, 'default'), - error = ('light red', 'default'), + error = (sol_red, 'default'), - header = ('light cyan', 'default'), - highlight = ('black,bold', 'default'), - intercept = ('brown', 'default',), - replay = ('dark green', 'default',), - ack = ('dark red', 'default'), + header = (sol_base01, 'default'), + highlight = (sol_base01, 'default'), + intercept = (sol_red, 'default',), + replay = (sol_green, 'default',), # Hex view - offset = ('light cyan', 'default'), + offset = (sol_cyan, 'default'), # Grid Editor - focusfield = ('black', 'light gray'), - focusfield_error = ('dark red', 'light gray'), - field_error = ('dark red', 'black'), - editfield = ('white', 'light cyan'), + focusfield = (sol_base00, sol_base2), + focusfield_error = (sol_red, sol_base2), + field_error = (sol_red, 'default'), + editfield = (sol_base01, 'default'), ) + class SolarizedDark(LowDark): high = dict( - body = ('dark cyan', 'default'), - foot = ('dark gray', 'default'), - title = ('white,bold', 'default',), - editline = ('white', 'default',), + title = (sol_blue, 'default'), + text = (sol_base0, 'default'), # Status bar & heading - heading = ('light gray', 'light cyan',), - heading_key = ('dark blue', 'white',), - heading_inactive = ('light cyan', 'light gray',), + heading = (sol_base03, sol_base1), + heading_key = (sol_blue+",bold", sol_base1), + heading_inactive = (sol_base1, sol_base02), # Help - key = ('dark blue', 'default',), - head = ('white,underline', 'default'), - text = ('light cyan', 'default'), + key = (sol_blue, 'default',), + head = (sol_base00, 'default'), # List and Connections - method = ('dark cyan', 'default'), - focus = ('white', 'default'), + method = (sol_cyan, 'default'), + focus = (sol_base1, 'default'), - code_200 = ('dark green', 'default'), - code_300 = ('light blue', 'default'), - code_400 = ('dark red', 'default',), - code_500 = ('dark red', 'default'), - code_other = ('light red', 'default'), + code_200 = (sol_green, 'default'), + code_300 = (sol_blue, 'default'), + code_400 = (sol_orange, 'default',), + code_500 = (sol_red, 'default'), + code_other = (sol_magenta, 'default'), - error = ('light red', 'default'), + error = (sol_red, 'default'), - header = ('yellow', 'default'), - highlight = ('white', 'default'), - intercept = ('brown', 'default',), - replay = ('dark green', 'default',), - ack = ('dark red', 'default'), + header = (sol_base01, 'default'), + highlight = (sol_base01, 'default'), + intercept = (sol_red, 'default',), + replay = (sol_green, 'default',), # Hex view - offset = ('yellow', 'default'), + offset = (sol_cyan, 'default'), # Grid Editor - focusfield = ('white', 'light cyan'), - focusfield_error = ('dark red', 'light gray'), - field_error = ('dark red', 'black'), - editfiled = ('black', 'light gray'), + focusfield = (sol_base0, sol_base02), + focusfield_error = (sol_red, sol_base02), + field_error = (sol_red, 'default'), + editfield = (sol_base1, 'default'), ) diff --git a/test/tools/testpatt b/test/tools/testpatt index 3b79e3ee..f6d1169b 100755 --- a/test/tools/testpatt +++ b/test/tools/testpatt @@ -2,8 +2,8 @@ # Generate a test pattern with pathoc PATHOD=http://localhost:9999 -pathoc localhost:8080 "get:'$PATHOD/p/200:p0,1'" -pathoc localhost:8080 "get:'$PATHOD/p/300:p0,1'" -pathoc localhost:8080 "get:'$PATHOD/p/400:p0,1'" -pathoc localhost:8080 "get:'$PATHOD/p/500:p0,1'" -pathoc localhost:8080 "get:'$PATHOD/p/600:p0,1'" +pathoc localhost:8080 "get:'$PATHOD/p/200:p0,1:b@200b'" +pathoc localhost:8080 "get:'$PATHOD/p/300:p0,1:b@200b'" +pathoc localhost:8080 "get:'$PATHOD/p/400:p0,1:b@200b'" +pathoc localhost:8080 "get:'$PATHOD/p/500:p0,1:b@200b'" +pathoc localhost:8080 "get:'$PATHOD/p/600:p0,1:b@200b'" -- cgit v1.2.3 From a2cbfb117b5b92b4c756ad6054deec76ce6f807d Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Thu, 19 Mar 2015 16:17:44 +0100 Subject: fix webapp on Windows - the p12 file needs a ".p12" extension. simply naming the file "p12" isn't sufficient --- libmproxy/onboarding/app.py | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/libmproxy/onboarding/app.py b/libmproxy/onboarding/app.py index f0aecc15..1df12c7c 100644 --- a/libmproxy/onboarding/app.py +++ b/libmproxy/onboarding/app.py @@ -38,27 +38,31 @@ class Index(tornado.web.RequestHandler): class PEM(tornado.web.RequestHandler): + @property + def filename(self): + return config.CONF_BASENAME + "-ca-cert.pem" + def get(self): - p = os.path.join( - self.request.master.server.config.cadir, - config.CONF_BASENAME + "-ca-cert.pem" - ) - self.set_header( - "Content-Type", "application/x-x509-ca-cert" - ) - self.write(open(p, "rb").read()) + p = os.path.join(self.request.master.server.config.cadir, self.filename) + self.set_header("Content-Type", "application/x-x509-ca-cert") + self.set_header("Content-Disposition", "attachment; filename={}".format(self.filename)) + + with open(p, "rb") as f: + self.write(f.read()) class P12(tornado.web.RequestHandler): + @property + def filename(self): + return config.CONF_BASENAME + "-ca-cert.p12" + def get(self): - p = os.path.join( - self.request.master.server.config.cadir, - config.CONF_BASENAME + "-ca-cert.p12" - ) - self.set_header( - "Content-Type", "application/x-pkcs12" - ) - self.write(open(p, "rb").read()) + p = os.path.join(self.request.master.server.config.cadir, self.filename) + self.set_header("Content-Type", "application/x-pkcs12") + self.set_header("Content-Disposition", "attachment; filename={}".format(self.filename)) + + with open(p, "rb") as f: + self.write(f.read()) application = tornado.web.Application( -- cgit v1.2.3 From 97c6d7ed25e026ae8d5511550df9718f829a7f1e Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Thu, 19 Mar 2015 16:29:05 +0100 Subject: onboarding app: serve certs inline to unbreak firefox --- libmproxy/onboarding/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libmproxy/onboarding/app.py b/libmproxy/onboarding/app.py index 1df12c7c..37f05e96 100644 --- a/libmproxy/onboarding/app.py +++ b/libmproxy/onboarding/app.py @@ -45,7 +45,7 @@ class PEM(tornado.web.RequestHandler): def get(self): p = os.path.join(self.request.master.server.config.cadir, self.filename) self.set_header("Content-Type", "application/x-x509-ca-cert") - self.set_header("Content-Disposition", "attachment; filename={}".format(self.filename)) + self.set_header("Content-Disposition", "inline; filename={}".format(self.filename)) with open(p, "rb") as f: self.write(f.read()) @@ -59,7 +59,7 @@ class P12(tornado.web.RequestHandler): def get(self): p = os.path.join(self.request.master.server.config.cadir, self.filename) self.set_header("Content-Type", "application/x-pkcs12") - self.set_header("Content-Disposition", "attachment; filename={}".format(self.filename)) + self.set_header("Content-Disposition", "inline; filename={}".format(self.filename)) with open(p, "rb") as f: self.write(f.read()) -- cgit v1.2.3