diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-12-30 21:19:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-30 21:19:25 +0100 |
| commit | e83083b64e8293fbd82d6625757d459664306bfc (patch) | |
| tree | 6207fec82b95947cce7ba74ab4d1243a3e4e9610 | |
| parent | 973406f327ceb488d4fa269b57d1e4f342e59d2c (diff) | |
| parent | a5f1215eb2a17dcc25b1b171d3550a4474e71214 (diff) | |
| download | mitmproxy-e83083b64e8293fbd82d6625757d459664306bfc.tar.gz mitmproxy-e83083b64e8293fbd82d6625757d459664306bfc.tar.bz2 mitmproxy-e83083b64e8293fbd82d6625757d459664306bfc.zip | |
Merge pull request #1905 from chhsiao90/allow-underscore-hostname
Allow underscore in hostname
| -rw-r--r-- | mitmproxy/net/check.py | 3 | ||||
| -rw-r--r-- | test/mitmproxy/net/test_check.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mitmproxy/net/check.py b/mitmproxy/net/check.py index 7b007cb5..f793d397 100644 --- a/mitmproxy/net/check.py +++ b/mitmproxy/net/check.py @@ -1,6 +1,7 @@ import re -_label_valid = re.compile(b"(?!-)[A-Z\d-]{1,63}(?<!-)$", re.IGNORECASE) +# Allow underscore in host name +_label_valid = re.compile(b"(?!-)[A-Z\d\-_]{1,63}(?<!-)$", re.IGNORECASE) def is_valid_host(host: bytes) -> bool: diff --git a/test/mitmproxy/net/test_check.py b/test/mitmproxy/net/test_check.py index 18a50157..36dca168 100644 --- a/test/mitmproxy/net/test_check.py +++ b/test/mitmproxy/net/test_check.py @@ -8,3 +8,5 @@ def test_is_valid_host(): assert check.is_valid_host(b"one.two") assert not check.is_valid_host(b"one" * 255) assert check.is_valid_host(b"one.two.") + # Allow underscore + assert check.is_valid_host(b"one_two") |