From 012bf452708464ae3d74f94a1ba757ce4331b34d Mon Sep 17 00:00:00 2001
From: imSp4rky <george+slight@slight.me>
Date: Tue, 20 Oct 2026 20:05:03 -0600
Subject: [PATCH] fix(hls): keep PlayReady session-data keys by matching the
 URN string

---
 tests/core/test_hls_session_keys.py | 115 ++++++++++++++++++++++++++++
 unshackle/core/manifests/hls.py     |   3 +-
 2 files changed, 116 insertions(+), 2 deletions(-)
 create mode 100644 tests/core/test_hls_session_keys.py

diff --git a/tests/core/test_hls_session_keys.py b/tests/core/test_hls_session_keys.py
new file mode 100644
index 00000000..9c5c9083
--- /dev/null
+++ b/tests/core/test_hls_session_keys.py
@@ -0,0 +1,115 @@
+"""Key selection helpers of the HLS parser: session-data keys, CDM filtering and key choice."""
+
+from __future__ import annotations
+
+import base64
+import json
+from typing import Optional
+
+import m3u8
+import pytest
+
+from unshackle.core.cdm.detect import cdm_type_stub
+from unshackle.core.manifests.hls import HLS
+
+pytestmark = pytest.mark.unit
+
+WV_URN = "urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed"
+PR_URN = "urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95"
+PR_NAME = "com.microsoft.playready"
+KEY_URI = "data:text/plain;base64,AAAA"
+
+
+def _master(value: str, data_id: str = "com.apple.hls.keys") -> m3u8.M3U8:
+    text = (
+        "#EXTM3U\n"
+        f'#EXT-X-SESSION-DATA:DATA-ID="{data_id}",VALUE="{value}"\n'
+        "#EXT-X-STREAM-INF:BANDWIDTH=1000,RESOLUTION=640x360\n"
+        "video.m3u8\n"
+    )
+    return m3u8.loads(text)
+
+
+def _b64(items: list[dict]) -> str:
+    return base64.b64encode(json.dumps(items).encode()).decode()
+
+
+def _item(method: str, keyformat: Optional[str] = None) -> dict:
+    item = {"method": method, "uri": KEY_URI}
+    if keyformat:
+        item["keyformat"] = keyformat
+    return item
+
+
+def _key(method: str, keyformat: Optional[str] = None) -> m3u8.model.Key:
+    return m3u8.model.Key(method=method, base_uri="", uri=KEY_URI, keyformat=keyformat)
+
+
+def test_session_data_playready_urn_key_is_kept() -> None:
+    keys = HLS.parse_session_data_keys(_master(_b64([_item("SAMPLE-AES-CTR", PR_URN)])))
+    assert [k.keyformat for k in keys] == [PR_URN]
+
+
+@pytest.mark.parametrize(
+    ("method", "keyformat"),
+    [
+        ("SAMPLE-AES-CTR", WV_URN),
+        ("SAMPLE-AES-CTR", PR_NAME),
+        ("SAMPLE-AES-CTR", PR_URN.upper()),
+        ("AES-128", None),
+        ("ISO-23001-7", None),
+    ],
+)
+def test_session_data_supported_keys_are_kept(method: str, keyformat: Optional[str]) -> None:
+    keys = HLS.parse_session_data_keys(_master(_b64([_item(method, keyformat)])))
+    assert [k.keyformat for k in keys] == [keyformat]
+
+
+def test_session_data_unknown_keyformat_is_dropped() -> None:
+    assert HLS.parse_session_data_keys(_master(_b64([_item("SAMPLE-AES", "com.example.drm")]))) == []
+
+
+def test_session_data_plain_json_value_is_parsed() -> None:
+    manifest = _master("placeholder")
+    # a quoted attribute cannot hold raw JSON quotes, so set the value after parsing
+    manifest.session_data[0].value = json.dumps([_item("SAMPLE-AES-CTR", WV_URN)])
+    keys = HLS.parse_session_data_keys(manifest)
+    assert len(keys) == 1
+
+
+def test_session_data_value_not_json_yields_nothing() -> None:
+    assert HLS.parse_session_data_keys(_master("not json at all")) == []
+
+
+def test_session_data_other_data_id_is_ignored() -> None:
+    manifest = _master(_b64([_item("SAMPLE-AES-CTR", WV_URN)]), data_id="com.example.other")
+    assert HLS.parse_session_data_keys(manifest) == []
+
+
+@pytest.mark.parametrize("playready_keyformat", [PR_URN, PR_NAME])
+def test_filter_keys_follows_cdm(playready_keyformat: str) -> None:
+    wv = _key("SAMPLE-AES-CTR", WV_URN)
+    pr = _key("SAMPLE-AES-CTR", playready_keyformat)
+    assert HLS.filter_keys_for_cdm([wv, pr], cdm_type_stub("widevine")) == [wv]
+    assert HLS.filter_keys_for_cdm([wv, pr], cdm_type_stub("playready")) == [pr]
+
+
+def test_filter_keys_preference_wins_over_cdm() -> None:
+    wv = _key("SAMPLE-AES-CTR", WV_URN)
+    pr = _key("SAMPLE-AES-CTR", PR_URN)
+    assert HLS.filter_keys_for_cdm([wv, pr], cdm_type_stub("widevine"), drm_preference="playready") == [pr]
+    assert HLS.filter_keys_for_cdm([wv, pr], cdm_type_stub("playready"), drm_preference="wv") == [wv]
+
+
+def test_filter_keys_unsatisfied_preference_falls_back_to_cdm() -> None:
+    wv = _key("SAMPLE-AES-CTR", WV_URN)
+    assert HLS.filter_keys_for_cdm([wv], cdm_type_stub("widevine"), drm_preference="playready") == [wv]
+
+
+def test_get_supported_key_none_method_returns_none() -> None:
+    assert HLS.get_supported_key([_key("NONE")]) is None
+
+
+def test_get_supported_key_unsupported_only_raises() -> None:
+    with pytest.raises(NotImplementedError, match="SAMPLE-AES"):
+        HLS.get_supported_key([_key("SAMPLE-AES", "com.example.drm")])
diff --git a/unshackle/core/manifests/hls.py b/unshackle/core/manifests/hls.py
index 166cedc9..f28f44e8 100644
--- a/unshackle/core/manifests/hls.py
+++ b/unshackle/core/manifests/hls.py
@@ -22,7 +22,6 @@ import m3u8
 import requests
 from langcodes import Language, tag_is_valid
 from m3u8 import M3U8
-from pyplayready.cdm import Cdm as PlayReadyCdm
 from pyplayready.system.pssh import PSSH as PR_PSSH
 from pywidevine.cdm import Cdm as WidevineCdm
 from pywidevine.pssh import PSSH as WV_PSSH
@@ -1399,7 +1398,7 @@ class HLS:
                     and key.keyformat.lower()
                     in {
                         WidevineCdm.urn,
-                        PlayReadyCdm,
+                        f"urn:uuid:{PR_PSSH.SYSTEM_ID}",
                         "com.microsoft.playready",
                     }
                 ):