feat: update constants to 123301039

Author: cycyrild

spotify_dl_cli/http_client/constants.py

@@ -1,6 +1,6 @@
-USER_AGENT = "Spotify/123200997 Win32/Windows 10 (10.0.19044; x86[native:x64])"
+USER_AGENT = "Spotify/123301039 Win32/Windows 10 (10.0.19044; x86[native:x64])"
 APP_PLATFORM = "Win32"
-SPOTIFY_APP_VERSION = "123200997"
+SPOTIFY_APP_VERSION = "123301039"
 
 BASE_HEADERS = {
     "user-agent": USER_AGENT,

spotify_dl_cli/playplay_emulator/constants.py

@@ -1,15 +1,26 @@
 # RVA addresses
 class ADDR:
     # 55 8B EC B8 3C 10 00 00 E8 ?? ?? ?? ?? A1 ?? ?? ?? ?? ?? ?? ?? ?? FC 8B 45 0C 53 8B 5D 10 56 8B 75 08 57 89 85 F4 EF FF FF E8 ?? ?? ?? ?? 8B 15 ?? ?? ?? ?? 8B C8 C1 E1 0E BF F0 09 01 00 2B F9 89 85 E4 EF FF FF 6A 10 56 89 95 F8 EF FF FF 8D 04 17 89 BD FC EF FF FF 50 E8 ?? ?? ?? ?? 8B 85 F8 EF FF FF 83 EF 18 89 BD 00 F0 FF FF 83 EF 10
-    DERIVE_KEY = 0x0084E86A
+    DERIVE_KEY = 0x0086650A
 
     # 55 8B EC 53 56 57 E9 ?? ?? ?? ??
-    INIT_WITH_KEY = 0x00722094
+    INIT_WITH_KEY = 0x005779BE
 
     # 88 51 0E 66 85 DB 0F 85 ?? ?? ?? ?? E9 ?? ?? ?? ??
-    GEN_KEYSTREAM = 0x0072124B
+    GEN_KEYSTREAM = 0x00576B97
 
-    PLAYPLAY_TOKEN = 0x011BFB20
+    # B8 ?? ?? ?? ?? C3 6A ?? 58 C3
+    PLAYPLAY_TOKEN = 0x0121C164
+
+
+class PLAYPLAY_VM:
+    ADDR_G_WORKSPACE_POOL = 0x01C29918
+    WORKSPACE_POOL_SIZE = 68096  # 0x10A00
+    WORKSPACE_CONST_OFFSET = 1024
+    WORKSPACE_CONST_SIZE = 1536  # 0x600
+
+    CONST_TABLE_VA_START = 0x0121C378
+    CONST_TABLE_VA_END = CONST_TABLE_VA_START + WORKSPACE_CONST_SIZE
 
 
 class STACK:
@@ -30,4 +41,13 @@ class SIZES:
     KEYSTREAM = 16
 
 
+class STUB_ADDRS:
+    SECURITY_CHECK_COOKIE = 0x004645F5
+    THUNK_JMP_RET = 0x01074707
+    MTX_UNLOCK = 0x0105FC31
+    CND_SIGNAL = 0x01061224
+    CND_WAIT = 0x0106130B
+    UNIQUE_LOCK_CTOR = 0x004EC3F3
+
+
 MAGIC_RET = 0xDEADBEEF

spotify_dl_cli/playplay_emulator/emulator.py

@@ -65,9 +65,7 @@ def getDerivedKey(
         uc, stack_utils = self._create_uc()
         esp = stack_utils.init_stack()
 
-        playplay_key_pool_ptr = stack_utils.next_heap(
-            key_derivation_vm.VM_WORKSPACE_POOL_SIZE
-        )
+        playplay_key_pool_ptr = stack_utils.next_heap(PLAYPLAY_VM.WORKSPACE_POOL_SIZE)
 
         key_derivation_vm.init_playplay_vm_workspace(uc, self.pe, playplay_key_pool_ptr)
 

spotify_dl_cli/playplay_emulator/key_derivation_vm.py

@@ -1,22 +1,17 @@
 import pefile
 from unicorn.unicorn import Uc
-from spotify_dl_cli.playplay_emulator.helpers import pack_u32
-
-ADDR_G_PLAYPLAY_VM_WORKSPACE_POOL = 0x01BC3DE8
-VM_WORKSPACE_POOL_SIZE = 68096  # 0x10A00
-VM_WORKSPACE_CONST_OFFSET = 1024
-VM_WORKSPACE_CONST_SIZE = 1536  # 0x600
-
-CONST_TABLE_VA_START = 0x011BFD18
-CONST_TABLE_VA_END = CONST_TABLE_VA_START + VM_WORKSPACE_CONST_SIZE
+from .helpers import pack_u32
+from .constants import PLAYPLAY_VM as VM
 
 
 def init_playplay_vm_workspace(uc: Uc, pe: pefile.PE, vm_pool_ptr: int) -> None:
-    uc.mem_write(ADDR_G_PLAYPLAY_VM_WORKSPACE_POOL, pack_u32(vm_pool_ptr))
-    uc.mem_write(vm_pool_ptr, b"\x00" * VM_WORKSPACE_POOL_SIZE)
-    rva_start = CONST_TABLE_VA_START - pe.OPTIONAL_HEADER.ImageBase  # type: ignore
+    uc.mem_write(VM.ADDR_G_WORKSPACE_POOL, pack_u32(vm_pool_ptr))
+    uc.mem_write(vm_pool_ptr, b"\x00" * VM.WORKSPACE_POOL_SIZE)
+    rva_start = VM.CONST_TABLE_VA_START - pe.OPTIONAL_HEADER.ImageBase  # type: ignore
 
-    const_table = pe.get_data(rva_start, CONST_TABLE_VA_END - CONST_TABLE_VA_START)
-    assert len(const_table) == VM_WORKSPACE_CONST_SIZE
+    const_table = pe.get_data(
+        rva_start, VM.CONST_TABLE_VA_END - VM.CONST_TABLE_VA_START
+    )
+    assert len(const_table) == VM.WORKSPACE_CONST_SIZE
 
-    uc.mem_write(vm_pool_ptr + VM_WORKSPACE_CONST_OFFSET, const_table)
+    uc.mem_write(vm_pool_ptr + VM.WORKSPACE_CONST_OFFSET, const_table)

spotify_dl_cli/playplay_emulator/patch_binary.py

@@ -1,5 +1,7 @@
 from typing import Callable
 
+from .constants import STUB_ADDRS
+
 STUB_RET = bytes([0xC3])
 
 
@@ -49,12 +51,12 @@ def patch_unique_lock_ctor(image: bytearray, image_base: int, va: int) -> None:
 PatchFn = Callable[[bytearray, int, int], None]
 
 PATCHES: tuple[tuple[int, PatchFn], ...] = (
-    (0x00463D65, patch_ret),  # __security_check_cookie
-    (0x0101F0F7, patch_ret),  # thunk jmp -> ret
-    (0x0100A615, patch_ret_zero),  # __Mtx_unlock
-    (0x0100BBC6, patch_ret_zero),  # __Cnd_signal
-    (0x0100BCAD, patch_ret_zero),  # __Cnd_wait
-    (0x004EA2A6, patch_unique_lock_ctor),  # unique_lock ctor
+    (STUB_ADDRS.SECURITY_CHECK_COOKIE, patch_ret),  # __security_check_cookie
+    (STUB_ADDRS.THUNK_JMP_RET, patch_ret),  # thunk jmp -> ret
+    (STUB_ADDRS.MTX_UNLOCK, patch_ret_zero),  # __Mtx_unlock
+    (STUB_ADDRS.CND_SIGNAL, patch_ret_zero),  # __Cnd_signal
+    (STUB_ADDRS.CND_WAIT, patch_ret_zero),  # __Cnd_wait
+    (STUB_ADDRS.UNIQUE_LOCK_CTOR, patch_unique_lock_ctor),  # unique_lock ctor
 )