Eyevinn / moqlivemock / 30900932881

48%

Build Type

push

github

Committed by tobbee

Commit Message

fix(mlmpub): serve the configured content key from /clearkey

The ClearKey license endpoint echoed each requested KID back as the
content key, ignoring -cenckey. A run with -cenckey set therefore
encrypted with the real key while handing players the KID, so EME
decrypted with the wrong key and the decoder failed on the first packet.
It only looked correct because -cenckey defaults to the KID.

Track the KID alongside the key in CENCInfo and add
DRMInfo.ContentKeyForKID, so the endpoint can look up the key for a
requested KID instead of reflecting it. An unrecognised KID is now a 404
rather than a bogus key: serving a key for content this publisher did not
encrypt is the failure being fixed. Request KIDs are base64url-decoded
(tolerating the padding the EME spec forbids but clients send) and the
response's k/kid are re-encoded unpadded per the spec.

Extract the handler as server.serveClearKey to make it testable, and
cover the -cenckey, KID-as-key, padded-KID, unknown-KID, no-ECCP and
malformed-request cases. Verified end to end with the reproduce from the
issue: k is now the configured key, not the KID.

Fixes #122

Coverage Stats

54 of 65 new or added lines in 3 files covered. (83.08%)

8 existing lines in 3 files now uncovered.

2406 of 4970 relevant lines covered (48.41%)

1933.88 hits per line