Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Java: Track taint through java.io.File constructor and #toURI; URI#toURL #4457

Merged
merged 1 commit into from
Oct 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,11 @@ private predicate constructorStep(Expr tracked, ConstructorCall sink) {
or
//a URI constructed from a tainted string is tainted.
s = "java.net.URI" and argi = 0 and sink.getNumArgument() = 1
or
//a File constructed from a tainted string is tainted.
s = "java.io.File" and argi = 0
or
s = "java.io.File" and argi = 1
aibaars marked this conversation as resolved.
Show resolved Hide resolved
)
or
exists(RefType t | t.getQualifiedName() = "java.lang.Number" |
Expand Down Expand Up @@ -372,6 +377,12 @@ private predicate taintPreservingQualifierToMethod(Method m) {
m.getDeclaringType().hasQualifiedName("java.nio", "ByteBuffer") and
m.hasName("get")
or
m.getDeclaringType().hasQualifiedName("java.io", "File") and
m.hasName("toURI")
or
m.getDeclaringType().hasQualifiedName("java.net", "URI") and
m.hasName("toURL")
or
m = any(GuiceProvider gp).getAnOverridingGetMethod()
or
m = any(ProtobufMessageLite p).getAGetterMethod()
Expand Down
3 changes: 3 additions & 0 deletions java/ql/test/library-tests/dataflow/taint/B.java
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ public static void maintest() {
String[][][] taintedArray3 = new String[][][] { { { s } } };
sink(taintedArray3);

// Tainted file path and URI
sink(new java.io.File(s).toURI().toURL());

return;
}

Expand Down
1 change: 1 addition & 0 deletions java/ql/test/library-tests/dataflow/taint/test.expected
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
| B.java:15:21:15:27 | taint(...) | B.java:126:10:126:21 | taintedArray |
| B.java:15:21:15:27 | taint(...) | B.java:128:10:128:22 | taintedArray2 |
| B.java:15:21:15:27 | taint(...) | B.java:130:10:130:22 | taintedArray3 |
| B.java:15:21:15:27 | taint(...) | B.java:133:10:133:44 | toURL(...) |
| MethodFlow.java:7:22:7:28 | taint(...) | MethodFlow.java:8:10:8:16 | tainted |
| MethodFlow.java:9:31:9:37 | taint(...) | MethodFlow.java:10:10:10:17 | tainted2 |
| MethodFlow.java:11:35:11:41 | taint(...) | MethodFlow.java:12:10:12:17 | tainted3 |
Expand Down