From 8b4c188d0f29eead85ba4199543128420aaf77a5 Mon Sep 17 00:00:00 2001
From: Kusal Kithul-Godage <git@kusal.io>
Date: Sat, 13 Jul 2024 21:56:21 +1000
Subject: [PATCH] WW-5440 Fix Showcase App allowlist configuration

---
 .../struts2/showcase/modelDriven/ModelDrivenAction.java  | 1 +
 .../showcase/modelDriven/{ => model}/Gangster.java       | 2 +-
 apps/showcase/src/main/resources/struts.xml              | 9 +++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)
 rename apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/{ => model}/Gangster.java (96%)

diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java
index a491ba7ca..60692b0e6 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java
@@ -22,6 +22,7 @@ package org.apache.struts2.showcase.modelDriven;
 
 import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.ModelDriven;
+import org.apache.struts2.showcase.modelDriven.model.Gangster;
 
 /**
  * Action to demonstrate simple model-driven feature of the framework.
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/Gangster.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/model/Gangster.java
similarity index 96%
rename from apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/Gangster.java
rename to apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/model/Gangster.java
index be2a571bb..6d0b26366 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/Gangster.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/model/Gangster.java
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.showcase.modelDriven;
+package org.apache.struts2.showcase.modelDriven.model;
 
 import java.io.Serializable;
 
diff --git a/apps/showcase/src/main/resources/struts.xml b/apps/showcase/src/main/resources/struts.xml
index 33095326c..d0f57325d 100644
--- a/apps/showcase/src/main/resources/struts.xml
+++ b/apps/showcase/src/main/resources/struts.xml
@@ -36,6 +36,15 @@
 
     <constant name="struts.allowlist.enable" value="true" />
     <constant name="struts.parameters.requireAnnotations" value="true" />
+    <constant name="struts.allowlist.packageNames" value="
+            org.apache.struts2.showcase.model,
+            org.apache.struts2.showcase.modelDriven.model
+    "/>
+    <constant name="struts.allowlist.classes" value="
+            org.apache.struts2.showcase.hangman.Hangman,
+            org.apache.struts2.showcase.hangman.HangmanConstants,
+            org.apache.struts2.showcase.hangman.Vocab
+    "/>
 
     <constant name="struts.convention.package.locators.basePackage" value="org.apache.struts2.showcase" />
     <constant name="struts.convention.result.path" value="/WEB-INF" />