Fix to URL.with_port() input filtering

CHANGES/793.bugfix.rst

@@ -0,0 +1 @@
+Added some input restrictions on with_port() function to prevent invalid boolean inputs or out of valid port inputs; handled incorrect 0 port representation.

tests/test_url_update_netloc.py

@@ -191,6 +191,11 @@ def test_with_port():
     assert str(url.with_port(8888)) == "http://example.com:8888"
 
 
+def test_with_port_with_no_port():
+    url = URL("http://example.com")
+    assert str(url.with_port(None)) == "http://example.com"
+
+
 def test_with_port_ipv6():
     url = URL("http://[::1]:8080/")
     assert str(url.with_port(80)) == "http://[::1]:80/"
@@ -214,3 +219,10 @@ def test_with_port_for_relative_url():
 def test_with_port_invalid_type():
     with pytest.raises(TypeError):
         URL("http://example.com").with_port("123")
+    with pytest.raises(TypeError):
+        URL("http://example.com").with_port(True)
+
+
+def test_with_port_invalid_range():
+    with pytest.raises(ValueError):
+        URL("http://example.com").with_port(-1)

yarl/_url.py

@@ -761,7 +761,7 @@ def _make_netloc(
             ret = cls._encode_host(host)
         else:
             ret = host
-        if port:
+        if port is not None:
             ret = ret + ":" + str(port)
         if password is not None:
             if not user:
@@ -869,8 +869,11 @@ def with_port(self, port):
 
         """
         # N.B. doesn't cleanup query/fragment
-        if port is not None and not isinstance(port, int):
-            raise TypeError(f"port should be int or None, got {type(port)}")
+        if port is not None:
+            if isinstance(port, bool) or not isinstance(port, int):
+                raise TypeError(f"port should be int or None, got {type(port)}")
+            if port < 0 or port > 65535:
+                raise ValueError(f"port must be between 0 and 65535, got {port}")
         if not self.is_absolute():
             raise ValueError("port replacement is not allowed for relative URLs")
         val = self._val