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

fix sending duplicate content-type header to remote schemas (fix #2159) #2170

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 5 commits into from
May 13, 2019
Merged

fix sending duplicate content-type header to remote schemas (fix #2159) #2170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2781bc7
fix sending duplicate content-type header to remote schemas
ecthiender May 13, 2019
78bf008
add tests
ecthiender May 13, 2019
6f51fb2
ignore content-type header sent by client
ecthiender May 13, 2019
a864723
cosmetic change
ecthiender May 13, 2019
f17debe
Merge branch 'master' into fix-2159-duplicate-content-type
0x777 May 13, 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
2 changes: 1 addition & 1 deletion server/src-lib/Hasura/GraphQL/Execute.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ execRemoteGQ manager userInfo reqHdrs q rsi opDef = do
n `notElem` [ "Content-Length", "Content-MD5", "User-Agent", "Host"
, "Origin", "Referer" , "Accept", "Accept-Encoding"
, "Accept-Language", "Accept-Datetime"
, "Cache-Control", "Connection", "DNT"
, "Cache-Control", "Connection", "DNT", "Content-Type"
]

filterUserVars hdrs =
Expand Down
1 change: 1 addition & 0 deletions server/tests-py/graphql_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,7 @@ def resolve_wassup(self, info, arg):
if not (headers.get_all('x-hasura-test') == ['abcd'] and
headers.get_all('x-hasura-role') == ['user'] and
headers.get_all('x-hasura-user-id') == ['abcd1234'] and
headers.get_all('content-type') == ['application/json'] and
headers.get_all('Authorization') == ['Bearer abcdef']):
raise Exception('headers dont match')

Expand Down
3 changes: 2 additions & 1 deletion server/tests-py/test_schema_stitching.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,8 @@ def test_remote_schema_forward_headers(self, hge_ctx):
'x-hasura-test': 'xyzz',
'x-hasura-role': 'user',
'x-hasura-user-id': 'abcd1234',
'Authorization': 'Bearer abcdef'
'content-type': 'application/json',
'Authorization': 'Bearer abcdef',
}
if hge_ctx.hge_key:
hdrs['x-hasura-admin-secret'] = hge_ctx.hge_key
Expand Down