diff options
| -rw-r--r-- | docs/certinstall.rst | 2 | ||||
| -rw-r--r-- | docs/install.rst | 2 | ||||
| -rw-r--r-- | test/conftest.py | 16 | ||||
| -rw-r--r-- | test/mitmproxy/net/test_tcp.py | 2 |
4 files changed, 20 insertions, 2 deletions
diff --git a/docs/certinstall.rst b/docs/certinstall.rst index 2594c439..2ec5f022 100644 --- a/docs/certinstall.rst +++ b/docs/certinstall.rst @@ -208,4 +208,4 @@ directory and uses this as the client cert. -.. _Certificate Pinning: https://security.stackexchange.com/questions/29988/what-is-certificate-pinning/ +.. _Certificate Pinning: https://en.wikipedia.org/wiki/HTTP_Public_Key_Pinning diff --git a/docs/install.rst b/docs/install.rst index 235e7c09..37bf8f76 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -72,7 +72,7 @@ executables. This includes a self-contained Python 3 environment, a recent OpenSSL that support ALPN and HTTP/2, and other dependencies that would otherwise we cumbersome to compile and install. -Please be advised that we do not updates these binaries after the initial +Please be advised that we do not update these binaries after the initial release. This means we do not include security-related updates of our dependencies in already released mitmproxy versions. If there is a severe issue, we might consider releasing a bugfix release of mitmproxy and corresponding diff --git a/test/conftest.py b/test/conftest.py index b0842bc3..27918cf9 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,4 +1,6 @@ import os +import socket + import pytest pytest_plugins = ('test.full_coverage_plugin',) @@ -17,3 +19,17 @@ skip_appveyor = pytest.mark.skipif( "APPVEYOR" in os.environ, reason='Skipping due to Appveyor' ) + +try: + s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) + s.bind(("::1", 0)) + s.close() +except OSError: + no_ipv6 = True +else: + no_ipv6 = False + +skip_no_ipv6 = pytest.mark.skipif( + no_ipv6, + reason='Host has no IPv6 support' +) diff --git a/test/mitmproxy/net/test_tcp.py b/test/mitmproxy/net/test_tcp.py index 9d521533..3e27929d 100644 --- a/test/mitmproxy/net/test_tcp.py +++ b/test/mitmproxy/net/test_tcp.py @@ -12,6 +12,7 @@ from mitmproxy import certs from mitmproxy.net import tcp from mitmproxy import exceptions from mitmproxy.test import tutils +from ...conftest import skip_no_ipv6 from . import tservers @@ -112,6 +113,7 @@ class TestServerBind(tservers.ServerTestBase): pass +@skip_no_ipv6 class TestServerIPv6(tservers.ServerTestBase): handler = EchoHandler addr = ("::1", 0) |