From 1039d09ed618afadf5d24a741d85ec34be29edd7 Mon Sep 17 00:00:00 2001 From: "Marcus R. Matos" Date: Fri, 3 Apr 2020 19:56:54 -0500 Subject: #3885 handle hyphens in domain name, enhance validation checks --- test/mitmproxy/net/test_check.py | 64 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) (limited to 'test') diff --git a/test/mitmproxy/net/test_check.py b/test/mitmproxy/net/test_check.py index 0ffd6b2e..e9258d7c 100644 --- a/test/mitmproxy/net/test_check.py +++ b/test/mitmproxy/net/test_check.py @@ -12,3 +12,67 @@ def test_is_valid_host(): # Allow underscore assert check.is_valid_host(b"one_two") assert check.is_valid_host(b"::1") + + # IPv6 Validations + assert check.is_valid_host(b'2001:0db8:85a3:0000:0000:8a2e:0370:7334') + assert check.is_valid_host(b'2001:db8:85a3:0:0:8a2e:370:7334') + assert check.is_valid_host(b'2001:db8:85a3::8a2e:370:7334') + assert not check.is_valid_host(b'2001:db8::85a3::7334') + assert check.is_valid_host(b'2001-db8-85a3-8d3-1319-8a2e-370-7348.ipv6-literal.net') + + # TLD must be between 2 and 63 chars + assert not check.is_valid_host(b'example.t') + assert check.is_valid_host(b'example.tl') + assert check.is_valid_host(b'example.tld') + assert check.is_valid_host(b'example.' + b"x" * 63) + assert not check.is_valid_host(b'example.' + b"x" * 64) + + # misc characters test + assert not check.is_valid_host(b'ex@mple') + assert not check.is_valid_host(b'ex@mple.com') + assert not check.is_valid_host(b'example..com') + assert not check.is_valid_host(b'.example.com') + assert not check.is_valid_host(b'@.example.com') + assert not check.is_valid_host(b'!.example.com') + + # Every label must be between 1 and 63 chars + #assert not check.is_valid_host('.tld') + assert check.is_valid_host(b'x' * 1 + b'.tld') + assert check.is_valid_host(b'x' * 30 + b'.tld') + assert not check.is_valid_host(b'x' * 64 + b'.tld') + assert check.is_valid_host(b'x' * 1 + b'.example.tld') + assert check.is_valid_host(b'x' * 30 + b'.example.tld') + assert not check.is_valid_host(b'x' * 64 + b'.example.tld') + + # Misc Underscore Test Cases + assert check.is_valid_host(b'_example') + assert check.is_valid_host(b'_example_') + assert check.is_valid_host(b'example_') + assert check.is_valid_host(b'_a.example.tld') + assert check.is_valid_host(b'a_.example.tld') + assert check.is_valid_host(b'_a_.example.tld') + assert not check.is_valid_host(b'a._example') + assert not check.is_valid_host(b'a._example_') + assert not check.is_valid_host(b'a.example_') + + # Misc Dash/Hyphen/Minus Test Cases + assert check.is_valid_host(b'-example') + assert check.is_valid_host(b'-example_') + assert check.is_valid_host(b'example-') + assert check.is_valid_host(b'-a.example.tld') + assert check.is_valid_host(b'a-.example.tld') + assert check.is_valid_host(b'-a-.example.tld') + assert not check.is_valid_host(b'a.-example') + assert not check.is_valid_host(b'a.-example-') + assert not check.is_valid_host(b'a.example-') + + # Misc Combo Test Cases + assert check.is_valid_host(b'api-.example.com') + assert check.is_valid_host(b'__a.example-site.com') + assert check.is_valid_host(b'_-a.example-site.com') + assert check.is_valid_host(b'_a_.example-site.com') + assert check.is_valid_host(b'-a-.example-site.com') + assert check.is_valid_host(b'api-.a.example.com') + assert check.is_valid_host(b'api-._a.example.com') + assert check.is_valid_host(b'api-.a_.example.com') + assert check.is_valid_host(b'api-.ab.example.com') \ No newline at end of file -- cgit v1.2.3 From 2722f4fd764657b1f059c66aa75a879acd56abca Mon Sep 17 00:00:00 2001 From: "Marcus R. Matos" Date: Fri, 3 Apr 2020 20:15:50 -0500 Subject: #3885 handle hyphens in domain name, enhance validation checks, linter updates --- test/mitmproxy/net/test_check.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/mitmproxy/net/test_check.py b/test/mitmproxy/net/test_check.py index e9258d7c..7def75fd 100644 --- a/test/mitmproxy/net/test_check.py +++ b/test/mitmproxy/net/test_check.py @@ -36,7 +36,7 @@ def test_is_valid_host(): assert not check.is_valid_host(b'!.example.com') # Every label must be between 1 and 63 chars - #assert not check.is_valid_host('.tld') + assert not check.is_valid_host(b'.tld') assert check.is_valid_host(b'x' * 1 + b'.tld') assert check.is_valid_host(b'x' * 30 + b'.tld') assert not check.is_valid_host(b'x' * 64 + b'.tld') @@ -55,7 +55,7 @@ def test_is_valid_host(): assert not check.is_valid_host(b'a._example_') assert not check.is_valid_host(b'a.example_') - # Misc Dash/Hyphen/Minus Test Cases + # Misc Dash/Hyphen/Minus Test Cases assert check.is_valid_host(b'-example') assert check.is_valid_host(b'-example_') assert check.is_valid_host(b'example-') -- cgit v1.2.3 From 901c0f6ede67b419e263eb1876f8720c791ed07f Mon Sep 17 00:00:00 2001 From: "Marcus R. Matos" Date: Sun, 5 Apr 2020 15:50:28 -0500 Subject: #3885 implement simpler regex for host validation --- test/mitmproxy/net/test_check.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'test') diff --git a/test/mitmproxy/net/test_check.py b/test/mitmproxy/net/test_check.py index 7def75fd..649e71da 100644 --- a/test/mitmproxy/net/test_check.py +++ b/test/mitmproxy/net/test_check.py @@ -13,7 +13,8 @@ def test_is_valid_host(): assert check.is_valid_host(b"one_two") assert check.is_valid_host(b"::1") - # IPv6 Validations + # IP Address Validations + assert check.is_valid_host(b'127.0.0.1') assert check.is_valid_host(b'2001:0db8:85a3:0000:0000:8a2e:0370:7334') assert check.is_valid_host(b'2001:db8:85a3:0:0:8a2e:370:7334') assert check.is_valid_host(b'2001:db8:85a3::8a2e:370:7334') @@ -21,7 +22,6 @@ def test_is_valid_host(): assert check.is_valid_host(b'2001-db8-85a3-8d3-1319-8a2e-370-7348.ipv6-literal.net') # TLD must be between 2 and 63 chars - assert not check.is_valid_host(b'example.t') assert check.is_valid_host(b'example.tl') assert check.is_valid_host(b'example.tld') assert check.is_valid_host(b'example.' + b"x" * 63) @@ -51,9 +51,6 @@ def test_is_valid_host(): assert check.is_valid_host(b'_a.example.tld') assert check.is_valid_host(b'a_.example.tld') assert check.is_valid_host(b'_a_.example.tld') - assert not check.is_valid_host(b'a._example') - assert not check.is_valid_host(b'a._example_') - assert not check.is_valid_host(b'a.example_') # Misc Dash/Hyphen/Minus Test Cases assert check.is_valid_host(b'-example') @@ -62,9 +59,6 @@ def test_is_valid_host(): assert check.is_valid_host(b'-a.example.tld') assert check.is_valid_host(b'a-.example.tld') assert check.is_valid_host(b'-a-.example.tld') - assert not check.is_valid_host(b'a.-example') - assert not check.is_valid_host(b'a.-example-') - assert not check.is_valid_host(b'a.example-') # Misc Combo Test Cases assert check.is_valid_host(b'api-.example.com') -- cgit v1.2.3