Skip to content

Update Dependency: commons-fileupload2-jakarta-servlet6 to 2.0.0-M4 #1465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jun 18, 2025
Merged

Update Dependency: commons-fileupload2-jakarta-servlet6 to 2.0.0-M4 #1465

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cc0e127
fix build failure.
vicheey Jun 17, 2025
29072d3
update commons-fileupload2-jakarta-servlet6 to 2.0.0-M4
vicheey Jun 17, 2025
db4aaa0
Update aws-serverless-java-container-core/src/main/java/com/amazonaws…
vicheey Jun 18, 2025
8b7e7ff
update to rethrow IOException
vicheey Jun 18, 2025
d7d4b9d
remove try-catch block
vicheey Jun 18, 2025
2939512
Merge branch 'main' into main
vicheey Jun 18, 2025
829b484
Merge branch 'main' into main
vicheey Jun 18, 2025
b8d7cb7
Merge branch 'main' into main
vicheey Jun 18, 2025
1011155
reset white space.
vicheey Jun 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aws-serverless-java-container-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
<version>2.0.0-M2</version>
<version>2.0.0-M4</version>
</dependency>

<dependency>
Expand Down
26 changes: 15 additions & 11 deletions .../src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ public Part getPart(String s)
}

@SuppressFBWarnings({"FILE_UPLOAD_FILENAME", "WEAK_FILENAMEUTILS"})
protected Map<String, List<Part>> getMultipartFormParametersMap() {
protected Map<String, List<Part>> getMultipartFormParametersMap() throws RuntimeException {
if (multipartFormParameters != null) {
return multipartFormParameters;
}
Expand All @@ -511,16 +511,20 @@ protected Map<String, List<Part>> getMultipartFormParametersMap() {
List<DiskFileItem> items = upload.parseRequest(this);
for (FileItem<DiskFileItem> item : items) {
String fileName = FilenameUtils.getName(item.getName());
AwsProxyRequestPart newPart = new AwsProxyRequestPart(item.get());
newPart.setName(item.getFieldName());
newPart.setSubmittedFileName(fileName);
newPart.setContentType(item.getContentType());
newPart.setSize(item.getSize());
item.getHeaders().getHeaderNames().forEachRemaining(h -> {
newPart.addHeader(h, item.getHeaders().getHeader(h));
});

addPart(multipartFormParameters, item.getFieldName(), newPart);
try {
AwsProxyRequestPart newPart = new AwsProxyRequestPart(item.get());
newPart.setName(item.getFieldName());
newPart.setSubmittedFileName(fileName);
newPart.setContentType(item.getContentType());
newPart.setSize(item.getSize());
item.getHeaders().getHeaderNames().forEachRemaining(h -> {
newPart.addHeader(h, item.getHeaders().getHeader(h));
});
addPart(multipartFormParameters, item.getFieldName(), newPart);
Copy link
Contributor

@valerena valerena Jun 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Go back to original indentation here

Copy link
Contributor Author

@vicheey vicheey Jun 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. It was not highlighted locally. Removing extra space.

} catch (IOException e) {
log.error("Encounter issue adding form multipart", e);
throw new RuntimeException(e);
Copy link
Contributor

@deki deki Jun 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please see https://javadoc.io/static/jakarta.servlet/jakarta.servlet-api/6.0.0/jakarta.servlet/jakarta/servlet/http/HttpServletRequest.html#getPart(java.lang.String) and https://javadoc.io/doc/jakarta.servlet/jakarta.servlet-api/6.0.0/jakarta.servlet/jakarta/servlet/http/HttpServletRequest.html:

IOException - if an I/O error occurred during the retrieval of the Part components of this request
ServletException - if this request is not of type multipart/form-data
IllegalStateException - if the request body is larger than maxRequestSize, or any Part in the request is larger than maxFileSize, or there is no @MultipartConfig or multipart-config in deployment descriptors

Therefore I wouldn't make it a generic RuntimeException here.

Copy link
Contributor Author

@vicheey vicheey Jun 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. Thank you. Since getMultipartFormParametersMap() used in getParts() which throw IOException, ServletException in its signature, i updated the code to just throw IOException from getMultipartFormParametersMap()

Copy link
Contributor

@deki deki Jun 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. You can even remove the try/ catch block.

Copy link
Contributor Author

@vicheey vicheey Jun 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Of course.

}
}
} catch (FileUploadException e) {
Timer.stop("SERVLET_REQUEST_GET_MULTIPART_PARAMS");
Expand Down
Loading