Skip to content
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

Jump to bottom

Don't parse empty extensions or variables as JSON #3501

Merged
merged 5 commits into from
Nov 13, 2019
Merged

Don't parse empty extensions or variables as JSON #3501

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
93207d1
Update runHttpQuery.ts
namanmukund Nov 13, 2019
2157f51
If extension is an empty string than JSON.parse will give an error
namanmukund Nov 13, 2019
261c099
re-writing the conditions in a logical order
namanmukund Nov 13, 2019
202e42a
Remove guarding of pre-`typeof` check, where `typeof` is sufficient.
abernix Nov 13, 2019
c681de1
Add CHANGELOG.md for #3501.
abernix Nov 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: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ The version headers in this history reflect the versions of Apollo Server itself

> The changes noted within this `vNEXT` section have not been released yet. New PRs and commits which introduce changes should include an entry in this `vNEXT` section as part of their development. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section.

- `apollo-server-core`: Don't try parsing `variables` and `extensions` as JSON if they are defined but empty strings. [PR #3501](https://github.com/apollographql/apollo-server/pull/3501)

### v2.9.8

> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/3cdde1b7a71ace6411fbacf82a1a61bf737444a6)
Expand Down
4 changes: 2 additions & 2 deletions packages/apollo-server-core/src/runHttpQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ function parseGraphQLRequest(
let queryString: string | undefined = requestParams.query;
let extensions = requestParams.extensions;

if (typeof extensions === 'string') {
if (typeof extensions === 'string' && extensions !== '') {
// For GET requests, we have to JSON-parse extensions. (For POST
// requests they get parsed as part of parsing the larger body they're
// inside.)
Expand Down Expand Up @@ -397,7 +397,7 @@ function parseGraphQLRequest(
const operationName = requestParams.operationName;

let variables = requestParams.variables;
if (typeof variables === 'string') {
if (typeof variables === 'string' && variables !== '') {
try {
// XXX Really we should only do this for GET requests, but for
// compatibility reasons we'll keep doing this at least for now for
Expand Down