Fix places which already dealt with both javax and jakarta

This commit is contained in:
Owen Mansel-Chan
2026-02-12 12:32:25 +00:00
parent 4b240ebf8a
commit 31840902cd
10 changed files with 14 additions and 25 deletions

View File

@@ -145,8 +145,7 @@ class CookieResponseWithoutHttpOnlySink extends DataFlow::ExprNode {
/** Holds if `cie` is an invocation of a JAX-RS `NewCookie` constructor that sets `HttpOnly` to true. */
predicate setsHttpOnlyInNewCookie(ClassInstanceExpr cie) {
cie.getConstructedType()
.hasQualifiedName([javaxOrJakarta() + ".ws.rs.core", "jakarta.ws.rs.core"], "NewCookie") and
cie.getConstructedType().hasQualifiedName(javaxOrJakarta() + ".ws.rs.core", "NewCookie") and
(
cie.getNumArgument() = 6 and
mayBeBooleanTrue(cie.getArgument(5)) // NewCookie(Cookie cookie, String comment, int maxAge, Date expiry, boolean secure, boolean httpOnly)

View File

@@ -89,7 +89,7 @@ private class TaintPropagatingCall extends Call {
}
private class JakartaType extends RefType {
JakartaType() { this.getPackage().hasName([javaxOrJakarta() + ".el", "jakarta.el"]) }
JakartaType() { this.getPackage().hasName(javaxOrJakarta() + ".el") }
}
private class ELProcessor extends JakartaType {

View File

@@ -21,12 +21,11 @@ class GetInitParameter extends Method {
(
this.getDeclaringType()
.getAnAncestor()
.hasQualifiedName([javaxOrJakarta() + ".servlet", "jakarta.servlet"],
.hasQualifiedName(javaxOrJakarta() + ".servlet",
["FilterConfig", "Registration", "ServletConfig", "ServletContext"]) or
this.getDeclaringType()
.getAnAncestor()
.hasQualifiedName([javaxOrJakarta() + ".faces.context", "jakarta.faces.context"],
"ExternalContext")
.hasQualifiedName(javaxOrJakarta() + ".faces.context", "ExternalContext")
) and
this.getName() = "getInitParameter"
}

View File

@@ -10,8 +10,7 @@ import java
*/
class ExternalContext extends RefType {
ExternalContext() {
this.hasQualifiedName([javaxOrJakarta() + ".faces.context", "jakarta.faces.context"],
"ExternalContext")
this.hasQualifiedName(javaxOrJakarta() + ".faces.context", "ExternalContext")
}
}