Skip to content

Commit 2a4d683

Browse files
committed
JS: An array of constants should be considered "filtered"
1 parent 602dae0 commit 2a4d683

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

javascript/ql/lib/semmle/javascript/security/dataflow/CleartextLoggingCustomizations.qll

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,24 @@ module CleartextLogging {
247247
reduceCall.getABoundCallbackParameter(0, 1) = name
248248
|
249249
reduceCall.getReceiver+().(DataFlow::MethodCallNode).getMethodName() = "filter"
250+
or
251+
isArrayOfConstants(reduceCall.getReceiver+())
250252
)
251253
or
252254
exists(StringOps::RegExpTest test | test.getStringOperand().getALocalSource() = name)
253255
or
254256
exists(MembershipCandidate test | test.getAMemberNode().getALocalSource() = name)
255257
}
258+
259+
private predicate isArrayOfConstants(DataFlow::ArrayCreationNode array) {
260+
forex(DataFlow::Node node |
261+
node =
262+
[
263+
array.getAnElement(), array.getAPropertyWrite().getRhs(),
264+
array.getAMethodCall("push").getArgument(0)
265+
]
266+
|
267+
exists(node.getStringValue())
268+
)
269+
}
256270
}

javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.expected

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
| build-leaks.js:4:39:6:1 | {\\n " ... leak]\\n} | build-leaks.js:5:35:5:45 | process.env | build-leaks.js:4:39:6:1 | {\\n " ... leak]\\n} | This creates a build artifact that depends on $@. | build-leaks.js:5:35:5:45 | process.env | sensitive data returned byprocess environment |
33
| build-leaks.js:34:26:34:57 | getEnv( ... ngified | build-leaks.js:15:24:15:34 | process.env | build-leaks.js:34:26:34:57 | getEnv( ... ngified | This creates a build artifact that depends on $@. | build-leaks.js:15:24:15:34 | process.env | sensitive data returned byprocess environment |
44
| build-leaks.js:41:43:41:86 | { "proc ... y(pw) } | build-leaks.js:40:14:40:60 | url.par ... assword | build-leaks.js:41:43:41:86 | { "proc ... y(pw) } | This creates a build artifact that depends on $@. | build-leaks.js:40:14:40:60 | url.par ... assword | sensitive data returned byan access to current_password |
5-
| build-leaks.js:102:30:102:46 | getFilteredEnv4() | build-leaks.js:97:43:97:53 | process.env | build-leaks.js:102:30:102:46 | getFilteredEnv4() | This creates a build artifact that depends on $@. | build-leaks.js:97:43:97:53 | process.env | sensitive data returned byprocess environment |
65
edges
76
| build-leaks.js:5:20:5:46 | JSON.st ... ss.env) | build-leaks.js:4:39:6:1 | {\\n " ... leak]\\n} | provenance | |
87
| build-leaks.js:5:35:5:45 | process.env | build-leaks.js:5:20:5:46 | JSON.st ... ss.env) | provenance | |
@@ -28,11 +27,6 @@ edges
2827
| build-leaks.js:40:14:40:60 | url.par ... assword | build-leaks.js:40:9:40:10 | pw | provenance | |
2928
| build-leaks.js:41:67:41:84 | JSON.stringify(pw) | build-leaks.js:41:43:41:86 | { "proc ... y(pw) } | provenance | |
3029
| build-leaks.js:41:82:41:83 | pw | build-leaks.js:41:67:41:84 | JSON.stringify(pw) | provenance | |
31-
| build-leaks.js:95:16:99:18 | ["FOO", ... }, {}) | build-leaks.js:102:30:102:46 | getFilteredEnv4() | provenance | |
32-
| build-leaks.js:97:17:97:19 | [post update] env | build-leaks.js:98:24:98:26 | env | provenance | |
33-
| build-leaks.js:97:43:97:53 | process.env | build-leaks.js:97:17:97:19 | [post update] env | provenance | Config |
34-
| build-leaks.js:98:24:98:26 | env | build-leaks.js:22:49:22:51 | env | provenance | |
35-
| build-leaks.js:98:24:98:26 | env | build-leaks.js:95:16:99:18 | ["FOO", ... }, {}) | provenance | |
3630
nodes
3731
| build-leaks.js:4:39:6:1 | {\\n " ... leak]\\n} | semmle.label | {\\n " ... leak]\\n} |
3832
| build-leaks.js:5:20:5:46 | JSON.st ... ss.env) | semmle.label | JSON.st ... ss.env) |
@@ -60,11 +54,6 @@ nodes
6054
| build-leaks.js:41:43:41:86 | { "proc ... y(pw) } | semmle.label | { "proc ... y(pw) } |
6155
| build-leaks.js:41:67:41:84 | JSON.stringify(pw) | semmle.label | JSON.stringify(pw) |
6256
| build-leaks.js:41:82:41:83 | pw | semmle.label | pw |
63-
| build-leaks.js:95:16:99:18 | ["FOO", ... }, {}) | semmle.label | ["FOO", ... }, {}) |
64-
| build-leaks.js:97:17:97:19 | [post update] env | semmle.label | [post update] env |
65-
| build-leaks.js:97:43:97:53 | process.env | semmle.label | process.env |
66-
| build-leaks.js:98:24:98:26 | env | semmle.label | env |
67-
| build-leaks.js:102:30:102:46 | getFilteredEnv4() | semmle.label | getFilteredEnv4() |
6857
subpaths
6958
| build-leaks.js:22:36:22:38 | raw | build-leaks.js:22:49:22:51 | env | build-leaks.js:24:20:24:22 | env | build-leaks.js:22:24:25:14 | Object. ... }, {}) |
7059
| build-leaks.js:22:36:22:38 | raw | build-leaks.js:23:39:23:41 | raw | build-leaks.js:24:20:24:22 | env | build-leaks.js:22:24:25:14 | Object. ... }, {}) |

javascript/ql/test/query-tests/Security/CWE-312/build-leaks.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ var server = https.createServer(function (req, res) {
9494
function getFilteredEnv4() {
9595
return ["FOO", "BAR", "BAZ"]
9696
.reduce((env, key) => {
97-
env[key] = JSON.stringify(process.env[key]); // $ SPURIOUS: Source[js/build-artifact-leak]
97+
env[key] = JSON.stringify(process.env[key]);
9898
return env;
9999
}, {});
100100
}
101101

102-
new webpack.DefinePlugin(getFilteredEnv4()); // $ SPURIOUS: Alert[js/build-artifact-leak]
102+
new webpack.DefinePlugin(getFilteredEnv4());
103103
})();

0 commit comments

Comments
 (0)