StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
Preserve Jellyfin image auth hardening
David Nashash2d7acbb398cd
diff --git a/data/src/main/java/com/streamvault/data/remote/jellyfin/JellyfinProvider.kt b/data/src/main/java/com/streamvault/data/remote/jellyfin/JellyfinProvider.ktindex c99e2f32..8669b812 100644--- a/data/src/main/java/com/streamvault/data/remote/jellyfin/JellyfinProvider.kt+++ b/data/src/main/java/com/streamvault/data/remote/jellyfin/JellyfinProvider.kt@@ -225,9 +225,9 @@ class JellyfinProvider @Inject constructor(return MovieEntity(streamId = stableRemoteId(remoteId),name = item.name.orEmpty(),- posterUrl = buildImageUrl(provider.serverUrl, remoteId, "Primary", item.imageTags?.get("Primary"), provider.password),+ posterUrl = buildImageUrl(provider.serverUrl, remoteId, "Primary", item.imageTags?.get("Primary")),backdropUrl = item.backdropImageTags?.firstOrNull()?.let { tag ->- buildImageUrl(provider.serverUrl, remoteId, "Backdrop", tag, provider.password, imageIndex = 0)+ buildImageUrl(provider.serverUrl, remoteId, "Backdrop", tag, imageIndex = 0)},categoryId = MOVIE_CATEGORY_ID,categoryName = "Movies",@@ -253,9 +253,9 @@ class JellyfinProvider @Inject constructor(seriesId = stableRemoteId(remoteId),providerSeriesId = remoteId,name = item.name.orEmpty(),- posterUrl = buildImageUrl(provider.serverUrl, remoteId, "Primary", item.imageTags?.get("Primary"), provider.password),+ posterUrl = buildImageUrl(provider.serverUrl, remoteId, "Primary", item.imageTags?.get("Primary")),backdropUrl = item.backdropImageTags?.firstOrNull()?.let { tag ->- buildImageUrl(provider.serverUrl, remoteId, "Backdrop", tag, provider.password, imageIndex = 0)+ buildImageUrl(provider.serverUrl, remoteId, "Backdrop", tag, imageIndex = 0)},categoryId = SERIES_CATEGORY_ID,categoryName = "Series",@@ -282,7 +282,7 @@ class JellyfinProvider @Inject constructor(seasonNumber = item.parentIndexNumber ?: 0,streamUrl = buildStreamUrl(provider.serverUrl, remoteId),containerExtension = item.primaryMediaSource?.container?.takeIf { it.isNotBlank() },- coverUrl = buildImageUrl(provider.serverUrl, remoteId, "Primary", item.imageTags?.get("Primary"), provider.password),+ coverUrl = buildImageUrl(provider.serverUrl, remoteId, "Primary", item.imageTags?.get("Primary")),plot = item.overview,duration = item.runTimeTicks?.let(::ticksToDurationString),durationSeconds = item.runTimeTicks?.let(::ticksToSeconds)?.toInt() ?: 0,@@ -323,9 +323,8 @@ class JellyfinProvider @Inject constructor(private fun buildStreamUrl(baseUrl: String, itemId: String): String ="${baseUrl.trimEnd('/')}/Videos/$itemId/stream"- private fun buildImageUrl(baseUrl: String, itemId: String, imageType: String, tag: String?, apiKey: String?, imageIndex: Int? = null): String {+ private fun buildImageUrl(baseUrl: String, itemId: String, imageType: String, tag: String?, imageIndex: Int? = null): String {val qs = buildList {- apiKey?.takeIf { it.isNotBlank() }?.let { add("api_key=${enc(it)}") }tag?.takeIf { it.isNotBlank() }?.let { add("tag=${enc(it)}") }}.joinToString("&")val path = if (imageIndex != null) "/Items/$itemId/Images/$imageType/$imageIndex" else "/Items/$itemId/Images/$imageType"diff --git a/data/src/test/java/com/streamvault/data/remote/jellyfin/JellyfinProviderTest.kt b/data/src/test/java/com/streamvault/data/remote/jellyfin/JellyfinProviderTest.ktnew file mode 100644index 00000000..5156725e--- /dev/null+++ b/data/src/test/java/com/streamvault/data/remote/jellyfin/JellyfinProviderTest.kt@@ -0,0 +1,73 @@+package com.streamvault.data.remote.jellyfin++import com.google.common.truth.Truth.assertThat+import com.google.gson.Gson+import com.streamvault.domain.model.Provider+import com.streamvault.domain.model.ProviderType+import com.streamvault.domain.model.Result+import kotlinx.coroutines.test.runTest+import okhttp3.OkHttpClient+import okhttp3.Protocol+import okhttp3.Response+import okhttp3.ResponseBody.Companion.toResponseBody+import okhttp3.MediaType.Companion.toMediaType+import org.junit.Test++class JellyfinProviderTest {++ @Test+ fun `fetchMovies does not embed access token in artwork urls`() = runTest {+ val client = OkHttpClient.Builder()+ .addInterceptor { chain ->+ val request = chain.request()+ val body = when (request.url.encodedPath) {+ "/Items" -> {+ """+ {+ "Items": [+ {+ "Id": "movie-1",+ "Name": "Movie 1",+ "ImageTags": { "Primary": "poster-tag" },+ "BackdropImageTags": ["backdrop-tag"]+ }+ ]+ }+ """.trimIndent()+ }+ else -> error("Unexpected request path: ${request.url.encodedPath}")+ }++ Response.Builder()+ .request(request)+ .protocol(Protocol.HTTP_1_1)+ .code(200)+ .message("OK")+ .body(body.toResponseBody("application/json".toMediaType()))+ .build()+ }+ .build()++ val provider = JellyfinProvider(+ okHttpClient = client,+ gson = Gson()+ )++ val result = provider.fetchMovies(+ Provider(+ name = "Jellyfin",+ type = ProviderType.JELLYFIN,+ serverUrl = "https://demo.example",+ username = "alice",+ password = "secret-token"+ )+ )++ assertThat(result).isInstanceOf(Result.Success::class.java)+ val movie = (result as Result.Success).data.single()+ assertThat(movie.posterUrl).isEqualTo("https://demo.example/Items/movie-1/Images/Primary?tag=poster-tag")+ assertThat(movie.backdropUrl).isEqualTo("https://demo.example/Items/movie-1/Images/Backdrop/0?tag=backdrop-tag")+ assertThat(movie.posterUrl).doesNotContain("api_key")+ assertThat(movie.backdropUrl).doesNotContain("api_key")+ }+}\ No newline at end of file