Skip to content

Fix: Multipart files processing when Array of files with same fieldName is sent in request #675

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
deki merged 2 commits into from
Nov 3, 2023
Merged

Fix: Multipart files processing when Array of files with same fieldName is sent in request #675

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
397cd9d
fix: Multipart files processing when Array of files with same fieldNa…
mbfreder Nov 3, 2023
3b00e72
moved getParts and getPart to AwsHttpServletRequest
mbfreder Nov 3, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
moved getParts and getPart to AwsHttpServletRequest
  • Loading branch information
@mbfreder
mbfreder committed Nov 3, 2023
commit 3b00e72f215059a2aefc2744a52b78ad845e0948
19 changes: 0 additions & 19 deletions .../com/amazonaws/serverless/proxy/internal/servlet/AwsHttpApiV2ProxyHttpServletRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,25 +235,6 @@ public void logout() throws ServletException {
throw new UnsupportedOperationException();
}

@Override
public Collection<Part> getParts() throws IOException, ServletException {
List<Part> partList =
getMultipartFormParametersMap().values().stream()
.flatMap(List::stream)
.collect(Collectors.toList());
return partList;
}

@Override
public Part getPart(String s) throws IOException, ServletException {
// In case there's multiple files with the same fieldName, we return the first one in the list
List<Part> values = getMultipartFormParametersMap().get(s);
if (Objects.isNull(values)) {
return null;
}
return getMultipartFormParametersMap().get(s).get(0);
}

@Override
public <T extends HttpUpgradeHandler> T upgrade(Class<T> aClass) throws IOException, ServletException {
throw new UnsupportedOperationException();
Expand Down
21 changes: 21 additions & 0 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 @@ -510,6 +510,27 @@ protected Map<String, List<String>> getFormUrlEncodedParametersMap() {
return urlEncodedFormParameters;
}

@Override
public Collection<Part> getParts()
throws IOException, ServletException {
List<Part> partList =
getMultipartFormParametersMap().values().stream()
.flatMap(List::stream)
.collect(Collectors.toList());
return partList;
}

@Override
public Part getPart(String s)
throws IOException, ServletException {
// In case there's multiple files with the same fieldName, we return the first one in the list
List<Part> values = getMultipartFormParametersMap().get(s);
if (Objects.isNull(values)) {
return null;
}
return getMultipartFormParametersMap().get(s).get(0);
}

@SuppressFBWarnings({"FILE_UPLOAD_FILENAME", "WEAK_FILENAMEUTILS"})
protected Map<String, List<Part>> getMultipartFormParametersMap() {
if (multipartFormParameters != null) {
Expand Down
24 changes: 0 additions & 24 deletions ...main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,30 +255,6 @@ public void logout()
throw new UnsupportedOperationException();
}


@Override
public Collection<Part> getParts()
throws IOException, ServletException {
List<Part> partList =
getMultipartFormParametersMap().values().stream()
.flatMap(List::stream)
.collect(Collectors.toList());
return partList;
}


@Override
public Part getPart(String s)
throws IOException, ServletException {
// In case there's multiple files with the same fieldName, we return the first one in the list
List<Part> values = getMultipartFormParametersMap().get(s);
if (Objects.isNull(values)) {
return null;
}
return getMultipartFormParametersMap().get(s).get(0);
}


@Override
public <T extends HttpUpgradeHandler> T upgrade(Class<T> aClass)
throws IOException, ServletException {
Expand Down