Skip to content

Java: Add support for Struts 7.x package names #21221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
navntoft merged 2 commits into from
Jan 27, 2026
+15 −5
Merged

Java: Add support for Struts 7.x package names #21221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a94d04
Java: Add support for Struts 7.x package names
navntoft Jan 26, 2026
ede05b5
Java: Add change note for Struts 7.x package name support
navntoft Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions java/ql/lib/change-notes/2026-01-27-struts-7-support.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
category: minorAnalysis
---
* Added support for Struts 7.x package names in the Struts framework library. The library now recognizes both the legacy `com.opensymphony.xwork2` package names (Struts 2.x-6.x) and the new `org.apache.struts2` package names (Struts 7.x+), maintaining backward compatibility while enabling analysis of code using the latest Struts versions.
11 changes: 8 additions & 3 deletions java/ql/lib/semmle/code/java/frameworks/struts/StrutsActions.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ class Struts2ActionClass extends Class {
// If there are no XML files present, then we assume we any class that extends a struts 2
// action must be reflectively constructed, as we have no better indication.
not exists(XmlFile xmlFile) and
this.getAnAncestor().hasQualifiedName("com.opensymphony.xwork2", "Action")
(
this.getAnAncestor().hasQualifiedName("com.opensymphony.xwork2", "Action") or
this.getAnAncestor().hasQualifiedName("org.apache.struts2.action", "Action")
)
or
// If there is a struts.xml file, then any class that is specified as an action is considered
// to be reflectively constructed.
Expand Down Expand Up @@ -78,7 +81,8 @@ class Struts2ActionClass extends Class {
* Holds if this action class extends the preparable interface.
*/
predicate isPreparable() {
this.getAnAncestor().hasQualifiedName("com.opensymphony.xwork2", "Preparable")
this.getAnAncestor().hasQualifiedName("com.opensymphony.xwork2", "Preparable") or
this.getAnAncestor().hasQualifiedName("org.apache.struts2", "Preparable")
}

/**
Expand Down Expand Up @@ -122,7 +126,8 @@ class Struts2PrepareMethod extends Method {
*/
class Struts2ActionSupportClass extends Class {
Struts2ActionSupportClass() {
this.getASourceSupertype+().hasQualifiedName("com.opensymphony.xwork2", "ActionSupport")
this.getASourceSupertype+().hasQualifiedName("com.opensymphony.xwork2", "ActionSupport") or
this.getASourceSupertype+().hasQualifiedName("org.apache.struts2", "ActionSupport")
}

/**
Expand Down
5 changes: 3 additions & 2 deletions java/ql/lib/semmle/code/java/frameworks/struts/StrutsConventions.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ private string getConventionSuffix(RefType refType) {
*
* The convention plugin identifies as an action class any class that has an ancestor package with
* the name "struts", "struts2", "action" or "actions", and either has an indicative suffix on the
* name, or extends com.opensymphony.xwork2.Action.
* name, or extends com.opensymphony.xwork2.Action (Struts 2.x-6.x) or org.apache.struts2.action.Action (Struts 7.x+).
*/
class Struts2ConventionActionClass extends Class {
Struts2ConventionActionClass() {
Expand All @@ -108,7 +108,8 @@ class Struts2ConventionActionClass extends Class {
) and
(
this.getName().matches("%" + getConventionSuffix(this)) or
this.getAnAncestor().hasQualifiedName("com.opensymphony.xwork2", "Action")
this.getAnAncestor().hasQualifiedName("com.opensymphony.xwork2", "Action") or
this.getAnAncestor().hasQualifiedName("org.apache.struts2.action", "Action")
)
}

Expand Down