From 1815656a02470d84b3f0054a64ae0d9238600ada Mon Sep 17 00:00:00 2001 From: Tony Torralba Date: Mon, 17 May 2021 16:56:37 +0200 Subject: [PATCH] Use set literals for OGNL packages --- .../src/semmle/code/java/security/OgnlInjection.qll | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/java/ql/src/semmle/code/java/security/OgnlInjection.qll b/java/ql/src/semmle/code/java/security/OgnlInjection.qll index a64f62bbcea..c31ecd2856b 100644 --- a/java/ql/src/semmle/code/java/security/OgnlInjection.qll +++ b/java/ql/src/semmle/code/java/security/OgnlInjection.qll @@ -53,25 +53,18 @@ private class DefaultOgnlInjectionSink extends OgnlInjectionSink { /** The class `org.apache.commons.ognl.Ognl` or `ognl.Ognl`. */ private class TypeOgnl extends Class { - TypeOgnl() { - this.hasQualifiedName("org.apache.commons.ognl", "Ognl") or - this.hasQualifiedName("ognl", "Ognl") - } + TypeOgnl() { this.hasQualifiedName(["org.apache.commons.ognl", "ognl"], "Ognl") } } /** The interface `org.apache.commons.ognl.Node` or `ognl.Node`. */ private class TypeNode extends Interface { - TypeNode() { - this.hasQualifiedName("org.apache.commons.ognl", "Node") or - this.hasQualifiedName("ognl", "Node") - } + TypeNode() { this.hasQualifiedName(["org.apache.commons.ognl", "ognl"], "Node") } } /** The interface `org.apache.commons.ognl.enhance.ExpressionAccessor` or `ognl.enhance.ExpressionAccessor`. */ private class TypeExpressionAccessor extends Interface { TypeExpressionAccessor() { - this.hasQualifiedName("org.apache.commons.ognl.enhance", "ExpressionAccessor") or - this.hasQualifiedName("ognl.enhance", "ExpressionAccessor") + this.hasQualifiedName(["org.apache.commons.ognl.enhance", "ognl.enhance"], "ExpressionAccessor") } }