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

ignore content-type header in auth webhook #2197

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 4 commits into from
May 16, 2019
Merged

ignore content-type header in auth webhook #2197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6cdead9
ignore content-type header in auth webhook
ecthiender May 16, 2019
ead18c3
Merge branch 'master' into fix-client-headers-auth-hook
0x777 May 16, 2019
e67d3c3
update relevant docs
ecthiender May 16, 2019
7e57091
Merge branch 'fix-client-headers-auth-hook' of github.com:ecthiender/…
ecthiender May 16, 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
1 change: 1 addition & 0 deletions docs/graphql/manual/auth/webhook.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ GET request
If you configure your webhook to use ``GET``, then Hasura **will forward all client headers except**:

- ``Content-Length``
- ``Content-Type``
- ``Content-MD5``
- ``User-Agent``
- ``Host``
Expand Down
8 changes: 2 additions & 6 deletions server/src-lib/Hasura/GraphQL/Execute.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import Hasura.HTTP
import Hasura.Prelude
import Hasura.RQL.DDL.Headers
import Hasura.RQL.Types
import Hasura.Server.Utils (bsToTxt)
import Hasura.Server.Utils (bsToTxt, commonClientHeadersIgnored)

import qualified Hasura.GraphQL.Execute.LiveQuery as EL
import qualified Hasura.GraphQL.Execute.Plan as EP
Expand Down Expand Up @@ -362,11 +362,7 @@ execRemoteGQ manager userInfo reqHdrs q rsi opDef = do
userInfoToHdrs = map (\(k, v) -> (CI.mk $ CS.cs k, CS.cs v)) $
userInfoToList userInfo
filteredHeaders = filterUserVars $ flip filter reqHdrs $ \(n, _) ->
n `notElem` [ "Content-Length", "Content-MD5", "User-Agent", "Host"
, "Origin", "Referer" , "Accept", "Accept-Encoding"
, "Accept-Language", "Accept-Datetime"
, "Cache-Control", "Connection", "DNT", "Content-Type"
]
n `notElem` commonClientHeadersIgnored

filterUserVars hdrs =
let txHdrs = map (\(n, v) -> (bsToTxt $ CI.original n, bsToTxt v)) hdrs
Expand Down
6 changes: 1 addition & 5 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 @@ -214,11 +214,7 @@ userInfoFromAuthHook logger manager hook reqHeaders = do
throw500 "Internal Server Error"

filteredHeaders = flip filter reqHeaders $ \(n, _) ->
n `notElem` [ "Content-Length", "Content-MD5", "User-Agent", "Host"
, "Origin", "Referer" , "Accept", "Accept-Encoding"
, "Accept-Language", "Accept-Datetime"
, "Cache-Control", "Connection", "DNT"
]
n `notElem` commonClientHeadersIgnored

getUserInfo
:: (MonadIO m, MonadError QErr m)
Expand Down
8 changes: 8 additions & 0 deletions server/src-lib/Hasura/Server/Utils.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,14 @@ userIdHeader = "x-hasura-user-id"
bsToTxt :: B.ByteString -> T.Text
bsToTxt = TE.decodeUtf8With TE.lenientDecode

commonClientHeadersIgnored :: (IsString a) => [a]
commonClientHeadersIgnored =
[ "Content-Length", "Content-MD5", "User-Agent", "Host"
, "Origin", "Referer" , "Accept", "Accept-Encoding"
, "Accept-Language", "Accept-Datetime"
, "Cache-Control", "Connection", "DNT", "Content-Type"
]

txtToBs :: T.Text -> B.ByteString
txtToBs = TE.encodeUtf8

Expand Down