Devine
/
pywidevine
mirror of https://github.com/devine-dl/pywidevine.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

serve: Provide key_type to get_keys as-is 

There's no need for serve code to handle parsing of it when the Cdm code will do so better.
This commit is contained in:
rlaphoenix 2022-08-06 09:22:59 +01:00
parent 11a2358002
commit bd62b8d131
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pywidevine/serve.py
View File

@ -22,7 +22,6 @@ from pywidevine.cdm import Cdm
from pywidevine.device import Device from pywidevine.device import Device
from pywidevine.exceptions import TooManySessions, InvalidSession, SignatureMismatch, InvalidInitData, \ from pywidevine.exceptions import TooManySessions, InvalidSession, SignatureMismatch, InvalidInitData, \
InvalidLicenseType InvalidLicenseType
from pywidevine.license_protocol_pb2 import License
routes = web.RouteTableDef() routes = web.RouteTableDef()
@ -250,6 +249,9 @@ async def get_license_challenge(request: web.Request) -> web.Response:
async def parse_license(request: web.Request) -> web.Response: async def parse_license(request: web.Request) -> web.Response:
secret_key = request.headers["X-Secret-Key"] secret_key = request.headers["X-Secret-Key"]
device_name = request.match_info["device"] device_name = request.match_info["device"]
key_type = request.match_info["key_type"]
if key_type == "ALL":
key_type = None
body = await request.json() body = await request.json()
for required_field in ("session_id", "license_message"): for required_field in ("session_id", "license_message"):
@ -262,22 +264,6 @@ async def parse_license(request: web.Request) -> web.Response:
# get session id # get session id
session_id = bytes.fromhex(body["session_id"]) session_id = bytes.fromhex(body["session_id"])
# get key type
key_type = request.match_info["key_type"]
if key_type == "ALL":
key_type = None
else:
try:
if key_type.isdigit():
key_type = License.KeyContainer.KeyType.Name(int(key_type))
else:
License.KeyContainer.KeyType.Value(key_type) # only test
except ValueError as e:
return web.json_response({
"status": 400,
"message": f"The Key Type value is invalid, {e}"
}, status=400)
# get cdm # get cdm
cdm = request.app["cdms"].get((secret_key, device_name)) cdm = request.app["cdms"].get((secret_key, device_name))
if not cdm: if not cdm: