Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

Accept bare hostnames in URL validation

disclosurezca41f7a8cff0
diff --git a/data/src/main/java/com/streamvault/data/util/UrlSecurityPolicy.kt b/data/src/main/java/com/streamvault/data/util/UrlSecurityPolicy.kt
index 0d004b77..f457dac2 100644
--- a/data/src/main/java/com/streamvault/data/util/UrlSecurityPolicy.kt
+++ b/data/src/main/java/com/streamvault/data/util/UrlSecurityPolicy.kt
@@ -131,7 +131,11 @@ object UrlSecurityPolicy {
): String? {
if (containsNewlines(url)) return invalidSchemeMessage
- val uri = runCatching { URI(url.trim()) }.getOrNull() ?: return invalidSchemeMessage
+ val trimmed = url.trim()
+ // If no scheme, prepend https:// — resolveUrlProtocol will later
+ // downgrade to http:// if the server doesn't support HTTPS.
+ val withScheme = if (trimmed.contains("://")) trimmed else "https://$trimmed"
+ val uri = runCatching { URI(withScheme) }.getOrNull() ?: return invalidSchemeMessage
val scheme = uri.scheme?.lowercase(Locale.ROOT) ?: return invalidSchemeMessage
if (scheme !in allowedSchemes) return invalidSchemeMessage
if (uri.host.isNullOrBlank()) return missingHostMessage
diff --git a/data/src/main/java/com/streamvault/data/validation/ProviderSetupInputValidatorImpl.kt b/data/src/main/java/com/streamvault/data/validation/ProviderSetupInputValidatorImpl.kt
index 763912ef..b41a7edd 100644
--- a/data/src/main/java/com/streamvault/data/validation/ProviderSetupInputValidatorImpl.kt
+++ b/data/src/main/java/com/streamvault/data/validation/ProviderSetupInputValidatorImpl.kt
@@ -282,23 +282,19 @@ class ProviderSetupInputValidatorImpl @Inject constructor() : ProviderSetupInput
): Result<ValidatedJellyfinProviderInput> {
val trimmedUrl = serverUrl.trim()
if (trimmedUrl.isBlank()) return Result.error("Server URL is required")
- if (!trimmedUrl.startsWith("http://") && !trimmedUrl.startsWith("https://")) {
- return Result.error("Server URL must start with http:// or https://")
- }
- val trimmedName = name.trim().ifBlank { trimmedUrl.substringAfter("//").substringBefore("/").ifBlank { "Jellyfin" } }
+ val url = if (trimmedUrl.contains("://")) trimmedUrl else "https://$trimmedUrl"
+ val trimmedName = name.trim().ifBlank { url.substringAfter("//").substringBefore("/").ifBlank { "Jellyfin" } }
val trimmedUser = username.trim()
if (!allowBlankPassword && password.isBlank()) return Result.error("Password is required")
- return Result.success(ValidatedJellyfinProviderInput(serverUrl = trimmedUrl, username = trimmedUser, password = password.trim(), name = trimmedName))
+ return Result.success(ValidatedJellyfinProviderInput(serverUrl = url, username = trimmedUser, password = password.trim(), name = trimmedName))
}
override fun validateJellyfinQuickConnect(serverUrl: String, name: String): Result<ValidatedJellyfinQuickConnectProviderInput> {
val trimmedUrl = serverUrl.trim()
if (trimmedUrl.isBlank()) return Result.error("Server URL is required")
- if (!trimmedUrl.startsWith("http://") && !trimmedUrl.startsWith("https://")) {
- return Result.error("Server URL must start with http:// or https://")
- }
- val trimmedName = name.trim().ifBlank { trimmedUrl.substringAfter("//").substringBefore("/").ifBlank { "Jellyfin" } }
- return Result.success(ValidatedJellyfinQuickConnectProviderInput(serverUrl = trimmedUrl, name = trimmedName))
+ val url = if (trimmedUrl.contains("://")) trimmedUrl else "https://$trimmedUrl"
+ val trimmedName = name.trim().ifBlank { url.substringAfter("//").substringBefore("/").ifBlank { "Jellyfin" } }
+ return Result.success(ValidatedJellyfinQuickConnectProviderInput(serverUrl = url, name = trimmedName))
}
private companion object {