Skip to content

Commit 7cff1f4

Browse files
erik-krogherik-krogh
committed
add model for the unified and remark libraries
1 parent 0d497e8 commit 7cff1f4

File tree

4 files changed

+142
-0
lines changed

4 files changed

+142
-0
lines changed

‎javascript/ql/src/semmle/javascript/frameworks/Markdown.qll

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,61 @@ private class ShowDownStep extends TaintTracking::AdditionalTaintStep, DataFlow:
4848
pred = this.getArgument(0)
4949
}
5050
}
51+
52+
/**
53+
* Classes and predicates for modelling taint steps in `unified` and `remark`.
54+
*/
55+
private module Unified {
56+
/**
57+
* The creation of a parser from `unified`.
58+
* The `remark` module is a shorthand that initializes `unified` with a markdown parser.
59+
*/
60+
DataFlow::CallNode unified() { result = DataFlow::moduleImport(["unified", "remark"]).getACall() }
61+
62+
/**
63+
* A chain of method calls that process an input with `unified`.
64+
*/
65+
class UnifiedChain extends DataFlow::CallNode {
66+
DataFlow::CallNode root;
67+
68+
UnifiedChain() {
69+
root = unified() and
70+
this = root.getAChainedMethodCall(["process", "processSync"])
71+
}
72+
73+
/**
74+
* Gets a plugin that is used in this chain.
75+
*/
76+
DataFlow::Node getAUsedPlugin() { result = root.getAChainedMethodCall("use").getArgument(0) }
77+
78+
/**
79+
* Gets the input that is processed.
80+
*/
81+
DataFlow::Node getInput() { result = getArgument(0) }
82+
83+
/**
84+
* Gets the processed output.
85+
*/
86+
DataFlow::Node getOutput() {
87+
this.getCalleeName() = "process" and result = getABoundCallbackParameter(1, 1)
88+
or
89+
this.getCalleeName() = "processSync" and result = this
90+
}
91+
}
92+
93+
/**
94+
* A taint step for the `unified` library.
95+
*/
96+
class UnifiedStep extends TaintTracking::AdditionalTaintStep, UnifiedChain {
97+
UnifiedStep() {
98+
// sanitizer. Mostly looking for `rehype-sanitize`, but also other plugins with `sanitize` in their name.
99+
not this.getAUsedPlugin().getALocalSource() =
100+
DataFlow::moduleImport(any(string s | s.matches("%sanitize%")))
101+
}
102+
103+
override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
104+
pred = getInput() and
105+
succ = getOutput()
106+
}
107+
}
108+
}

‎javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXss.expected

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,29 @@ nodes
3232
| ReflectedXss.js:42:12:42:39 | convert ... q.body) |
3333
| ReflectedXss.js:42:31:42:38 | req.body |
3434
| ReflectedXss.js:42:31:42:38 | req.body |
35+
| ReflectedXss.js:56:12:56:19 | req.body |
36+
| ReflectedXss.js:56:12:56:19 | req.body |
37+
| ReflectedXss.js:56:12:56:19 | req.body |
38+
| ReflectedXss.js:64:14:64:21 | req.body |
39+
| ReflectedXss.js:64:14:64:21 | req.body |
40+
| ReflectedXss.js:64:39:64:42 | file |
41+
| ReflectedXss.js:65:16:65:19 | file |
42+
| ReflectedXss.js:65:16:65:19 | file |
43+
| ReflectedXss.js:68:12:68:41 | remark( ... q.body) |
44+
| ReflectedXss.js:68:12:68:52 | remark( ... tring() |
45+
| ReflectedXss.js:68:12:68:52 | remark( ... tring() |
46+
| ReflectedXss.js:68:33:68:40 | req.body |
47+
| ReflectedXss.js:68:33:68:40 | req.body |
48+
| ReflectedXss.js:72:12:72:56 | unified ... q.body) |
49+
| ReflectedXss.js:72:12:72:65 | unified ... oString |
50+
| ReflectedXss.js:72:12:72:65 | unified ... oString |
51+
| ReflectedXss.js:72:48:72:55 | req.body |
52+
| ReflectedXss.js:72:48:72:55 | req.body |
53+
| ReflectedXss.js:74:20:74:27 | req.body |
54+
| ReflectedXss.js:74:20:74:27 | req.body |
55+
| ReflectedXss.js:74:34:74:34 | f |
56+
| ReflectedXss.js:75:14:75:14 | f |
57+
| ReflectedXss.js:75:14:75:14 | f |
3558
| ReflectedXssContentTypes.js:10:14:10:36 | "FOO: " ... rams.id |
3659
| ReflectedXssContentTypes.js:10:14:10:36 | "FOO: " ... rams.id |
3760
| ReflectedXssContentTypes.js:10:24:10:36 | req.params.id |
@@ -143,6 +166,23 @@ edges
143166
| ReflectedXss.js:42:31:42:38 | req.body | ReflectedXss.js:42:12:42:39 | convert ... q.body) |
144167
| ReflectedXss.js:42:31:42:38 | req.body | ReflectedXss.js:42:12:42:39 | convert ... q.body) |
145168
| ReflectedXss.js:42:31:42:38 | req.body | ReflectedXss.js:42:12:42:39 | convert ... q.body) |
169+
| ReflectedXss.js:56:12:56:19 | req.body | ReflectedXss.js:56:12:56:19 | req.body |
170+
| ReflectedXss.js:64:14:64:21 | req.body | ReflectedXss.js:64:39:64:42 | file |
171+
| ReflectedXss.js:64:14:64:21 | req.body | ReflectedXss.js:64:39:64:42 | file |
172+
| ReflectedXss.js:64:39:64:42 | file | ReflectedXss.js:65:16:65:19 | file |
173+
| ReflectedXss.js:64:39:64:42 | file | ReflectedXss.js:65:16:65:19 | file |
174+
| ReflectedXss.js:68:12:68:41 | remark( ... q.body) | ReflectedXss.js:68:12:68:52 | remark( ... tring() |
175+
| ReflectedXss.js:68:12:68:41 | remark( ... q.body) | ReflectedXss.js:68:12:68:52 | remark( ... tring() |
176+
| ReflectedXss.js:68:33:68:40 | req.body | ReflectedXss.js:68:12:68:41 | remark( ... q.body) |
177+
| ReflectedXss.js:68:33:68:40 | req.body | ReflectedXss.js:68:12:68:41 | remark( ... q.body) |
178+
| ReflectedXss.js:72:12:72:56 | unified ... q.body) | ReflectedXss.js:72:12:72:65 | unified ... oString |
179+
| ReflectedXss.js:72:12:72:56 | unified ... q.body) | ReflectedXss.js:72:12:72:65 | unified ... oString |
180+
| ReflectedXss.js:72:48:72:55 | req.body | ReflectedXss.js:72:12:72:56 | unified ... q.body) |
181+
| ReflectedXss.js:72:48:72:55 | req.body | ReflectedXss.js:72:12:72:56 | unified ... q.body) |
182+
| ReflectedXss.js:74:20:74:27 | req.body | ReflectedXss.js:74:34:74:34 | f |
183+
| ReflectedXss.js:74:20:74:27 | req.body | ReflectedXss.js:74:34:74:34 | f |
184+
| ReflectedXss.js:74:34:74:34 | f | ReflectedXss.js:75:14:75:14 | f |
185+
| ReflectedXss.js:74:34:74:34 | f | ReflectedXss.js:75:14:75:14 | f |
146186
| ReflectedXssContentTypes.js:10:24:10:36 | req.params.id | ReflectedXssContentTypes.js:10:14:10:36 | "FOO: " ... rams.id |
147187
| ReflectedXssContentTypes.js:10:24:10:36 | req.params.id | ReflectedXssContentTypes.js:10:14:10:36 | "FOO: " ... rams.id |
148188
| ReflectedXssContentTypes.js:10:24:10:36 | req.params.id | ReflectedXssContentTypes.js:10:14:10:36 | "FOO: " ... rams.id |
@@ -227,6 +267,11 @@ edges
227267
| ReflectedXss.js:34:12:34:18 | mytable | ReflectedXss.js:32:14:32:21 | req.body | ReflectedXss.js:34:12:34:18 | mytable | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:32:14:32:21 | req.body | user-provided value |
228268
| ReflectedXss.js:41:12:41:19 | req.body | ReflectedXss.js:41:12:41:19 | req.body | ReflectedXss.js:41:12:41:19 | req.body | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:41:12:41:19 | req.body | user-provided value |
229269
| ReflectedXss.js:42:12:42:39 | convert ... q.body) | ReflectedXss.js:42:31:42:38 | req.body | ReflectedXss.js:42:12:42:39 | convert ... q.body) | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:42:31:42:38 | req.body | user-provided value |
270+
| ReflectedXss.js:56:12:56:19 | req.body | ReflectedXss.js:56:12:56:19 | req.body | ReflectedXss.js:56:12:56:19 | req.body | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:56:12:56:19 | req.body | user-provided value |
271+
| ReflectedXss.js:65:16:65:19 | file | ReflectedXss.js:64:14:64:21 | req.body | ReflectedXss.js:65:16:65:19 | file | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:64:14:64:21 | req.body | user-provided value |
272+
| ReflectedXss.js:68:12:68:52 | remark( ... tring() | ReflectedXss.js:68:33:68:40 | req.body | ReflectedXss.js:68:12:68:52 | remark( ... tring() | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:68:33:68:40 | req.body | user-provided value |
273+
| ReflectedXss.js:72:12:72:65 | unified ... oString | ReflectedXss.js:72:48:72:55 | req.body | ReflectedXss.js:72:12:72:65 | unified ... oString | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:72:48:72:55 | req.body | user-provided value |
274+
| ReflectedXss.js:75:14:75:14 | f | ReflectedXss.js:74:20:74:27 | req.body | ReflectedXss.js:75:14:75:14 | f | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:74:20:74:27 | req.body | user-provided value |
230275
| ReflectedXssContentTypes.js:10:14:10:36 | "FOO: " ... rams.id | ReflectedXssContentTypes.js:10:24:10:36 | req.params.id | ReflectedXssContentTypes.js:10:14:10:36 | "FOO: " ... rams.id | Cross-site scripting vulnerability due to $@. | ReflectedXssContentTypes.js:10:24:10:36 | req.params.id | user-provided value |
231276
| ReflectedXssContentTypes.js:20:14:20:36 | "FOO: " ... rams.id | ReflectedXssContentTypes.js:20:24:20:36 | req.params.id | ReflectedXssContentTypes.js:20:14:20:36 | "FOO: " ... rams.id | Cross-site scripting vulnerability due to $@. | ReflectedXssContentTypes.js:20:24:20:36 | req.params.id | user-provided value |
232277
| ReflectedXssContentTypes.js:39:13:39:35 | "FOO: " ... rams.id | ReflectedXssContentTypes.js:39:23:39:35 | req.params.id | ReflectedXssContentTypes.js:39:13:39:35 | "FOO: " ... rams.id | Cross-site scripting vulnerability due to $@. | ReflectedXssContentTypes.js:39:23:39:35 | req.params.id | user-provided value |

‎javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXss.js

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,37 @@ app.get('/user/:id', function(req, res) {
4141
res.send(req.body); // NOT OK
4242
res.send(converter.makeHtml(req.body)); // NOT OK
4343
});
44+
45+
var unified = require('unified');
46+
var markdown = require('remark-parse');
47+
var remark2rehype = require('remark-rehype');
48+
var doc = require('rehype-document');
49+
var format = require('rehype-format');
50+
var html = require('rehype-stringify');
51+
var remark = require("remark");
52+
var sanitize = require("rehype-sanitize");
53+
const { resetExtensions } = require('showdown');
54+
55+
app.get('/user/:id', function (req, res) {
56+
res.send(req.body); // NOT OK
57+
58+
unified()
59+
.use(markdown)
60+
.use(remark2rehype)
61+
.use(doc, { title: '👋🌍' })
62+
.use(format)
63+
.use(html)
64+
.process(req.body, function (err, file) {
65+
res.send(file); // NOT OK
66+
});
67+
68+
res.send(remark().processSync(req.body).toString()); // NOT OK
69+
70+
res.send(remark().use(sanitize).processSync(req.body).toString()); // OK
71+
72+
res.send(unified().use(markdown).processSync(req.body).toString); // NOT OK
73+
74+
remark().process(req.body, (e, f) => {
75+
res.send(f); // NOT OK
76+
})
77+
});

‎javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXssWithCustomSanitizer.expected

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
| ReflectedXss.js:34:12:34:18 | mytable | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:32:14:32:21 | req.body | user-provided value |
77
| ReflectedXss.js:41:12:41:19 | req.body | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:41:12:41:19 | req.body | user-provided value |
88
| ReflectedXss.js:42:12:42:39 | convert ... q.body) | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:42:31:42:38 | req.body | user-provided value |
9+
| ReflectedXss.js:56:12:56:19 | req.body | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:56:12:56:19 | req.body | user-provided value |
10+
| ReflectedXss.js:65:16:65:19 | file | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:64:14:64:21 | req.body | user-provided value |
11+
| ReflectedXss.js:68:12:68:52 | remark( ... tring() | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:68:33:68:40 | req.body | user-provided value |
12+
| ReflectedXss.js:72:12:72:65 | unified ... oString | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:72:48:72:55 | req.body | user-provided value |
13+
| ReflectedXss.js:75:14:75:14 | f | Cross-site scripting vulnerability due to $@. | ReflectedXss.js:74:20:74:27 | req.body | user-provided value |
914
| ReflectedXssContentTypes.js:10:14:10:36 | "FOO: " ... rams.id | Cross-site scripting vulnerability due to $@. | ReflectedXssContentTypes.js:10:24:10:36 | req.params.id | user-provided value |
1015
| ReflectedXssContentTypes.js:20:14:20:36 | "FOO: " ... rams.id | Cross-site scripting vulnerability due to $@. | ReflectedXssContentTypes.js:20:24:20:36 | req.params.id | user-provided value |
1116
| ReflectedXssContentTypes.js:39:13:39:35 | "FOO: " ... rams.id | Cross-site scripting vulnerability due to $@. | ReflectedXssContentTypes.js:39:23:39:35 | req.params.id | user-provided value |

0 commit comments

Comments
 (0)