diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-02-08 00:44:38 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-02-08 00:44:38 +0100 |
| commit | c8d2876f2340cd751f81b0c187dd0e97c97447cc (patch) | |
| tree | 85c84867a5d5ef02ec7764e56882ec612ecef084 | |
| parent | 218e66cb32de43f4ec868acfd799e2fdfde15986 (diff) | |
| download | mitmproxy-c8d2876f2340cd751f81b0c187dd0e97c97447cc.tar.gz mitmproxy-c8d2876f2340cd751f81b0c187dd0e97c97447cc.tar.bz2 mitmproxy-c8d2876f2340cd751f81b0c187dd0e97c97447cc.zip | |
raise error if --http2 is specified, but the OpenSSL version doesn't support it
| -rw-r--r-- | libmproxy/cmdline.py | 5 | ||||
| -rw-r--r-- | libmproxy/proxy/config.py | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py index 111ab145..d8b6000c 100644 --- a/libmproxy/cmdline.py +++ b/libmproxy/cmdline.py @@ -363,6 +363,11 @@ def proxy_options(parser): help="Proxy service port." ) http2 = group.add_mutually_exclusive_group() + # !!! + # Watch out: We raise a RuntimeError in libmproxy.proxy.config if http2 is enabled, + # but the OpenSSL version does not have ALPN support (which is the default on Ubuntu 14.04). + # Do not simply set --http2 as enabled by default. + # !!! http2.add_argument("--http2", action="store_true", dest="http2") http2.add_argument("--no-http2", action="store_false", dest="http2", help="Explicitly enable/disable experimental HTTP2 support. " diff --git a/libmproxy/proxy/config.py b/libmproxy/proxy/config.py index bf765d81..a635ab19 100644 --- a/libmproxy/proxy/config.py +++ b/libmproxy/proxy/config.py @@ -180,6 +180,9 @@ def process_proxy_options(parser, options): parser.error("Certificate file does not exist: %s" % parts[1]) certs.append(parts) + if options.http2 and not tcp.HAS_ALPN: + raise RuntimeError("HTTP2 support requires OpenSSL 1.0.2 or above.") + return ProxyConfig( host=options.addr, port=options.port, |