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

fix(cdm): apply session key fix to custom_remote_cdm

Browse Source 
Apply the same partial cached keys fix from decrypt_labs_remote_cdm to custom_remote_cdm. When cached keys don't cover all required KIDs, store them in session["cached_keys"] instead of session["keys"] to allow parse_license() to properly combine vault_keys + cached_keys + license_keys.
This commit is contained in:
Andy
2025-11-08 03:02:17 +00:00
parent cc7263884f
commit 11bcca9632
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
unshackle/core/cdm/custom_remote_cdm.py
View File

@@ -891,7 +891,6 @@ class CustomRemoteCDM:
if "vault_keys" in session: if "vault_keys" in session:
all_available_keys.extend(session["vault_keys"]) all_available_keys.extend(session["vault_keys"])
session["keys"] = all_available_keys
session["tried_cache"] = True session["tried_cache"] = True
# Check if we have all required keys # Check if we have all required keys
@@ -904,11 +903,18 @@ class CustomRemoteCDM:
required_kids = set(self._required_kids) required_kids = set(self._required_kids)
missing_kids = required_kids - available_kids missing_kids = required_kids - available_kids
if not missing_kids: if missing_kids:
# Store cached keys separately - don't populate session["keys"] yet
# This allows parse_license() to properly combine cached + license keys
session["cached_keys"] = cached_keys
else:
# All required keys are available from cache
session["keys"] = all_available_keys
return b"" return b""
else:
# Store cached keys for later combination # No required KIDs specified - return cached keys
session["cached_keys"] = cached_keys session["keys"] = all_available_keys
return b""
# Handle license request response or fetch license if keys missing # Handle license request response or fetch license if keys missing
challenge = parsed_response.get("challenge") challenge = parsed_response.get("challenge")
@@ -952,8 +958,9 @@ class CustomRemoteCDM:
session = self._sessions[session_id] session = self._sessions[session_id]
# If we already have keys and no cached keys to combine, skip # Skip parsing if we already have final keys (no cached keys to combine)
if session["keys"] and not session.get("cached_keys"): # If cached_keys exist (Widevine or PlayReady), we need to combine them with license keys
if session["keys"] and "cached_keys" not in session:
return return
# Ensure we have a challenge and session ID # Ensure we have a challenge and session ID