Additionally allow "bearer" instead of only "Bearer" in Authorization… (#1558)

This commit is contained in:
Wolfgang Walther
2020-07-16 12:09:40 -05:00
committed by GitHub
parent 1f6a824dfb
commit 6b2767d35c
4 changed files with 16 additions and 4 deletions
+7
View File
@@ -170,3 +170,10 @@ spec actualPgVersion = describe "authorization" $ do
{ matchStatus = 400
, matchHeaders = []
}
it "allows 'Bearer' and 'bearer' as authentication schemes" $ do
let token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoicG9zdGdyZXN0X3Rlc3RfYXV0aG9yIiwiaWQiOiJqZG9lIn0.B-lReuGNDwAlU1GOC476MlO0vAt9JNoHIlxg2vwMaO0"
request methodGet "/authors_only" [authHeader "Bearer" token] ""
`shouldRespondWith` 200
request methodGet "/authors_only" [authHeader "bearer" token] ""
`shouldRespondWith` 200
+7 -4
View File
@@ -190,15 +190,18 @@ noBlankHeader = notElem mempty
noProfileHeader :: [Header] -> Bool
noProfileHeader headers = isNothing $ find ((== "Content-Profile") . fst) headers
authHeader :: BS.ByteString -> BS.ByteString -> Header
authHeader typ creds =
(hAuthorization, typ <> " " <> creds)
authHeaderBasic :: BS.ByteString -> BS.ByteString -> Header
authHeaderBasic u p =
(hAuthorization, "Basic " <> (toS . B64.encode . toS $ u <> ":" <> p))
authHeader "Basic" $ toS . B64.encode . toS $ u <> ":" <> p
authHeaderJWT :: BS.ByteString -> Header
authHeaderJWT token =
(hAuthorization, "Bearer " <> token)
authHeaderJWT = authHeader "Bearer"
-- | Tests whether the text can be parsed as a json object comtaining
-- | Tests whether the text can be parsed as a json object containing
-- the key "message", and optional keys "details", "hint", "code",
-- and no extraneous keys
isErrorFormat :: BL.ByteString -> Bool