Json parsing exceptions should not cause 500 errors (#111548)
Currently we wrap JsonEOFException from advancing the json parser into our own XContentEOFException, but this has the drawback that is results in 500 errors on the client side. Instead this should be 400 errors. This changes XContentEOFException to extend XContentParseException so we report a 400 error instead. Closes #111542
This commit is contained in:
parent
f7639605a5
commit
000ebaf7c2
|
@ -0,0 +1,6 @@
|
|||
pr: 111548
|
||||
summary: Json parsing exceptions should not cause 500 errors
|
||||
area: Infra/Core
|
||||
type: bug
|
||||
issues:
|
||||
- 111542
|
|
@ -57,7 +57,8 @@ public class JsonXContentParser extends AbstractXContentParser {
|
|||
try {
|
||||
return convertToken(parser.nextToken());
|
||||
} catch (JsonEOFException e) {
|
||||
throw new XContentEOFException(e);
|
||||
JsonLocation location = e.getLocation();
|
||||
throw new XContentEOFException(new XContentLocation(location.getLineNr(), location.getColumnNr()), "Unexpected end of file", e);
|
||||
} catch (JsonParseException e) {
|
||||
throw newXContentParseException(e);
|
||||
}
|
||||
|
|
|
@ -8,11 +8,9 @@
|
|||
|
||||
package org.elasticsearch.xcontent;
|
||||
|
||||
import java.io.IOException;
|
||||
public class XContentEOFException extends XContentParseException {
|
||||
|
||||
public class XContentEOFException extends IOException {
|
||||
|
||||
public XContentEOFException(IOException cause) {
|
||||
super(cause);
|
||||
public XContentEOFException(XContentLocation location, String message, Exception cause) {
|
||||
super(location, message, cause);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -114,14 +114,14 @@ setup:
|
|||
|
||||
- match: { responses.0.hits.total: 2 }
|
||||
- match: { responses.1.error.root_cause.0.type: x_content_e_o_f_exception }
|
||||
- match: { responses.1.error.root_cause.0.reason: "/Unexpected.end.of.input/" }
|
||||
- match: { responses.1.error.root_cause.0.reason: "/\\[1:22\\].Unexpected.end.of.file/" }
|
||||
- match: { responses.2.hits.total: 1 }
|
||||
- match: { responses.3.error.root_cause.0.type: parsing_exception }
|
||||
- match: { responses.3.error.root_cause.0.reason: "/unknown.query.\\[unknown\\]/" }
|
||||
- match: { responses.4.error.root_cause.0.type: illegal_argument_exception }
|
||||
- match: { responses.4.error.root_cause.0.reason: "[rest_total_hits_as_int] cannot be used if the tracking of total hits is not accurate, got 1" }
|
||||
- match: { responses.0.status: 200 }
|
||||
- match: { responses.1.status: 500 }
|
||||
- match: { responses.1.status: 400 }
|
||||
- match: { responses.2.status: 200 }
|
||||
- match: { responses.3.status: 400 }
|
||||
|
||||
|
|
|
@ -103,8 +103,7 @@ public class XContentUtilsTests extends ESTestCase {
|
|||
XContentEOFException.class,
|
||||
() -> XContentUtils.positionParserAtTokenAfterField(parser, missingField, errorFormat)
|
||||
);
|
||||
|
||||
assertThat(exception.getMessage(), containsString("Unexpected end-of-input"));
|
||||
assertThat(exception.getMessage(), containsString("[4:1] Unexpected end of file"));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -309,8 +309,8 @@ public class HuggingFaceElserResponseEntityTests extends ESTestCase {
|
|||
new HttpResult(mock(HttpResponse.class), responseJson.getBytes(StandardCharsets.UTF_8))
|
||||
)
|
||||
);
|
||||
|
||||
assertThat(thrownException.getMessage(), containsString("expected close marker for Array (start marker at"));
|
||||
assertThat(thrownException.getMessage(), containsString("[5:1] Unexpected end of file"));
|
||||
assertThat(thrownException.getCause().getMessage(), containsString("expected close marker for Array (start marker at"));
|
||||
}
|
||||
|
||||
public void testFails_ResponseIsInvalidJson_MissingField() {
|
||||
|
|
|
@ -8,7 +8,6 @@ package org.elasticsearch.xpack.ml.job.process.autodetect.writer;
|
|||
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.elasticsearch.ElasticsearchParseException;
|
||||
import org.elasticsearch.xcontent.XContentEOFException;
|
||||
import org.elasticsearch.xcontent.XContentParseException;
|
||||
import org.elasticsearch.xcontent.XContentParser;
|
||||
|
||||
|
@ -196,7 +195,7 @@ class XContentRecordReader {
|
|||
protected XContentParser.Token tryNextTokenOrReadToEndOnError() throws IOException {
|
||||
try {
|
||||
return parser.nextToken();
|
||||
} catch (XContentEOFException | XContentParseException e) {
|
||||
} catch (XContentParseException e) {
|
||||
logger.warn("Attempting to recover from malformed JSON data.", e);
|
||||
for (int i = 0; i <= nestedLevel; ++i) {
|
||||
readToEndOfObject();
|
||||
|
@ -217,7 +216,7 @@ class XContentRecordReader {
|
|||
do {
|
||||
try {
|
||||
token = parser.nextToken();
|
||||
} catch (XContentEOFException | XContentParseException e) {
|
||||
} catch (XContentParseException e) {
|
||||
++errorCounter;
|
||||
if (errorCounter >= PARSE_ERRORS_LIMIT) {
|
||||
logger.error("Failed to recover from malformed JSON data.", e);
|
||||
|
|
Loading…
Reference in New Issue