WW-5340 Add debug logging for rejected form fields

apache · Oct 5, 2023 · 276ede4 · 276ede4
1 parent 20eafb6
commit 276ede4
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
@@ -142,26 +142,22 @@ protected void processNormalFormField(FileItem item, String charset) throws Unsu
             }
 
             long size = item.getSize();
-            if (size == 0) {
-                values.add(StringUtils.EMPTY);
-            } else if (size > maxStringLength) {
+            if (size > maxStringLength) {
+                LOG.debug("Form field {} of size {} bytes exceeds limit of {}.", item.getFieldName(), size, maxStringLength);
                 String errorKey = "struts.messages.upload.error.parameter.too.long";
                 LocalizedMessage localizedMessage = new LocalizedMessage(this.getClass(), errorKey, null,
-                    new Object[]{item.getFieldName(), maxStringLength, size});
-
+                        new Object[]{item.getFieldName(), maxStringLength, size});
                 if (!errors.contains(localizedMessage)) {
                     errors.add(localizedMessage);
                 }
                 return;
-
-            } else if (charset != null) {
-                values.add(item.getString(charset));
+            }
+            if (size == 0) {
+                values.add(StringUtils.EMPTY);
+            } else if (charset == null) {
+                values.add(item.getString()); // WW-633
             } else {
-                // note: see https://issues.apache.org/jira/browse/WW-633
-                // basically, in some cases the charset may be null, so
-                // we're just going to try to "other" method (no idea if this
-                // will work)
-                values.add(item.getString());
+                values.add(item.getString(charset));
             }
             params.put(item.getFieldName(), values);
         } finally {