From f6a3bd15b3b8c3d30abf6e5209e10cff3c4784e0 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Tue, 7 Apr 2015 10:01:18 +1200 Subject: console: All palettes now explicitly set a background colour There's a new option --palette-transparent to turn this off if you want to use your own terminal background. --- libmproxy/main.py | 1 + 1 file changed, 1 insertion(+) (limited to 'libmproxy/main.py') diff --git a/libmproxy/main.py b/libmproxy/main.py index e5b7f56b..7d22b48c 100644 --- a/libmproxy/main.py +++ b/libmproxy/main.py @@ -89,6 +89,7 @@ def mitmproxy(): # pragma: nocover proxy_config = process_proxy_options(parser, options) console_options = console.Options(**cmdline.get_common_options(options)) console_options.palette = options.palette + console_options.palette_transparent = options.palette_transparent console_options.eventlog = options.eventlog console_options.intercept = options.intercept -- cgit v1.2.3 From 2242c671fd53a5a5a864bcdc085a2207018fd5f0 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Wed, 8 Apr 2015 00:20:32 +0200 Subject: allow passing custom argv to libmproxy.main --- libmproxy/main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libmproxy/main.py') diff --git a/libmproxy/main.py b/libmproxy/main.py index e5b7f56b..a29fdb9d 100644 --- a/libmproxy/main.py +++ b/libmproxy/main.py @@ -75,14 +75,14 @@ def get_server(dummy_server, options): sys.exit(1) -def mitmproxy(): # pragma: nocover +def mitmproxy(args=None): # pragma: nocover from . import console check_versions() assert_utf8_env() parser = cmdline.mitmproxy() - options = parser.parse_args() + options = parser.parse_args(args) if options.quiet: options.verbose = 0 @@ -101,13 +101,13 @@ def mitmproxy(): # pragma: nocover pass -def mitmdump(): # pragma: nocover +def mitmdump(args=None): # pragma: nocover from . import dump check_versions() parser = cmdline.mitmdump() - options = parser.parse_args() + options = parser.parse_args(args) if options.quiet: options.verbose = 0 options.flow_detail = 0 @@ -135,13 +135,13 @@ def mitmdump(): # pragma: nocover pass -def mitmweb(): # pragma: nocover +def mitmweb(args=None): # pragma: nocover from . import web check_versions() parser = cmdline.mitmweb() - options = parser.parse_args() + options = parser.parse_args(args) if options.quiet: options.verbose = 0 -- cgit v1.2.3 From 850a50262be8264fabe1d1a18b2985b70f7a86ae Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Wed, 15 Apr 2015 12:56:43 +1200 Subject: console: add a -l flag to set the limit on startup --- libmproxy/main.py | 1 + 1 file changed, 1 insertion(+) (limited to 'libmproxy/main.py') diff --git a/libmproxy/main.py b/libmproxy/main.py index 7d56a505..32ab738e 100644 --- a/libmproxy/main.py +++ b/libmproxy/main.py @@ -92,6 +92,7 @@ def mitmproxy(args=None): # pragma: nocover console_options.palette_transparent = options.palette_transparent console_options.eventlog = options.eventlog console_options.intercept = options.intercept + console_options.limit = options.limit server = get_server(console_options.no_server, proxy_config) -- cgit v1.2.3 From a05a70d8168a07c92b2a3ecbbb1958d85532efe3 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sat, 30 May 2015 12:03:28 +1200 Subject: Add coding style check, reformat. --- libmproxy/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmproxy/main.py') diff --git a/libmproxy/main.py b/libmproxy/main.py index 32ab738e..73e6c62b 100644 --- a/libmproxy/main.py +++ b/libmproxy/main.py @@ -70,7 +70,7 @@ def get_server(dummy_server, options): else: try: return ProxyServer(options) - except ProxyServerError, v: + except ProxyServerError as v: print(str(v), file=sys.stderr) sys.exit(1) -- cgit v1.2.3 From 13ee54da86319e4a028279c4dce0967d8a786067 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sun, 31 May 2015 13:13:12 +1200 Subject: Remove dependency on PyOpenSSL, move version check into netlib. There are a few more functions in the code that accesses PyOpenSSL directly that should probably also be moved to netlib. Later. --- libmproxy/main.py | 48 ++++-------------------------------------------- 1 file changed, 4 insertions(+), 44 deletions(-) (limited to 'libmproxy/main.py') diff --git a/libmproxy/main.py b/libmproxy/main.py index 73e6c62b..98413c7a 100644 --- a/libmproxy/main.py +++ b/libmproxy/main.py @@ -2,52 +2,12 @@ from __future__ import print_function, absolute_import import os import signal import sys -import netlib.version +import netlib.version, netlib.version_check from . import version, cmdline from .proxy import process_proxy_options, ProxyServerError from .proxy.server import DummyServer, ProxyServer -# This file is not included in coverage analysis or tests - anything that can be -# tested should live elsewhere. - -def check_versions(): - """ - Having installed a wrong version of pyOpenSSL or netlib is unfortunately a - very common source of error. Check before every start that both versions are - somewhat okay. - """ - # We don't introduce backward-incompatible changes in patch versions. Only - # consider major and minor version. - if netlib.version.IVERSION[:2] != version.IVERSION[:2]: - print( - "Warning: You are using mitmdump %s with netlib %s. " - "Most likely, that won't work - please upgrade!" % ( - version.VERSION, netlib.version.VERSION - ), - file=sys.stderr - ) - import OpenSSL - import inspect - v = tuple([int(x) for x in OpenSSL.__version__.split(".")][:2]) - if v < (0, 14): - print( - "You are using an outdated version of pyOpenSSL:" - " mitmproxy requires pyOpenSSL 0.14 or greater.", - file=sys.stderr - ) - # Some users apparently have multiple versions of pyOpenSSL installed. - # Report which one we got. - pyopenssl_path = os.path.dirname(inspect.getfile(OpenSSL)) - print( - "Your pyOpenSSL %s installation is located at %s" % ( - OpenSSL.__version__, pyopenssl_path - ), - file=sys.stderr - ) - sys.exit(1) - - def assert_utf8_env(): spec = "" for i in ["LANG", "LC_CTYPE", "LC_ALL"]: @@ -78,7 +38,7 @@ def get_server(dummy_server, options): def mitmproxy(args=None): # pragma: nocover from . import console - check_versions() + netlib.version_check.version_check(version.IVERSION) assert_utf8_env() parser = cmdline.mitmproxy() @@ -106,7 +66,7 @@ def mitmproxy(args=None): # pragma: nocover def mitmdump(args=None): # pragma: nocover from . import dump - check_versions() + netlib.version_check.version_check(version.IVERSION) parser = cmdline.mitmdump() options = parser.parse_args(args) @@ -140,7 +100,7 @@ def mitmdump(args=None): # pragma: nocover def mitmweb(args=None): # pragma: nocover from . import web - check_versions() + netlib.version_check.version_check(version.IVERSION) parser = cmdline.mitmweb() options = parser.parse_args(args) -- cgit v1.2.3 From 6c3233ce0cceede1d289b934f98751ce4285fae3 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sun, 31 May 2015 13:16:03 +1200 Subject: Appease the code style gods. --- libmproxy/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libmproxy/main.py') diff --git a/libmproxy/main.py b/libmproxy/main.py index 98413c7a..e7d0f7e0 100644 --- a/libmproxy/main.py +++ b/libmproxy/main.py @@ -2,7 +2,8 @@ from __future__ import print_function, absolute_import import os import signal import sys -import netlib.version, netlib.version_check +import netlib.version +import netlib.version_check from . import version, cmdline from .proxy import process_proxy_options, ProxyServerError from .proxy.server import DummyServer, ProxyServer -- cgit v1.2.3