WW-5352 Ensure allowlist is cleared if in unexpected state

apache · Jan 9, 2024 · bf3f407 · bf3f407
1 parent 4255da3
commit bf3f407
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/core/src/main/java/org/apache/struts2/interceptor/parameter/ParametersInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/parameter/ParametersInterceptor.java
@@ -219,6 +219,10 @@ protected void applyParameters(final Object action, ValueStack stack, HttpParame
         Map<String, Parameter> acceptableParameters;
         ValueStack newStack;
         try {
+            if (!threadAllowlist.getAllowlist().isEmpty()) {
+                LOG.error("Thread allowlist was utilised but not cleared", new IllegalStateException());
+                threadAllowlist.clearAllowlist();
+            }
             acceptableParameters = toAcceptableParameters(parameters, action); // Side-effect: Allowlist required types
 
             newStack = toNewStack(stack);