Add an UnsupportedProtocol exception (#128)

* Add an UnsupportedProtocol exception

* Update httpcore/_async/connection_pool.py

Co-authored-by: Florimond Manca <florimond.manca@gmail.com>

* Update tests/async_tests/test_interfaces.py

Co-authored-by: Florimond Manca <florimond.manca@gmail.com>

* Update tests/async_tests/test_interfaces.py

Co-authored-by: Florimond Manca <florimond.manca@gmail.com>

* Unasync

Co-authored-by: Florimond Manca <florimond.manca@gmail.com>

httpcore/__init__.py

@@ -12,6 +12,7 @@
     ReadError,
     ReadTimeout,
     TimeoutException,
+    UnsupportedProtocol,
     WriteError,
     WriteTimeout,
 )
@@ -38,5 +39,6 @@
     "ReadError",
     "WriteError",
     "CloseError",
+    "UnsupportedProtocol",
 ]
 __version__ = "0.9.1"

httpcore/_async/connection_pool.py

@@ -2,7 +2,7 @@
 from typing import AsyncIterator, Callable, Dict, List, Optional, Set, Tuple
 
 from .._backends.auto import AsyncLock, AsyncSemaphore, AutoBackend
-from .._exceptions import PoolTimeout
+from .._exceptions import PoolTimeout, UnsupportedProtocol
 from .._threadlock import ThreadLock
 from .._types import URL, Headers, Origin, TimeoutDict
 from .._utils import get_logger, origin_to_url_string, url_to_origin
@@ -124,7 +124,10 @@ async def request(
         stream: AsyncByteStream = None,
         timeout: TimeoutDict = None,
     ) -> Tuple[bytes, int, bytes, Headers, AsyncByteStream]:
-        assert url[0] in (b"http", b"https")
+        if url[0] not in (b"http", b"https"):
+            scheme = url[0].decode("latin-1")
+            raise UnsupportedProtocol(f"Unsupported URL protocol {scheme!r}")
+
         origin = url_to_origin(url)
 
         if self._keepalive_expiry is not None:

httpcore/_exceptions.py

@@ -13,6 +13,10 @@ def map_exceptions(map: Dict[Type[Exception], Type[Exception]]) -> Iterator[None
         raise
 
 
+class UnsupportedProtocol(Exception):
+    pass
+
+
 class ProtocolError(Exception):
     pass
 

httpcore/_sync/connection_pool.py

@@ -2,7 +2,7 @@
 from typing import Iterator, Callable, Dict, List, Optional, Set, Tuple
 
 from .._backends.auto import SyncLock, SyncSemaphore, SyncBackend
-from .._exceptions import PoolTimeout
+from .._exceptions import PoolTimeout, UnsupportedProtocol
 from .._threadlock import ThreadLock
 from .._types import URL, Headers, Origin, TimeoutDict
 from .._utils import get_logger, origin_to_url_string, url_to_origin
@@ -124,7 +124,10 @@ def request(
         stream: SyncByteStream = None,
         timeout: TimeoutDict = None,
     ) -> Tuple[bytes, int, bytes, Headers, SyncByteStream]:
-        assert url[0] in (b"http", b"https")
+        if url[0] not in (b"http", b"https"):
+            scheme = url[0].decode("latin-1")
+            raise UnsupportedProtocol(f"Unsupported URL protocol {scheme!r}")
+
         origin = url_to_origin(url)
 
         if self._keepalive_expiry is not None:

tests/async_tests/test_interfaces.py

@@ -50,6 +50,16 @@ async def test_https_request() -> None:
         assert len(http._connections[url[:3]]) == 1  # type: ignore
 
 
+@pytest.mark.usefixtures("async_environment")
+async def test_request_unsupported_protocol() -> None:
+    async with httpcore.AsyncConnectionPool() as http:
+        method = b"GET"
+        url = (b"ftp", b"example.org", 443, b"/")
+        headers = [(b"host", b"example.org")]
+        with pytest.raises(httpcore.UnsupportedProtocol):
+            await http.request(method, url, headers)
+
+
 @pytest.mark.usefixtures("async_environment")
 async def test_http2_request() -> None:
     async with httpcore.AsyncConnectionPool(http2=True) as http:

tests/sync_tests/test_interfaces.py

@@ -51,6 +51,16 @@ def test_https_request() -> None:
 
 
 
+def test_request_unsupported_protocol() -> None:
+    with httpcore.SyncConnectionPool() as http:
+        method = b"GET"
+        url = (b"ftp", b"example.org", 443, b"/")
+        headers = [(b"host", b"example.org")]
+        with pytest.raises(httpcore.UnsupportedProtocol):
+            http.request(method, url, headers)
+
+
+
 def test_http2_request() -> None:
     with httpcore.SyncConnectionPool(http2=True) as http:
         method = b"GET"