Skip to content

Commit acbf791

Browse files
codeql-cicodeql-ci
authored
Merge pull request #7408 from asgerf/js/trusted-types-sinks
Approved by esbena
2 parents 90d7b94 + e64a6dc commit acbf791

File tree

5 files changed

+103
-0
lines changed

5 files changed

+103
-0
lines changed

‎javascript/ql/lib/javascript.qll

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ import semmle.javascript.frameworks.SocketIO
126126
import semmle.javascript.frameworks.StringFormatters
127127
import semmle.javascript.frameworks.TorrentLibraries
128128
import semmle.javascript.frameworks.Typeahead
129+
import semmle.javascript.frameworks.TrustedTypes
129130
import semmle.javascript.frameworks.UriLibraries
130131
import semmle.javascript.frameworks.Vue
131132
import semmle.javascript.frameworks.Vuex

‎javascript/ql/lib/semmle/javascript/frameworks/TrustedTypes.qll

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/**
2+
* Module for working with uses of the [Trusted Types API](https://developer.mozilla.org/en-US/docs/Web/API/Trusted_Types_API)
3+
*/
4+
5+
private import javascript
6+
private import semmle.javascript.security.dataflow.Xss
7+
private import semmle.javascript.security.dataflow.ClientSideUrlRedirectCustomizations
8+
private import semmle.javascript.security.dataflow.CodeInjectionCustomizations
9+
10+
/**
11+
* Module for working with uses of the [Trusted Types API](https://developer.mozilla.org/en-US/docs/Web/API/Trusted_Types_API).
12+
*/
13+
module TrustedTypes {
14+
private class TrustedTypesEntry extends API::EntryPoint {
15+
TrustedTypesEntry() { this = "TrustedTypesEntry" }
16+
17+
override DataFlow::SourceNode getAUse() { result = DataFlow::globalVarRef("trustedTypes") }
18+
19+
override DataFlow::Node getARhs() { none() }
20+
}
21+
22+
private API::Node trustedTypesObj() { result = any(TrustedTypesEntry entry).getNode() }
23+
24+
/** A call to `trustedTypes.createPolicy`. */
25+
class PolicyCreation extends API::CallNode {
26+
PolicyCreation() { this = trustedTypesObj().getMember("createPolicy").getACall() }
27+
28+
/** Gets the function passed as the given option. */
29+
DataFlow::FunctionNode getPolicyCallback(string method) {
30+
// Require local callback to avoid potential call/return mismatch in the uses below
31+
result = getOptionArgument(1, method).getALocalSource()
32+
}
33+
}
34+
35+
/**
36+
* A data-flow step from the use of a policy to its callback.
37+
*/
38+
private class PolicyInputStep extends DataFlow::SharedFlowStep {
39+
override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
40+
exists(PolicyCreation policy, string method |
41+
pred = policy.getReturn().getMember(method).getParameter(0).getARhs() and
42+
succ = policy.getPolicyCallback(method).getParameter(0)
43+
)
44+
}
45+
}
46+
47+
/**
48+
* The creation of a trusted HTML object, as an XSS sink.
49+
*/
50+
private class XssSink extends DomBasedXss::Sink {
51+
XssSink() { this = any(PolicyCreation creation).getPolicyCallback("createHTML").getAReturn() }
52+
}
53+
54+
/**
55+
* The creation of a trusted script, as a code-injection sink.
56+
*/
57+
private class CodeInjectionSink extends CodeInjection::Sink {
58+
CodeInjectionSink() {
59+
this = any(PolicyCreation creation).getPolicyCallback("createScript").getAReturn()
60+
}
61+
}
62+
63+
/**
64+
* The creation of a trusted script URL, as a URL redirection sink.
65+
*
66+
* This is currently handled by the client-side URL redirection query, as this checks for untrusted hostname in the URL.
67+
*/
68+
private class UrlSink extends ClientSideUrlRedirect::Sink {
69+
UrlSink() {
70+
this = any(PolicyCreation creation).getPolicyCallback("createScriptURL").getAReturn()
71+
}
72+
}
73+
}

‎javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.expected

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,11 @@ nodes
427427
| translate.js:7:42:7:60 | target.substring(1) |
428428
| translate.js:9:27:9:50 | searchP ... 'term') |
429429
| translate.js:9:27:9:50 | searchP ... 'term') |
430+
| trusted-types.js:2:66:2:66 | x |
431+
| trusted-types.js:2:71:2:71 | x |
432+
| trusted-types.js:2:71:2:71 | x |
433+
| trusted-types.js:3:24:3:34 | window.name |
434+
| trusted-types.js:3:24:3:34 | window.name |
430435
| tst3.js:2:12:2:75 | JSON.pa ... tr(1))) |
431436
| tst3.js:2:23:2:74 | decodeU ... str(1)) |
432437
| tst3.js:2:42:2:63 | window. ... .search |
@@ -1183,6 +1188,10 @@ edges
11831188
| translate.js:7:42:7:47 | target | translate.js:7:42:7:60 | target.substring(1) |
11841189
| translate.js:7:42:7:60 | target.substring(1) | translate.js:9:27:9:50 | searchP ... 'term') |
11851190
| translate.js:7:42:7:60 | target.substring(1) | translate.js:9:27:9:50 | searchP ... 'term') |
1191+
| trusted-types.js:2:66:2:66 | x | trusted-types.js:2:71:2:71 | x |
1192+
| trusted-types.js:2:66:2:66 | x | trusted-types.js:2:71:2:71 | x |
1193+
| trusted-types.js:3:24:3:34 | window.name | trusted-types.js:2:66:2:66 | x |
1194+
| trusted-types.js:3:24:3:34 | window.name | trusted-types.js:2:66:2:66 | x |
11861195
| tst3.js:2:12:2:75 | JSON.pa ... tr(1))) | tst3.js:4:25:4:28 | data |
11871196
| tst3.js:2:12:2:75 | JSON.pa ... tr(1))) | tst3.js:5:26:5:29 | data |
11881197
| tst3.js:2:12:2:75 | JSON.pa ... tr(1))) | tst3.js:7:32:7:35 | data |
@@ -1612,6 +1621,7 @@ edges
16121621
| tooltip.jsx:10:25:10:30 | source | tooltip.jsx:6:20:6:30 | window.name | tooltip.jsx:10:25:10:30 | source | Cross-site scripting vulnerability due to $@. | tooltip.jsx:6:20:6:30 | window.name | user-provided value |
16131622
| tooltip.jsx:11:25:11:30 | source | tooltip.jsx:6:20:6:30 | window.name | tooltip.jsx:11:25:11:30 | source | Cross-site scripting vulnerability due to $@. | tooltip.jsx:6:20:6:30 | window.name | user-provided value |
16141623
| translate.js:9:27:9:50 | searchP ... 'term') | translate.js:6:16:6:39 | documen ... .search | translate.js:9:27:9:50 | searchP ... 'term') | Cross-site scripting vulnerability due to $@. | translate.js:6:16:6:39 | documen ... .search | user-provided value |
1624+
| trusted-types.js:2:71:2:71 | x | trusted-types.js:3:24:3:34 | window.name | trusted-types.js:2:71:2:71 | x | Cross-site scripting vulnerability due to $@. | trusted-types.js:3:24:3:34 | window.name | user-provided value |
16151625
| tst3.js:4:25:4:32 | data.src | tst3.js:2:42:2:63 | window. ... .search | tst3.js:4:25:4:32 | data.src | Cross-site scripting vulnerability due to $@. | tst3.js:2:42:2:63 | window. ... .search | user-provided value |
16161626
| tst3.js:5:26:5:31 | data.p | tst3.js:2:42:2:63 | window. ... .search | tst3.js:5:26:5:31 | data.p | Cross-site scripting vulnerability due to $@. | tst3.js:2:42:2:63 | window. ... .search | user-provided value |
16171627
| tst3.js:7:32:7:37 | data.p | tst3.js:2:42:2:63 | window. ... .search | tst3.js:7:32:7:37 | data.p | Cross-site scripting vulnerability due to $@. | tst3.js:2:42:2:63 | window. ... .search | user-provided value |

‎javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.expected

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,11 @@ nodes
434434
| translate.js:7:42:7:60 | target.substring(1) |
435435
| translate.js:9:27:9:50 | searchP ... 'term') |
436436
| translate.js:9:27:9:50 | searchP ... 'term') |
437+
| trusted-types.js:2:66:2:66 | x |
438+
| trusted-types.js:2:71:2:71 | x |
439+
| trusted-types.js:2:71:2:71 | x |
440+
| trusted-types.js:3:24:3:34 | window.name |
441+
| trusted-types.js:3:24:3:34 | window.name |
437442
| tst3.js:2:12:2:75 | JSON.pa ... tr(1))) |
438443
| tst3.js:2:23:2:74 | decodeU ... str(1)) |
439444
| tst3.js:2:42:2:63 | window. ... .search |
@@ -1218,6 +1223,10 @@ edges
12181223
| translate.js:7:42:7:47 | target | translate.js:7:42:7:60 | target.substring(1) |
12191224
| translate.js:7:42:7:60 | target.substring(1) | translate.js:9:27:9:50 | searchP ... 'term') |
12201225
| translate.js:7:42:7:60 | target.substring(1) | translate.js:9:27:9:50 | searchP ... 'term') |
1226+
| trusted-types.js:2:66:2:66 | x | trusted-types.js:2:71:2:71 | x |
1227+
| trusted-types.js:2:66:2:66 | x | trusted-types.js:2:71:2:71 | x |
1228+
| trusted-types.js:3:24:3:34 | window.name | trusted-types.js:2:66:2:66 | x |
1229+
| trusted-types.js:3:24:3:34 | window.name | trusted-types.js:2:66:2:66 | x |
12211230
| tst3.js:2:12:2:75 | JSON.pa ... tr(1))) | tst3.js:4:25:4:28 | data |
12221231
| tst3.js:2:12:2:75 | JSON.pa ... tr(1))) | tst3.js:5:26:5:29 | data |
12231232
| tst3.js:2:12:2:75 | JSON.pa ... tr(1))) | tst3.js:7:32:7:35 | data |

‎javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/trusted-types.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
(function() {
2+
const policy1 = trustedTypes.createPolicy('x', { createHTML: x => x }); // NOT OK
3+
policy1.createHTML(window.name);
4+
5+
const policy2 = trustedTypes.createPolicy('x', { createHTML: x => 'safe' }); // OK
6+
policy2.createHTML(window.name);
7+
8+
const policy3 = trustedTypes.createPolicy('x', { createHTML: x => x }); // OK
9+
policy3.createHTML('safe');
10+
})();

0 commit comments

Comments
 (0)