Skip to content

Commit fb80c5e

Browse files
committed
Rename SimpleScalarSanitizer to SimpleTypeSanitizer
1 parent 696788e commit fb80c5e

28 files changed

+33
-35
lines changed

java/ql/lib/semmle/code/java/security/BrokenCryptoAlgorithmQuery.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module InsecureCryptoConfig implements DataFlow::ConfigSig {
2828

2929
predicate isSink(DataFlow::Node n) { exists(CryptoAlgoSpec c | n.asExpr() = c.getAlgoSpec()) }
3030

31-
predicate isBarrier(DataFlow::Node node) { node instanceof SimpleScalarSanitizer }
31+
predicate isBarrier(DataFlow::Node node) { node instanceof SimpleTypeSanitizer }
3232
}
3333

3434
/**

java/ql/lib/semmle/code/java/security/CommandLineQuery.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ private class DefaultCommandInjectionSink extends CommandInjectionSink {
3939

4040
private class DefaultCommandInjectionSanitizer extends CommandInjectionSanitizer {
4141
DefaultCommandInjectionSanitizer() {
42-
this instanceof SimpleScalarSanitizer
42+
this instanceof SimpleTypeSanitizer
4343
or
4444
isSafeCommandArgument(this.asExpr())
4545
}

java/ql/lib/semmle/code/java/security/ExecTaintedLocalQuery.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module ExecTaintedLocalConfig implements DataFlow::ConfigSig {
1313
predicate isSink(DataFlow::Node sink) { sink.asExpr() instanceof ArgumentToExec }
1414

1515
predicate isBarrier(DataFlow::Node node) {
16-
node instanceof SimpleScalarSanitizer
16+
node instanceof SimpleTypeSanitizer
1717
or
1818
isSafeCommandArgument(node.asExpr())
1919
}

java/ql/lib/semmle/code/java/security/HttpsUrlsQuery.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ module HttpStringToUrlOpenMethodFlowConfig implements DataFlow::ConfigSig {
3939
any(HttpUrlsAdditionalTaintStep c).step(node1, node2)
4040
}
4141

42-
predicate isBarrier(DataFlow::Node node) { node instanceof SimpleScalarSanitizer }
42+
predicate isBarrier(DataFlow::Node node) { node instanceof SimpleTypeSanitizer }
4343
}
4444

4545
/**

java/ql/lib/semmle/code/java/security/JndiInjectionQuery.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ deprecated class JndiInjectionFlowConfig extends TaintTracking::Configuration {
2020
override predicate isSink(DataFlow::Node sink) { sink instanceof JndiInjectionSink }
2121

2222
override predicate isSanitizer(DataFlow::Node node) {
23-
node instanceof SimpleScalarSanitizer or
23+
node instanceof SimpleTypeSanitizer or
2424
node instanceof JndiInjectionSanitizer
2525
}
2626

@@ -38,7 +38,7 @@ module JndiInjectionFlowConfig implements DataFlow::ConfigSig {
3838
predicate isSink(DataFlow::Node sink) { sink instanceof JndiInjectionSink }
3939

4040
predicate isBarrier(DataFlow::Node node) {
41-
node instanceof SimpleScalarSanitizer or
41+
node instanceof SimpleTypeSanitizer or
4242
node instanceof JndiInjectionSanitizer
4343
}
4444

java/ql/lib/semmle/code/java/security/LdapInjection.qll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ private class DefaultLdapInjectionSink extends LdapInjectionSink {
3434
}
3535

3636
/** A sanitizer that clears the taint on (boxed) primitive types. */
37-
private class DefaultLdapSanitizer extends LdapInjectionSanitizer instanceof SimpleScalarSanitizer {
38-
}
37+
private class DefaultLdapSanitizer extends LdapInjectionSanitizer instanceof SimpleTypeSanitizer { }
3938

4039
/**
4140
* Holds if `n1` to `n2` is a dataflow step that converts between `String` and `LdapName`,

java/ql/lib/semmle/code/java/security/LogInjection.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ private class DefaultLogInjectionSink extends LogInjectionSink {
3131
DefaultLogInjectionSink() { sinkNode(this, "log-injection") }
3232
}
3333

34-
private class DefaultLogInjectionSanitizer extends LogInjectionSanitizer instanceof SimpleScalarSanitizer
34+
private class DefaultLogInjectionSanitizer extends LogInjectionSanitizer instanceof SimpleTypeSanitizer
3535
{ }
3636

3737
private class LineBreaksLogInjectionSanitizer extends LogInjectionSanitizer {

java/ql/lib/semmle/code/java/security/OgnlInjectionQuery.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ module OgnlInjectionFlowConfig implements DataFlow::ConfigSig {
3434

3535
predicate isSink(DataFlow::Node sink) { sink instanceof OgnlInjectionSink }
3636

37-
predicate isBarrier(DataFlow::Node node) { node instanceof SimpleScalarSanitizer }
37+
predicate isBarrier(DataFlow::Node node) { node instanceof SimpleTypeSanitizer }
3838

3939
predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
4040
any(OgnlInjectionAdditionalTaintStep c).step(node1, node2)

java/ql/lib/semmle/code/java/security/RequestForgery.qll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ private class DefaultRequestForgerySink extends RequestForgerySink {
6060
/** A sanitizer for request forgery vulnerabilities. */
6161
abstract class RequestForgerySanitizer extends DataFlow::Node { }
6262

63-
private class PrimitiveSanitizer extends RequestForgerySanitizer instanceof SimpleScalarSanitizer {
64-
}
63+
private class PrimitiveSanitizer extends RequestForgerySanitizer instanceof SimpleTypeSanitizer { }
6564

6665
private class HostnameSanitizingPrefix extends InterestingPrefix {
6766
int offset;

java/ql/lib/semmle/code/java/security/ResponseSplittingQuery.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module ResponseSplittingConfig implements DataFlow::ConfigSig {
1717
predicate isSink(DataFlow::Node sink) { sink instanceof HeaderSplittingSink }
1818

1919
predicate isBarrier(DataFlow::Node node) {
20-
node instanceof SimpleScalarSanitizer
20+
node instanceof SimpleTypeSanitizer
2121
or
2222
exists(MethodCall ma, string methodName, CompileTimeConstantExpr target |
2323
node.asExpr() = ma and

0 commit comments

Comments
 (0)