Skip to content

Commit 0e40717

Browse files
committed
JS: recognize res.sendfile root option
1 parent f84301e commit 0e40717

File tree

4 files changed

+20
-8
lines changed

4 files changed

+20
-8
lines changed

javascript/ql/src/semmle/javascript/Concepts.qll

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,15 @@ abstract class FileSystemAccess extends DataFlow::Node {
2828

2929
/** Gets an argument to this file system access that is interpreted as a path. */
3030
abstract DataFlow::Node getAPathArgument();
31-
31+
32+
/**
33+
* Gets an argument to this file system access that is interpreted as a root folder
34+
* in which the path arguments are constrained.
35+
*
36+
* In other words, if a root argument is provided, the underlying file access does its own
37+
* sanitization to prevent the path arguments from traversing outside the root folder.
38+
*/
39+
DataFlow::Node getRootPathArgument() { none() }
3240
}
3341

3442
/**

javascript/ql/src/semmle/javascript/frameworks/Express.qll

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -866,6 +866,10 @@ module Express {
866866
override DataFlow::Node getAPathArgument() {
867867
result = DataFlow::valueNode(astNode.getArgument(0))
868868
}
869+
870+
override DataFlow::Node getRootPathArgument() {
871+
result = this.(DataFlow::CallNode).getOptionArgument(1, "root")
872+
}
869873
}
870874

871875
/**

javascript/ql/src/semmle/javascript/security/dataflow/TaintedPath.qll

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,11 @@ module TaintedPath {
7171
*/
7272
class FsPathSink extends Sink, DataFlow::ValueNode {
7373
FsPathSink() {
74-
this = any(FileSystemAccess fs).getAPathArgument()
74+
exists (FileSystemAccess fs |
75+
this = fs.getAPathArgument() and
76+
not exists(fs.getRootPathArgument())
77+
or
78+
this = fs.getRootPathArgument())
7579
}
7680
}
7781

javascript/ql/test/query-tests/Security/CWE-022/TaintedPath.expected

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,7 @@ nodes
8484
| tainted-require.js:7:19:7:37 | req.param("module") |
8585
| tainted-sendFile.js:7:16:7:33 | req.param("gimme") |
8686
| tainted-sendFile.js:9:16:9:33 | req.param("gimme") |
87-
| tainted-sendFile.js:12:16:12:33 | req.param("gimme") |
88-
| tainted-sendFile.js:14:16:14:33 | req.param("gimme") |
89-
| tainted-sendFile.js:17:16:17:32 | req.param("file") |
87+
| tainted-sendFile.js:17:43:17:58 | req.param("dir") |
9088
| views.js:1:43:1:55 | req.params[0] |
9189
edges
9290
| TaintedPath-es6.js:7:7:7:44 | path | TaintedPath-es6.js:10:41:10:44 | path |
@@ -191,7 +189,5 @@ edges
191189
| tainted-require.js:7:19:7:37 | req.param("module") | tainted-require.js:7:19:7:37 | req.param("module") | tainted-require.js:7:19:7:37 | req.param("module") | This path depends on $@. | tainted-require.js:7:19:7:37 | req.param("module") | a user-provided value |
192190
| tainted-sendFile.js:7:16:7:33 | req.param("gimme") | tainted-sendFile.js:7:16:7:33 | req.param("gimme") | tainted-sendFile.js:7:16:7:33 | req.param("gimme") | This path depends on $@. | tainted-sendFile.js:7:16:7:33 | req.param("gimme") | a user-provided value |
193191
| tainted-sendFile.js:9:16:9:33 | req.param("gimme") | tainted-sendFile.js:9:16:9:33 | req.param("gimme") | tainted-sendFile.js:9:16:9:33 | req.param("gimme") | This path depends on $@. | tainted-sendFile.js:9:16:9:33 | req.param("gimme") | a user-provided value |
194-
| tainted-sendFile.js:12:16:12:33 | req.param("gimme") | tainted-sendFile.js:12:16:12:33 | req.param("gimme") | tainted-sendFile.js:12:16:12:33 | req.param("gimme") | This path depends on $@. | tainted-sendFile.js:12:16:12:33 | req.param("gimme") | a user-provided value |
195-
| tainted-sendFile.js:14:16:14:33 | req.param("gimme") | tainted-sendFile.js:14:16:14:33 | req.param("gimme") | tainted-sendFile.js:14:16:14:33 | req.param("gimme") | This path depends on $@. | tainted-sendFile.js:14:16:14:33 | req.param("gimme") | a user-provided value |
196-
| tainted-sendFile.js:17:16:17:32 | req.param("file") | tainted-sendFile.js:17:16:17:32 | req.param("file") | tainted-sendFile.js:17:16:17:32 | req.param("file") | This path depends on $@. | tainted-sendFile.js:17:16:17:32 | req.param("file") | a user-provided value |
192+
| tainted-sendFile.js:17:43:17:58 | req.param("dir") | tainted-sendFile.js:17:43:17:58 | req.param("dir") | tainted-sendFile.js:17:43:17:58 | req.param("dir") | This path depends on $@. | tainted-sendFile.js:17:43:17:58 | req.param("dir") | a user-provided value |
197193
| views.js:1:43:1:55 | req.params[0] | views.js:1:43:1:55 | req.params[0] | views.js:1:43:1:55 | req.params[0] | This path depends on $@. | views.js:1:43:1:55 | req.params[0] | a user-provided value |

0 commit comments

Comments
 (0)