KTOR-3055 Add @ThreadLocal annotation to top level constants (#2586)

ktorio · Aug 25, 2021 · 8097868 · 8097868
1 parent 380f86a
commit 8097868
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/...ent/ktor-client-features/ktor-client-auth/common/src/io/ktor/client/features/auth/Auth.kt b/...ent/ktor-client-features/ktor-client-auth/common/src/io/ktor/client/features/auth/Auth.kt
@@ -10,6 +10,7 @@ import io.ktor.client.request.*
 import io.ktor.http.*
 import io.ktor.http.auth.*
 import io.ktor.util.*
+import kotlin.native.concurrent.*
 
 /**
  * Client authentication feature.
@@ -81,4 +82,5 @@ public fun HttpClientConfig<*>.Auth(block: Auth.() -> Unit) {
  * be removed after that.
  */
 @PublicAPICandidate("1.6.0")
+@SharedImmutable
 internal val AuthHeaderAttribute = AttributeKey<HttpAuthHeader>("AuthHeader")
diff --git a/...tor-client-features/ktor-client-auth/common/test/io/ktor/client/features/auth/AuthTest.kt b/...tor-client-features/ktor-client-auth/common/test/io/ktor/client/features/auth/AuthTest.kt
@@ -324,6 +324,26 @@ class AuthTest : ClientLoader() {
         }
     }
 
+    @Test
+    fun testRefreshOnBackgroundThread() = clientTests {
+        config {
+            install(Auth) {
+                bearer {
+                    refreshTokens { BearerTokens("valid", "refresh") }
+                    loadTokens { BearerTokens("invalid", "refresh") }
+                    realm = "TestServer"
+                }
+            }
+        }
+
+        test { client ->
+            val response = withContext(Dispatchers.Default) {
+                client.get<HttpStatement>("$TEST_SERVER/auth/bearer/test-refresh").execute()
+            }
+            assertEquals(HttpStatusCode.OK, response.status)
+        }
+    }
+
     @Suppress("JoinDeclarationAndAssignment")
     @Test
     fun testRefreshWithSameClient() = clientTests {

diff --git a/ktor-http/common/src/io/ktor/http/auth/HttpAuthHeader.kt b/ktor-http/common/src/io/ktor/http/auth/HttpAuthHeader.kt
@@ -13,6 +13,7 @@ import kotlin.native.concurrent.*
 @ThreadLocal
 private val TOKEN_EXTRA = setOf('!', '#', '$', '%', '&', '\'', '*', '+', '-', '.', '^', '_', '`', '|', '~')
 
+@ThreadLocal
 private val TOKEN68_EXTRA = setOf('-', '.', '_', '~', '+', '/')
 
 @ThreadLocal