Skip to content

Commit

Permalink
Fix sorting of proxy_map in PDMPyPIClient
Browse files Browse the repository at this point in the history
Sort proxy_map after constructing URLPatterns. URLPattern has logic to
make more specific patterns sort first. Current code instead sorts URLs
as strings, which orders them lexicographically. This means that URLs
from `no_proxy` usually sort *after* URLs from `all_proxy` and so
`no_proxy` settings have no effect.

Fixes #3254
  • Loading branch information
eltoder committed Nov 5, 2024
1 parent acb40b0 commit a4a7d3b
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 1 deletion.
1 change: 1 addition & 0 deletions news/3254.bugfix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix using `no_proxy` when `all_proxy` is set.
3 changes: 2 additions & 1 deletion src/pdm/models/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,9 @@ def cache_transport(transport: httpx.BaseTransport) -> httpx.BaseTransport:
mounts: dict[str, httpx.BaseTransport] = {"file://": LocalFSTransport()}
self._trusted_host_ports: set[tuple[str, int | None]] = set()
self._proxy_map = {
URLPattern(key): proxy for key, proxy in sorted(self._get_proxy_map(None, allow_env_proxies=True).items())
URLPattern(key): proxy for key, proxy in self._get_proxy_map(None, allow_env_proxies=True).items()
}
self._proxy_map = dict(sorted(self._proxy_map.items()))
for s in sources:
assert s.url is not None
url = httpx.URL(s.url)
Expand Down
24 changes: 24 additions & 0 deletions tests/models/test_session.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
from __future__ import annotations

from typing import TYPE_CHECKING

if TYPE_CHECKING:
from pdm.project.core import Project


def test_session_sources_all_proxy(project: Project, mocker, monkeypatch):
monkeypatch.setenv("all_proxy", "http://localhost:8888")
mock_get_transport = mocker.patch("pdm.models.session._get_transport")

assert project.environment.session is not None
transport_args = mock_get_transport.call_args
assert transport_args is not None
assert transport_args.kwargs["proxy"].url == "http://localhost:8888"

monkeypatch.setenv("no_proxy", "pypi.org")
mock_get_transport.reset_mock()
del project.environment.session
assert project.environment.session is not None
transport_args = mock_get_transport.call_args
assert transport_args is not None
assert transport_args.kwargs["proxy"] is None

0 comments on commit a4a7d3b

Please sign in to comment.