From 9870844b38c84e7446b15909758497cecb26301e Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Thu, 20 Oct 2016 10:46:47 +1300
Subject: netlib.utils -> netlib.check

Now only contains is_valid_[host,port]

Intermediate step - this will be in mitproxy.net soon.
---
 netlib/check.py           | 22 ++++++++++++++++++++++
 netlib/http/http1/read.py |  4 ++--
 netlib/http/url.py        |  6 +++---
 netlib/socks.py           |  5 +++--
 netlib/utils.py           | 22 ----------------------
 5 files changed, 30 insertions(+), 29 deletions(-)
 create mode 100644 netlib/check.py
 delete mode 100644 netlib/utils.py

(limited to 'netlib')

diff --git a/netlib/check.py b/netlib/check.py
new file mode 100644
index 00000000..7b007cb5
--- /dev/null
+++ b/netlib/check.py
@@ -0,0 +1,22 @@
+import re
+
+_label_valid = re.compile(b"(?!-)[A-Z\d-]{1,63}(?<!-)$", re.IGNORECASE)
+
+
+def is_valid_host(host: bytes) -> bool:
+    """
+        Checks if a hostname is valid.
+    """
+    try:
+        host.decode("idna")
+    except ValueError:
+        return False
+    if len(host) > 255:
+        return False
+    if host and host[-1:] == b".":
+        host = host[:-1]
+    return all(_label_valid.match(x) for x in host.split(b"."))
+
+
+def is_valid_port(port):
+    return 0 <= port <= 65535
diff --git a/netlib/http/http1/read.py b/netlib/http/http1/read.py
index 4c00a96a..89b73c5a 100644
--- a/netlib/http/http1/read.py
+++ b/netlib/http/http1/read.py
@@ -6,7 +6,7 @@ from netlib.http import request
 from netlib.http import response
 from netlib.http import headers
 from netlib.http import url
-from netlib import utils
+from netlib import check
 from netlib import exceptions
 
 
@@ -274,7 +274,7 @@ def _parse_authority_form(hostport):
     try:
         host, port = hostport.split(b":")
         port = int(port)
-        if not utils.is_valid_host(host) or not utils.is_valid_port(port):
+        if not check.is_valid_host(host) or not check.is_valid_port(port):
             raise ValueError()
     except ValueError:
         raise exceptions.HttpSyntaxException("Invalid host specification: {}".format(hostport))
diff --git a/netlib/http/url.py b/netlib/http/url.py
index 67e22efa..3ca58120 100644
--- a/netlib/http/url.py
+++ b/netlib/http/url.py
@@ -2,7 +2,7 @@ import urllib
 from typing import Sequence
 from typing import Tuple
 
-from netlib import utils
+from netlib import check
 
 
 # PY2 workaround
@@ -62,9 +62,9 @@ def parse(url):
     if not full_path.startswith(b"/"):
         full_path = b"/" + full_path
 
-    if not utils.is_valid_host(host):
+    if not check.is_valid_host(host):
         raise ValueError("Invalid Host")
-    if not utils.is_valid_port(port):
+    if not check.is_valid_port(port):
         raise ValueError("Invalid Port")
 
     return parsed.scheme, host, port, full_path
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
diff --git a/netlib/utils.py b/netlib/utils.py
deleted file mode 100644
index 7b007cb5..00000000
--- a/netlib/utils.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import re
-
-_label_valid = re.compile(b"(?!-)[A-Z\d-]{1,63}(?<!-)$", re.IGNORECASE)
-
-
-def is_valid_host(host: bytes) -> bool:
-    """
-        Checks if a hostname is valid.
-    """
-    try:
-        host.decode("idna")
-    except ValueError:
-        return False
-    if len(host) > 255:
-        return False
-    if host and host[-1:] == b".":
-        host = host[:-1]
-    return all(_label_valid.match(x) for x in host.split(b"."))
-
-
-def is_valid_port(port):
-    return 0 <= port <= 65535
-- 
cgit v1.2.3