From de5d741b61238984af270bd41971132b79ca99ce Mon Sep 17 00:00:00 2001 From: Kusal Kithul-Godage Date: Tue, 27 Jun 2023 12:55:09 +1000 Subject: [PATCH 1/2] WW-5314 Do not log warnings for bad user input from JakartaMultiPartRequest --- .../struts2/dispatcher/multipart/JakartaMultiPartRequest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 index cd0aaff96..8361d2707 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java @@ -70,7 +70,7 @@ public class JakartaMultiPartRequest extends AbstractMultiPartRequest { setLocale(request); processUpload(request, saveDir); } catch (FileUploadException e) { - LOG.warn("Request exceeded size limit!", e); + LOG.debug("Request exceeded size limit!", e); LocalizedMessage errorMessage; if (e instanceof FileUploadBase.SizeLimitExceededException) { FileUploadBase.SizeLimitExceededException ex = (FileUploadBase.SizeLimitExceededException) e; @@ -89,7 +89,7 @@ public class JakartaMultiPartRequest extends AbstractMultiPartRequest { errors.add(errorMessage); } } catch (Exception e) { - LOG.warn("Unable to parse request", e); + LOG.debug("Unable to parse request", e); LocalizedMessage errorMessage = buildErrorMessage(e, new Object[]{}); if (!errors.contains(errorMessage)) { errors.add(errorMessage); From 71050c446d873bb25b85622a5c836bf14ab9173e Mon Sep 17 00:00:00 2001 From: Kusal Kithul-Godage Date: Tue, 27 Jun 2023 13:04:09 +1000 Subject: [PATCH 2/2] WW-5314 Update log level in JakartaStreamMultiPartRequest --- .../dispatcher/multipart/JakartaStreamMultiPartRequest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java index 7eb867392..dec0b6841 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java @@ -194,7 +194,7 @@ public class JakartaStreamMultiPartRequest extends AbstractMultiPartRequest { setLocale(request); processUpload(request, saveDir); } catch (Exception e) { - LOG.warn("Error occurred during parsing of multi part request", e); + LOG.debug("Error occurred during parsing of multi part request", e); LocalizedMessage errorMessage = buildErrorMessage(e, new Object[]{}); if (!errors.contains(errorMessage)) { errors.add(errorMessage); @@ -249,10 +249,9 @@ public class JakartaStreamMultiPartRequest extends AbstractMultiPartRequest { else { // prevent processing file field item if request size not allowed. - // also warn user in the logs. if (!requestSizePermitted) { addFileSkippedError(itemStream.getName(), request); - LOG.warn("Skipped stream '{}', request maximum size ({}) exceeded.", itemStream.getName(), maxSize); + LOG.debug("Skipped stream '{}', request maximum size ({}) exceeded.", itemStream.getName(), maxSize); continue; }