Skip to content

Commit d114cdc

Browse files
erik-krogherik-krogh
committed
add taint step through the colorette library
1 parent e4427bb commit d114cdc

File tree

4 files changed

+65
-39
lines changed

4 files changed

+65
-39
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ lgtm,codescanning
33
Affected packages are
44
[ansi-colors](https://npmjs.com/package/ansi-colors),
55
[colors](https://npmjs.com/package/colors),
6-
[wrap-ansi](https://npmjs.com/package/wrap-ansi)
6+
[wrap-ansi](https://npmjs.com/package/wrap-ansi),
7+
[colorette](https://npmjs.com/package/colorette)

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,3 +240,15 @@ class WrapAnsiStep extends TaintTracking::SharedTaintStep {
240240
)
241241
}
242242
}
243+
244+
/**
245+
* A step through the [`colorette`](https://npmjs.org/package/colorette) library.
246+
*/
247+
class ColoretteStep extends TaintTracking::SharedTaintStep {
248+
override predicate stringManipulationStep(DataFlow::Node pred, DataFlow::Node succ) {
249+
exists(API::CallNode call | call = API::moduleImport("colorette").getAMember().getACall() |
250+
pred = call.getArgument(0) and
251+
succ = call
252+
)
253+
}
254+
}

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

Lines changed: 49 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,29 @@ 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:39:9:39:36 | q |
26-
| logInjectionBad.js:39:13:39:36 | url.par ... , true) |
27-
| logInjectionBad.js:39:23:39:29 | req.url |
28-
| logInjectionBad.js:39:23:39:29 | req.url |
29-
| logInjectionBad.js:40:9:40:35 | username |
30-
| logInjectionBad.js:40:20:40:20 | q |
31-
| logInjectionBad.js:40:20:40:26 | q.query |
32-
| logInjectionBad.js:40:20:40:35 | q.query.username |
33-
| logInjectionBad.js:42:18:42:54 | ansiCol ... ername) |
34-
| logInjectionBad.js:42:18:42:54 | ansiCol ... ername) |
35-
| logInjectionBad.js:42:46:42:53 | username |
36-
| logInjectionBad.js:43:18:43:47 | colors. ... ername) |
37-
| logInjectionBad.js:43:18:43:47 | colors. ... ername) |
38-
| logInjectionBad.js:43:39:43:46 | username |
39-
| logInjectionBad.js:44:18:44:61 | wrapAns ... e), 20) |
40-
| logInjectionBad.js:44:18:44:61 | wrapAns ... e), 20) |
41-
| logInjectionBad.js:44:27:44:56 | colors. ... ername) |
42-
| logInjectionBad.js:44:48:44:55 | username |
25+
| logInjectionBad.js:40:9:40:36 | q |
26+
| logInjectionBad.js:40:13:40:36 | url.par ... , true) |
27+
| logInjectionBad.js:40:23:40:29 | req.url |
28+
| logInjectionBad.js:40:23:40:29 | req.url |
29+
| logInjectionBad.js:41:9:41:35 | username |
30+
| logInjectionBad.js:41:20:41:20 | q |
31+
| logInjectionBad.js:41:20:41:26 | q.query |
32+
| logInjectionBad.js:41:20:41:35 | q.query.username |
33+
| logInjectionBad.js:43:18:43:54 | ansiCol ... ername) |
34+
| logInjectionBad.js:43:18:43:54 | ansiCol ... ername) |
35+
| logInjectionBad.js:43:46:43:53 | username |
36+
| logInjectionBad.js:44:18:44:47 | colors. ... ername) |
37+
| logInjectionBad.js:44:18:44:47 | colors. ... ername) |
38+
| logInjectionBad.js:44:39:44:46 | username |
39+
| logInjectionBad.js:45:18:45:61 | wrapAns ... e), 20) |
40+
| logInjectionBad.js:45:18:45:61 | wrapAns ... e), 20) |
41+
| logInjectionBad.js:45:27:45:56 | colors. ... ername) |
42+
| logInjectionBad.js:45:48:45:55 | username |
43+
| logInjectionBad.js:46:17:46:47 | underli ... name))) |
44+
| logInjectionBad.js:46:17:46:47 | underli ... name))) |
45+
| logInjectionBad.js:46:27:46:46 | bold(blue(username)) |
46+
| logInjectionBad.js:46:32:46:45 | blue(username) |
47+
| logInjectionBad.js:46:37:46:44 | username |
4348
edges
4449
| logInjectionBad.js:19:9:19:36 | q | logInjectionBad.js:20:20:20:20 | q |
4550
| logInjectionBad.js:19:13:19:36 | url.par ... , true) | logInjectionBad.js:19:9:19:36 | q |
@@ -63,29 +68,35 @@ edges
6368
| logInjectionBad.js:29:14:29:18 | error | logInjectionBad.js:30:42:30:46 | error |
6469
| logInjectionBad.js:30:42:30:46 | error | logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` |
6570
| logInjectionBad.js:30:42:30:46 | error | logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` |
66-
| logInjectionBad.js:39:9:39:36 | q | logInjectionBad.js:40:20:40:20 | q |
67-
| logInjectionBad.js:39:13:39:36 | url.par ... , true) | logInjectionBad.js:39:9:39:36 | q |
68-
| logInjectionBad.js:39:23:39:29 | req.url | logInjectionBad.js:39:13:39:36 | url.par ... , true) |
69-
| logInjectionBad.js:39:23:39:29 | req.url | logInjectionBad.js:39:13:39:36 | url.par ... , true) |
70-
| logInjectionBad.js:40:9:40:35 | username | logInjectionBad.js:42:46:42:53 | username |
71-
| logInjectionBad.js:40:9:40:35 | username | logInjectionBad.js:43:39:43:46 | username |
72-
| logInjectionBad.js:40:9:40:35 | username | logInjectionBad.js:44:48:44:55 | username |
73-
| logInjectionBad.js:40:20:40:20 | q | logInjectionBad.js:40:20:40:26 | q.query |
74-
| logInjectionBad.js:40:20:40:26 | q.query | logInjectionBad.js:40:20:40:35 | q.query.username |
75-
| logInjectionBad.js:40:20:40:35 | q.query.username | logInjectionBad.js:40:9:40:35 | username |
76-
| logInjectionBad.js:42:46:42:53 | username | logInjectionBad.js:42:18:42:54 | ansiCol ... ername) |
77-
| logInjectionBad.js:42:46:42:53 | username | logInjectionBad.js:42:18:42:54 | ansiCol ... ername) |
78-
| logInjectionBad.js:43:39:43:46 | username | logInjectionBad.js:43:18:43:47 | colors. ... ername) |
79-
| logInjectionBad.js:43:39:43:46 | username | logInjectionBad.js:43:18:43:47 | colors. ... ername) |
80-
| logInjectionBad.js:44:27:44:56 | colors. ... ername) | logInjectionBad.js:44:18:44:61 | wrapAns ... e), 20) |
81-
| logInjectionBad.js:44:27:44:56 | colors. ... ername) | logInjectionBad.js:44:18:44:61 | wrapAns ... e), 20) |
82-
| logInjectionBad.js:44:48:44:55 | username | logInjectionBad.js:44:27:44:56 | colors. ... ername) |
71+
| logInjectionBad.js:40:9:40:36 | q | logInjectionBad.js:41:20:41:20 | q |
72+
| logInjectionBad.js:40:13:40:36 | url.par ... , true) | logInjectionBad.js:40:9:40:36 | q |
73+
| logInjectionBad.js:40:23:40:29 | req.url | logInjectionBad.js:40:13:40:36 | url.par ... , true) |
74+
| logInjectionBad.js:40:23:40:29 | req.url | logInjectionBad.js:40:13:40:36 | url.par ... , true) |
75+
| logInjectionBad.js:41:9:41:35 | username | logInjectionBad.js:43:46:43:53 | username |
76+
| logInjectionBad.js:41:9:41:35 | username | logInjectionBad.js:44:39:44:46 | username |
77+
| logInjectionBad.js:41:9:41:35 | username | logInjectionBad.js:45:48:45:55 | username |
78+
| logInjectionBad.js:41:9:41:35 | username | logInjectionBad.js:46:37:46:44 | username |
79+
| logInjectionBad.js:41:20:41:20 | q | logInjectionBad.js:41:20:41:26 | q.query |
80+
| logInjectionBad.js:41:20:41:26 | q.query | logInjectionBad.js:41:20:41:35 | q.query.username |
81+
| logInjectionBad.js:41:20:41:35 | q.query.username | logInjectionBad.js:41:9:41:35 | username |
82+
| logInjectionBad.js:43:46:43:53 | username | logInjectionBad.js:43:18:43:54 | ansiCol ... ername) |
83+
| logInjectionBad.js:43:46:43:53 | username | logInjectionBad.js:43:18:43:54 | ansiCol ... ername) |
84+
| logInjectionBad.js:44:39:44:46 | username | logInjectionBad.js:44:18:44:47 | colors. ... ername) |
85+
| logInjectionBad.js:44:39:44:46 | username | logInjectionBad.js:44:18:44:47 | colors. ... ername) |
86+
| logInjectionBad.js:45:27:45:56 | colors. ... ername) | logInjectionBad.js:45:18:45:61 | wrapAns ... e), 20) |
87+
| logInjectionBad.js:45:27:45:56 | colors. ... ername) | logInjectionBad.js:45:18:45:61 | wrapAns ... e), 20) |
88+
| logInjectionBad.js:45:48:45:55 | username | logInjectionBad.js:45:27:45:56 | colors. ... ername) |
89+
| logInjectionBad.js:46:27:46:46 | bold(blue(username)) | logInjectionBad.js:46:17:46:47 | underli ... name))) |
90+
| logInjectionBad.js:46:27:46:46 | bold(blue(username)) | logInjectionBad.js:46:17:46:47 | underli ... name))) |
91+
| logInjectionBad.js:46:32:46:45 | blue(username) | logInjectionBad.js:46:27:46:46 | bold(blue(username)) |
92+
| logInjectionBad.js:46:37:46:44 | username | logInjectionBad.js:46:32:46:45 | blue(username) |
8393
#select
8494
| 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 |
8595
| 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 |
8696
| 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 |
8797
| 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 |
8898
| 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 |
89-
| logInjectionBad.js:42:18:42:54 | ansiCol ... ername) | logInjectionBad.js:39:23:39:29 | req.url | logInjectionBad.js:42:18:42:54 | ansiCol ... ername) | $@ flows to log entry. | logInjectionBad.js:39:23:39:29 | req.url | User-provided value |
90-
| logInjectionBad.js:43:18:43:47 | colors. ... ername) | logInjectionBad.js:39:23:39:29 | req.url | logInjectionBad.js:43:18:43:47 | colors. ... ername) | $@ flows to log entry. | logInjectionBad.js:39:23:39:29 | req.url | User-provided value |
91-
| logInjectionBad.js:44:18:44:61 | wrapAns ... e), 20) | logInjectionBad.js:39:23:39:29 | req.url | logInjectionBad.js:44:18:44:61 | wrapAns ... e), 20) | $@ flows to log entry. | logInjectionBad.js:39:23:39:29 | req.url | User-provided value |
99+
| logInjectionBad.js:43:18:43:54 | ansiCol ... ername) | logInjectionBad.js:40:23:40:29 | req.url | logInjectionBad.js:43:18:43:54 | ansiCol ... ername) | $@ flows to log entry. | logInjectionBad.js:40:23:40:29 | req.url | User-provided value |
100+
| logInjectionBad.js:44:18:44:47 | colors. ... ername) | logInjectionBad.js:40:23:40:29 | req.url | logInjectionBad.js:44:18:44:47 | colors. ... ername) | $@ flows to log entry. | logInjectionBad.js:40:23:40:29 | req.url | User-provided value |
101+
| logInjectionBad.js:45:18:45:61 | wrapAns ... e), 20) | logInjectionBad.js:40:23:40:29 | req.url | logInjectionBad.js:45:18:45:61 | wrapAns ... e), 20) | $@ flows to log entry. | logInjectionBad.js:40:23:40:29 | req.url | User-provided value |
102+
| logInjectionBad.js:46:17:46:47 | underli ... name))) | logInjectionBad.js:40:23:40:29 | req.url | logInjectionBad.js:46:17:46:47 | underli ... name))) | $@ flows to log entry. | logInjectionBad.js:40:23:40: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
@@ -34,6 +34,7 @@ const server = http.createServer((req, res) => {
3434
const ansiColors = require('ansi-colors');
3535
const colors = require('colors');
3636
import wrapAnsi from 'wrap-ansi';
37+
import { blue, bold, underline } from "colorette"
3738

3839
const server2 = http.createServer((req, res) => {
3940
let q = url.parse(req.url, true);
@@ -42,4 +43,5 @@ const server2 = http.createServer((req, res) => {
4243
console.info(ansiColors.yellow.underline(username)); // NOT OK
4344
console.info(colors.red.underline(username)); // NOT OK
4445
console.info(wrapAnsi(colors.red.underline(username), 20)); // NOT OK
46+
console.log(underline(bold(blue(username)))); // NOT OK
4547
});

0 commit comments

Comments
 (0)