honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix AIOOB on indexed geo_shape query (#28458) 

This change fixes a possible AIOOB during the parsing of the document that contains the indexed shape.
This change ensures that the parsing does not continue when the field that contains the shape has been found.

Closes #28456
This commit is contained in:
Jim Ferenczi 2018-02-01 09:01:48 +01:00 committed by GitHub
parent 9bada306dc
commit c7d5a54b42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java
View File

@ -409,6 +409,7 @@ public class GeoShapeQueryBuilder extends AbstractQueryBuilder<GeoShapeQueryBuil
parser.nextToken();
if (++currentPathSlot == pathElements.length) {
listener.onResponse(ShapeParser.parse(parser));
return;
}
} else {
parser.nextToken();

26
server/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java
View File

@ -119,6 +119,7 @@ public class GeoShapeQueryBuilderTests extends AbstractQueryTestCase<GeoShapeQue
XContentBuilder builder = XContentFactory.jsonBuilder().prettyPrint();
builder.startObject();
builder.field(expectedShapePath, indexedShapeToReturn);
builder.field(randomAlphaOfLengthBetween(10, 20), "something");
builder.endObject();
json = builder.string();
} catch (IOException ex) {
@ -227,13 +228,7 @@ public class GeoShapeQueryBuilderTests extends AbstractQueryTestCase<GeoShapeQue
@Override
public void testMustRewrite() throws IOException {
GeoShapeQueryBuilder sqb;
do {
sqb = doCreateTestQueryBuilder();
// do this until we get one without a shape
} while (sqb.shape() != null);
GeoShapeQueryBuilder query = sqb;
GeoShapeQueryBuilder query = doCreateTestQueryBuilder(true);
UnsupportedOperationException e = expectThrows(UnsupportedOperationException.class, () -> query.toQuery(createShardContext()));
assertEquals("query must be rewritten first", e.getMessage());
@ -244,6 +239,23 @@ public class GeoShapeQueryBuilderTests extends AbstractQueryTestCase<GeoShapeQue
assertEquals(geoShapeQueryBuilder, rewrite);
}
public void testMultipleRewrite() throws IOException {
GeoShapeQueryBuilder shape = doCreateTestQueryBuilder(true);
QueryBuilder builder = new BoolQueryBuilder()
.should(shape)
.should(shape);
builder = rewriteAndFetch(builder, createShardContext());
GeoShapeQueryBuilder expectedShape = new GeoShapeQueryBuilder(GEO_SHAPE_FIELD_NAME, indexedShapeToReturn);
expectedShape.strategy(shape.strategy());
expectedShape.relation(shape.relation());
QueryBuilder expected = new BoolQueryBuilder()
.should(expectedShape)
.should(expectedShape);
assertEquals(expected, builder);
}
public void testIgnoreUnmapped() throws IOException {
ShapeType shapeType = ShapeType.randomType(random());
ShapeBuilder shape = RandomShapeGenerator.createShapeWithin(random(), null, shapeType);