Skip to content

Commit 8b91914

Browse files
erik-krogherik-krogh
authored
Merge pull request #16417 from erik-krogh/dummyPass
JS: Remove some FPs from the hardcoded-credentials query
2 parents 99940a6 + 39a8b49 commit 8b91914

File tree

5 files changed

+43
-15
lines changed

5 files changed

+43
-15
lines changed

‎javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ module NodeJSLib {
10031003
exists(ClientRequestLoginCallback callback | this = callback.getACall().getArgument(0))
10041004
}
10051005

1006-
override string getCredentialsKind() { result = "Node.js http(s) client login username" }
1006+
override string getCredentialsKind() { result = "user name" }
10071007
}
10081008

10091009
/**
@@ -1014,7 +1014,7 @@ module NodeJSLib {
10141014
exists(ClientRequestLoginCallback callback | this = callback.getACall().getArgument(1))
10151015
}
10161016

1017-
override string getCredentialsKind() { result = "Node.js http(s) client login password" }
1017+
override string getCredentialsKind() { result = "password" }
10181018
}
10191019

10201020
/**

‎javascript/ql/src/Security/CWE-798/HardcodedCredentials.qhelp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
If possible, store configuration files including credential data separately from the source code,
2020
in a secure location with restricted access.
2121
</p>
22+
<p>
23+
If the credentials are a placeholder value, make sure the value is obviously a placeholder by
24+
using a name such as <code>"SampleToken"</code> or <code>"MyPassword"</code>.
25+
</p>
2226
</recommendation>
2327

2428
<example>

‎javascript/ql/src/Security/CWE-798/HardcodedCredentials.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ where
3030
// exclude dummy passwords and templates
3131
not (
3232
sink.getNode().(Sink).(DefaultCredentialsSink).getKind() =
33-
["password", "credentials", "token"] and
33+
["password", "credentials", "token", "key"] and
3434
PasswordHeuristics::isDummyPassword(val)
3535
or
3636
sink.getNode().(Sink).getKind() = "authorization header" and

‎javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.expected

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,12 @@ nodes
153153
| HardcodedCredentials.js:135:41:135:50 | "hgfedcba" |
154154
| HardcodedCredentials.js:135:41:135:50 | "hgfedcba" |
155155
| HardcodedCredentials.js:135:41:135:50 | "hgfedcba" |
156-
| HardcodedCredentials.js:160:38:160:48 | "change_me" |
157-
| HardcodedCredentials.js:160:38:160:48 | "change_me" |
158-
| HardcodedCredentials.js:160:38:160:48 | "change_me" |
159-
| HardcodedCredentials.js:161:41:161:51 | 'change_me' |
160-
| HardcodedCredentials.js:161:41:161:51 | 'change_me' |
161-
| HardcodedCredentials.js:161:41:161:51 | 'change_me' |
156+
| HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" |
157+
| HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" |
158+
| HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" |
159+
| HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' |
160+
| HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' |
161+
| HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' |
162162
| HardcodedCredentials.js:164:35:164:45 | 'change_me' |
163163
| HardcodedCredentials.js:164:35:164:45 | 'change_me' |
164164
| HardcodedCredentials.js:164:35:164:45 | 'change_me' |
@@ -271,6 +271,18 @@ nodes
271271
| HardcodedCredentials.js:295:37:295:66 | `Basic ... 000001` |
272272
| HardcodedCredentials.js:295:37:295:66 | `Basic ... 000001` |
273273
| HardcodedCredentials.js:295:37:295:66 | `Basic ... 000001` |
274+
| HardcodedCredentials.js:299:44:299:52 | 'mytoken' |
275+
| HardcodedCredentials.js:299:44:299:52 | 'mytoken' |
276+
| HardcodedCredentials.js:299:44:299:52 | 'mytoken' |
277+
| HardcodedCredentials.js:300:44:300:56 | 'SampleToken' |
278+
| HardcodedCredentials.js:300:44:300:56 | 'SampleToken' |
279+
| HardcodedCredentials.js:300:44:300:56 | 'SampleToken' |
280+
| HardcodedCredentials.js:301:44:301:55 | 'MyPassword' |
281+
| HardcodedCredentials.js:301:44:301:55 | 'MyPassword' |
282+
| HardcodedCredentials.js:301:44:301:55 | 'MyPassword' |
283+
| HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' |
284+
| HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' |
285+
| HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' |
274286
edges
275287
| HardcodedCredentials.js:5:15:5:22 | 'dbuser' | HardcodedCredentials.js:5:15:5:22 | 'dbuser' |
276288
| HardcodedCredentials.js:8:19:8:28 | 'hgfedcba' | HardcodedCredentials.js:8:19:8:28 | 'hgfedcba' |
@@ -326,8 +338,8 @@ edges
326338
| HardcodedCredentials.js:130:44:130:53 | 'hgfedcba' | HardcodedCredentials.js:130:44:130:53 | 'hgfedcba' |
327339
| HardcodedCredentials.js:131:52:131:61 | 'hgfedcba' | HardcodedCredentials.js:131:52:131:61 | 'hgfedcba' |
328340
| HardcodedCredentials.js:135:41:135:50 | "hgfedcba" | HardcodedCredentials.js:135:41:135:50 | "hgfedcba" |
329-
| HardcodedCredentials.js:160:38:160:48 | "change_me" | HardcodedCredentials.js:160:38:160:48 | "change_me" |
330-
| HardcodedCredentials.js:161:41:161:51 | 'change_me' | HardcodedCredentials.js:161:41:161:51 | 'change_me' |
341+
| HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" | HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" |
342+
| HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' | HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' |
331343
| HardcodedCredentials.js:164:35:164:45 | 'change_me' | HardcodedCredentials.js:164:35:164:45 | 'change_me' |
332344
| HardcodedCredentials.js:171:11:171:25 | USER | HardcodedCredentials.js:173:35:173:38 | USER |
333345
| HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:171:11:171:25 | USER |
@@ -399,6 +411,10 @@ edges
399411
| HardcodedCredentials.js:293:37:293:65 | `Basic ... xxxxxx` | HardcodedCredentials.js:293:37:293:65 | `Basic ... xxxxxx` |
400412
| HardcodedCredentials.js:294:37:294:70 | `Basic ... gbbbbb` | HardcodedCredentials.js:294:37:294:70 | `Basic ... gbbbbb` |
401413
| HardcodedCredentials.js:295:37:295:66 | `Basic ... 000001` | HardcodedCredentials.js:295:37:295:66 | `Basic ... 000001` |
414+
| HardcodedCredentials.js:299:44:299:52 | 'mytoken' | HardcodedCredentials.js:299:44:299:52 | 'mytoken' |
415+
| HardcodedCredentials.js:300:44:300:56 | 'SampleToken' | HardcodedCredentials.js:300:44:300:56 | 'SampleToken' |
416+
| HardcodedCredentials.js:301:44:301:55 | 'MyPassword' | HardcodedCredentials.js:301:44:301:55 | 'MyPassword' |
417+
| HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' | HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' |
402418
#select
403419
| HardcodedCredentials.js:5:15:5:22 | 'dbuser' | HardcodedCredentials.js:5:15:5:22 | 'dbuser' | HardcodedCredentials.js:5:15:5:22 | 'dbuser' | The hard-coded value "dbuser" is used as $@. | HardcodedCredentials.js:5:15:5:22 | 'dbuser' | user name |
404420
| HardcodedCredentials.js:8:19:8:28 | 'hgfedcba' | HardcodedCredentials.js:8:19:8:28 | 'hgfedcba' | HardcodedCredentials.js:8:19:8:28 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:8:19:8:28 | 'hgfedcba' | password |
@@ -448,8 +464,8 @@ edges
448464
| HardcodedCredentials.js:130:44:130:53 | 'hgfedcba' | HardcodedCredentials.js:130:44:130:53 | 'hgfedcba' | HardcodedCredentials.js:130:44:130:53 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:130:44:130:53 | 'hgfedcba' | key |
449465
| HardcodedCredentials.js:131:52:131:61 | 'hgfedcba' | HardcodedCredentials.js:131:52:131:61 | 'hgfedcba' | HardcodedCredentials.js:131:52:131:61 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:131:52:131:61 | 'hgfedcba' | key |
450466
| HardcodedCredentials.js:135:41:135:50 | "hgfedcba" | HardcodedCredentials.js:135:41:135:50 | "hgfedcba" | HardcodedCredentials.js:135:41:135:50 | "hgfedcba" | The hard-coded value "hgfedcba" is used as $@. | HardcodedCredentials.js:135:41:135:50 | "hgfedcba" | key |
451-
| HardcodedCredentials.js:160:38:160:48 | "change_me" | HardcodedCredentials.js:160:38:160:48 | "change_me" | HardcodedCredentials.js:160:38:160:48 | "change_me" | The hard-coded value "change_me" is used as $@. | HardcodedCredentials.js:160:38:160:48 | "change_me" | key |
452-
| HardcodedCredentials.js:161:41:161:51 | 'change_me' | HardcodedCredentials.js:161:41:161:51 | 'change_me' | HardcodedCredentials.js:161:41:161:51 | 'change_me' | The hard-coded value "change_me" is used as $@. | HardcodedCredentials.js:161:41:161:51 | 'change_me' | key |
467+
| HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" | HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" | HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" | The hard-coded value "oiuneawrgiyubaegr" is used as $@. | HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" | key |
468+
| HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' | HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' | HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' | The hard-coded value "oiuneawrgiyubaegr" is used as $@. | HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' | key |
453469
| HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:178:30:178:44 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:178:30:178:44 | `Basic ${AUTH}` | authorization header |
454470
| HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:188:30:188:44 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:188:30:188:44 | `Basic ${AUTH}` | authorization header |
455471
| HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:195:37:195:51 | `Basic ${AUTH}` | The hard-coded value "sdsdag" is used as $@. | HardcodedCredentials.js:195:37:195:51 | `Basic ${AUTH}` | authorization header |
@@ -464,3 +480,4 @@ edges
464480
| HardcodedCredentials.js:245:22:245:44 | "myHard ... ateKey" | HardcodedCredentials.js:245:22:245:44 | "myHard ... ateKey" | HardcodedCredentials.js:246:42:246:51 | privateKey | The hard-coded value "myHardCodedPrivateKey" is used as $@. | HardcodedCredentials.js:246:42:246:51 | privateKey | key |
465481
| HardcodedCredentials.js:292:37:292:57 | `Basic ... sdsdag` | HardcodedCredentials.js:292:37:292:57 | `Basic ... sdsdag` | HardcodedCredentials.js:292:37:292:57 | `Basic ... sdsdag` | The hard-coded value "Basic sdsdag:sdsdag" is used as $@. | HardcodedCredentials.js:292:37:292:57 | `Basic ... sdsdag` | authorization header |
466482
| HardcodedCredentials.js:294:37:294:70 | `Basic ... gbbbbb` | HardcodedCredentials.js:294:37:294:70 | `Basic ... gbbbbb` | HardcodedCredentials.js:294:37:294:70 | `Basic ... gbbbbb` | The hard-coded value "Basic sdsdag:aaaiuogrweuibgbbbbb" is used as $@. | HardcodedCredentials.js:294:37:294:70 | `Basic ... gbbbbb` | authorization header |
483+
| HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' | HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' | HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' | The hard-coded value "iubfewiaaweiybgaeuybgera" is used as $@. | HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' | key |

‎javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@
157157
})();
158158

159159
(function(){
160-
require("cookie-session")({ secret: "change_me" }); // NOT OK
161-
require('crypto').createHmac('sha256', 'change_me'); // NOT OK
160+
require("cookie-session")({ secret: "oiuneawrgiyubaegr" }); // NOT OK
161+
require('crypto').createHmac('sha256', 'oiuneawrgiyubaegr'); // NOT OK
162162

163163
var basicAuth = require('express-basic-auth');
164164
basicAuth({users: { [adminName]: 'change_me' }}); // OK
@@ -294,3 +294,10 @@
294294
headers.append("Authorization", `Basic sdsdag:aaaiuogrweuibgbbbbb`); // NOT OK
295295
headers.append("Authorization", `Basic sdsdag:000000000000001`); // OK
296296
});
297+
298+
(function () {
299+
require('crypto').createHmac('sha256', 'mytoken'); // OK
300+
require('crypto').createHmac('sha256', 'SampleToken'); // OK
301+
require('crypto').createHmac('sha256', 'MyPassword'); // OK
302+
require('crypto').createHmac('sha256', 'iubfewiaaweiybgaeuybgera'); // NOT OK
303+
})();

0 commit comments

Comments
 (0)