unshackle-dl/unshackle
1
0
Fork 0
forked from kenzuya/unshackle
Code Pull Requests 1 Activity

fix(serve): use correct pywidevine users config format

Browse Source 
pywidevine's serve module expects users to be a dict mapping secret keys to user objects with devices and username, not a simple list.
This was causing TypeError when accessing CDM endpoints.
This commit is contained in:
Andy
2026-01-22 17:33:19 +00:00
parent eaad0e3cc2
commit 9463870da7
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
unshackle/commands/serve.py
View File

@@ -81,7 +81,7 @@ def serve(host: str, port: int, caddy: bool, api_only: bool, no_key: bool, debug
app["config"] = {"users": []} app["config"] = {"users": []}
else: else:
app = web.Application(middlewares=[cors_middleware, pywidevine_serve.authentication]) app = web.Application(middlewares=[cors_middleware, pywidevine_serve.authentication])
app["config"] = {"users": [api_secret]} app["config"] = {"users": {api_secret: {"devices": [], "username": "api_user"}}}
app["debug_api"] = debug_api app["debug_api"] = debug_api
setup_routes(app) setup_routes(app)
setup_swagger(app) setup_swagger(app)
@@ -102,10 +102,14 @@ def serve(host: str, port: int, caddy: bool, api_only: bool, no_key: bool, debug
app = web.Application(middlewares=[cors_middleware, pywidevine_serve.authentication]) app = web.Application(middlewares=[cors_middleware, pywidevine_serve.authentication])
# Setup config - add API secret to users for authentication # Setup config - add API secret to users for authentication
serve_config = dict(config.serve) serve_config = dict(config.serve)
if not serve_config.get("users"): if not serve_config.get("users") or not isinstance(serve_config["users"], dict):
serve_config["users"] = [] serve_config["users"] = {}
if api_secret not in serve_config["users"]: if api_secret not in serve_config["users"]:
serve_config["users"].append(api_secret) device_names = [d.stem if hasattr(d, "stem") else str(d) for d in serve_config.get("devices", [])]
serve_config["users"][api_secret] = {
"devices": device_names,
"username": "api_user"
}
app["config"] = serve_config app["config"] = serve_config
app.on_startup.append(pywidevine_serve._startup) app.on_startup.append(pywidevine_serve._startup)