Skip to content
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

Jump to bottom

Add proper longitude validation in geo_polygon_query #30497

Merged
merged 1 commit into from May 10, 2018
Merged

Add proper longitude validation in geo_polygon_query #30497

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java
View file
Open in desktop
Expand Up @@ -177,7 +177,7 @@ protected Query doToQuery(QueryShardContext context) throws IOException {
throw new QueryShardException(context, "illegal latitude value [{}] for [{}]", point.lat(),
GeoPolygonQueryBuilder.NAME);
}
if (!GeoUtils.isValidLongitude(point.lat())) {
if (!GeoUtils.isValidLongitude(point.lon())) {
throw new QueryShardException(context, "illegal longitude value [{}] for [{}]", point.lon(),
GeoPolygonQueryBuilder.NAME);
}
Expand Down
34 changes: 34 additions & 0 deletions server/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java
View file
Open in desktop
Expand Up @@ -254,4 +254,38 @@ public void testIgnoreUnmapped() throws IOException {
QueryShardException e = expectThrows(QueryShardException.class, () -> failingQueryBuilder.toQuery(createShardContext()));
assertThat(e.getMessage(), containsString("failed to find geo_point field [unmapped]"));
}

public void testPointValidation() throws IOException {
assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
QueryShardContext context = createShardContext();
String queryInvalidLat = "{\n" +
" \"geo_polygon\":{\n" +
" \"" + GEO_POINT_FIELD_NAME + "\":{\n" +
" \"points\":[\n" +
" [-70, 140],\n" +
" [-80, 30],\n" +
" [-90, 20]\n" +
" ]\n" +
" }\n" +
" }\n" +
"}\n";

QueryShardException e1 = expectThrows(QueryShardException.class, () -> parseQuery(queryInvalidLat).toQuery(context));
assertThat(e1.getMessage(), containsString("illegal latitude value [140.0] for [geo_polygon]"));

String queryInvalidLon = "{\n" +
" \"geo_polygon\":{\n" +
" \"" + GEO_POINT_FIELD_NAME + "\":{\n" +
" \"points\":[\n" +
" [-70, 40],\n" +
" [-80, 30],\n" +
" [-190, 20]\n" +
" ]\n" +
" }\n" +
" }\n" +
"}\n";

QueryShardException e2 = expectThrows(QueryShardException.class, () -> parseQuery(queryInvalidLon).toQuery(context));
assertThat(e2.getMessage(), containsString("illegal longitude value [-190.0] for [geo_polygon]"));
}
}
23 changes: 8 additions & 15 deletions server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_1.json
View file
Open in desktop
@@ -1,19 +1,12 @@
{
"filtered": {
"query": {
"match_all": {}
},
"filter": {
"geo_polygon": {
"location": {
"points": {
"points": [
[-70, 40],
[-80, 30],
[-90, 20]
]
}
}
"geo_polygon": {
"location": {
"points": {
"points": [
[-70, 40],
[-80, 30],
[-90, 20]
]
}
}
}
Expand Down
24 changes: 8 additions & 16 deletions server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_2.json
View file
Open in desktop
@@ -1,21 +1,13 @@
{
"filtered": {
"query": {
"match_all": {}
},
"filter": {
"geo_polygon": {
"location": {
"points": [
[-70, 40],
[-80, 30],
[-90, 20]
],
"something_else": {
"geo_polygon": {
"location": {
"points": [
[-70, 40],
[-80, 30],
[-90, 20]
],
"something_else": {

}

}
}
}
}
Expand Down
11 changes: 2 additions & 9 deletions server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_3.json
View file
Open in desktop
@@ -1,12 +1,5 @@
{
"filtered": {
"query": {
"match_all": {}
},
"filter": {
"geo_polygon": {
"location": ["WRONG"]
}
}
"geo_polygon": {
"location": ["WRONG"]
}
}
23 changes: 8 additions & 15 deletions server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_4.json
View file
Open in desktop
@@ -1,19 +1,12 @@
{
"filtered": {
"query": {
"match_all": {}
"geo_polygon": {
"location": {
"points": [
[-70, 40],
[-80, 30],
[-90, 20]
]
},
"filter": {
"geo_polygon": {
"location": {
"points": [
[-70, 40],
[-80, 30],
[-90, 20]
]
},
"bla": true
}
}
"bla": true
}
}
23 changes: 8 additions & 15 deletions server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_5.json
View file
Open in desktop
@@ -1,19 +1,12 @@
{
"filtered": {
"query": {
"match_all": {}
"geo_polygon": {
"location": {
"points": [
[-70, 40],
[-80, 30],
[-90, 20]
]
},
"filter": {
"geo_polygon": {
"location": {
"points": [
[-70, 40],
[-80, 30],
[-90, 20]
]
},
"bla": ["array"]
}
}
"bla": ["array"]
}
}