Skip to content

Commit b7b74b5

Browse files
author
Benjamin Muskalla
committed
Track taint for String.valueOf(..)
1 parent d900fca commit b7b74b5

File tree

3 files changed

+30
-26
lines changed

3 files changed

+30
-26
lines changed

‎java/ql/src/semmle/code/java/dataflow/FlowSteps.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@ private class StringTaintPreservingMethod extends TaintPreservingCallable {
111111
this.hasName([
112112
"concat", "copyValueOf", "endsWith", "format", "formatted", "getBytes", "indent", "intern",
113113
"join", "repeat", "split", "strip", "stripIndent", "stripLeading", "stripTrailing",
114-
"substring", "toCharArray", "toLowerCase", "toString", "toUpperCase", "trim"
114+
"substring", "toCharArray", "toLowerCase", "toString", "toUpperCase", "trim", "valueOf"
115115
])
116116
}
117117

118118
override predicate returnsTaintFrom(int arg) {
119119
arg = -1 and not this.isStatic()
120120
or
121-
this.hasName(["concat", "copyValueOf"]) and arg = 0
121+
this.hasName(["concat", "copyValueOf", "valueOf"]) and arg = 0
122122
or
123123
this.hasName(["format", "formatted", "join"]) and arg = [0 .. getNumberOfParameters()]
124124
}

‎java/ql/test/library-tests/dataflow/taint/B.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ public static void maintest() throws java.io.UnsupportedEncodingException, java.
3434
// tainted - data preserving constructors
3535
String constructed = new String(complex);
3636
sink(constructed);
37+
// tainted - data preserving method
38+
String valueOf = String.valueOf(complex.toCharArray());
39+
sink(valueOf);
3740
// tainted - unsafe escape
3841
String badEscape = constructed.replaceAll("(<script>)", "");
3942
sink(badEscape);

‎java/ql/test/library-tests/dataflow/taint/test.expected

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,32 @@
1010
| B.java:15:21:15:27 | taint(...) | B.java:30:10:30:15 | method |
1111
| B.java:15:21:15:27 | taint(...) | B.java:33:10:33:16 | complex |
1212
| B.java:15:21:15:27 | taint(...) | B.java:36:10:36:20 | constructed |
13-
| B.java:15:21:15:27 | taint(...) | B.java:39:10:39:18 | badEscape |
14-
| B.java:15:21:15:27 | taint(...) | B.java:42:10:42:14 | token |
15-
| B.java:15:21:15:27 | taint(...) | B.java:55:10:55:13 | cond |
16-
| B.java:15:21:15:27 | taint(...) | B.java:58:10:58:14 | logic |
17-
| B.java:15:21:15:27 | taint(...) | B.java:60:10:60:39 | endsWith(...) |
18-
| B.java:15:21:15:27 | taint(...) | B.java:63:10:63:14 | logic |
13+
| B.java:15:21:15:27 | taint(...) | B.java:39:10:39:16 | valueOf |
14+
| B.java:15:21:15:27 | taint(...) | B.java:42:10:42:18 | badEscape |
15+
| B.java:15:21:15:27 | taint(...) | B.java:45:10:45:14 | token |
16+
| B.java:15:21:15:27 | taint(...) | B.java:58:10:58:13 | cond |
17+
| B.java:15:21:15:27 | taint(...) | B.java:61:10:61:14 | logic |
18+
| B.java:15:21:15:27 | taint(...) | B.java:63:10:63:39 | endsWith(...) |
1919
| B.java:15:21:15:27 | taint(...) | B.java:66:10:66:14 | logic |
20-
| B.java:15:21:15:27 | taint(...) | B.java:74:10:74:16 | trimmed |
21-
| B.java:15:21:15:27 | taint(...) | B.java:76:10:76:14 | split |
22-
| B.java:15:21:15:27 | taint(...) | B.java:78:10:78:14 | lower |
23-
| B.java:15:21:15:27 | taint(...) | B.java:80:10:80:14 | upper |
24-
| B.java:15:21:15:27 | taint(...) | B.java:82:10:82:14 | bytes |
25-
| B.java:15:21:15:27 | taint(...) | B.java:84:10:84:17 | toString |
26-
| B.java:15:21:15:27 | taint(...) | B.java:86:10:86:13 | subs |
27-
| B.java:15:21:15:27 | taint(...) | B.java:88:10:88:13 | repl |
28-
| B.java:15:21:15:27 | taint(...) | B.java:90:10:90:16 | replAll |
29-
| B.java:15:21:15:27 | taint(...) | B.java:92:10:92:18 | replFirst |
30-
| B.java:15:21:15:27 | taint(...) | B.java:105:12:105:25 | serializedData |
31-
| B.java:15:21:15:27 | taint(...) | B.java:117:12:117:27 | deserializedData |
32-
| B.java:15:21:15:27 | taint(...) | B.java:126:10:126:21 | taintedArray |
33-
| B.java:15:21:15:27 | taint(...) | B.java:128:10:128:22 | taintedArray2 |
34-
| B.java:15:21:15:27 | taint(...) | B.java:130:10:130:22 | taintedArray3 |
35-
| B.java:15:21:15:27 | taint(...) | B.java:133:10:133:44 | toURL(...) |
36-
| B.java:15:21:15:27 | taint(...) | B.java:136:10:136:37 | toPath(...) |
37-
| B.java:15:21:15:27 | taint(...) | B.java:139:10:139:46 | toFile(...) |
20+
| B.java:15:21:15:27 | taint(...) | B.java:69:10:69:14 | logic |
21+
| B.java:15:21:15:27 | taint(...) | B.java:77:10:77:16 | trimmed |
22+
| B.java:15:21:15:27 | taint(...) | B.java:79:10:79:14 | split |
23+
| B.java:15:21:15:27 | taint(...) | B.java:81:10:81:14 | lower |
24+
| B.java:15:21:15:27 | taint(...) | B.java:83:10:83:14 | upper |
25+
| B.java:15:21:15:27 | taint(...) | B.java:85:10:85:14 | bytes |
26+
| B.java:15:21:15:27 | taint(...) | B.java:87:10:87:17 | toString |
27+
| B.java:15:21:15:27 | taint(...) | B.java:89:10:89:13 | subs |
28+
| B.java:15:21:15:27 | taint(...) | B.java:91:10:91:13 | repl |
29+
| B.java:15:21:15:27 | taint(...) | B.java:93:10:93:16 | replAll |
30+
| B.java:15:21:15:27 | taint(...) | B.java:95:10:95:18 | replFirst |
31+
| B.java:15:21:15:27 | taint(...) | B.java:108:12:108:25 | serializedData |
32+
| B.java:15:21:15:27 | taint(...) | B.java:120:12:120:27 | deserializedData |
33+
| B.java:15:21:15:27 | taint(...) | B.java:129:10:129:21 | taintedArray |
34+
| B.java:15:21:15:27 | taint(...) | B.java:131:10:131:22 | taintedArray2 |
35+
| B.java:15:21:15:27 | taint(...) | B.java:133:10:133:22 | taintedArray3 |
36+
| B.java:15:21:15:27 | taint(...) | B.java:136:10:136:44 | toURL(...) |
37+
| B.java:15:21:15:27 | taint(...) | B.java:139:10:139:37 | toPath(...) |
38+
| B.java:15:21:15:27 | taint(...) | B.java:142:10:142:46 | toFile(...) |
3839
| MethodFlow.java:7:22:7:28 | taint(...) | MethodFlow.java:8:10:8:16 | tainted |
3940
| MethodFlow.java:9:31:9:37 | taint(...) | MethodFlow.java:10:10:10:17 | tainted2 |
4041
| MethodFlow.java:11:35:11:41 | taint(...) | MethodFlow.java:12:10:12:17 | tainted3 |

0 commit comments

Comments
 (0)