From 6f96da08c9d838e4ead43425440d6120d4a02d0f Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Wed, 17 Feb 2016 08:48:59 +0530 Subject: Handle port numbers in host header from: https://github.com/mitmproxy/netlib/pull/121 --- test/netlib/http/test_request.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'test/netlib/http/test_request.py') diff --git a/test/netlib/http/test_request.py b/test/netlib/http/test_request.py index b4ecfd4e..4f8a34c2 100644 --- a/test/netlib/http/test_request.py +++ b/test/netlib/http/test_request.py @@ -106,6 +106,8 @@ class TestRequestUtils(object): request = treq() assert request.pretty_host == "address" assert request.host == "address" + request.headers["host"] = "other:22" + assert request.pretty_host == "other" request.headers["host"] = "other" assert request.pretty_host == "other" assert request.host == "address" @@ -123,6 +125,8 @@ class TestRequestUtils(object): assert request.pretty_url == "http://address:22/path" request.headers["host"] = "other" assert request.pretty_url == "http://other:22/path" + request.headers["host"] = "other:33" + assert request.pretty_url == "http://other:33/path" def test_pretty_url_authority(self): request = treq(first_line_format="authority") -- cgit v1.2.3 From 175109e44e419dcc1792d8f7171782448c5c3ea4 Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Thu, 18 Feb 2016 07:01:52 +0530 Subject: Use host header values only when the ports match --- test/netlib/http/test_request.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'test/netlib/http/test_request.py') diff --git a/test/netlib/http/test_request.py b/test/netlib/http/test_request.py index 4f8a34c2..350b5405 100644 --- a/test/netlib/http/test_request.py +++ b/test/netlib/http/test_request.py @@ -104,19 +104,23 @@ class TestRequestUtils(object): def test_pretty_host(self): request = treq() + # Without host header assert request.pretty_host == "address" assert request.host == "address" + # Same port as self.port (22) request.headers["host"] = "other:22" assert request.pretty_host == "other" + # Different Ports request.headers["host"] = "other" - assert request.pretty_host == "other" + assert request.pretty_host == "address" assert request.host == "address" + # Empty host request.host = None assert request.pretty_host is None assert request.host is None # Invalid IDNA - request.headers["host"] = ".disqus.com" + request.headers["host"] = ".disqus.com:22" assert request.pretty_host == ".disqus.com" def test_pretty_url(self): -- cgit v1.2.3 From d6ab9901d1f4d330a624b1a41d86d8d03c910b7a Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Thu, 18 Feb 2016 21:58:32 +0530 Subject: Fixup more tests --- test/netlib/http/test_request.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'test/netlib/http/test_request.py') diff --git a/test/netlib/http/test_request.py b/test/netlib/http/test_request.py index 350b5405..5672259e 100644 --- a/test/netlib/http/test_request.py +++ b/test/netlib/http/test_request.py @@ -110,7 +110,7 @@ class TestRequestUtils(object): # Same port as self.port (22) request.headers["host"] = "other:22" assert request.pretty_host == "other" - # Different Ports + # Different ports request.headers["host"] = "other" assert request.pretty_host == "address" assert request.host == "address" @@ -125,12 +125,15 @@ class TestRequestUtils(object): def test_pretty_url(self): request = treq() + # Without host header assert request.url == "http://address:22/path" assert request.pretty_url == "http://address:22/path" - request.headers["host"] = "other" + # Same port as self.port (22) + request.headers["host"] = "other:22" assert request.pretty_url == "http://other:22/path" - request.headers["host"] = "other:33" - assert request.pretty_url == "http://other:33/path" + # Different ports + request.headers["host"] = "other" + assert request.pretty_url == "http://address:22/path" def test_pretty_url_authority(self): request = treq(first_line_format="authority") -- cgit v1.2.3