feat(serve): gate server_cdm per service and let clients follow it

serve.users.<key>.server_cdm accepts a list of service tags; retry re-attaches the job service and a bare string no longer fails open. An unset client server_cdm now follows the server's per-service /tracks flag.
This commit is contained in:
imSp4rky
2026-08-27 10:10:46 -06:00
parent 5128fef473
commit 3aa275035b
5 changed files with 94 additions and 23 deletions
+49
View File
@@ -1,5 +1,6 @@
"""Only keys that opt in may have the server run the CDM licensing."""
from datetime import datetime
from types import SimpleNamespace
import pytest
@@ -12,6 +13,8 @@ pytestmark = pytest.mark.unit
USERS = {
"tier1key": {"username": "tier1"},
"tier3key": {"username": "tier3", "server_cdm": True},
"tier2key": {"username": "tier2", "server_cdm": ["example1"]},
"tier2strkey": {"username": "tier2str", "server_cdm": "example1"},
}
ENTITLEMENTS = [
@@ -37,6 +40,52 @@ def test_server_cdm_allowed(serve_users, key, allowed):
assert handlers.server_cdm_allowed(request(key)) is allowed
@pytest.mark.parametrize(("service", "allowed"), [("EXAMPLE1", True), ("EXAMPLE2", False), (None, False)])
def test_server_cdm_service_list(serve_users, service, allowed):
assert handlers.server_cdm_allowed(request("tier2key"), service) is allowed
@pytest.mark.parametrize(("service", "allowed"), [("EXAMPLE1", True), ("EXAMPLE2", False)])
def test_server_cdm_bare_tag(serve_users, service, allowed):
# A bare tag gates one service. It must not read as a truthy value that opens every service.
assert handlers.server_cdm_allowed(request("tier2strkey"), service) is allowed
def test_download_gate_uses_job_service(serve_users):
handlers.enforce_download_gates({"service": "EXAMPLE1"}, request("tier2key"))
with pytest.raises(APIError):
handlers.enforce_download_gates({"service": "EXAMPLE2"}, request("tier2key"))
@pytest.mark.parametrize(("service", "allowed"), [("EXAMPLE1", True), ("EXAMPLE2", False)])
async def test_retry_gate_uses_job_service(serve_users, monkeypatch, service, allowed):
# The job keeps its tag outside `parameters`, so the retry gate must add it back.
from unshackle.core.api import download_manager as dm
job = SimpleNamespace(service=service, title_id="t1", parameters={}, status=dm.JobStatus.FAILED)
new_job = SimpleNamespace(job_id="new", status=dm.JobStatus.QUEUED, created_time=datetime.now())
async def start_workers():
return None
manager = SimpleNamespace(
get_job=lambda job_id: job,
start_workers=start_workers,
create_job=lambda *args, **kwargs: new_job,
)
monkeypatch.setattr(dm, "get_download_manager", lambda: manager)
monkeypatch.setattr(handlers, "owns_job", lambda job, request: True)
monkeypatch.setattr(handlers, "validate_service", lambda tag, request=None: tag)
if allowed:
response = await handlers.retry_download_job_handler("job1", request("tier2key"))
assert response.status == 202
else:
with pytest.raises(APIError) as ei:
await handlers.retry_download_job_handler("job1", request("tier2key"))
assert ei.value.error_code == APIErrorCode.FORBIDDEN
def test_no_request_allows(serve_users):
assert handlers.server_cdm_allowed(None) is True