Skip to content

Commit 35c513d

Browse files
erik-krogherik-krogh
committed
add taint step through the cli-color library
1 parent ec9c885 commit 35c513d

File tree

4 files changed

+79
-57
lines changed

4 files changed

+79
-57
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ lgtm,codescanning
55
[colors](https://npmjs.com/package/colors),
66
[wrap-ansi](https://npmjs.com/package/wrap-ansi),
77
[colorette](https://npmjs.com/package/colorette),
8-
[cli-highlight](https://npmjs.com/package/cli-highlight)
8+
[cli-highlight](https://npmjs.com/package/cli-highlight),
9+
[cli-color](https://npmjs.com/package/cli-color)

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,3 +266,15 @@ class CliHighlightStep extends TaintTracking::SharedTaintStep {
266266
)
267267
}
268268
}
269+
270+
/**
271+
* A step through the [`cli-color`](https://npmjs.org/package/cli-color) library.
272+
*/
273+
class CliColorStep extends TaintTracking::SharedTaintStep {
274+
override predicate stringManipulationStep(DataFlow::Node pred, DataFlow::Node succ) {
275+
exists(API::CallNode call | call = API::moduleImport("cli-color").getAMember*().getACall() |
276+
pred = call.getArgument(0) and
277+
succ = call
278+
)
279+
}
280+
}

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

Lines changed: 63 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,35 @@ 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:41:9:41:36 | q |
26-
| logInjectionBad.js:41:13:41:36 | url.par ... , true) |
27-
| logInjectionBad.js:41:23:41:29 | req.url |
28-
| logInjectionBad.js:41:23:41:29 | req.url |
29-
| logInjectionBad.js:42:9:42:35 | username |
30-
| logInjectionBad.js:42:20:42:20 | q |
31-
| logInjectionBad.js:42:20:42:26 | q.query |
32-
| logInjectionBad.js:42:20:42:35 | q.query.username |
33-
| logInjectionBad.js:44:18:44:54 | ansiCol ... ername) |
34-
| logInjectionBad.js:44:18:44:54 | ansiCol ... ername) |
35-
| logInjectionBad.js:44:46:44:53 | username |
36-
| logInjectionBad.js:45:18:45:47 | colors. ... ername) |
37-
| logInjectionBad.js:45:18:45:47 | colors. ... ername) |
38-
| logInjectionBad.js:45:39:45:46 | username |
39-
| logInjectionBad.js:46:18:46:61 | wrapAns ... e), 20) |
40-
| logInjectionBad.js:46:18:46:61 | wrapAns ... e), 20) |
41-
| logInjectionBad.js:46:27:46:56 | colors. ... ername) |
42-
| logInjectionBad.js:46:48:46:55 | username |
43-
| logInjectionBad.js:47:17:47:47 | underli ... name))) |
44-
| logInjectionBad.js:47:17:47:47 | underli ... name))) |
45-
| logInjectionBad.js:47:27:47:46 | bold(blue(username)) |
46-
| logInjectionBad.js:47:32:47:45 | blue(username) |
47-
| logInjectionBad.js:47:37:47:44 | username |
48-
| logInjectionBad.js:48:17:48:76 | highlig ... true}) |
49-
| logInjectionBad.js:48:17:48:76 | highlig ... true}) |
50-
| logInjectionBad.js:48:27:48:34 | username |
25+
| logInjectionBad.js:42:9:42:36 | q |
26+
| logInjectionBad.js:42:13:42:36 | url.par ... , true) |
27+
| logInjectionBad.js:42:23:42:29 | req.url |
28+
| logInjectionBad.js:42:23:42:29 | req.url |
29+
| logInjectionBad.js:43:9:43:35 | username |
30+
| logInjectionBad.js:43:20:43:20 | q |
31+
| logInjectionBad.js:43:20:43:26 | q.query |
32+
| logInjectionBad.js:43:20:43:35 | q.query.username |
33+
| logInjectionBad.js:45:18:45:54 | ansiCol ... ername) |
34+
| logInjectionBad.js:45:18:45:54 | ansiCol ... ername) |
35+
| logInjectionBad.js:45:46:45:53 | username |
36+
| logInjectionBad.js:46:18:46:47 | colors. ... ername) |
37+
| logInjectionBad.js:46:18:46:47 | colors. ... ername) |
38+
| logInjectionBad.js:46:39:46:46 | username |
39+
| logInjectionBad.js:47:18:47:61 | wrapAns ... e), 20) |
40+
| logInjectionBad.js:47:18:47:61 | wrapAns ... e), 20) |
41+
| logInjectionBad.js:47:27:47:56 | colors. ... ername) |
42+
| logInjectionBad.js:47:48:47:55 | username |
43+
| logInjectionBad.js:48:17:48:47 | underli ... name))) |
44+
| logInjectionBad.js:48:17:48:47 | underli ... name))) |
45+
| logInjectionBad.js:48:27:48:46 | bold(blue(username)) |
46+
| logInjectionBad.js:48:32:48:45 | blue(username) |
47+
| logInjectionBad.js:48:37:48:44 | username |
48+
| logInjectionBad.js:49:17:49:76 | highlig ... true}) |
49+
| logInjectionBad.js:49:17:49:76 | highlig ... true}) |
50+
| logInjectionBad.js:49:27:49:34 | username |
51+
| logInjectionBad.js:50:17:50:51 | clc.red ... ername) |
52+
| logInjectionBad.js:50:17:50:51 | clc.red ... ername) |
53+
| logInjectionBad.js:50:43:50:50 | username |
5154
edges
5255
| logInjectionBad.js:19:9:19:36 | q | logInjectionBad.js:20:20:20:20 | q |
5356
| logInjectionBad.js:19:13:19:36 | url.par ... , true) | logInjectionBad.js:19:9:19:36 | q |
@@ -71,39 +74,43 @@ edges
7174
| logInjectionBad.js:29:14:29:18 | error | logInjectionBad.js:30:42:30:46 | error |
7275
| logInjectionBad.js:30:42:30:46 | error | logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` |
7376
| logInjectionBad.js:30:42:30:46 | error | logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` |
74-
| logInjectionBad.js:41:9:41:36 | q | logInjectionBad.js:42:20:42:20 | q |
75-
| logInjectionBad.js:41:13:41:36 | url.par ... , true) | logInjectionBad.js:41:9:41:36 | q |
76-
| logInjectionBad.js:41:23:41:29 | req.url | logInjectionBad.js:41:13:41:36 | url.par ... , true) |
77-
| logInjectionBad.js:41:23:41:29 | req.url | logInjectionBad.js:41:13:41:36 | url.par ... , true) |
78-
| logInjectionBad.js:42:9:42:35 | username | logInjectionBad.js:44:46:44:53 | username |
79-
| logInjectionBad.js:42:9:42:35 | username | logInjectionBad.js:45:39:45:46 | username |
80-
| logInjectionBad.js:42:9:42:35 | username | logInjectionBad.js:46:48:46:55 | username |
81-
| logInjectionBad.js:42:9:42:35 | username | logInjectionBad.js:47:37:47:44 | username |
82-
| logInjectionBad.js:42:9:42:35 | username | logInjectionBad.js:48:27:48:34 | username |
83-
| logInjectionBad.js:42:20:42:20 | q | logInjectionBad.js:42:20:42:26 | q.query |
84-
| logInjectionBad.js:42:20:42:26 | q.query | logInjectionBad.js:42:20:42:35 | q.query.username |
85-
| logInjectionBad.js:42:20:42:35 | q.query.username | logInjectionBad.js:42:9:42:35 | username |
86-
| logInjectionBad.js:44:46:44:53 | username | logInjectionBad.js:44:18:44:54 | ansiCol ... ername) |
87-
| logInjectionBad.js:44:46:44:53 | username | logInjectionBad.js:44:18:44:54 | ansiCol ... ername) |
88-
| logInjectionBad.js:45:39:45:46 | username | logInjectionBad.js:45:18:45:47 | colors. ... ername) |
89-
| logInjectionBad.js:45:39:45:46 | username | logInjectionBad.js:45:18:45:47 | colors. ... ername) |
90-
| logInjectionBad.js:46:27:46:56 | colors. ... ername) | logInjectionBad.js:46:18:46:61 | wrapAns ... e), 20) |
91-
| logInjectionBad.js:46:27:46:56 | colors. ... ername) | logInjectionBad.js:46:18:46:61 | wrapAns ... e), 20) |
92-
| logInjectionBad.js:46:48:46:55 | username | logInjectionBad.js:46:27:46:56 | colors. ... ername) |
93-
| logInjectionBad.js:47:27:47:46 | bold(blue(username)) | logInjectionBad.js:47:17:47:47 | underli ... name))) |
94-
| logInjectionBad.js:47:27:47:46 | bold(blue(username)) | logInjectionBad.js:47:17:47:47 | underli ... name))) |
95-
| logInjectionBad.js:47:32:47:45 | blue(username) | logInjectionBad.js:47:27:47:46 | bold(blue(username)) |
96-
| logInjectionBad.js:47:37:47:44 | username | logInjectionBad.js:47:32:47:45 | blue(username) |
97-
| logInjectionBad.js:48:27:48:34 | username | logInjectionBad.js:48:17:48:76 | highlig ... true}) |
98-
| logInjectionBad.js:48:27:48:34 | username | logInjectionBad.js:48:17:48:76 | highlig ... true}) |
77+
| logInjectionBad.js:42:9:42:36 | q | logInjectionBad.js:43:20:43:20 | q |
78+
| logInjectionBad.js:42:13:42:36 | url.par ... , true) | logInjectionBad.js:42:9:42:36 | q |
79+
| logInjectionBad.js:42:23:42:29 | req.url | logInjectionBad.js:42:13:42:36 | url.par ... , true) |
80+
| logInjectionBad.js:42:23:42:29 | req.url | logInjectionBad.js:42:13:42:36 | url.par ... , true) |
81+
| logInjectionBad.js:43:9:43:35 | username | logInjectionBad.js:45:46:45:53 | username |
82+
| logInjectionBad.js:43:9:43:35 | username | logInjectionBad.js:46:39:46:46 | username |
83+
| logInjectionBad.js:43:9:43:35 | username | logInjectionBad.js:47:48:47:55 | username |
84+
| logInjectionBad.js:43:9:43:35 | username | logInjectionBad.js:48:37:48:44 | username |
85+
| logInjectionBad.js:43:9:43:35 | username | logInjectionBad.js:49:27:49:34 | username |
86+
| logInjectionBad.js:43:9:43:35 | username | logInjectionBad.js:50:43:50:50 | username |
87+
| logInjectionBad.js:43:20:43:20 | q | logInjectionBad.js:43:20:43:26 | q.query |
88+
| logInjectionBad.js:43:20:43:26 | q.query | logInjectionBad.js:43:20:43:35 | q.query.username |
89+
| logInjectionBad.js:43:20:43:35 | q.query.username | logInjectionBad.js:43:9:43:35 | username |
90+
| logInjectionBad.js:45:46:45:53 | username | logInjectionBad.js:45:18:45:54 | ansiCol ... ername) |
91+
| logInjectionBad.js:45:46:45:53 | username | logInjectionBad.js:45:18:45:54 | ansiCol ... ername) |
92+
| logInjectionBad.js:46:39:46:46 | username | logInjectionBad.js:46:18:46:47 | colors. ... ername) |
93+
| logInjectionBad.js:46:39:46:46 | username | logInjectionBad.js:46:18:46:47 | colors. ... ername) |
94+
| logInjectionBad.js:47:27:47:56 | colors. ... ername) | logInjectionBad.js:47:18:47:61 | wrapAns ... e), 20) |
95+
| logInjectionBad.js:47:27:47:56 | colors. ... ername) | logInjectionBad.js:47:18:47:61 | wrapAns ... e), 20) |
96+
| logInjectionBad.js:47:48:47:55 | username | logInjectionBad.js:47:27:47:56 | colors. ... ername) |
97+
| logInjectionBad.js:48:27:48:46 | bold(blue(username)) | logInjectionBad.js:48:17:48:47 | underli ... name))) |
98+
| logInjectionBad.js:48:27:48:46 | bold(blue(username)) | logInjectionBad.js:48:17:48:47 | underli ... name))) |
99+
| logInjectionBad.js:48:32:48:45 | blue(username) | logInjectionBad.js:48:27:48:46 | bold(blue(username)) |
100+
| logInjectionBad.js:48:37:48:44 | username | logInjectionBad.js:48:32:48:45 | blue(username) |
101+
| logInjectionBad.js:49:27:49:34 | username | logInjectionBad.js:49:17:49:76 | highlig ... true}) |
102+
| logInjectionBad.js:49:27:49:34 | username | logInjectionBad.js:49:17:49:76 | highlig ... true}) |
103+
| logInjectionBad.js:50:43:50:50 | username | logInjectionBad.js:50:17:50:51 | clc.red ... ername) |
104+
| logInjectionBad.js:50:43:50:50 | username | logInjectionBad.js:50:17:50:51 | clc.red ... ername) |
99105
#select
100106
| 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 |
101107
| 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 |
102108
| 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 |
103109
| 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 |
104110
| 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 |
105-
| logInjectionBad.js:44:18:44:54 | ansiCol ... ername) | logInjectionBad.js:41:23:41:29 | req.url | logInjectionBad.js:44:18:44:54 | ansiCol ... ername) | $@ flows to log entry. | logInjectionBad.js:41:23:41:29 | req.url | User-provided value |
106-
| logInjectionBad.js:45:18:45:47 | colors. ... ername) | logInjectionBad.js:41:23:41:29 | req.url | logInjectionBad.js:45:18:45:47 | colors. ... ername) | $@ flows to log entry. | logInjectionBad.js:41:23:41:29 | req.url | User-provided value |
107-
| logInjectionBad.js:46:18:46:61 | wrapAns ... e), 20) | logInjectionBad.js:41:23:41:29 | req.url | logInjectionBad.js:46:18:46:61 | wrapAns ... e), 20) | $@ flows to log entry. | logInjectionBad.js:41:23:41:29 | req.url | User-provided value |
108-
| logInjectionBad.js:47:17:47:47 | underli ... name))) | logInjectionBad.js:41:23:41:29 | req.url | logInjectionBad.js:47:17:47:47 | underli ... name))) | $@ flows to log entry. | logInjectionBad.js:41:23:41:29 | req.url | User-provided value |
109-
| logInjectionBad.js:48:17:48:76 | highlig ... true}) | logInjectionBad.js:41:23:41:29 | req.url | logInjectionBad.js:48:17:48:76 | highlig ... true}) | $@ flows to log entry. | logInjectionBad.js:41:23:41:29 | req.url | User-provided value |
111+
| logInjectionBad.js:45:18:45:54 | ansiCol ... ername) | logInjectionBad.js:42:23:42:29 | req.url | logInjectionBad.js:45:18:45:54 | ansiCol ... ername) | $@ flows to log entry. | logInjectionBad.js:42:23:42:29 | req.url | User-provided value |
112+
| logInjectionBad.js:46:18:46:47 | colors. ... ername) | logInjectionBad.js:42:23:42:29 | req.url | logInjectionBad.js:46:18:46:47 | colors. ... ername) | $@ flows to log entry. | logInjectionBad.js:42:23:42:29 | req.url | User-provided value |
113+
| logInjectionBad.js:47:18:47:61 | wrapAns ... e), 20) | logInjectionBad.js:42:23:42:29 | req.url | logInjectionBad.js:47:18:47:61 | wrapAns ... e), 20) | $@ flows to log entry. | logInjectionBad.js:42:23:42:29 | req.url | User-provided value |
114+
| logInjectionBad.js:48:17:48:47 | underli ... name))) | logInjectionBad.js:42:23:42:29 | req.url | logInjectionBad.js:48:17:48:47 | underli ... name))) | $@ flows to log entry. | logInjectionBad.js:42:23:42:29 | req.url | User-provided value |
115+
| logInjectionBad.js:49:17:49:76 | highlig ... true}) | logInjectionBad.js:42:23:42:29 | req.url | logInjectionBad.js:49:17:49:76 | highlig ... true}) | $@ flows to log entry. | logInjectionBad.js:42:23:42:29 | req.url | User-provided value |
116+
| logInjectionBad.js:50:17:50:51 | clc.red ... ername) | logInjectionBad.js:42:23:42:29 | req.url | logInjectionBad.js:50:17:50:51 | clc.red ... ername) | $@ flows to log entry. | logInjectionBad.js:42:23:42: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
@@ -36,6 +36,7 @@ const colors = require('colors');
3636
import wrapAnsi from 'wrap-ansi';
3737
import { blue, bold, underline } from "colorette"
3838
const highlight = require('cli-highlight').highlight;
39+
var clc = require("cli-color");
3940

4041
const server2 = http.createServer((req, res) => {
4142
let q = url.parse(req.url, true);
@@ -46,4 +47,5 @@ const server2 = http.createServer((req, res) => {
4647
console.info(wrapAnsi(colors.red.underline(username), 20)); // NOT OK
4748
console.log(underline(bold(blue(username)))); // NOT OK
4849
console.log(highlight(username, {language: 'sql', ignoreIllegals: true})); // NOT OK
50+
console.log(clc.red.bgWhite.underline(username)); // NOT OK
4951
});

0 commit comments

Comments
 (0)