Throw if illegal type in meta request

1 files changed, 8 insertions, 0 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/horizon/TsdbQueryRewriter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/horizon/TsdbQueryRewriter.java
index 2060336487d..e034be46063 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/horizon/TsdbQueryRewriter.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/horizon/TsdbQueryRewriter.java
@@ -38,6 +38,7 @@ public class TsdbQueryRewriter {
             throw new UnauthorizedException();
 
         JsonNode root = mapper.readTree(data);
+        requireLegalType(root);
         getField(root, "executionGraph", ArrayNode.class)
                 .ifPresent(graph -> rewriteQueryGraph(graph, authorizedTenants, operator, systemName));
         getField(root, "filters", ArrayNode.class)
@@ -95,6 +96,13 @@ public class TsdbQueryRewriter {
         }
     }
 
+    private static void requireLegalType(JsonNode root) {
+        Optional.ofNullable(root.get("type"))
+                .map(JsonNode::asText)
+                .filter(type -> !"TAG_KEYS_AND_VALUES".equals(type))
+                .ifPresent(type -> { throw new IllegalArgumentException("Illegal type " + type); });
+    }
+
     private static <T extends JsonNode> Optional<T> getField(JsonNode object, String fieldName, Class<T> clazz) {
         return Optional.ofNullable(object.get(fieldName)).filter(clazz::isInstance).map(clazz::cast);
     }