forked from kenzuya/unshackle
fix(cdm): correct error key casing in Decrypt Labs API response parsing
The API returns error details with capital "Error" key, but the code was checking for lowercase "error", causing error details to be ignored.
This commit is contained in:
@@ -449,8 +449,8 @@ class DecryptLabsRemoteCDM:
|
|||||||
error_msg = data.get("message", "Unknown error")
|
error_msg = data.get("message", "Unknown error")
|
||||||
if "details" in data:
|
if "details" in data:
|
||||||
error_msg += f" - Details: {data['details']}"
|
error_msg += f" - Details: {data['details']}"
|
||||||
if "error" in data:
|
if "Error" in data:
|
||||||
error_msg += f" - Error: {data['error']}"
|
error_msg += f" - Error: {data['Error']}"
|
||||||
|
|
||||||
if "service_certificate is required" in str(data) and not session["service_certificate"]:
|
if "service_certificate is required" in str(data) and not session["service_certificate"]:
|
||||||
error_msg += " (No service certificate was provided to the CDM session)"
|
error_msg += " (No service certificate was provided to the CDM session)"
|
||||||
@@ -537,8 +537,8 @@ class DecryptLabsRemoteCDM:
|
|||||||
error_msg = f"API response: {data['message']} - {error_msg}"
|
error_msg = f"API response: {data['message']} - {error_msg}"
|
||||||
if "details" in data:
|
if "details" in data:
|
||||||
error_msg += f" - Details: {data['details']}"
|
error_msg += f" - Details: {data['details']}"
|
||||||
if "error" in data:
|
if "Error" in data:
|
||||||
error_msg += f" - Error: {data['error']}"
|
error_msg += f" - Error: {data['Error']}"
|
||||||
|
|
||||||
if already_tried_cache and data.get("message") == "success":
|
if already_tried_cache and data.get("message") == "success":
|
||||||
return b""
|
return b""
|
||||||
@@ -612,8 +612,8 @@ class DecryptLabsRemoteCDM:
|
|||||||
|
|
||||||
if data.get("message") != "success":
|
if data.get("message") != "success":
|
||||||
error_msg = data.get("message", "Unknown error")
|
error_msg = data.get("message", "Unknown error")
|
||||||
if "error" in data:
|
if "Error" in data:
|
||||||
error_msg += f" - Error: {data['error']}"
|
error_msg += f" - Error: {data['Error']}"
|
||||||
if "details" in data:
|
if "details" in data:
|
||||||
error_msg += f" - Details: {data['details']}"
|
error_msg += f" - Details: {data['details']}"
|
||||||
raise requests.RequestException(f"License decrypt error: {error_msg}")
|
raise requests.RequestException(f"License decrypt error: {error_msg}")
|
||||||
|
|||||||
Reference in New Issue
Block a user