StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
fix(stalker): limit cookie headers to required fields
David Nashash3ec4b71c1563
diff --git a/data/src/main/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiService.kt b/data/src/main/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiService.ktindex aba27657..eed61806 100644--- a/data/src/main/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiService.kt+++ b/data/src/main/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiService.kt@@ -1434,13 +1434,9 @@ class OkHttpStalkerApiService @Inject constructor(private fun buildCookieHeader(url: String, profile: StalkerDeviceProfile): String {val cookies = linkedMapOf<String, String>()- profile.macAddress.takeIf { it.isNotBlank() }?.let { cookies["mac"] = it }- profile.locale.takeIf { it.isNotBlank() }?.let { cookies["stb_lang"] = it }- profile.timezone.takeIf { it.isNotBlank() }?.let { cookies["timezone"] = it }- profile.serialNumber.takeIf { it.isNotBlank() }?.let { cookies["sn"] = it }- profile.deviceId.takeIf { it.isNotBlank() }?.let { cookies["device_id"] = it }- profile.deviceId2.takeIf { it.isNotBlank() }?.let { cookies["device_id2"] = it }- profile.signature.takeIf { it.isNotBlank() }?.let { cookies["signature"] = it }+ profile.macAddress.takeIf { it.isNotBlank() }?.let { cookies["mac"] = encode(it) }+ profile.locale.takeIf { it.isNotBlank() }?.let { cookies["stb_lang"] = encode(it) }+ profile.timezone.takeIf { it.isNotBlank() }?.let { cookies["timezone"] = encode(it) }cookieJar.cookieHeaderFor(url).split(';').mapNotNull { part ->val key = part.substringBefore('=', missingDelimiterValue = "").trim()diff --git a/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.kt b/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.ktindex 3d9171f8..b916239e 100644--- a/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.kt+++ b/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.kt@@ -27,6 +27,7 @@ import com.streamvault.domain.provider.IptvProviderimport com.streamvault.domain.util.ChannelNormalizerimport java.io.IOExceptionimport java.net.URI+import java.net.URLEncoderimport java.util.Base64import java.util.Localeimport kotlinx.coroutines.sync.Mutex@@ -877,13 +878,9 @@ class StalkerProvider(profile: StalkerDeviceProfile): String {val cookies = linkedMapOf(- "mac" to profile.macAddress,- "stb_lang" to profile.locale,- "timezone" to profile.timezone,- "sn" to profile.serialNumber,- "device_id" to profile.deviceId,- "device_id2" to profile.deviceId2,- "signature" to profile.signature+ "mac" to encodeCookieValue(profile.macAddress),+ "stb_lang" to encodeCookieValue(profile.locale),+ "timezone" to encodeCookieValue(profile.timezone))serverCookieHeader.split(';').mapNotNull { part ->@@ -896,6 +893,9 @@ class StalkerProvider(return cookies.entries.joinToString("; ") { (key, value) -> "$key=$value" }}+ private fun encodeCookieValue(value: String): String =+ URLEncoder.encode(value, Charsets.UTF_8.name()).replace("+", "%20")+private fun derivePlaybackCookieMode(current: StalkerCookieMode,url: Stringdiff --git a/data/src/test/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiServiceTest.kt b/data/src/test/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiServiceTest.ktindex a04454c2..7819ac89 100644--- a/data/src/test/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiServiceTest.kt+++ b/data/src/test/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiServiceTest.kt@@ -531,8 +531,12 @@ class OkHttpStalkerApiServiceTest {portalUrl = "https://portal.example.com/c",macAddress = "00:1A:79:12:34:56",deviceProfile = "MAG250",- timezone = "UTC",- locale = "en"+ timezone = "Europe/Amsterdam",+ locale = "en us",+ serialNumberOverride = "serial-123",+ deviceIdOverride = "device-123",+ deviceId2Override = "device-456",+ signatureOverride = "signature-789")) as Result.Success@@ -542,8 +546,12 @@ class OkHttpStalkerApiServiceTest {portalUrl = "https://portal.example.com/c",macAddress = "00:1A:79:12:34:56",deviceProfile = "MAG250",- timezone = "UTC",- locale = "en"+ timezone = "Europe/Amsterdam",+ locale = "en us",+ serialNumberOverride = "serial-123",+ deviceIdOverride = "device-123",+ deviceId2Override = "device-456",+ signatureOverride = "signature-789"),kind = StalkerStreamKind.LIVE,cmd = "ffmpeg http://localhost/ch/1234_"@@ -552,6 +560,13 @@ class OkHttpStalkerApiServiceTest {assertThat(createLinkResult).isInstanceOf(Result.Success::class.java)assertThat(authResult.data.first.serverCookieHeader).contains("PHPSESSID=session-42")assertThat(observedCookies.single()).contains("PHPSESSID=session-42")+ assertThat(observedCookies.single()).contains("mac=00%3A1A%3A79%3A12%3A34%3A56")+ assertThat(observedCookies.single()).contains("stb_lang=en%20us")+ assertThat(observedCookies.single()).contains("timezone=Europe%2FAmsterdam")+ assertThat(observedCookies.single()).doesNotContain("sn=")+ assertThat(observedCookies.single()).doesNotContain("device_id=")+ assertThat(observedCookies.single()).doesNotContain("device_id2=")+ assertThat(observedCookies.single()).doesNotContain("signature=")}@Testdiff --git a/data/src/test/java/com/streamvault/data/remote/stalker/StalkerProviderTest.kt b/data/src/test/java/com/streamvault/data/remote/stalker/StalkerProviderTest.ktindex 25aceb0c..7537bb1e 100644--- a/data/src/test/java/com/streamvault/data/remote/stalker/StalkerProviderTest.kt+++ b/data/src/test/java/com/streamvault/data/remote/stalker/StalkerProviderTest.kt@@ -243,8 +243,12 @@ class StalkerProviderTest {playbackBackendHint = com.streamvault.domain.model.StalkerPlaybackBackendHint.TEMP_LINK_STRICT,cookieModeHint = com.streamvault.domain.model.StalkerCookieMode.CREATE_LINK,deviceProfile = "MAG322",- timezone = "UTC",- locale = "en"+ timezone = "Europe/Amsterdam",+ locale = "en us",+ serialNumber = "serial-123",+ deviceId = "device-123",+ deviceId2 = "device-456",+ signature = "signature-789")val result = provider.resolvePlaybackInfo(@@ -260,6 +264,13 @@ class StalkerProviderTest {assertThat(result).isInstanceOf(Result.Success::class.java)val success = result as Result.SuccessassertThat(success.data.headers["Cookie"]).contains("PHPSESSID=fresh-session")+ assertThat(success.data.headers["Cookie"]).contains("mac=00%3A1A%3A79%3A12%3A34%3A56")+ assertThat(success.data.headers["Cookie"]).contains("stb_lang=en%20us")+ assertThat(success.data.headers["Cookie"]).contains("timezone=Europe%2FAmsterdam")+ assertThat(success.data.headers["Cookie"]).doesNotContain("sn=")+ assertThat(success.data.headers["Cookie"]).doesNotContain("device_id=")+ assertThat(success.data.headers["Cookie"]).doesNotContain("device_id2=")+ assertThat(success.data.headers["Cookie"]).doesNotContain("signature=")assertThat(success.data.headers["Accept-Encoding"]).isEqualTo("identity")}diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.mdindex 1b22d865..96f2aaec 100644--- a/docs/CHANGELOG.md+++ b/docs/CHANGELOG.md@@ -7,6 +7,7 @@ All notable product changes are recorded in this document.### Fixed- Fixed Stalker endpoint handling so authenticated requests stay on the discovered API endpoint instead of retrying the sibling `portal.php` or `server/load.php` path automatically.+- Fixed Stalker request and playback cookies to only send the required `mac`, `stb_lang`, and `timezone` client values, with encoded cookie formatting and no extra device-identity cookies.## [1.0.14] - 2026-06-06