-
Notifications
You must be signed in to change notification settings - Fork 1.8k
JS: Improve graphql flow #20450
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.
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
JS: Improve graphql flow #20450
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
a6d728a
JS: Add test case with missing alert using `graphql`
Napalys 4282005
JS: Add summary model for `graphql`'s `rootValue`
Napalys 6d461d6
JS: Add change note
Napalys 6c18b4d
JS: Add test case for graph ql variableValues injection
Napalys 7affcf4
JS: Add `variableValues` to the previous summaryModel to enchance the…
Napalys File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| --- | ||
| category: minorAnalysis | ||
| --- | ||
| * Support for the [graphql](https://www.npmjs.com/package/graphql) library has been improved. Data flow from GraphQL query sources and variables to resolver function parameters is now tracked. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| extensions: | ||
| - addsTo: | ||
| pack: codeql/javascript-all | ||
| extensible: summaryModel | ||
| data: | ||
| - ["graphql", "Member[graphql]", "Argument[0].Member[source,variableValues]", "Argument[0].Member[rootValue].AnyMember.Parameter[0]", "taint"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/graph-ql.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| const express = require('express'); | ||
| const { graphql, buildSchema } = require('graphql'); | ||
|
|
||
| const app = express(); | ||
| app.use(express.json()); | ||
|
|
||
| const schema = buildSchema(` | ||
| type Query { | ||
| greet(name: String!): String | ||
| calc(expr: String!): String | ||
| } | ||
| `); | ||
|
|
||
| const root = { | ||
| greet: ({ name }) => { | ||
| return `Hello, ${name}!`; | ||
| }, | ||
| calc: ({ expr }) => { | ||
| try { | ||
| return eval(expr).toString(); // $ Alert[js/code-injection] | ||
| } catch (e) { | ||
| return `Error: ${e.message}`; | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| app.post('/graphql', async (req, res) => { | ||
| const { query, variables } = req.body; // $ Source[js/code-injection] | ||
| const result = await graphql({ | ||
| schema, | ||
| source: query, | ||
| rootValue: root, | ||
| variableValues: variables | ||
Napalys marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }); | ||
| res.json(result); | ||
|
|
||
| const root1 = { | ||
| greet: ({ name, title }) => { | ||
| return eval(name + title).toString(); // $ Alert[js/code-injection] | ||
| } | ||
| }; | ||
| graphql({ | ||
| schema: buildSchema(` | ||
| type Query { | ||
| greet(name: String!, title: String): String | ||
| } | ||
| `), | ||
| source: ` | ||
| query GreetUser($name: String!, $title: String) { | ||
| greet(name: $name, title: $title) | ||
| } | ||
| `, | ||
| rootValue: root1, | ||
| variableValues: variables | ||
| }); | ||
| }); | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[nitpick] The filename 'graph-ql.js' uses a hyphen, but GraphQL is typically written as one word. Consider renaming to 'graphql.js' for consistency with the library name.