diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-10-20 10:46:47 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-10-20 10:46:47 +1300 |
| commit | 9870844b38c84e7446b15909758497cecb26301e (patch) | |
| tree | abb86d6ff64934ec274e5cf2cd5634e92480623a /netlib/socks.py | |
| parent | e0f3cce14cb26d10bc259d431f688fb0d10ab3f5 (diff) | |
| download | mitmproxy-9870844b38c84e7446b15909758497cecb26301e.tar.gz mitmproxy-9870844b38c84e7446b15909758497cecb26301e.tar.bz2 mitmproxy-9870844b38c84e7446b15909758497cecb26301e.zip | |
netlib.utils -> netlib.check
Now only contains is_valid_[host,port]
Intermediate step - this will be in mitproxy.net soon.
Diffstat (limited to 'netlib/socks.py')
| -rw-r--r-- | netlib/socks.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/netlib/socks.py b/netlib/socks.py index 30fe1c9d..377308a8 100644 --- a/netlib/socks.py +++ b/netlib/socks.py @@ -2,7 +2,8 @@ import struct import array import ipaddress -from netlib import tcp, utils +from netlib import tcp +from netlib import check from mitmproxy.types import bidi @@ -204,7 +205,7 @@ class Message: elif atyp == ATYP.DOMAINNAME: length, = struct.unpack("!B", f.safe_read(1)) host = f.safe_read(length) - if not utils.is_valid_host(host): + if not check.is_valid_host(host): raise SocksError(REP.GENERAL_SOCKS_SERVER_FAILURE, "Invalid hostname: %s" % host) host = host.decode("idna") use_ipv6 = False |