Skip to content

[UNDERTOW-2616] Fix thrown exception to align with servlet specs #1798

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[UNDERTOW-2616] Fix thrown exception to align with servlet specs #1798

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 37 additions & 10 deletions servlet/src/main/java/io/undertow/servlet/spec/HttpServletRequestImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public final class HttpServletRequestImpl implements HttpServletRequest {
private volatile AsyncContextImpl asyncContext = null;
private Map<String, Deque<String>> queryParameters;
private FormData parsedFormData;
private RuntimeException formParsingException;
private Exception formParsingException;
private Charset characterEncoding;
private boolean readStarted;
private SessionConfig.SessionCookieSource sessionCookieSource;
Expand Down Expand Up @@ -752,7 +752,12 @@ public String getParameter(final String name) {
}
Deque<String> params = queryParameters.get(name);
if (params == null) {
final FormData parsedFormData = parseFormData();
FormData parsedFormData;
try {
parsedFormData = parseFormData();
} catch (Exception e) {
throw new IllegalStateException(e);
}
if (parsedFormData != null) {
FormData.FormValue res = parsedFormData.getFirst(name);
if (res == null || res.isFileItem() && !res.isBigField()) {
Expand All @@ -772,7 +777,12 @@ public Enumeration<String> getParameterNames() {
queryParameters = exchange.getQueryParameters();
}
final Set<String> parameterNames = new HashSet<>(queryParameters.keySet());
final FormData parsedFormData = parseFormData();
FormData parsedFormData;
try {
parsedFormData = parseFormData();
} catch (Exception e) {
throw new IllegalStateException(e);
}
if (parsedFormData != null) {
Iterator<String> it = parsedFormData.iterator();
while (it.hasNext()) {
Expand Down Expand Up @@ -800,7 +810,12 @@ public String[] getParameterValues(final String name) {
ret.add(param);
}
}
final FormData parsedFormData = parseFormData();
FormData parsedFormData;
try {
parsedFormData = parseFormData();
} catch (Exception e) {
throw new IllegalStateException(e);
}
if (parsedFormData != null) {
Deque<FormData.FormValue> res = parsedFormData.get(name);
if (res != null) {
Expand All @@ -827,7 +842,12 @@ public Map<String, String[]> getParameterMap() {
arrayMap.put(entry.getKey(), new ArrayList<>(entry.getValue()));
}

final FormData parsedFormData = parseFormData();
FormData parsedFormData;
try {
parsedFormData = parseFormData();
} catch (Exception e) {
throw new IllegalStateException(e);
}
if (parsedFormData != null) {
Iterator<String> it = parsedFormData.iterator();
while (it.hasNext()) {
Expand Down Expand Up @@ -860,9 +880,13 @@ public Map<String, String[]> getParameterMap() {
return ret;
}

private FormData parseFormData() {
private FormData parseFormData() throws IOException{
if(formParsingException != null) {
throw formParsingException;
if(this.formParsingException instanceof IOException) {
throw (IOException) this.formParsingException;
} else {
throw (RuntimeException) this.formParsingException;
}
}
if (parsedFormData == null) {
if (readStarted) {
Expand All @@ -877,11 +901,14 @@ private FormData parseFormData() {
try {
return parsedFormData = parser.parseBlocking();
} catch (RequestTooBigException | MultiPartParserDefinition.FileTooLargeException e) {
throw formParsingException = new IllegalStateException(e);
formParsingException = new IllegalStateException(e);
throw (IllegalStateException)formParsingException;
} catch (RuntimeException e) {
throw formParsingException = e;
formParsingException = e;
throw e;
} catch (IOException e) {
throw formParsingException = new RuntimeException(e);
formParsingException = e;
throw e;
}
}
return parsedFormData;
Expand Down
Loading