kenzuya/unshackle
1
0
Fork 2
mirror of https://github.com/unshackle-dl/unshackle.git synced 2026-11-13 12:35:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(remote): send the typed --proxy to the server when it resolved to loopback

Browse Source 
dl and search keep the typed --proxy value, so --proxy controld:ca --remote sends the server the Control D resolver, not this machine's forwarder. The Control D log names the location and masks the resolver ID in place of 127.0.0.1.
This commit is contained in:
imSp4rky
2026-10-21 11:03:10 -06:00
parent f5bd24b5e9
commit e5c339934c
6 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/core/test_controld_proxy.py
+18
View File
@@ -267,12 +267,14 @@ def account(catalogue: None, monkeypatch: pytest.MonkeyPatch) -> Iterator[Accoun
monkeypatch.setattr("unshackle.core.proxies.controld.requests.request", made.request)
controld.FORWARDERS.clear()
controld.REGIONS.clear()
controld.LOCATIONS.clear()
yield made
for server in controld.FORWARDERS.values():
server.shutdown()
server.server_close()
controld.FORWARDERS.clear()
controld.REGIONS.clear()
controld.LOCATIONS.clear()
def test_locations_come_from_control_d(account: Account) -> None:
@@ -378,6 +380,13 @@ def test_a_server_runs_a_forwarder_for_a_resolver_a_client_sends(account: Accoun
local_proxy("controld://evil.example/x@dns.controld.com")
def test_the_log_names_the_location_and_masks_the_resolver(account: Account) -> None:
provider = ControlD(token="secret", profile="abcd123", resolver="efgh456")
provider.get_proxy("yul")
provider.get_proxy("yul") # a profile already on the region keeps its location
assert provider.last_connection_display() == "(YUL - Montreal): efgh***@dns.controld.com"
def test_remote_sends_the_resolver_and_a_bare_region_skips_control_d(
account: Account, monkeypatch: pytest.MonkeyPatch
) -> None:
@@ -391,6 +400,15 @@ def test_remote_sends_the_resolver_and_a_bare_region_skips_control_d(
remote_service.resolve_remote_proxy_arg("us") # a loopback forwarder is useless to a server
def test_a_server_gets_the_typed_proxy_only_when_this_machine_resolved_it_to_loopback() -> None:
from unshackle.core.remote_service import server_proxy_arg
assert server_proxy_arg({"proxy": "http://127.0.0.1:4000", "proxy_arg": "controld:ca"}) == "controld:ca"
assert server_proxy_arg({"proxy": "https://u:p@ca1.example:89", "proxy_arg": "nordvpn:ca"}) == (
"https://u:p@ca1.example:89"
)
@pytest.mark.parametrize("query", ["ca", "us:seattle", "us-ny", "uk1", "yul", "jfk", "res_yyz", "nordvpn:ca"])
def test_a_region_query_matches(query: str) -> None:
assert re.fullmatch(rf"(?:[a-z]+:)?{REGION}", query, re.IGNORECASE)