Skip to content

Commit 626a653

Browse files
erik-krogherik-krogh
committed
add taint step through the colors library
1 parent a21ebbb commit 626a653

File tree

4 files changed

+48
-23
lines changed

4 files changed

+48
-23
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
lgtm,codescanning
22
* The dataflow libraries now model dataflow through console styling libraries.
33
Affected packages are
4-
[ansi-colors](https://npmjs.com/package/ansi-colors)
4+
[ansi-colors](https://npmjs.com/package/ansi-colors),
5+
[colors](https://npmjs.com/package/colors)

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,3 +213,18 @@ class AnsiColorsStep extends TaintTracking::SharedTaintStep {
213213
)
214214
}
215215
}
216+
217+
/**
218+
* A step through the [`colors`](https://npmjs.org/package/colors) library.
219+
* This step ignores the `String.prototype` modifying part of the `colors` library.
220+
*/
221+
class ColorsStep extends TaintTracking::SharedTaintStep {
222+
override predicate stringManipulationStep(DataFlow::Node pred, DataFlow::Node succ) {
223+
exists(API::CallNode call |
224+
call = API::moduleImport(["colors", "colors/safe"]).getAMember*().getACall()
225+
|
226+
pred = call.getArgument(0) and
227+
succ = call
228+
)
229+
}
230+
}

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

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,20 @@ 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:37:9:37:36 | q |
26-
| logInjectionBad.js:37:13:37:36 | url.par ... , true) |
27-
| logInjectionBad.js:37:23:37:29 | req.url |
28-
| logInjectionBad.js:37:23:37:29 | req.url |
29-
| logInjectionBad.js:38:9:38:35 | username |
30-
| logInjectionBad.js:38:20:38:20 | q |
31-
| logInjectionBad.js:38:20:38:26 | q.query |
32-
| logInjectionBad.js:38:20:38:35 | q.query.username |
33-
| logInjectionBad.js:40:18:40:54 | ansiCol ... ername) |
34-
| logInjectionBad.js:40:18:40:54 | ansiCol ... ername) |
35-
| logInjectionBad.js:40:46:40:53 | username |
25+
| logInjectionBad.js:38:9:38:36 | q |
26+
| logInjectionBad.js:38:13:38:36 | url.par ... , true) |
27+
| logInjectionBad.js:38:23:38:29 | req.url |
28+
| logInjectionBad.js:38:23:38:29 | req.url |
29+
| logInjectionBad.js:39:9:39:35 | username |
30+
| logInjectionBad.js:39:20:39:20 | q |
31+
| logInjectionBad.js:39:20:39:26 | q.query |
32+
| logInjectionBad.js:39:20:39:35 | q.query.username |
33+
| logInjectionBad.js:41:18:41:54 | ansiCol ... ername) |
34+
| logInjectionBad.js:41:18:41:54 | ansiCol ... ername) |
35+
| logInjectionBad.js:41:46:41:53 | username |
36+
| logInjectionBad.js:42:18:42:47 | colors. ... ername) |
37+
| logInjectionBad.js:42:18:42:47 | colors. ... ername) |
38+
| logInjectionBad.js:42:39:42:46 | username |
3639
edges
3740
| logInjectionBad.js:19:9:19:36 | q | logInjectionBad.js:20:20:20:20 | q |
3841
| logInjectionBad.js:19:13:19:36 | url.par ... , true) | logInjectionBad.js:19:9:19:36 | q |
@@ -56,20 +59,24 @@ edges
5659
| logInjectionBad.js:29:14:29:18 | error | logInjectionBad.js:30:42:30:46 | error |
5760
| logInjectionBad.js:30:42:30:46 | error | logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` |
5861
| logInjectionBad.js:30:42:30:46 | error | logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` |
59-
| logInjectionBad.js:37:9:37:36 | q | logInjectionBad.js:38:20:38:20 | q |
60-
| logInjectionBad.js:37:13:37:36 | url.par ... , true) | logInjectionBad.js:37:9:37:36 | q |
61-
| logInjectionBad.js:37:23:37:29 | req.url | logInjectionBad.js:37:13:37:36 | url.par ... , true) |
62-
| logInjectionBad.js:37:23:37:29 | req.url | logInjectionBad.js:37:13:37:36 | url.par ... , true) |
63-
| logInjectionBad.js:38:9:38:35 | username | logInjectionBad.js:40:46:40:53 | username |
64-
| logInjectionBad.js:38:20:38:20 | q | logInjectionBad.js:38:20:38:26 | q.query |
65-
| logInjectionBad.js:38:20:38:26 | q.query | logInjectionBad.js:38:20:38:35 | q.query.username |
66-
| logInjectionBad.js:38:20:38:35 | q.query.username | logInjectionBad.js:38:9:38:35 | username |
67-
| logInjectionBad.js:40:46:40:53 | username | logInjectionBad.js:40:18:40:54 | ansiCol ... ername) |
68-
| logInjectionBad.js:40:46:40:53 | username | logInjectionBad.js:40:18:40:54 | ansiCol ... ername) |
62+
| logInjectionBad.js:38:9:38:36 | q | logInjectionBad.js:39:20:39:20 | q |
63+
| logInjectionBad.js:38:13:38:36 | url.par ... , true) | logInjectionBad.js:38:9:38:36 | q |
64+
| logInjectionBad.js:38:23:38:29 | req.url | logInjectionBad.js:38:13:38:36 | url.par ... , true) |
65+
| logInjectionBad.js:38:23:38:29 | req.url | logInjectionBad.js:38:13:38:36 | url.par ... , true) |
66+
| logInjectionBad.js:39:9:39:35 | username | logInjectionBad.js:41:46:41:53 | username |
67+
| logInjectionBad.js:39:9:39:35 | username | logInjectionBad.js:42:39:42:46 | username |
68+
| logInjectionBad.js:39:20:39:20 | q | logInjectionBad.js:39:20:39:26 | q.query |
69+
| logInjectionBad.js:39:20:39:26 | q.query | logInjectionBad.js:39:20:39:35 | q.query.username |
70+
| logInjectionBad.js:39:20:39:35 | q.query.username | logInjectionBad.js:39:9:39:35 | username |
71+
| logInjectionBad.js:41:46:41:53 | username | logInjectionBad.js:41:18:41:54 | ansiCol ... ername) |
72+
| logInjectionBad.js:41:46:41:53 | username | logInjectionBad.js:41:18:41:54 | ansiCol ... ername) |
73+
| logInjectionBad.js:42:39:42:46 | username | logInjectionBad.js:42:18:42:47 | colors. ... ername) |
74+
| logInjectionBad.js:42:39:42:46 | username | logInjectionBad.js:42:18:42:47 | colors. ... ername) |
6975
#select
7076
| 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 |
7177
| 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 |
7278
| 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 |
7379
| 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 |
7480
| 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 |
75-
| logInjectionBad.js:40:18:40:54 | ansiCol ... ername) | logInjectionBad.js:37:23:37:29 | req.url | logInjectionBad.js:40:18:40:54 | ansiCol ... ername) | $@ flows to log entry. | logInjectionBad.js:37:23:37:29 | req.url | User-provided value |
81+
| logInjectionBad.js:41:18:41:54 | ansiCol ... ername) | logInjectionBad.js:38:23:38:29 | req.url | logInjectionBad.js:41:18:41:54 | ansiCol ... ername) | $@ flows to log entry. | logInjectionBad.js:38:23:38:29 | req.url | User-provided value |
82+
| logInjectionBad.js:42:18:42:47 | colors. ... ername) | logInjectionBad.js:38:23:38:29 | req.url | logInjectionBad.js:42:18:42:47 | colors. ... ername) | $@ flows to log entry. | logInjectionBad.js:38:23:38: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
@@ -32,10 +32,12 @@ const server = http.createServer((req, res) => {
3232
});
3333

3434
const ansiColors = require('ansi-colors');
35+
const colors = require('colors');
3536

3637
const server2 = http.createServer((req, res) => {
3738
let q = url.parse(req.url, true);
3839
let username = q.query.username;
3940

4041
console.info(ansiColors.yellow.underline(username)); // NOT OK
42+
console.info(colors.red.underline(username)); // NOT OK
4143
});

0 commit comments

Comments
 (0)