Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 15:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #693 from atlassian/WW-5314-log-jakarta

Browse Source 
WW-5314 Do not log warnings for bad user input from JakartaMultiPartRequest
This commit is contained in:
Lukasz Lenart
2023-06-27 08:45:47 +02:00
committed by GitHub
parent 13013e7565 71050c446d
commit 3891a6bc5c
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
+2 -2
View File
@@ -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);
core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
+2 -3
View File
@@ -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;
}