Make parsing strict for geo_shape query & filter and stricter for `…

…common` query. Closes #4508
elastic · Dec 18, 2013 · e7e1667 · e7e1667
1 parent bb4d3f5
commit e7e1667
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/rest-spec b/rest-spec
diff --git a/rest-spec b/rest-spec
@@ -0,0 +1 @@
+../elasticsearch-rest-api-spec/
diff --git a/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java b/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java
@@ -104,6 +104,8 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
                                 }
                             }
                         }
+                    } else {
+                        throw new QueryParsingException(parseContext.index(), "[common] query does not support [" + currentFieldName + "]");
                     }
                 } else if (token.isValue()) {
                     if ("query".equals(currentFieldName)) {

diff --git a/src/main/java/org/elasticsearch/index/query/GeoShapeFilterParser.java b/src/main/java/org/elasticsearch/index/query/GeoShapeFilterParser.java
@@ -135,6 +135,8 @@ public Filter parse(QueryParseContext parseContext) throws IOException, QueryPar
                                 throw new QueryParsingException(parseContext.index(), "Type for indexed shape not provided");
                             }
                             shape = fetchService.fetch(id, type, index, shapeFieldName);
+                        } else {
+                            throw new QueryParsingException(parseContext.index(), "[geo_shape] filter does not support [" + currentFieldName + "]");
                         }
                     }
                 }
@@ -145,6 +147,8 @@ public Filter parse(QueryParseContext parseContext) throws IOException, QueryPar
                     cache = parser.booleanValue();
                 } else if ("_cache_key".equals(currentFieldName)) {
                     cacheKey = new CacheKeyFilter.Key(parser.text());
+                } else {
+                    throw new QueryParsingException(parseContext.index(), "[geo_shape] filter does not support [" + currentFieldName + "]");
                 }
             }
         }

diff --git a/src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java b/src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java
@@ -113,6 +113,8 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
                                 throw new QueryParsingException(parseContext.index(), "Type for indexed shape not provided");
                             }
                             shape = fetchService.fetch(id, type, index, shapeFieldName);
+                        } else {
+                            throw new QueryParsingException(parseContext.index(), "[geo_shape] query does not support [" + currentFieldName + "]");
                         }
                     }
                 }
@@ -121,6 +123,8 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
                     boost = parser.floatValue();
                 } else if ("_name".equals(currentFieldName)) {
                     queryName = parser.text();
+                } else {
+                    throw new QueryParsingException(parseContext.index(), "[geo_shape] query does not support [" + currentFieldName + "]");
                 }
             }
         }