fix(download): can't download when using direct access.

Author: Apricityx

app/src/main/java/top/apricityx/workshop/DownloadCenterManager.kt

@@ -17,6 +17,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import okhttp3.OkHttpClient
 import top.apricityx.workshop.steam.protocol.applyDefaultHttpTimeouts
+import top.apricityx.workshop.steam.protocol.applySteamHttpCompatibility
 import top.apricityx.workshop.workshop.DownloadEvent
 import top.apricityx.workshop.workshop.DownloadState
 import top.apricityx.workshop.workshop.WorkshopDownloadEngine
@@ -326,6 +327,7 @@ class DownloadCenterManager private constructor(
         }
         val taskClient = OkHttpClient.Builder()
             .applyDefaultHttpTimeouts()
+            .applySteamHttpCompatibility()
             .applyAppNetworkLogging("download-task")
             .cookieJar(
                 SteamWebSessionCookieJar(

app/src/main/java/top/apricityx/workshop/SteamAuthRepository.kt

@@ -27,6 +27,7 @@ import top.apricityx.workshop.steam.protocol.SteamPublishedFileQuery
 import top.apricityx.workshop.steam.protocol.SteamPublishedFileQueryResult
 import top.apricityx.workshop.steam.protocol.SteamWebAccessTokens
 import top.apricityx.workshop.steam.protocol.applyDefaultHttpTimeouts
+import top.apricityx.workshop.steam.protocol.applySteamHttpCompatibility
 import java.util.UUID
 import java.io.IOException
 import java.security.SecureRandom
@@ -92,6 +93,7 @@ class SteamAuthRepository(context: Context) {
     private val httpClient by lazy {
         OkHttpClient.Builder()
             .applyDefaultHttpTimeouts()
+            .applySteamHttpCompatibility()
             .applyAppNetworkLogging("steam-auth")
             .hostnameVerifier(experimentalWorkshopDirectAccessRuntime.hostnameVerifier)
             .addExperimentalWorkshopDirectAccess(

app/src/main/java/top/apricityx/workshop/SteamAuthenticatedCleartextInterceptor.kt

@@ -13,7 +13,7 @@ class SteamAuthenticatedCleartextInterceptor(
         if (
             !request.url.isHttps &&
             hasAuthenticatedSteamSession() &&
-            request.url.host.isSteamAuthenticatedTrafficDomain() &&
+            request.url.host.isSteamWebAuthenticatedTrafficDomain() &&
             !allowAuthenticatedCleartextHttpProvider()
         ) {
             throw SteamAuthenticatedCleartextBlockedException(request.url.host)
@@ -28,14 +28,11 @@ class SteamAuthenticatedCleartextBlockedException(
     "当前设置禁止带 Steam 登录态的明文 HTTP 请求：$host。可在设置里开启后重试。",
 )
 
-internal fun String.isSteamAuthenticatedTrafficDomain(): Boolean {
+internal fun String.isSteamWebAuthenticatedTrafficDomain(): Boolean {
     val host = lowercase()
     return host.matchesDomainSuffix("steamcommunity.com") ||
         host.matchesDomainSuffix("steampowered.com") ||
-        host.matchesDomainSuffix("steamcontent.com") ||
-        host.matchesDomainSuffix("steam.clngaa.com") ||
-        host.matchesDomainSuffix("dl.eccdnx.com") ||
-        host.matchesDomainSuffix("pphimalayanrt.com")
+        host.matchesDomainSuffix("steamcontent.com")
 }
 
 private fun String.matchesDomainSuffix(suffix: String): Boolean =

app/src/main/java/top/apricityx/workshop/WorkshopViewModel.kt

@@ -40,6 +40,7 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import top.apricityx.workshop.steam.protocol.DEFAULT_HTTP_TIMEOUT_SECONDS
 import top.apricityx.workshop.steam.protocol.applyDefaultHttpTimeouts
+import top.apricityx.workshop.steam.protocol.applySteamHttpCompatibility
 import top.apricityx.workshop.steam.protocol.SteamPublishedFileQuery
 import top.apricityx.workshop.steam.protocol.STEAM_PUBLISHED_FILE_QUERY_TYPE_RANKED_BY_TEXT_SEARCH
 import top.apricityx.workshop.steam.protocol.SteamGuardChallengeType
@@ -79,6 +80,7 @@ class WorkshopViewModel(
         createExperimentalWorkshopDirectAccessRuntime(application.filesDir)
     private val httpClient = OkHttpClient.Builder()
         .applyDefaultHttpTimeouts()
+        .applySteamHttpCompatibility()
         .applyAppNetworkLogging("workshop-web")
         .cookieJar(steamWebCookieJar)
         .hostnameVerifier(experimentalWorkshopDirectAccessRuntime.hostnameVerifier)
@@ -3430,4 +3432,3 @@ private const val BAIDU_DEFAULT_TARGET_LANGUAGE = "zh"
 
 
 
-

app/src/test/java/top/apricityx/workshop/SteamAuthenticatedCleartextInterceptorTest.kt

@@ -49,12 +49,12 @@ class SteamAuthenticatedCleartextInterceptorTest {
             allowAuthenticatedCleartextHttp = true,
         )
 
-        client.newCall(Request.Builder().url(steamHttpUrl("st.dl.eccdnx.com")).build()).execute().use { response ->
+        client.newCall(Request.Builder().url(steamHttpUrl("api.steampowered.com")).build()).execute().use { response ->
             assertThat(response.isSuccessful).isTrue()
         }
 
         val request = server.takeRequest()
-        assertThat(request.url.host).isEqualTo("st.dl.eccdnx.com")
+        assertThat(request.url.host).isEqualTo("api.steampowered.com")
     }
 
     @Test
@@ -73,6 +73,22 @@ class SteamAuthenticatedCleartextInterceptorTest {
         assertThat(request.url.host).isEqualTo("dl.steam.clngaa.com")
     }
 
+    @Test
+    fun allows_cdn_cleartext_requests_when_authenticated_session_is_present() {
+        server.enqueue(MockResponse.Builder().code(200).body("ok").build())
+        val client = testClient(
+            hasAuthenticatedSteamSession = true,
+            allowAuthenticatedCleartextHttp = false,
+        )
+
+        client.newCall(Request.Builder().url(steamHttpUrl("st.dl.eccdnx.com")).build()).execute().use { response ->
+            assertThat(response.isSuccessful).isTrue()
+        }
+
+        val request = server.takeRequest()
+        assertThat(request.url.host).isEqualTo("st.dl.eccdnx.com")
+    }
+
     private fun testClient(
         hasAuthenticatedSteamSession: Boolean,
         allowAuthenticatedCleartextHttp: Boolean,

steam-protocol/src/main/kotlin/top/apricityx/workshop/steam/protocol/Models.kt

@@ -29,16 +29,25 @@ data class CdnServer(
 
     val supportsHttps: Boolean = normalizedHttpsSupport == "mandatory" || normalizedHttpsSupport == "optional"
     val requiresHttps: Boolean = normalizedHttpsSupport == "mandatory"
-    val port: Int = if (requiresHttps) 443 else 80
-    val secureScheme: String = if (requiresHttps) "https" else "http"
+    val port: Int = if (supportsHttps) 443 else 80
+    val secureScheme: String = if (supportsHttps) "https" else "http"
 
-    fun requestEndpoints(): List<CdnRequestEndpoint> =
-        listOf(
+    fun requestEndpoints(): List<CdnRequestEndpoint> = buildList {
+        add(
             CdnRequestEndpoint(
                 scheme = secureScheme,
                 port = port,
             ),
         )
+        if (supportsHttps && !requiresHttps) {
+            add(
+                CdnRequestEndpoint(
+                    scheme = "http",
+                    port = 80,
+                ),
+            )
+        }
+    }
 }
 
 data class CdnRequestEndpoint(

steam-protocol/src/main/kotlin/top/apricityx/workshop/steam/protocol/OkHttpTimeouts.kt

@@ -2,6 +2,7 @@ package top.apricityx.workshop.steam.protocol
 
 import java.util.concurrent.TimeUnit
 import okhttp3.OkHttpClient
+import okhttp3.Protocol
 
 const val DEFAULT_HTTP_TIMEOUT_SECONDS = 30L
 
@@ -12,9 +13,13 @@ fun OkHttpClient.Builder.applyDefaultHttpTimeouts(
         .readTimeout(timeoutSeconds, TimeUnit.SECONDS)
         .writeTimeout(timeoutSeconds, TimeUnit.SECONDS)
 
+fun OkHttpClient.Builder.applySteamHttpCompatibility(): OkHttpClient.Builder =
+    protocols(listOf(Protocol.HTTP_1_1))
+
 fun newDefaultOkHttpClient(
     timeoutSeconds: Long = DEFAULT_HTTP_TIMEOUT_SECONDS,
 ): OkHttpClient =
     OkHttpClient.Builder()
         .applyDefaultHttpTimeouts(timeoutSeconds)
+        .applySteamHttpCompatibility()
         .build()

steam-protocol/src/test/kotlin/top/apricityx/workshop/steam/protocol/CdnServerTest.kt

@@ -5,16 +5,17 @@ import org.junit.Test
 
 class CdnServerTest {
     @Test
-    fun `optional https support follows reference client and uses http only`() {
+    fun `optional https support prefers https and keeps http fallback`() {
         val server = testServer(httpsSupport = "optional")
 
         assertThat(server.supportsHttps).isTrue()
         assertThat(server.requiresHttps).isFalse()
-        assertThat(server.secureScheme).isEqualTo("http")
-        assertThat(server.port).isEqualTo(80)
+        assertThat(server.secureScheme).isEqualTo("https")
+        assertThat(server.port).isEqualTo(443)
         assertThat(server.requestEndpoints()).containsExactly(
+            CdnRequestEndpoint(scheme = "https", port = 443),
             CdnRequestEndpoint(scheme = "http", port = 80),
-        )
+        ).inOrder()
     }
 
     @Test

steam-protocol/src/test/kotlin/top/apricityx/workshop/steam/protocol/OkHttpTimeoutsTest.kt

@@ -0,0 +1,24 @@
+package top.apricityx.workshop.steam.protocol
+
+import com.google.common.truth.Truth.assertThat
+import okhttp3.OkHttpClient
+import okhttp3.Protocol
+import org.junit.Test
+
+class OkHttpTimeoutsTest {
+    @Test
+    fun `applySteamHttpCompatibility forces http1 only`() {
+        val client = OkHttpClient.Builder()
+            .applySteamHttpCompatibility()
+            .build()
+
+        assertThat(client.protocols).containsExactly(Protocol.HTTP_1_1)
+    }
+
+    @Test
+    fun `newDefaultOkHttpClient uses steam-compatible protocols`() {
+        val client = newDefaultOkHttpClient()
+
+        assertThat(client.protocols).containsExactly(Protocol.HTTP_1_1)
+    }
+}

workshop-core/src/test/kotlin/top/apricityx/workshop/workshop/SteamCdnTransportTest.kt

@@ -89,6 +89,25 @@ class SteamCdnTransportTest {
         assertThat(url.encodedQuery).isEqualTo("token=abc")
     }
 
+    @Test
+    fun `buildRequestUrl prefers https endpoint when cdn advertises optional https`() {
+        val server = testServer(
+            host = "origin.example.net",
+            httpsSupport = "optional",
+        )
+
+        val url = transport.buildRequestUrl(
+            server = server,
+            endpoint = server.requestEndpoints().first(),
+            path = "depot/646570/manifest/1/5/999",
+            query = null,
+            proxyServer = null,
+        )
+
+        assertThat(url.scheme).isEqualTo("https")
+        assertThat(url.port).isEqualTo(443)
+    }
+
     private fun testServer(
         host: String,
         vHost: String = host,