KTOR-3391 Fix Digest Auth: algorithm isn't specified in the Authoriza…

…tion header (#3732)

(cherry picked from commit 0d63c4d)

buildSrc/src/main/kotlin/test/server/tests/Auth.kt

@@ -43,6 +43,16 @@ internal fun Application.authTestServer() {
             }
         }
 
+        digest("digest-SHA256") {
+            val password = "Circle Of Life"
+            algorithmName = "SHA-256"
+            realm = "[email protected]"
+
+            digestProvider { userName, realm ->
+                digest(MessageDigest.getInstance(algorithmName), "$userName:$realm:$password")
+            }
+        }
+
         basic("basic") {
             validate { credential ->
                 check("MyUser" == credential.name)
@@ -86,6 +96,11 @@ internal fun Application.authTestServer() {
                     call.respondText("ok")
                 }
             }
+            authenticate("digest-SHA256") {
+                get("digest-SHA256") {
+                    call.respondText("ok")
+                }
+            }
             authenticate("basic") {
                 get("basic-fixed") {
                     call.respondText("ok")

ktor-client/ktor-client-plugins/ktor-client-auth/common/src/io/ktor/client/plugins/auth/providers/DigestAuthProvider.kt

@@ -189,6 +189,7 @@ public class DigestAuthProvider(
                 this["uri"] = url.fullPath
                 actualQop?.let { this["qop"] = it }
                 this["nc"] = nonceCount.toString()
+                this["algorithm"] = algorithmName
             }
         )
 

ktor-client/ktor-client-plugins/ktor-client-auth/common/test/io/ktor/client/plugins/auth/AuthTest.kt

@@ -15,7 +15,6 @@ import io.ktor.client.tests.utils.*
 import io.ktor.http.*
 import io.ktor.http.auth.*
 import io.ktor.test.dispatcher.*
-import io.ktor.util.*
 import io.ktor.utils.io.errors.*
 import kotlinx.coroutines.*
 import kotlin.test.*
@@ -83,6 +82,22 @@ class AuthTest : ClientLoader() {
         }
     }
 
+    @Test
+    fun testDigestAuthSHA256() = clientTests(listOf("Js", "native")) {
+        config {
+            install(Auth) {
+                digest {
+                    algorithmName = "SHA-256"
+                    credentials { DigestAuthCredentials("MyName", "Circle Of Life") }
+                    realm = "[email protected]"
+                }
+            }
+        }
+        test { client ->
+            assertTrue(client.get("$TEST_SERVER/auth/digest-SHA256").status.isSuccess())
+        }
+    }
+
     @Suppress("DEPRECATION")
     @Test
     fun testBasicAuthLegacy() = clientTests(listOf("Js")) {