Skip to content

Commit 053d9b5

Browse files
erik-krogherik-krogh
committed
add taint step through the kleur library
1 parent 6e2b924 commit 053d9b5

File tree

4 files changed

+101
-73
lines changed

4 files changed

+101
-73
lines changed

‎javascript/change-notes/2021-06-22-colors.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ lgtm,codescanning
77
[colorette](https://npmjs.com/package/colorette),
88
[cli-highlight](https://npmjs.com/package/cli-highlight),
99
[cli-color](https://npmjs.com/package/cli-color),
10-
[slice-ansi](https://npmjs.com/package/slice-ansi)
10+
[slice-ansi](https://npmjs.com/package/slice-ansi),
11+
[kleur](https://npmjs.com/package/kleur)

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,3 +290,21 @@ class SliceAnsiStep extends TaintTracking::SharedTaintStep {
290290
)
291291
}
292292
}
293+
294+
/**
295+
* A step through the [`kleur`](https://npmjs.org/package/kleur) library.
296+
*/
297+
class KleurStep extends TaintTracking::SharedTaintStep {
298+
private API::Node kleurInstance() {
299+
result = API::moduleImport("kleur")
300+
or
301+
result = kleurInstance().getAMember().getReturn()
302+
}
303+
304+
override predicate stringManipulationStep(DataFlow::Node pred, DataFlow::Node succ) {
305+
exists(API::CallNode call | call = kleurInstance().getAMember().getACall() |
306+
pred = call.getArgument(0) and
307+
succ = call
308+
)
309+
}
310+
}

‎javascript/ql/test/query-tests/Security/CWE-117/LogInjection.expected‎

Lines changed: 79 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -22,39 +22,42 @@ nodes
2222
| logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` |
2323
| logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` |
2424
| logInjectionBad.js:30:42:30:46 | error |
25-
| logInjectionBad.js:43:9:43:36 | q |
26-
| logInjectionBad.js:43:13:43:36 | url.par ... , true) |
27-
| logInjectionBad.js:43:23:43:29 | req.url |
28-
| logInjectionBad.js:43:23:43:29 | req.url |
29-
| logInjectionBad.js:44:9:44:35 | username |
30-
| logInjectionBad.js:44:20:44:20 | q |
31-
| logInjectionBad.js:44:20:44:26 | q.query |
32-
| logInjectionBad.js:44:20:44:35 | q.query.username |
33-
| logInjectionBad.js:46:18:46:54 | ansiCol ... ername) |
34-
| logInjectionBad.js:46:18:46:54 | ansiCol ... ername) |
35-
| logInjectionBad.js:46:46:46:53 | username |
36-
| logInjectionBad.js:47:18:47:47 | colors. ... ername) |
37-
| logInjectionBad.js:47:18:47:47 | colors. ... ername) |
38-
| logInjectionBad.js:47:39:47:46 | username |
39-
| logInjectionBad.js:48:18:48:61 | wrapAns ... e), 20) |
40-
| logInjectionBad.js:48:18:48:61 | wrapAns ... e), 20) |
41-
| logInjectionBad.js:48:27:48:56 | colors. ... ername) |
42-
| logInjectionBad.js:48:48:48:55 | username |
43-
| logInjectionBad.js:49:17:49:47 | underli ... name))) |
44-
| logInjectionBad.js:49:17:49:47 | underli ... name))) |
45-
| logInjectionBad.js:49:27:49:46 | bold(blue(username)) |
46-
| logInjectionBad.js:49:32:49:45 | blue(username) |
47-
| logInjectionBad.js:49:37:49:44 | username |
48-
| logInjectionBad.js:50:17:50:76 | highlig ... true}) |
49-
| logInjectionBad.js:50:17:50:76 | highlig ... true}) |
50-
| logInjectionBad.js:50:27:50:34 | username |
51-
| logInjectionBad.js:51:17:51:51 | clc.red ... ername) |
52-
| logInjectionBad.js:51:17:51:51 | clc.red ... ername) |
53-
| logInjectionBad.js:51:43:51:50 | username |
54-
| logInjectionBad.js:52:17:52:65 | sliceAn ... 20, 30) |
55-
| logInjectionBad.js:52:17:52:65 | sliceAn ... 20, 30) |
56-
| logInjectionBad.js:52:27:52:56 | colors. ... ername) |
57-
| logInjectionBad.js:52:48:52:55 | username |
25+
| logInjectionBad.js:44:9:44:36 | q |
26+
| logInjectionBad.js:44:13:44:36 | url.par ... , true) |
27+
| logInjectionBad.js:44:23:44:29 | req.url |
28+
| logInjectionBad.js:44:23:44:29 | req.url |
29+
| logInjectionBad.js:45:9:45:35 | username |
30+
| logInjectionBad.js:45:20:45:20 | q |
31+
| logInjectionBad.js:45:20:45:26 | q.query |
32+
| logInjectionBad.js:45:20:45:35 | q.query.username |
33+
| logInjectionBad.js:47:18:47:54 | ansiCol ... ername) |
34+
| logInjectionBad.js:47:18:47:54 | ansiCol ... ername) |
35+
| logInjectionBad.js:47:46:47:53 | username |
36+
| logInjectionBad.js:48:18:48:47 | colors. ... ername) |
37+
| logInjectionBad.js:48:18:48:47 | colors. ... ername) |
38+
| logInjectionBad.js:48:39:48:46 | username |
39+
| logInjectionBad.js:49:18:49:61 | wrapAns ... e), 20) |
40+
| logInjectionBad.js:49:18:49:61 | wrapAns ... e), 20) |
41+
| logInjectionBad.js:49:27:49:56 | colors. ... ername) |
42+
| logInjectionBad.js:49:48:49:55 | username |
43+
| logInjectionBad.js:50:17:50:47 | underli ... name))) |
44+
| logInjectionBad.js:50:17:50:47 | underli ... name))) |
45+
| logInjectionBad.js:50:27:50:46 | bold(blue(username)) |
46+
| logInjectionBad.js:50:32:50:45 | blue(username) |
47+
| logInjectionBad.js:50:37:50:44 | username |
48+
| logInjectionBad.js:51:17:51:76 | highlig ... true}) |
49+
| logInjectionBad.js:51:17:51:76 | highlig ... true}) |
50+
| logInjectionBad.js:51:27:51:34 | username |
51+
| logInjectionBad.js:52:17:52:51 | clc.red ... ername) |
52+
| logInjectionBad.js:52:17:52:51 | clc.red ... ername) |
53+
| logInjectionBad.js:52:43:52:50 | username |
54+
| logInjectionBad.js:53:17:53:65 | sliceAn ... 20, 30) |
55+
| logInjectionBad.js:53:17:53:65 | sliceAn ... 20, 30) |
56+
| logInjectionBad.js:53:27:53:56 | colors. ... ername) |
57+
| logInjectionBad.js:53:48:53:55 | username |
58+
| logInjectionBad.js:54:17:54:55 | kleur.b ... ername) |
59+
| logInjectionBad.js:54:17:54:55 | kleur.b ... ername) |
60+
| logInjectionBad.js:54:47:54:54 | username |
5861
edges
5962
| logInjectionBad.js:19:9:19:36 | q | logInjectionBad.js:20:20:20:20 | q |
6063
| logInjectionBad.js:19:13:19:36 | url.par ... , true) | logInjectionBad.js:19:9:19:36 | q |
@@ -78,48 +81,52 @@ edges
7881
| logInjectionBad.js:29:14:29:18 | error | logInjectionBad.js:30:42:30:46 | error |
7982
| logInjectionBad.js:30:42:30:46 | error | logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` |
8083
| logInjectionBad.js:30:42:30:46 | error | logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` |
81-
| logInjectionBad.js:43:9:43:36 | q | logInjectionBad.js:44:20:44:20 | q |
82-
| logInjectionBad.js:43:13:43:36 | url.par ... , true) | logInjectionBad.js:43:9:43:36 | q |
83-
| logInjectionBad.js:43:23:43:29 | req.url | logInjectionBad.js:43:13:43:36 | url.par ... , true) |
84-
| logInjectionBad.js:43:23:43:29 | req.url | logInjectionBad.js:43:13:43:36 | url.par ... , true) |
85-
| logInjectionBad.js:44:9:44:35 | username | logInjectionBad.js:46:46:46:53 | username |
86-
| logInjectionBad.js:44:9:44:35 | username | logInjectionBad.js:47:39:47:46 | username |
87-
| logInjectionBad.js:44:9:44:35 | username | logInjectionBad.js:48:48:48:55 | username |
88-
| logInjectionBad.js:44:9:44:35 | username | logInjectionBad.js:49:37:49:44 | username |
89-
| logInjectionBad.js:44:9:44:35 | username | logInjectionBad.js:50:27:50:34 | username |
90-
| logInjectionBad.js:44:9:44:35 | username | logInjectionBad.js:51:43:51:50 | username |
91-
| logInjectionBad.js:44:9:44:35 | username | logInjectionBad.js:52:48:52:55 | username |
92-
| logInjectionBad.js:44:20:44:20 | q | logInjectionBad.js:44:20:44:26 | q.query |
93-
| logInjectionBad.js:44:20:44:26 | q.query | logInjectionBad.js:44:20:44:35 | q.query.username |
94-
| logInjectionBad.js:44:20:44:35 | q.query.username | logInjectionBad.js:44:9:44:35 | username |
95-
| logInjectionBad.js:46:46:46:53 | username | logInjectionBad.js:46:18:46:54 | ansiCol ... ername) |
96-
| logInjectionBad.js:46:46:46:53 | username | logInjectionBad.js:46:18:46:54 | ansiCol ... ername) |
97-
| logInjectionBad.js:47:39:47:46 | username | logInjectionBad.js:47:18:47:47 | colors. ... ername) |
98-
| logInjectionBad.js:47:39:47:46 | username | logInjectionBad.js:47:18:47:47 | colors. ... ername) |
99-
| logInjectionBad.js:48:27:48:56 | colors. ... ername) | logInjectionBad.js:48:18:48:61 | wrapAns ... e), 20) |
100-
| logInjectionBad.js:48:27:48:56 | colors. ... ername) | logInjectionBad.js:48:18:48:61 | wrapAns ... e), 20) |
101-
| logInjectionBad.js:48:48:48:55 | username | logInjectionBad.js:48:27:48:56 | colors. ... ername) |
102-
| logInjectionBad.js:49:27:49:46 | bold(blue(username)) | logInjectionBad.js:49:17:49:47 | underli ... name))) |
103-
| logInjectionBad.js:49:27:49:46 | bold(blue(username)) | logInjectionBad.js:49:17:49:47 | underli ... name))) |
104-
| logInjectionBad.js:49:32:49:45 | blue(username) | logInjectionBad.js:49:27:49:46 | bold(blue(username)) |
105-
| logInjectionBad.js:49:37:49:44 | username | logInjectionBad.js:49:32:49:45 | blue(username) |
106-
| logInjectionBad.js:50:27:50:34 | username | logInjectionBad.js:50:17:50:76 | highlig ... true}) |
107-
| logInjectionBad.js:50:27:50:34 | username | logInjectionBad.js:50:17:50:76 | highlig ... true}) |
108-
| logInjectionBad.js:51:43:51:50 | username | logInjectionBad.js:51:17:51:51 | clc.red ... ername) |
109-
| logInjectionBad.js:51:43:51:50 | username | logInjectionBad.js:51:17:51:51 | clc.red ... ername) |
110-
| logInjectionBad.js:52:27:52:56 | colors. ... ername) | logInjectionBad.js:52:17:52:65 | sliceAn ... 20, 30) |
111-
| logInjectionBad.js:52:27:52:56 | colors. ... ername) | logInjectionBad.js:52:17:52:65 | sliceAn ... 20, 30) |
112-
| logInjectionBad.js:52:48:52:55 | username | logInjectionBad.js:52:27:52:56 | colors. ... ername) |
84+
| logInjectionBad.js:44:9:44:36 | q | logInjectionBad.js:45:20:45:20 | q |
85+
| logInjectionBad.js:44:13:44:36 | url.par ... , true) | logInjectionBad.js:44:9:44:36 | q |
86+
| logInjectionBad.js:44:23:44:29 | req.url | logInjectionBad.js:44:13:44:36 | url.par ... , true) |
87+
| logInjectionBad.js:44:23:44:29 | req.url | logInjectionBad.js:44:13:44:36 | url.par ... , true) |
88+
| logInjectionBad.js:45:9:45:35 | username | logInjectionBad.js:47:46:47:53 | username |
89+
| logInjectionBad.js:45:9:45:35 | username | logInjectionBad.js:48:39:48:46 | username |
90+
| logInjectionBad.js:45:9:45:35 | username | logInjectionBad.js:49:48:49:55 | username |
91+
| logInjectionBad.js:45:9:45:35 | username | logInjectionBad.js:50:37:50:44 | username |
92+
| logInjectionBad.js:45:9:45:35 | username | logInjectionBad.js:51:27:51:34 | username |
93+
| logInjectionBad.js:45:9:45:35 | username | logInjectionBad.js:52:43:52:50 | username |
94+
| logInjectionBad.js:45:9:45:35 | username | logInjectionBad.js:53:48:53:55 | username |
95+
| logInjectionBad.js:45:9:45:35 | username | logInjectionBad.js:54:47:54:54 | username |
96+
| logInjectionBad.js:45:20:45:20 | q | logInjectionBad.js:45:20:45:26 | q.query |
97+
| logInjectionBad.js:45:20:45:26 | q.query | logInjectionBad.js:45:20:45:35 | q.query.username |
98+
| logInjectionBad.js:45:20:45:35 | q.query.username | logInjectionBad.js:45:9:45:35 | username |
99+
| logInjectionBad.js:47:46:47:53 | username | logInjectionBad.js:47:18:47:54 | ansiCol ... ername) |
100+
| logInjectionBad.js:47:46:47:53 | username | logInjectionBad.js:47:18:47:54 | ansiCol ... ername) |
101+
| logInjectionBad.js:48:39:48:46 | username | logInjectionBad.js:48:18:48:47 | colors. ... ername) |
102+
| logInjectionBad.js:48:39:48:46 | username | logInjectionBad.js:48:18:48:47 | colors. ... ername) |
103+
| logInjectionBad.js:49:27:49:56 | colors. ... ername) | logInjectionBad.js:49:18:49:61 | wrapAns ... e), 20) |
104+
| logInjectionBad.js:49:27:49:56 | colors. ... ername) | logInjectionBad.js:49:18:49:61 | wrapAns ... e), 20) |
105+
| logInjectionBad.js:49:48:49:55 | username | logInjectionBad.js:49:27:49:56 | colors. ... ername) |
106+
| logInjectionBad.js:50:27:50:46 | bold(blue(username)) | logInjectionBad.js:50:17:50:47 | underli ... name))) |
107+
| logInjectionBad.js:50:27:50:46 | bold(blue(username)) | logInjectionBad.js:50:17:50:47 | underli ... name))) |
108+
| logInjectionBad.js:50:32:50:45 | blue(username) | logInjectionBad.js:50:27:50:46 | bold(blue(username)) |
109+
| logInjectionBad.js:50:37:50:44 | username | logInjectionBad.js:50:32:50:45 | blue(username) |
110+
| logInjectionBad.js:51:27:51:34 | username | logInjectionBad.js:51:17:51:76 | highlig ... true}) |
111+
| logInjectionBad.js:51:27:51:34 | username | logInjectionBad.js:51:17:51:76 | highlig ... true}) |
112+
| logInjectionBad.js:52:43:52:50 | username | logInjectionBad.js:52:17:52:51 | clc.red ... ername) |
113+
| logInjectionBad.js:52:43:52:50 | username | logInjectionBad.js:52:17:52:51 | clc.red ... ername) |
114+
| logInjectionBad.js:53:27:53:56 | colors. ... ername) | logInjectionBad.js:53:17:53:65 | sliceAn ... 20, 30) |
115+
| logInjectionBad.js:53:27:53:56 | colors. ... ername) | logInjectionBad.js:53:17:53:65 | sliceAn ... 20, 30) |
116+
| logInjectionBad.js:53:48:53:55 | username | logInjectionBad.js:53:27:53:56 | colors. ... ername) |
117+
| logInjectionBad.js:54:47:54:54 | username | logInjectionBad.js:54:17:54:55 | kleur.b ... ername) |
118+
| logInjectionBad.js:54:47:54:54 | username | logInjectionBad.js:54:17:54:55 | kleur.b ... ername) |
113119
#select
114120
| logInjectionBad.js:22:18:22:43 | `[INFO] ... rname}` | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:22:18:22:43 | `[INFO] ... rname}` | $@ flows to log entry. | logInjectionBad.js:19:23:19:29 | req.url | User-provided value |
115121
| logInjectionBad.js:23:37:23:44 | username | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:23:37:23:44 | username | $@ flows to log entry. | logInjectionBad.js:19:23:19:29 | req.url | User-provided value |
116122
| logInjectionBad.js:24:35:24:42 | username | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:24:35:24:42 | username | $@ flows to log entry. | logInjectionBad.js:19:23:19:29 | req.url | User-provided value |
117123
| logInjectionBad.js:25:36:25:43 | username | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:25:36:25:43 | username | $@ flows to log entry. | logInjectionBad.js:19:23:19:29 | req.url | User-provided value |
118124
| logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` | $@ flows to log entry. | logInjectionBad.js:19:23:19:29 | req.url | User-provided value |
119-
| logInjectionBad.js:46:18:46:54 | ansiCol ... ername) | logInjectionBad.js:43:23:43:29 | req.url | logInjectionBad.js:46:18:46:54 | ansiCol ... ername) | $@ flows to log entry. | logInjectionBad.js:43:23:43:29 | req.url | User-provided value |
120-
| logInjectionBad.js:47:18:47:47 | colors. ... ername) | logInjectionBad.js:43:23:43:29 | req.url | logInjectionBad.js:47:18:47:47 | colors. ... ername) | $@ flows to log entry. | logInjectionBad.js:43:23:43:29 | req.url | User-provided value |
121-
| logInjectionBad.js:48:18:48:61 | wrapAns ... e), 20) | logInjectionBad.js:43:23:43:29 | req.url | logInjectionBad.js:48:18:48:61 | wrapAns ... e), 20) | $@ flows to log entry. | logInjectionBad.js:43:23:43:29 | req.url | User-provided value |
122-
| logInjectionBad.js:49:17:49:47 | underli ... name))) | logInjectionBad.js:43:23:43:29 | req.url | logInjectionBad.js:49:17:49:47 | underli ... name))) | $@ flows to log entry. | logInjectionBad.js:43:23:43:29 | req.url | User-provided value |
123-
| logInjectionBad.js:50:17:50:76 | highlig ... true}) | logInjectionBad.js:43:23:43:29 | req.url | logInjectionBad.js:50:17:50:76 | highlig ... true}) | $@ flows to log entry. | logInjectionBad.js:43:23:43:29 | req.url | User-provided value |
124-
| logInjectionBad.js:51:17:51:51 | clc.red ... ername) | logInjectionBad.js:43:23:43:29 | req.url | logInjectionBad.js:51:17:51:51 | clc.red ... ername) | $@ flows to log entry. | logInjectionBad.js:43:23:43:29 | req.url | User-provided value |
125-
| logInjectionBad.js:52:17:52:65 | sliceAn ... 20, 30) | logInjectionBad.js:43:23:43:29 | req.url | logInjectionBad.js:52:17:52:65 | sliceAn ... 20, 30) | $@ flows to log entry. | logInjectionBad.js:43:23:43:29 | req.url | User-provided value |
125+
| logInjectionBad.js:47:18:47:54 | ansiCol ... ername) | logInjectionBad.js:44:23:44:29 | req.url | logInjectionBad.js:47:18:47:54 | ansiCol ... ername) | $@ flows to log entry. | logInjectionBad.js:44:23:44:29 | req.url | User-provided value |
126+
| logInjectionBad.js:48:18:48:47 | colors. ... ername) | logInjectionBad.js:44:23:44:29 | req.url | logInjectionBad.js:48:18:48:47 | colors. ... ername) | $@ flows to log entry. | logInjectionBad.js:44:23:44:29 | req.url | User-provided value |
127+
| logInjectionBad.js:49:18:49:61 | wrapAns ... e), 20) | logInjectionBad.js:44:23:44:29 | req.url | logInjectionBad.js:49:18:49:61 | wrapAns ... e), 20) | $@ flows to log entry. | logInjectionBad.js:44:23:44:29 | req.url | User-provided value |
128+
| logInjectionBad.js:50:17:50:47 | underli ... name))) | logInjectionBad.js:44:23:44:29 | req.url | logInjectionBad.js:50:17:50:47 | underli ... name))) | $@ flows to log entry. | logInjectionBad.js:44:23:44:29 | req.url | User-provided value |
129+
| logInjectionBad.js:51:17:51:76 | highlig ... true}) | logInjectionBad.js:44:23:44:29 | req.url | logInjectionBad.js:51:17:51:76 | highlig ... true}) | $@ flows to log entry. | logInjectionBad.js:44:23:44:29 | req.url | User-provided value |
130+
| logInjectionBad.js:52:17:52:51 | clc.red ... ername) | logInjectionBad.js:44:23:44:29 | req.url | logInjectionBad.js:52:17:52:51 | clc.red ... ername) | $@ flows to log entry. | logInjectionBad.js:44:23:44:29 | req.url | User-provided value |
131+
| logInjectionBad.js:53:17:53:65 | sliceAn ... 20, 30) | logInjectionBad.js:44:23:44:29 | req.url | logInjectionBad.js:53:17:53:65 | sliceAn ... 20, 30) | $@ flows to log entry. | logInjectionBad.js:44:23:44:29 | req.url | User-provided value |
132+
| logInjectionBad.js:54:17:54:55 | kleur.b ... ername) | logInjectionBad.js:44:23:44:29 | req.url | logInjectionBad.js:54:17:54:55 | kleur.b ... ername) | $@ flows to log entry. | logInjectionBad.js:44:23:44:29 | req.url | User-provided value |

‎javascript/ql/test/query-tests/Security/CWE-117/logInjectionBad.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import { blue, bold, underline } from "colorette"
3838
const highlight = require('cli-highlight').highlight;
3939
var clc = require("cli-color");
4040
import sliceAnsi from 'slice-ansi';
41+
import kleur from 'kleur';
4142

4243
const server2 = http.createServer((req, res) => {
4344
let q = url.parse(req.url, true);
@@ -50,4 +51,5 @@ const server2 = http.createServer((req, res) => {
5051
console.log(highlight(username, {language: 'sql', ignoreIllegals: true})); // NOT OK
5152
console.log(clc.red.bgWhite.underline(username)); // NOT OK
5253
console.log(sliceAnsi(colors.red.underline(username), 20, 30)); // NOT OK
54+
console.log(kleur.blue().bold().underline(username)); // NOT OK
5355
});

0 commit comments

Comments
 (0)