Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3184090

Browse files
owen-mcowen-mc
committed
Fix places which already dealt with both javax and jakarta
1 parent 4b240eb commit 3184090

10 files changed

Lines changed: 14 additions & 25 deletions

File tree

‎java/ql/lib/semmle/code/java/frameworks/JaxWS.qll‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ private import semmle.code.java.security.XSS
1313
/**
1414
* Gets a name for the root package of JAX-RS.
1515
*/
16-
string getAJaxRsPackage() { result in [javaxOrJakarta() + ".ws.rs", "jakarta.ws.rs"] }
16+
string getAJaxRsPackage() { result in [javaxOrJakarta() + ".ws.rs"] }
1717

1818
/**
1919
* Gets a name for package `subpackage` within the JAX-RS hierarchy.
@@ -42,7 +42,7 @@ class JaxWsEndpoint extends Class {
4242
result.isPublic() and
4343
not result instanceof InitializerMethod and
4444
not exists(Annotation a | a = result.getAnAnnotation() |
45-
a.getType().hasQualifiedName([javaxOrJakarta() + "", "jakarta"] + ".jws", "WebMethod") and
45+
a.getType().hasQualifiedName(javaxOrJakarta() + ".jws", "WebMethod") and
4646
a.getValue("exclude").(BooleanLiteral).getBooleanValue() = true
4747
) and
4848
forex(ParamOrReturn paramOrRet | paramOrRet = result.getAParameter() or paramOrRet = result |
@@ -62,8 +62,7 @@ class JaxWsEndpoint extends Class {
6262
/** The annotation type `@XmlJavaTypeAdapter`. */
6363
class XmlJavaTypeAdapter extends AnnotationType {
6464
XmlJavaTypeAdapter() {
65-
this.hasQualifiedName([javaxOrJakarta() + "", "jakarta"] + ".xml.bind.annotation.adapters",
66-
"XmlJavaTypeAdapter")
65+
this.hasQualifiedName(javaxOrJakarta() + ".xml.bind.annotation.adapters", "XmlJavaTypeAdapter")
6766
}
6867
}
6968

@@ -292,9 +291,7 @@ class JaxRSAnnotation extends Annotation {
292291
JaxRSAnnotation() {
293292
exists(AnnotationType a |
294293
a = this.getType() and
295-
a.getPackage()
296-
.getName()
297-
.regexpMatch([javaxOrJakarta() + "\\.ws\\.rs(\\..*)?", "jakarta\\.ws\\.rs(\\..*)?"])
294+
a.getPackage().getName().regexpMatch(javaxOrJakarta() + "\\.ws\\.rs(\\..*)?")
298295
)
299296
}
300297
}

‎java/ql/lib/semmle/code/java/frameworks/Jms.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ import java
77
/** The method `ObjectMessage.getObject`. */
88
class ObjectMessageGetObjectMethod extends Method {
99
ObjectMessageGetObjectMethod() {
10-
this.hasQualifiedName([javaxOrJakarta() + "", "jakarta"] + ".jms", "ObjectMessage", "getObject")
10+
this.hasQualifiedName(javaxOrJakarta() + ".jms", "ObjectMessage", "getObject")
1111
}
1212
}

‎java/ql/lib/semmle/code/java/frameworks/Mail.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import java
88
* The class `javax.mail.Session` or `jakarta.mail.Session`.
99
*/
1010
class MailSession extends Class {
11-
MailSession() { this.hasQualifiedName([javaxOrJakarta() + ".mail", "jakarta.mail"], "Session") }
11+
MailSession() { this.hasQualifiedName(javaxOrJakarta() + ".mail", "Session") }
1212
}
1313

1414
/**

‎java/ql/lib/semmle/code/java/frameworks/Servlets.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ predicate isRequestGetParamMethod(MethodCall ma) {
377377
/** The Java EE RequestDispatcher. */
378378
class RequestDispatcher extends RefType {
379379
RequestDispatcher() {
380-
this.hasQualifiedName([javaxOrJakarta() + ".servlet", "jakarta.servlet"], "RequestDispatcher") or
380+
this.hasQualifiedName(javaxOrJakarta() + ".servlet", "RequestDispatcher") or
381381
this.hasQualifiedName(javaxOrJakarta() + ".portlet", "PortletRequestDispatcher")
382382
}
383383
}

‎java/ql/lib/semmle/code/java/frameworks/javaee/Persistence.qll‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ import java
99
/**
1010
* Gets a JavaEE Persistence API package name.
1111
*/
12-
string getAPersistencePackageName() {
13-
result = [javaxOrJakarta() + ".persistence", "jakarta.persistence"]
14-
}
12+
string getAPersistencePackageName() { result = javaxOrJakarta() + ".persistence" }
1513

1614
/**
1715
* A `RefType` with the `@Entity` annotation that indicates that it can be persisted using a JPA

‎java/ql/lib/semmle/code/java/frameworks/javaee/jsf/JSFRenderer.qll‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ import java
88
* The JSF class `FacesContext` for processing HTTP requests.
99
*/
1010
class FacesContext extends RefType {
11-
FacesContext() {
12-
this.hasQualifiedName([javaxOrJakarta() + ".faces.context", "jakarta.faces.context"],
13-
"FacesContext")
14-
}
11+
FacesContext() { this.hasQualifiedName(javaxOrJakarta() + ".faces.context", "FacesContext") }
1512
}
1613

1714
/**

‎java/ql/src/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.ql‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ class CookieResponseWithoutHttpOnlySink extends DataFlow::ExprNode {
145145

146146
/** Holds if `cie` is an invocation of a JAX-RS `NewCookie` constructor that sets `HttpOnly` to true. */
147147
predicate setsHttpOnlyInNewCookie(ClassInstanceExpr cie) {
148-
cie.getConstructedType()
149-
.hasQualifiedName([javaxOrJakarta() + ".ws.rs.core", "jakarta.ws.rs.core"], "NewCookie") and
148+
cie.getConstructedType().hasQualifiedName(javaxOrJakarta() + ".ws.rs.core", "NewCookie") and
150149
(
151150
cie.getNumArgument() = 6 and
152151
mayBeBooleanTrue(cie.getArgument(5)) // NewCookie(Cookie cookie, String comment, int maxAge, Date expiry, boolean secure, boolean httpOnly)

‎java/ql/src/experimental/Security/CWE/CWE-094/JakartaExpressionInjectionLib.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ private class TaintPropagatingCall extends Call {
8989
}
9090

9191
private class JakartaType extends RefType {
92-
JakartaType() { this.getPackage().hasName([javaxOrJakarta() + ".el", "jakarta.el"]) }
92+
JakartaType() { this.getPackage().hasName(javaxOrJakarta() + ".el") }
9393
}
9494

9595
private class ELProcessor extends JakartaType {

‎java/ql/src/experimental/Security/CWE/CWE-400/LocalThreadResourceAbuse.ql‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ class GetInitParameter extends Method {
2121
(
2222
this.getDeclaringType()
2323
.getAnAncestor()
24-
.hasQualifiedName([javaxOrJakarta() + ".servlet", "jakarta.servlet"],
24+
.hasQualifiedName(javaxOrJakarta() + ".servlet",
2525
["FilterConfig", "Registration", "ServletConfig", "ServletContext"]) or
2626
this.getDeclaringType()
2727
.getAnAncestor()
28-
.hasQualifiedName([javaxOrJakarta() + ".faces.context", "jakarta.faces.context"],
29-
"ExternalContext")
28+
.hasQualifiedName(javaxOrJakarta() + ".faces.context", "ExternalContext")
3029
) and
3130
this.getName() = "getInitParameter"
3231
}

‎java/ql/src/experimental/semmle/code/java/frameworks/Jsf.qll‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import java
1010
*/
1111
class ExternalContext extends RefType {
1212
ExternalContext() {
13-
this.hasQualifiedName([javaxOrJakarta() + ".faces.context", "jakarta.faces.context"],
14-
"ExternalContext")
13+
this.hasQualifiedName(javaxOrJakarta() + ".faces.context", "ExternalContext")
1514
}
1615
}
1716

0 commit comments

Comments
 (0)