这是indexloc提供的服务，不要输入任何密码
Skip to content

allow x-hasura- req headers for jwt unauth role (close #1686) #1689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 5, 2019
Merged

allow x-hasura- req headers for jwt unauth role (close #1686) #1689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
839d211
allow x-hasura- req headers for jwt unauth role
Mar 1, 2019
bd4a9e8
Merge branch 'master' into issue-1686-unauth-headers-jwt
0x777 Mar 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions server/src-lib/Hasura/HTTP.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module Hasura.HTTP
( wreqOptions
, HttpException(..)
, hdrsToText
) where

import Control.Lens hiding ((.=))
Expand All @@ -12,8 +13,16 @@ import qualified Network.HTTP.Client as HTTP
import qualified Network.HTTP.Types as HTTP
import qualified Network.Wreq as Wreq

import Data.CaseInsensitive (original)
import Hasura.Server.Utils (bsToTxt)
import Hasura.Server.Version (currentVersion)

hdrsToText :: [HTTP.Header] -> [(Text, Text)]
hdrsToText hdrs =
[ (bsToTxt $ original hdrName, bsToTxt hdrVal)
| (hdrName, hdrVal) <- hdrs
]

wreqOptions :: HTTP.Manager -> [HTTP.Header] -> Wreq.Options
wreqOptions manager hdrs =
Wreq.defaults
Expand Down
7 changes: 0 additions & 7 deletions server/src-lib/Hasura/Server/Auth.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ module Hasura.Server.Auth
import Control.Exception (try)
import Control.Lens
import Data.Aeson
import Data.CaseInsensitive (CI (..), original)
import Data.IORef (newIORef)

import qualified Data.Aeson as J
Expand Down Expand Up @@ -73,12 +72,6 @@ data AuthMode
| AMAdminSecretAndJWT !AdminSecret !JWTCtx !(Maybe RoleName)
deriving (Show, Eq)

hdrsToText :: [N.Header] -> [(T.Text, T.Text)]
hdrsToText hdrs =
[ (bsToTxt $ original hdrName, bsToTxt hdrVal)
| (hdrName, hdrVal) <- hdrs
]

mkAuthMode
:: ( MonadIO m
, MonadError T.Text m
Expand Down
3 changes: 2 additions & 1 deletion server/src-lib/Hasura/Server/Auth/JWT.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ processJwt jwtCtx headers mUnAuthRole =

withoutAuthZHeader = do
unAuthRole <- maybe missingAuthzHeader return mUnAuthRole
return $ mkUserInfo unAuthRole $ mkUserVars []
return $ mkUserInfo unAuthRole $ mkUserVars $ hdrsToText headers

missingAuthzHeader =
throw400 InvalidHeaders "Missing Authorization header in JWT authentication mode"

Expand Down