jocay/webssh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimized is_valid_hostname

Browse Source
This commit is contained in:
Sheng
2018-08-21 21:55:57 +08:00
parent 9a49c9e5a3
commit 90397715dc
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webssh/utils.py
+7 -5
View File
@@ -1,13 +1,16 @@
import ipaddress import ipaddress
import re import re
try: try:
from types import UnicodeType from types import UnicodeType
except ImportError: except ImportError:
UnicodeType = str UnicodeType = str
numeric = re.compile(r'[0-9]+$')
allowed = re.compile(r'(?!-)[a-z0-9-]{1,63}(?<!-)$', re.IGNORECASE)
def to_str(bstr, encoding='utf-8'): def to_str(bstr, encoding='utf-8'):
if isinstance(bstr, bytes): if isinstance(bstr, bytes):
return bstr.decode(encoding) return bstr.decode(encoding)
@@ -43,17 +46,16 @@ def is_valid_port(port):
def is_valid_hostname(hostname): def is_valid_hostname(hostname):
if hostname[-1] == ".": if hostname[-1] == '.':
# strip exactly one dot from the right, if present # strip exactly one dot from the right, if present
hostname = hostname[:-1] hostname = hostname[:-1]
if len(hostname) > 253: if len(hostname) > 253:
return False return False
labels = hostname.split(".") labels = hostname.split('.')
# the TLD must be not all-numeric # the TLD must be not all-numeric
if re.match(r"[0-9]+$", labels[-1]): if numeric.match(labels[-1]):
return False return False
allowed = re.compile(r"(?!-)[a-z0-9-]{1,63}(?<!-)$", re.IGNORECASE)
return all(allowed.match(label) for label in labels) return all(allowed.match(label) for label in labels)