diff options
| -rw-r--r-- | mitmproxy/net/http/message.py | 3 | ||||
| -rw-r--r-- | mitmproxy/net/tcp.py | 8 | ||||
| -rw-r--r-- | setup.py | 1 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mitmproxy/net/http/message.py b/mitmproxy/net/http/message.py index 3a243070..d3d6898d 100644 --- a/mitmproxy/net/http/message.py +++ b/mitmproxy/net/http/message.py @@ -180,9 +180,10 @@ class Message(serializable.Serializable): return "utf8" else: # We may also want to check for HTML meta tags here at some point. + # REGEX_ENCODING = re.compile(rb"""<meta[^>]+charset=['"]?([^'"]+)""") return "latin-1" - def get_text(self, strict: bool=True) -> str: + def get_text(self, strict: bool=True) -> Optional[str]: """ The HTTP message body decoded with both content-encoding header (e.g. gzip) and content-type header charset. diff --git a/mitmproxy/net/tcp.py b/mitmproxy/net/tcp.py index 11cabf07..2dd32c9b 100644 --- a/mitmproxy/net/tcp.py +++ b/mitmproxy/net/tcp.py @@ -5,15 +5,15 @@ import sys import threading import time import traceback - import binascii +from ssl import match_hostname +from ssl import CertificateError from typing import Optional # noqa from mitmproxy.utils import strutils import certifi -from backports import ssl_match_hostname import OpenSSL from OpenSSL import SSL @@ -726,8 +726,8 @@ class TCPClient(_Connection): hostname = sni else: hostname = "no-hostname" - ssl_match_hostname.match_hostname(crt, hostname) - except (ValueError, ssl_match_hostname.CertificateError) as e: + match_hostname(crt, hostname) + except (ValueError, CertificateError) as e: self.ssl_verification_error = exceptions.InvalidCertificateException( "Certificate Verification Error for {}: {}".format( sni or repr(self.address), @@ -58,7 +58,6 @@ setup( # https://packaging.python.org/en/latest/requirements/#install-requires # It is not considered best practice to use install_requires to pin dependencies to specific versions. install_requires=[ - "backports.ssl_match_hostname>=3.5.0.1, <3.6", "blinker>=1.4, <1.5", "click>=6.2, <7.0", "certifi>=2015.11.20.1", # no semver here - this should always be on the last release! |