CDRM-Team/pywidevine
1
0
Fork 0
mirror of https://github.com/devine-dl/pywidevine.git synced 2025-11-04 03:44:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

serve: Catch InvalidSession instead of manually ensuring session validity

Browse Source
This commit is contained in:
rlaphoenix 2022-08-06 09:02:29 +01:00
parent 93d9561fac
commit 2c33af79df
1 changed files with 31 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
pywidevine/serve.py
View File

@ -106,10 +106,10 @@ async def close(request: web.Request) -> web.Response:
try: try:
cdm.close(session_id) cdm.close(session_id)
except InvalidSession as e: except InvalidSession:
return web.json_response({ return web.json_response({
"status": 400, "status": 400,
"message": str(e) "message": f"Invalid Session ID '{session_id.hex()}', it may have expired."
}, status=400) }, status=400)
return web.json_response({ return web.json_response({
@ -146,20 +146,15 @@ async def set_service_certificate(request: web.Request) -> web.Response:
"message": f"No Cdm session for {device_name} has been opened yet. No session to use." "message": f"No Cdm session for {device_name} has been opened yet. No session to use."
}, status=400) }, status=400)
if session_id not in cdm._sessions:
# This can happen if:
# - API server gets shutdown/restarted,
# - The user calls /challenge before /open,
# - The user called /open on a different IP Address
# - The user closed the session
return web.json_response({
"status": 400,
"message": "Invalid Session ID. Session ID may have Expired."
}, status=400)
# set service certificate # set service certificate
certificate = body.get("certificate") certificate = body.get("certificate")
provider_id = cdm.set_service_certificate(session_id, certificate) try:
provider_id = cdm.set_service_certificate(session_id, certificate)
except InvalidSession:
return web.json_response({
"status": 400,
"message": f"Invalid Session ID '{session_id.hex()}', it may have expired."
}, status=400)
return web.json_response({ return web.json_response({
"status": 200, "status": 200,
@ -194,17 +189,6 @@ async def get_license_challenge(request: web.Request) -> web.Response:
"message": f"No Cdm session for {device_name} has been opened yet. No session to use." "message": f"No Cdm session for {device_name} has been opened yet. No session to use."
}, status=400) }, status=400)
if session_id not in cdm._sessions:
# This can happen if:
# - API server gets shutdown/restarted,
# - The user calls /challenge before /open,
# - The user called /open on a different IP Address
# - The user closed the session
return web.json_response({
"status": 400,
"message": "Invalid Session ID. Session ID may have Expired."
}, status=400)
# enforce service certificate (opt-in) # enforce service certificate (opt-in)
if request.app["config"].get("force_privacy_mode") and not cdm._sessions[session_id].service_certificate: if request.app["config"].get("force_privacy_mode") and not cdm._sessions[session_id].service_certificate:
return web.json_response({ return web.json_response({
@ -216,12 +200,18 @@ async def get_license_challenge(request: web.Request) -> web.Response:
init_data = PSSH(body["init_data"]) init_data = PSSH(body["init_data"])
# get challenge # get challenge
license_request = cdm.get_license_challenge( try:
session_id=session_id, license_request = cdm.get_license_challenge(
pssh=init_data, session_id=session_id,
type_=LicenseType.Value(request.match_info["license_type"]), pssh=init_data,
privacy_mode=True type_=LicenseType.Value(request.match_info["license_type"]),
) privacy_mode=True
)
except InvalidSession:
return web.json_response({
"status": 400,
"message": f"Invalid Session ID '{session_id.hex()}', it may have expired."
}, status=400)
return web.json_response({ return web.json_response({
"status": 200, "status": 200,
@ -272,20 +262,15 @@ async def parse_license(request: web.Request) -> web.Response:
"message": f"No Cdm session for {device_name} has been opened yet. No session to use." "message": f"No Cdm session for {device_name} has been opened yet. No session to use."
}, status=400) }, status=400)
if session_id not in cdm._sessions: # parse the license message
# This can happen if: try:
# - API server gets shutdown/restarted, cdm.parse_license(session_id, body["license_message"])
# - The user calls /challenge before /open, except InvalidSession:
# - The user called /open on a different IP Address
# - The user closed the session
return web.json_response({ return web.json_response({
"status": 400, "status": 400,
"message": "Invalid Session ID. Session ID may have Expired." "message": f"Invalid Session ID '{session_id.hex()}', it may have expired."
}, status=400) }, status=400)
# parse the license message
cdm.parse_license(session_id, body["license_message"])
# prepare the keys # prepare the keys
license_keys = [ license_keys = [
{ {
@ -336,20 +321,14 @@ async def get_keys(request: web.Request) -> web.Response:
"message": f"No Cdm session for {device_name} has been opened yet. No session to use." "message": f"No Cdm session for {device_name} has been opened yet. No session to use."
}, status=400) }, status=400)
if session_id not in cdm._sessions:
# This can happen if:
# - API server gets shutdown/restarted,
# - The user calls /challenge before /open,
# - The user called /open on a different IP Address
# - The user closed the session
return web.json_response({
"status": 400,
"message": "Invalid Session ID. Session ID may have Expired."
}, status=400)
# get keys # get keys
try: try:
keys = cdm.get_keys(session_id, key_type) keys = cdm.get_keys(session_id, key_type)
except InvalidSession:
return web.json_response({
"status": 400,
"message": f"Invalid Session ID '{session_id.hex()}', it may have expired."
}, status=400)
except ValueError as e: except ValueError as e:
return web.json_response({ return web.json_response({
"status": 400, "status": 400,