zhaarey/unshackle
1
0
Fork 0
mirror of https://github.com/unshackle-dl/unshackle.git synced 2025-10-23 15:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cdm): Clean up session data when retrieving cached keys

Browse Source 
Remove decrypt_labs_session_id and challenge from session when cached keys exist but there are missing kids, ensuring clean state for subsequent requests.
This commit is contained in:
Andy
2025-09-06 18:52:20 +00:00
parent 16ee4175a4
commit 83b600e999
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
unshackle/core/cdm/decrypt_labs_remote_cdm.py
View File

@@ -250,12 +250,14 @@ class DecryptLabsRemoteCDM:
"pssh": None, "pssh": None,
"challenge": None, "challenge": None,
"decrypt_labs_session_id": None, "decrypt_labs_session_id": None,
"tried_cache": False,
"cached_keys": None,
} }
return session_id return session_id
def close(self, session_id: bytes) -> None: def close(self, session_id: bytes) -> None:
""" """
Close a CDM session. Close a CDM session and perform comprehensive cleanup.
Args: Args:
session_id: Session identifier session_id: Session identifier
@@ -266,6 +268,8 @@ class DecryptLabsRemoteCDM:
if session_id not in self._sessions: if session_id not in self._sessions:
raise DecryptLabsRemoteCDMExceptions.InvalidSession(f"Invalid session ID: {session_id.hex()}") raise DecryptLabsRemoteCDMExceptions.InvalidSession(f"Invalid session ID: {session_id.hex()}")
session = self._sessions[session_id]
session.clear()
del self._sessions[session_id] del self._sessions[session_id]
def get_service_certificate(self, session_id: bytes) -> Optional[bytes]: def get_service_certificate(self, session_id: bytes) -> Optional[bytes]:
@@ -435,6 +439,10 @@ class DecryptLabsRemoteCDM:
if missing_kids: if missing_kids:
session["cached_keys"] = parsed_keys session["cached_keys"] = parsed_keys
request_data["get_cached_keys_if_exists"] = False request_data["get_cached_keys_if_exists"] = False
session["decrypt_labs_session_id"] = None
session["challenge"] = None
session["tried_cache"] = False
response = self._http_session.post(f"{self.host}/get-request", json=request_data, timeout=30) response = self._http_session.post(f"{self.host}/get-request", json=request_data, timeout=30)
if response.status_code == 200: if response.status_code == 200:
data = response.json() data = response.json()
@@ -580,6 +588,7 @@ class DecryptLabsRemoteCDM:
all_keys.append(license_key) all_keys.append(license_key)
session["keys"] = all_keys session["keys"] = all_keys
session["cached_keys"] = None
else: else:
session["keys"] = license_keys session["keys"] = license_keys