aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2020-04-06 22:39:56 +0200
committerGitHub <noreply@github.com>2020-04-06 22:39:56 +0200
commitfbe296aaba774b01348a55a6c9e10097bfd61b60 (patch)
tree50c8f0c71bd4703b78c7ce7b021469018d6be613 /mitmproxy
parent467234aa96058aa2cc74c0111b491b74c911d3d6 (diff)
parent901c0f6ede67b419e263eb1876f8720c791ed07f (diff)
downloadmitmproxy-fbe296aaba774b01348a55a6c9e10097bfd61b60.tar.gz
mitmproxy-fbe296aaba774b01348a55a6c9e10097bfd61b60.tar.bz2
mitmproxy-fbe296aaba774b01348a55a6c9e10097bfd61b60.zip
Merge pull request #3893 from matosconsulting/mitmenhancedhostcheck
#3885 handle hyphens in domain name, enhance validation checks
Diffstat (limited to 'mitmproxy')
-rw-r--r--mitmproxy/net/check.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mitmproxy/net/check.py b/mitmproxy/net/check.py
index a19ad6fe..ffb5e163 100644
--- a/mitmproxy/net/check.py
+++ b/mitmproxy/net/check.py
@@ -2,7 +2,8 @@ import ipaddress
import re
# Allow underscore in host name
-_label_valid = re.compile(br"(?!-)[A-Z\d\-_]{1,63}(?<!-)$", re.IGNORECASE)
+# Note: This could be a DNS label, a hostname, a FQDN, or an IP
+_label_valid = re.compile(br"[A-Z\d\-_]{1,63}$", re.IGNORECASE)
def is_valid_host(host: bytes) -> bool: