kenzuya/unshackle
1
0
Fork 2
mirror of https://github.com/unshackle-dl/unshackle.git synced 2026-11-14 04:55:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): skip the local geoblock for a relayed tag not installed here

Browse Source
This commit is contained in:
imSp4rky
2026-11-01 20:06:09 -07:00
parent 99f0c269be
commit de9646dba2
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/remote/unit/test_handler_proxy_policy.py
+5
View File
@@ -63,6 +63,11 @@ def test_region_match_no_proxy(monkeypatch):
assert handlers.resolve_handler_proxy({"client_region": "ca"}, "EXAMPLE", request("plainkey")) == (None, []) assert handlers.resolve_handler_proxy({"client_region": "ca"}, "EXAMPLE", request("plainkey")) == (None, [])
def test_relayed_tag_not_installed_here_skips_the_local_geoblock(monkeypatch):
patch_server_region(monkeypatch, "CA")
assert handlers.resolve_handler_proxy({"client_region": "ca"}, "NOTHERE", request("plainkey")) == (None, [])
def test_region_unknown_no_error(monkeypatch): def test_region_unknown_no_error(monkeypatch):
patch_server_region(monkeypatch, None) patch_server_region(monkeypatch, None)
assert handlers.resolve_handler_proxy({"client_region": "ca"}, "EXAMPLE", request("plainkey")) == (None, []) assert handlers.resolve_handler_proxy({"client_region": "ca"}, "EXAMPLE", request("plainkey")) == (None, [])
unshackle/core/api/handlers.py
+3 -1
View File
@@ -4686,7 +4686,9 @@ def resolve_handler_proxy(
log.debug(f"Server region lookup failed: {e!r}") log.debug(f"Server region lookup failed: {e!r}")
server_region = None server_region = None
geoblock = getattr(Services.load(normalized_service), "GEOBLOCK", ()) or () geoblock: Any = ()
with suppress(KeyError): # a relayed tag need not be installed on this server
geoblock = getattr(Services.load(normalized_service), "GEOBLOCK", ()) or ()
if client_region.lower() in {x.lower() for x in geoblock}: if client_region.lower() in {x.lower() for x in geoblock}:
raise APIError( raise APIError(
APIErrorCode.GEOFENCE, APIErrorCode.GEOFENCE,