hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-05 13:45:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11769 from erik-krogh/moreSan

Browse Source 
JS: Sanitizer for `sanitizer(x) === true`
This commit is contained in:
Erik Krogh Kristensen
2023-02-27 15:48:34 +01:00
committed by GitHub
parent 332b759873 943bdeca6d
commit 927c322b7b
5 changed files with 192 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/UnsafeShellCommandConstruction.expected
View File

@@ -301,6 +301,24 @@ nodes
| lib/lib.js:562:26:562:29 | name |
| lib/lib.js:566:26:566:29 | name |
| lib/lib.js:566:26:566:29 | name |
| lib/lib.js:572:41:572:44 | name |
| lib/lib.js:572:41:572:44 | name |
| lib/lib.js:573:22:573:25 | name |
| lib/lib.js:573:22:573:25 | name |
| lib/lib.js:579:25:579:28 | name |
| lib/lib.js:579:25:579:28 | name |
| lib/lib.js:590:29:590:32 | name |
| lib/lib.js:590:29:590:32 | name |
| lib/lib.js:593:25:593:28 | name |
| lib/lib.js:593:25:593:28 | name |
| lib/lib.js:608:42:608:45 | name |
| lib/lib.js:608:42:608:45 | name |
| lib/lib.js:609:22:609:25 | name |
| lib/lib.js:609:22:609:25 | name |
| lib/lib.js:626:29:626:32 | name |
| lib/lib.js:626:29:626:32 | name |
| lib/lib.js:629:25:629:28 | name |
| lib/lib.js:629:25:629:28 | name |
| lib/subLib2/compiled-file.ts:3:26:3:29 | name |
| lib/subLib2/compiled-file.ts:3:26:3:29 | name |
| lib/subLib2/compiled-file.ts:4:25:4:28 | name |
@@ -703,6 +721,34 @@ edges
| lib/lib.js:558:41:558:44 | name | lib/lib.js:566:26:566:29 | name |
| lib/lib.js:558:41:558:44 | name | lib/lib.js:566:26:566:29 | name |
| lib/lib.js:558:41:558:44 | name | lib/lib.js:566:26:566:29 | name |
| lib/lib.js:572:41:572:44 | name | lib/lib.js:573:22:573:25 | name |
| lib/lib.js:572:41:572:44 | name | lib/lib.js:573:22:573:25 | name |
| lib/lib.js:572:41:572:44 | name | lib/lib.js:573:22:573:25 | name |
| lib/lib.js:572:41:572:44 | name | lib/lib.js:573:22:573:25 | name |
| lib/lib.js:572:41:572:44 | name | lib/lib.js:579:25:579:28 | name |
| lib/lib.js:572:41:572:44 | name | lib/lib.js:579:25:579:28 | name |
| lib/lib.js:572:41:572:44 | name | lib/lib.js:579:25:579:28 | name |
| lib/lib.js:572:41:572:44 | name | lib/lib.js:579:25:579:28 | name |
| lib/lib.js:572:41:572:44 | name | lib/lib.js:590:29:590:32 | name |
| lib/lib.js:572:41:572:44 | name | lib/lib.js:590:29:590:32 | name |
| lib/lib.js:572:41:572:44 | name | lib/lib.js:590:29:590:32 | name |
| lib/lib.js:572:41:572:44 | name | lib/lib.js:590:29:590:32 | name |
| lib/lib.js:572:41:572:44 | name | lib/lib.js:593:25:593:28 | name |
| lib/lib.js:572:41:572:44 | name | lib/lib.js:593:25:593:28 | name |
| lib/lib.js:572:41:572:44 | name | lib/lib.js:593:25:593:28 | name |
| lib/lib.js:572:41:572:44 | name | lib/lib.js:593:25:593:28 | name |
| lib/lib.js:608:42:608:45 | name | lib/lib.js:609:22:609:25 | name |
| lib/lib.js:608:42:608:45 | name | lib/lib.js:609:22:609:25 | name |
| lib/lib.js:608:42:608:45 | name | lib/lib.js:609:22:609:25 | name |
| lib/lib.js:608:42:608:45 | name | lib/lib.js:609:22:609:25 | name |
| lib/lib.js:608:42:608:45 | name | lib/lib.js:626:29:626:32 | name |
| lib/lib.js:608:42:608:45 | name | lib/lib.js:626:29:626:32 | name |
| lib/lib.js:608:42:608:45 | name | lib/lib.js:626:29:626:32 | name |
| lib/lib.js:608:42:608:45 | name | lib/lib.js:626:29:626:32 | name |
| lib/lib.js:608:42:608:45 | name | lib/lib.js:629:25:629:28 | name |
| lib/lib.js:608:42:608:45 | name | lib/lib.js:629:25:629:28 | name |
| lib/lib.js:608:42:608:45 | name | lib/lib.js:629:25:629:28 | name |
| lib/lib.js:608:42:608:45 | name | lib/lib.js:629:25:629:28 | name |
| lib/subLib2/compiled-file.ts:3:26:3:29 | name | lib/subLib2/compiled-file.ts:4:25:4:28 | name |
| lib/subLib2/compiled-file.ts:3:26:3:29 | name | lib/subLib2/compiled-file.ts:4:25:4:28 | name |
| lib/subLib2/compiled-file.ts:3:26:3:29 | name | lib/subLib2/compiled-file.ts:4:25:4:28 | name |
@@ -826,6 +872,13 @@ edges
| lib/lib.js:560:14:560:29 | "rm -rf " + name | lib/lib.js:558:41:558:44 | name | lib/lib.js:560:26:560:29 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:558:41:558:44 | name | library input | lib/lib.js:560:9:560:30 | exec("r ... + name) | shell command |
| lib/lib.js:562:14:562:29 | "rm -rf " + name | lib/lib.js:558:41:558:44 | name | lib/lib.js:562:26:562:29 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:558:41:558:44 | name | library input | lib/lib.js:562:9:562:30 | exec("r ... + name) | shell command |
| lib/lib.js:566:14:566:29 | "rm -rf " + name | lib/lib.js:558:41:558:44 | name | lib/lib.js:566:26:566:29 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:558:41:558:44 | name | library input | lib/lib.js:566:9:566:30 | exec("r ... + name) | shell command |
| lib/lib.js:573:10:573:25 | "rm -rf " + name | lib/lib.js:572:41:572:44 | name | lib/lib.js:573:22:573:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:572:41:572:44 | name | library input | lib/lib.js:573:2:573:26 | cp.exec ... + name) | shell command |
| lib/lib.js:579:13:579:28 | "rm -rf " + name | lib/lib.js:572:41:572:44 | name | lib/lib.js:579:25:579:28 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:572:41:572:44 | name | library input | lib/lib.js:579:5:579:29 | cp.exec ... + name) | shell command |
| lib/lib.js:590:17:590:32 | "rm -rf " + name | lib/lib.js:572:41:572:44 | name | lib/lib.js:590:29:590:32 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:572:41:572:44 | name | library input | lib/lib.js:590:9:590:33 | cp.exec ... + name) | shell command |
| lib/lib.js:593:13:593:28 | "rm -rf " + name | lib/lib.js:572:41:572:44 | name | lib/lib.js:593:25:593:28 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:572:41:572:44 | name | library input | lib/lib.js:593:5:593:29 | cp.exec ... + name) | shell command |
| lib/lib.js:609:10:609:25 | "rm -rf " + name | lib/lib.js:608:42:608:45 | name | lib/lib.js:609:22:609:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:608:42:608:45 | name | library input | lib/lib.js:609:2:609:26 | cp.exec ... + name) | shell command |
| lib/lib.js:626:17:626:32 | "rm -rf " + name | lib/lib.js:608:42:608:45 | name | lib/lib.js:626:29:626:32 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:608:42:608:45 | name | library input | lib/lib.js:626:9:626:33 | cp.exec ... + name) | shell command |
| lib/lib.js:629:13:629:28 | "rm -rf " + name | lib/lib.js:608:42:608:45 | name | lib/lib.js:629:25:629:28 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:608:42:608:45 | name | library input | lib/lib.js:629:5:629:29 | cp.exec ... + name) | shell command |
| lib/subLib2/compiled-file.ts:4:13:4:28 | "rm -rf " + name | lib/subLib2/compiled-file.ts:3:26:3:29 | name | lib/subLib2/compiled-file.ts:4:25:4:28 | name | This string concatenation which depends on $@ is later used in a $@. | lib/subLib2/compiled-file.ts:3:26:3:29 | name | library input | lib/subLib2/compiled-file.ts:4:5:4:29 | cp.exec ... + name) | shell command |
| lib/subLib2/special-file.js:4:10:4:25 | "rm -rf " + name | lib/subLib2/special-file.js:3:28:3:31 | name | lib/subLib2/special-file.js:4:22:4:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/subLib2/special-file.js:3:28:3:31 | name | library input | lib/subLib2/special-file.js:4:2:4:26 | cp.exec ... + name) | shell command |
| lib/subLib3/my-file.ts:4:10:4:25 | "rm -rf " + name | lib/subLib3/my-file.ts:3:28:3:31 | name | lib/subLib3/my-file.ts:4:22:4:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/subLib3/my-file.ts:3:28:3:31 | name | library input | lib/subLib3/my-file.ts:4:2:4:26 | cp.exec ... + name) | shell command |

60
javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/lib.js
View File

@@ -568,3 +568,63 @@ module.exports.badSanitizer = function (name) {
exec("rm -rf " + name); // OK
}
}
module.exports.safeWithBool = function (name) {
cp.exec("rm -rf " + name); // NOT OK
if (isSafeName(name)) {
cp.exec("rm -rf " + name); // OK
}
cp.exec("rm -rf " + name); // NOT OK
if (isSafeName(name) === true) {
cp.exec("rm -rf " + name); // OK
}
if (isSafeName(name) !== false) {
cp.exec("rm -rf " + name); // OK
}
if (isSafeName(name) == false) {
cp.exec("rm -rf " + name); // NOT OK
}
cp.exec("rm -rf " + name); // NOT OK
}
function indirectThing(name) {
return isSafeName(name);
}
function indirectThing2(name) {
return isSafeName(name) === true;
}
function moreIndirect(name) {
return indirectThing2(name) !== false;
}
module.exports.veryIndeirect = function (name) {
cp.exec("rm -rf " + name); // NOT OK
if (indirectThing(name)) {
cp.exec("rm -rf " + name); // OK
}
if (indirectThing2(name)) {
cp.exec("rm -rf " + name); // OK
}
if (moreIndirect(name)) {
cp.exec("rm -rf " + name); // OK
}
if (moreIndirect(name) !== false) {
cp.exec("rm -rf " + name); // OK
} else {
cp.exec("rm -rf " + name); // NOT OK
}
cp.exec("rm -rf " + name); // NOT OK
}

23
javascript/ql/test/query-tests/Security/CWE-089/untyped/koarouter.js Normal file
View File

@@ -0,0 +1,23 @@
const Router = require('koa-router')
const {Sequelize} = require("sequelize");
new Router().get("/hello", (ctx) => {
const { version } = ctx.query;
if (version && validVersion(version) === false) {
throw new Error(`invalid version ${version}`);
}
const conditions = ['1'];
if (version) {
conditions.push(`version = ${version}`)
}
new Sequelize().query(`SELECT * FROM t WHERE ${conditions.join(' and ')}`, null); // OK
});
function validVersion(version) {
const pattern = /^[a-zA-Z0-9]+$/;
return pattern.test(version);
}