Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/vesta/http.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
from typing import NamedTuple
from typing import Optional
from urllib.parse import urljoin
from urllib.parse import urlsplit

# Re-export as a convenience
HTTPError = urllib.error.HTTPError
Expand Down Expand Up @@ -69,7 +70,7 @@ def __init__(
def request(
self,
method: Literal["GET", "POST"],
url: str,
path: str,
*,
json: Optional[Any] = None,
headers: Optional[Mapping[str, str]] = None,
Expand All @@ -78,8 +79,13 @@ def request(

Raises urllib.error.HTTPError for 4xx/5xx responses.
Raises urllib.error.URLError for connection errors.
Raises ValueError if ``path`` is not a relative path.
"""
full_url = urljoin(self.base_url, url.lstrip("/"))
parts = urlsplit(path)
if parts.scheme or parts.netloc:
raise ValueError(f"expected a relative path, got {path!r}")

full_url = urljoin(self.base_url, path.lstrip("/"))

request_headers = dict(self.headers)
if headers:
Expand Down
13 changes: 13 additions & 0 deletions tests/test_http.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,19 @@ def test_json_body(self, mock_response):
assert mock["data"] == b'{"key":"value"}'
assert mock["headers"]["Content-type"] == "application/json"

@pytest.mark.parametrize(
"path",
[
"https://evil.example.com/x",
"http://evil.example.com/x",
"//evil.example.com/x",
],
)
def test_rejects_non_relative_path(self, path):
client = Client(base_url="https://api.example.com")
with pytest.raises(ValueError, match="expected a relative path"):
client.request("GET", path)

def test_http_error(self, monkeypatch):
"""Test that urllib.error.HTTPError is raised and propagated correctly."""
client = Client(base_url="https://api.example.com")
Expand Down
Loading