hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-21 11:16:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10046 from erik-krogh/protoFunc

Browse Source 
JS: generalize `BarrierGuardFunction`to work on function that have multiple parameters
This commit is contained in:
Erik Krogh Kristensen
2022-08-17 14:50:54 +02:00
committed by GitHub
parent 6e495ba6e5 14cfe2e250
commit bd4947fdbd
3 changed files with 77 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
javascript/ql/lib/semmle/javascript/dataflow/Configuration.qll
View File

@@ -2018,6 +2018,7 @@ private class BarrierGuardFunction extends Function {
BarrierGuardNode guard; BarrierGuardNode guard;
boolean guardOutcome; boolean guardOutcome;
string label; string label;
int paramIndex;
BarrierGuardFunction() { BarrierGuardFunction() {
barrierGuardIsRelevant(guard) and barrierGuardIsRelevant(guard) and
@@ -2041,8 +2042,7 @@ private class BarrierGuardFunction extends Function {
sanitizedParameter.flowsToExpr(e) and sanitizedParameter.flowsToExpr(e) and
barrierGuardBlocksExpr(guard, guardOutcome, e, label) barrierGuardBlocksExpr(guard, guardOutcome, e, label)
) and ) and
getNumParameter() = 1 and sanitizedParameter.getParameter() = getParameter(paramIndex)
sanitizedParameter.getParameter() = getParameter(0)
} }
/** /**
@@ -2050,10 +2050,10 @@ private class BarrierGuardFunction extends Function {
*/ */
predicate isBarrierCall(DataFlow::CallNode call, Expr e, boolean outcome, string lbl) { predicate isBarrierCall(DataFlow::CallNode call, Expr e, boolean outcome, string lbl) {
exists(DataFlow::Node arg | exists(DataFlow::Node arg |
argumentPassing(pragma[only_bind_into](call), pragma[only_bind_into](arg),
pragma[only_bind_into](this), pragma[only_bind_into](sanitizedParameter)) and
arg.asExpr() = e and arg.asExpr() = e and
arg = call.getArgument(0) and arg = call.getArgument(paramIndex) and
call.getNumArgument() = 1 and
argumentPassing(call, arg, this, sanitizedParameter) and
outcome = guardOutcome and outcome = guardOutcome and
lbl = label lbl = label
) )

57
javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/PrototypePollutingFunction.expected
View File

@@ -1528,6 +1528,31 @@ nodes
| tests.js:571:24:571:31 | src[key] | | tests.js:571:24:571:31 | src[key] |
| tests.js:571:28:571:30 | key | | tests.js:571:28:571:30 | key |
| tests.js:571:28:571:30 | key | | tests.js:571:28:571:30 | key |
| tests.js:576:30:576:32 | src |
| tests.js:576:30:576:32 | src |
| tests.js:577:14:577:16 | key |
| tests.js:577:14:577:16 | key |
| tests.js:577:14:577:16 | key |
| tests.js:580:38:580:40 | src |
| tests.js:580:38:580:40 | src |
| tests.js:580:38:580:45 | src[key] |
| tests.js:580:38:580:45 | src[key] |
| tests.js:580:38:580:45 | src[key] |
| tests.js:580:38:580:45 | src[key] |
| tests.js:580:38:580:45 | src[key] |
| tests.js:582:17:582:19 | key |
| tests.js:582:17:582:19 | key |
| tests.js:582:17:582:19 | key |
| tests.js:582:24:582:26 | src |
| tests.js:582:24:582:26 | src |
| tests.js:582:24:582:31 | src[key] |
| tests.js:582:24:582:31 | src[key] |
| tests.js:582:24:582:31 | src[key] |
| tests.js:582:24:582:31 | src[key] |
| tests.js:582:24:582:31 | src[key] |
| tests.js:582:24:582:31 | src[key] |
| tests.js:582:28:582:30 | key |
| tests.js:582:28:582:30 | key |
edges edges
| examples/PrototypePollutingFunction.js:1:16:1:18 | dst | examples/PrototypePollutingFunction.js:5:19:5:21 | dst | | examples/PrototypePollutingFunction.js:1:16:1:18 | dst | examples/PrototypePollutingFunction.js:5:19:5:21 | dst |
| examples/PrototypePollutingFunction.js:1:16:1:18 | dst | examples/PrototypePollutingFunction.js:5:19:5:21 | dst | | examples/PrototypePollutingFunction.js:1:16:1:18 | dst | examples/PrototypePollutingFunction.js:5:19:5:21 | dst |
@@ -3461,6 +3486,38 @@ edges
| tests.js:571:28:571:30 | key | tests.js:571:24:571:31 | src[key] | | tests.js:571:28:571:30 | key | tests.js:571:24:571:31 | src[key] |
| tests.js:571:28:571:30 | key | tests.js:571:24:571:31 | src[key] | | tests.js:571:28:571:30 | key | tests.js:571:24:571:31 | src[key] |
| tests.js:571:28:571:30 | key | tests.js:571:24:571:31 | src[key] | | tests.js:571:28:571:30 | key | tests.js:571:24:571:31 | src[key] |
| tests.js:576:30:576:32 | src | tests.js:580:38:580:40 | src |
| tests.js:576:30:576:32 | src | tests.js:580:38:580:40 | src |
| tests.js:576:30:576:32 | src | tests.js:582:24:582:26 | src |
| tests.js:576:30:576:32 | src | tests.js:582:24:582:26 | src |
| tests.js:577:14:577:16 | key | tests.js:582:17:582:19 | key |
| tests.js:577:14:577:16 | key | tests.js:582:17:582:19 | key |
| tests.js:577:14:577:16 | key | tests.js:582:17:582:19 | key |
| tests.js:577:14:577:16 | key | tests.js:582:17:582:19 | key |
| tests.js:577:14:577:16 | key | tests.js:582:17:582:19 | key |
| tests.js:577:14:577:16 | key | tests.js:582:17:582:19 | key |
| tests.js:577:14:577:16 | key | tests.js:582:17:582:19 | key |
| tests.js:577:14:577:16 | key | tests.js:582:28:582:30 | key |
| tests.js:577:14:577:16 | key | tests.js:582:28:582:30 | key |
| tests.js:577:14:577:16 | key | tests.js:582:28:582:30 | key |
| tests.js:577:14:577:16 | key | tests.js:582:28:582:30 | key |
| tests.js:580:38:580:40 | src | tests.js:580:38:580:45 | src[key] |
| tests.js:580:38:580:40 | src | tests.js:580:38:580:45 | src[key] |
| tests.js:580:38:580:45 | src[key] | tests.js:576:30:576:32 | src |
| tests.js:580:38:580:45 | src[key] | tests.js:576:30:576:32 | src |
| tests.js:580:38:580:45 | src[key] | tests.js:576:30:576:32 | src |
| tests.js:580:38:580:45 | src[key] | tests.js:576:30:576:32 | src |
| tests.js:580:38:580:45 | src[key] | tests.js:576:30:576:32 | src |
| tests.js:580:38:580:45 | src[key] | tests.js:576:30:576:32 | src |
| tests.js:582:24:582:26 | src | tests.js:582:24:582:31 | src[key] |
| tests.js:582:24:582:26 | src | tests.js:582:24:582:31 | src[key] |
| tests.js:582:24:582:26 | src | tests.js:582:24:582:31 | src[key] |
| tests.js:582:24:582:26 | src | tests.js:582:24:582:31 | src[key] |
| tests.js:582:24:582:31 | src[key] | tests.js:582:24:582:31 | src[key] |
| tests.js:582:28:582:30 | key | tests.js:582:24:582:31 | src[key] |
| tests.js:582:28:582:30 | key | tests.js:582:24:582:31 | src[key] |
| tests.js:582:28:582:30 | key | tests.js:582:24:582:31 | src[key] |
| tests.js:582:28:582:30 | key | tests.js:582:24:582:31 | src[key] |
#select #select
| examples/PrototypePollutingFunction.js:7:13:7:15 | dst | examples/PrototypePollutingFunction.js:2:14:2:16 | key | examples/PrototypePollutingFunction.js:7:13:7:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | examples/PrototypePollutingFunction.js:2:21:2:23 | src | src | examples/PrototypePollutingFunction.js:7:13:7:15 | dst | dst | | examples/PrototypePollutingFunction.js:7:13:7:15 | dst | examples/PrototypePollutingFunction.js:2:14:2:16 | key | examples/PrototypePollutingFunction.js:7:13:7:15 | dst | Properties are copied from $@ to $@ without guarding against prototype pollution. | examples/PrototypePollutingFunction.js:2:21:2:23 | src | src | examples/PrototypePollutingFunction.js:7:13:7:15 | dst | dst |
| path-assignment.js:15:13:15:18 | target | path-assignment.js:8:19:8:25 | keys[i] | path-assignment.js:15:13:15:18 | target | The property chain $@ is recursively assigned to $@ without guarding against prototype pollution. | path-assignment.js:8:19:8:25 | keys[i] | here | path-assignment.js:15:13:15:18 | target | target | | path-assignment.js:15:13:15:18 | target | path-assignment.js:8:19:8:25 | keys[i] | path-assignment.js:15:13:15:18 | target | The property chain $@ is recursively assigned to $@ without guarding against prototype pollution. | path-assignment.js:8:19:8:25 | keys[i] | here | path-assignment.js:15:13:15:18 | target | target |

15
javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/tests.js
View File

@@ -572,3 +572,18 @@ function copyHasOwnProperty3(dst, src) {
} }
} }
} }
function indirectHasOwn(dst, src) {
for (let key in src) {
if (!src.hasOwnProperty(key)) continue;
if (hasOwn(dst, key) && isObject(dst[key])) {
indirectHasOwn(dst[key], src[key]);
} else {
dst[key] = src[key];
}
}
}
function hasOwn(obj, key) {
return obj.hasOwnProperty(key)
}