Merge pull request #892 from softwaremill/auth-lowercase

Fixes #890: Accept authorization type in lower case
softwaremill · Dec 21, 2020 · 43bd2c0 · 43bd2c0
2 parents e787bf9 + 7e4c781
commit 43bd2c0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/core/src/main/scala/sttp/tapir/Mapping.scala b/core/src/main/scala/sttp/tapir/Mapping.scala
@@ -86,13 +86,14 @@ object Mapping {
       override def validator: Validator[H] = Validator.pass
     }
 
-  /** A mapping which, during encoding, adds the given `prefix`. When decoding, the prefix is removed (if present),
-    * otherwise an error is reported.
+  /** A mapping which, during encoding, adds the given `prefix`. When decoding, the prefix is removed (case
+    * insensitive,if present), otherwise an error is reported.
     */
-  def stringPrefix(prefix: String): Mapping[String, String] = {
+  def stringPrefixCaseInsensitive(prefix: String): Mapping[String, String] = {
     val prefixLength = prefix.length
+    val prefixLower = prefix.toLowerCase
     def removePrefix(v: String): DecodeResult[String] =
-      if (v.startsWith(prefix)) DecodeResult.Value(v.substring(prefixLength))
+      if (v.toLowerCase.startsWith(prefixLower)) DecodeResult.Value(v.substring(prefixLength))
       else DecodeResult.Error(v, new IllegalArgumentException(s"The given value doesn't start with $prefix"))
     Mapping.fromDecode(removePrefix)(v => s"$prefix$v")
   }

diff --git a/core/src/main/scala/sttp/tapir/TapirAuth.scala b/core/src/main/scala/sttp/tapir/TapirAuth.scala
@@ -58,5 +58,5 @@ object TapirAuth {
     EndpointInput.Auth.Http(authType, header[T]("Authorization")(authCodec), challenge, None)
   }
 
-  private def stringPrefixWithSpace(prefix: String) = Mapping.stringPrefix(prefix + " ")
+  private def stringPrefixWithSpace(prefix: String) = Mapping.stringPrefixCaseInsensitive(prefix + " ")
 }
diff --git a/server/tests/src/main/scala/sttp/tapir/server/tests/ServerAuthenticationTests.scala b/server/tests/src/main/scala/sttp/tapir/server/tests/ServerAuthenticationTests.scala
@@ -37,6 +37,7 @@ class ServerAuthenticationTests[F[_], S, ROUTE](backend: SttpBackend[IO, Any], s
     List(
       ("basic", basic, (r: Request[_, Any]) => r.header("Authorization", "Basic dXNlcjpzZWNyZXQ=")),
       ("bearer", bearer, (r: Request[_, Any]) => r.header("Authorization", "Bearer kajsdhf[")),
+      ("lower case bearer", bearer, (r: Request[_, Any]) => r.header("Authorization", "bearer kajsdhf[")),
       (
         "apiKey in query param",
         apiKeyInQuery,
@@ -59,7 +60,7 @@ class ServerAuthenticationTests[F[_], S, ROUTE](backend: SttpBackend[IO, Any], s
 
   private def expectedChallenge(authType: String) = authType match {
     case "basic"                                      => s"""Basic realm="$Realm""""
-    case "bearer"                                     => s"""Bearer realm="$Realm""""
+    case "bearer" | "lower case bearer"               => s"""Bearer realm="$Realm""""
     case "apiKey in query param" | "apiKey in header" => s"""ApiKey realm="$Realm""""
   }