Skip to content

Commit fbfbe70

Browse files
committed
add support for unnamed/default exports in PackageExports.qll
1 parent bdfb810 commit fbfbe70

File tree

4 files changed

+25
-0
lines changed

4 files changed

+25
-0
lines changed

javascript/ql/src/semmle/javascript/PackageExports.qll

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,12 @@ private DataFlow::Node getAValueExportedByPackage() {
7878
private DataFlow::Node getAnExportFromModule(Module mod) {
7979
result.analyze().getAValue() = mod.(NodeModule).getAModuleExportsValue()
8080
or
81+
exists(Variable var | var = mod.(Closure::ClosureModule).getExportsVariable() |
82+
result.asExpr() = var.getAReference() or
83+
result.asExpr() = var.getAnAssignedExpr()
84+
)
85+
or
86+
result.analyze().getAValue() = mod.(AmdModule).getDefine().getAModuleExportsValue()
87+
or
8188
result = mod.getAnExportedValue(_)
8289
}

javascript/ql/test/query-tests/Performance/ReDoS/PolynomialBackTracking.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
| highlight.js:38:64:38:69 | [^()]* | Strings starting with 'A(' and with many repetitions of ''' can start matching anywhere after the start of the preceeding [^()]* |
2626
| highlight.js:39:22:39:24 | \\w* | Strings starting with 'A' and with many repetitions of 'A' can start matching anywhere after the start of the preceeding [a-zA-Z_]\\w*\\([^()]*(\\([^()]*(\\([^()]*\\)[^()]*)*\\)[^()]*)*\\)\\s*\\{ |
2727
| lib/lib.js:1:15:1:16 | a* | Strings with many repetitions of 'a' can start matching anywhere after the start of the preceeding a*b |
28+
| lib/lib.js:8:3:8:4 | f* | Strings with many repetitions of 'f' can start matching anywhere after the start of the preceeding f*g |
2829
| polynomial-redos.js:7:24:7:26 | \\s+ | Strings with many repetitions of ' ' can start matching anywhere after the start of the preceeding \\s+$ |
2930
| polynomial-redos.js:8:17:8:18 | * | Strings with many repetitions of ' ' can start matching anywhere after the start of the preceeding *, * |
3031
| polynomial-redos.js:9:19:9:21 | \\s* | Strings with many repetitions of ' ' can start matching anywhere after the start of the preceeding \\s*\\n\\s* |

javascript/ql/test/query-tests/Performance/ReDoS/PolynomialReDoS.expected

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ nodes
33
| lib/lib.js:3:28:3:31 | name |
44
| lib/lib.js:4:14:4:17 | name |
55
| lib/lib.js:4:14:4:17 | name |
6+
| lib/lib.js:7:19:7:22 | name |
7+
| lib/lib.js:7:19:7:22 | name |
8+
| lib/lib.js:8:13:8:16 | name |
9+
| lib/lib.js:8:13:8:16 | name |
610
| polynomial-redos.js:5:6:5:32 | tainted |
711
| polynomial-redos.js:5:16:5:32 | req.query.tainted |
812
| polynomial-redos.js:5:16:5:32 | req.query.tainted |
@@ -150,6 +154,10 @@ edges
150154
| lib/lib.js:3:28:3:31 | name | lib/lib.js:4:14:4:17 | name |
151155
| lib/lib.js:3:28:3:31 | name | lib/lib.js:4:14:4:17 | name |
152156
| lib/lib.js:3:28:3:31 | name | lib/lib.js:4:14:4:17 | name |
157+
| lib/lib.js:7:19:7:22 | name | lib/lib.js:8:13:8:16 | name |
158+
| lib/lib.js:7:19:7:22 | name | lib/lib.js:8:13:8:16 | name |
159+
| lib/lib.js:7:19:7:22 | name | lib/lib.js:8:13:8:16 | name |
160+
| lib/lib.js:7:19:7:22 | name | lib/lib.js:8:13:8:16 | name |
153161
| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:7:2:7:8 | tainted |
154162
| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:7:2:7:8 | tainted |
155163
| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:8:2:8:8 | tainted |
@@ -289,6 +297,7 @@ edges
289297
| polynomial-redos.js:123:13:123:20 | replaced | polynomial-redos.js:123:3:123:20 | result |
290298
#select
291299
| lib/lib.js:4:2:4:18 | regexp.test(name) | lib/lib.js:3:28:3:31 | name | lib/lib.js:4:14:4:17 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'a'. | lib/lib.js:1:15:1:16 | a* | regular expression | lib/lib.js:3:28:3:31 | name | library input |
300+
| lib/lib.js:8:2:8:17 | /f*g/.test(name) | lib/lib.js:7:19:7:22 | name | lib/lib.js:8:13:8:16 | name | This $@ that depends on $@ may run slow on strings with many repetitions of 'f'. | lib/lib.js:8:3:8:4 | f* | regular expression | lib/lib.js:7:19:7:22 | name | library input |
292301
| polynomial-redos.js:7:2:7:34 | tainted ... /g, '') | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:7:2:7:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of ' '. | polynomial-redos.js:7:24:7:26 | \\s+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
293302
| polynomial-redos.js:8:2:8:23 | tainted ... *, */) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:8:2:8:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of ' '. | polynomial-redos.js:8:17:8:18 | * | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
294303
| polynomial-redos.js:9:2:9:34 | tainted ... g, ' ') | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:9:2:9:8 | tainted | This $@ that depends on $@ may run slow on strings with many repetitions of ' '. | polynomial-redos.js:9:19:9:21 | \\s* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |

javascript/ql/test/query-tests/Performance/ReDoS/lib/lib.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,11 @@ var regexp = /a*b/;
33
module.exports = function (name) {
44
regexp.test(name); // NOT OK
55
};
6+
7+
function bar(reg, name) {
8+
/f*g/.test(name); // NOT OK
9+
}
10+
11+
if (typeof define !== 'undefined' && define.amd) { // AMD
12+
define([], function () {return bar});
13+
}

0 commit comments

Comments
 (0)