Skip to content

Commit c4eb9a4

Browse files
committed
Make the TaintTracking::Configuration s extend the default configurations again
1 parent 58b85c4 commit c4eb9a4

File tree

5 files changed

+14
-26
lines changed

5 files changed

+14
-26
lines changed

javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/CAPLogInjectionQuery.qll

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,11 @@ class CdsLogSink extends DataFlow::Node {
4343
}
4444
}
4545

46-
class CAPLogInjectionConfiguration extends TaintTracking::Configuration {
46+
class CAPLogInjectionConfiguration extends LogInjectionConfiguration {
4747
CAPLogInjectionConfiguration() { this = "CAP Log Injection" }
4848

4949
override predicate isSource(DataFlow::Node start) {
50-
exists(LogInjectionConfiguration logInjectionConfiguration |
51-
logInjectionConfiguration.isSource(start)
52-
)
50+
super.isSource(start)
5351
or
5452
start instanceof RemoteFlowSource
5553
}

javascript/frameworks/ui5/lib/advanced_security/javascript/frameworks/ui5/UI5XssQuery.qll

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ import advanced_security.javascript.frameworks.ui5.dataflow.DataFlow as UI5DataF
33
import advanced_security.javascript.frameworks.ui5.UI5View
44
import semmle.javascript.security.dataflow.DomBasedXssQuery as DomBasedXss
55

6-
class Configuration extends TaintTracking::Configuration {
6+
class Configuration extends DomBasedXss::Configuration {
77
Configuration() { this = "UI5 HTML Injection" }
88

99
override predicate isSource(DataFlow::Node start) {
10-
exists(DomBasedXss::Configuration domBasedXssConfiguration |
11-
domBasedXssConfiguration.isSource(start)
12-
)
10+
super.isSource(start)
1311
or
1412
start instanceof RemoteFlowSource
1513
}
@@ -19,9 +17,7 @@ class Configuration extends TaintTracking::Configuration {
1917
DataFlow::FlowLabel outLabel
2018
) {
2119
/* Already an additional flow step defined in `DomBasedXssQuery::Configuration` */
22-
exists(DomBasedXss::Configuration domBasedXssConfiguration |
23-
domBasedXssConfiguration.isAdditionalFlowStep(start, end, inLabel, outLabel)
24-
)
20+
super.isAdditionalFlowStep(start, end, inLabel, outLabel)
2521
or
2622
/* TODO: Legacy code */
2723
/* Handler argument node to handler parameter */
@@ -39,9 +35,7 @@ class Configuration extends TaintTracking::Configuration {
3935

4036
override predicate isBarrier(DataFlow::Node node) {
4137
/* 1. Already a sanitizer defined in `DomBasedXssQuery::Configuration` */
42-
exists(DomBasedXss::Configuration domBasedXssConfiguration |
43-
domBasedXssConfiguration.isSanitizer(node)
44-
)
38+
super.isSanitizer(node)
4539
or
4640
/* 2. Value read from a non-string control property */
4741
exists(PropertyMetadata m | not m.isUnrestrictedStringType() | node = m)

javascript/frameworks/xsjs/lib/advanced_security/javascript/frameworks/xsjs/XSJSReflectedXssQuery.qll

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@ class XSJSResponseSetBodyCall extends MethodCallNode {
1313
XSJSResponse getParentXSJSResponse() { result = response }
1414
}
1515

16-
class Configuration extends TaintTracking::Configuration {
16+
class Configuration extends DomBasedXss::Configuration {
1717
Configuration() { this = "XSJS Reflected XSS Query" }
1818

1919
override predicate isSource(DataFlow::Node start) {
20-
exists(DomBasedXss::Configuration domBasedXssConfiguration |
21-
domBasedXssConfiguration.isSource(start)
22-
) or
20+
super.isSource(start) or
2321
start instanceof RemoteFlowSource
2422
}
2523

javascript/frameworks/xsjs/lib/advanced_security/javascript/frameworks/xsjs/XSJSSqlInjectionQuery.qll

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ class XSJSDBConnectionPrepareStatementArgument extends DataFlow::ValueNode {
1212
predicate isConcatenated() { this.getAPredecessor+() instanceof StringOps::ConcatenationNode }
1313
}
1414

15-
class Configuration extends TaintTracking::Configuration {
15+
class Configuration extends SqlInjection::Configuration {
1616
Configuration() { this = "XSJS SQL Injection Query" }
1717

1818
override predicate isSource(DataFlow::Node start) {
19-
exists(SqlInjection::Configuration sqlInjectionConfiguration |
20-
sqlInjectionConfiguration.isSource(start)
21-
) or
19+
super.isSource(start)
20+
or
2221
start instanceof RemoteFlowSource
2322
}
2423

javascript/frameworks/xsjs/lib/advanced_security/javascript/frameworks/xsjs/XSJSUrlRedirectQuery.qll

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ import javascript
22
import advanced_security.javascript.frameworks.xsjs.AsyncXSJS
33
import semmle.javascript.security.dataflow.ServerSideUrlRedirectQuery as UrlRedirect
44

5-
class Configuration extends TaintTracking::Configuration {
5+
class Configuration extends UrlRedirect::Configuration {
66
Configuration() { this = "XSJS URL Redirect Query" }
77

88
override predicate isSource(DataFlow::Node start) {
9-
exists(UrlRedirect::Configuration urlRedirectConfiguration |
10-
urlRedirectConfiguration.isSource(start)
11-
) or
9+
super.isSource(start)
10+
or
1211
start instanceof RemoteFlowSource
1312
}
1413

0 commit comments

Comments
 (0)