Validate max_query_length in Label API (#2572)

grafana · Sep 1, 2020 · c1f07f0 · c1f07f0
1 parent ab2dc9e
commit c1f07f0
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/pkg/querier/querier.go b/pkg/querier/querier.go
@@ -281,6 +281,15 @@ func (q *Querier) queryIngestersForSample(ctx context.Context, params logql.Sele
 
 // Label does the heavy lifting for a Label query.
 func (q *Querier) Label(ctx context.Context, req *logproto.LabelRequest) (*logproto.LabelResponse, error) {
+	userID, err := user.ExtractOrgID(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	if err = q.validateQueryTimeRange(userID, *req.Start, *req.End); err != nil {
+		return nil, err
+	}
+
 	// Enforce the query timeout while querying backends
 	ctx, cancel := context.WithDeadline(ctx, time.Now().Add(q.cfg.QueryTimeout))
 	defer cancel()
@@ -292,11 +301,6 @@ func (q *Querier) Label(ctx context.Context, req *logproto.LabelRequest) (*logpr
 		return nil, err
 	}
 
-	userID, err := user.ExtractOrgID(ctx)
-	if err != nil {
-		return nil, err
-	}
-
 	from, through := model.TimeFromUnixNano(req.Start.UnixNano()), model.TimeFromUnixNano(req.End.UnixNano())
 	var storeValues []string
 	if req.Values {