receive: Add extra validation for tenant label name. (#4404)

Fixes: #4396 Signed-off-by: Bartlomiej Plotka <[email protected]>
thanos-io · Jul 2, 2021 · 06ae3b8 · 06ae3b8
1 parent 55d2775
commit 06ae3b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cmd/thanos/receive.go b/cmd/thanos/receive.go
@@ -55,6 +55,9 @@ func registerReceive(app *extkingpin.App) {
 			return errors.Wrap(err, "parse labels")
 		}
 
+		if !model.LabelName.IsValid(model.LabelName(conf.tenantLabelName)) {
+			return errors.Errorf("unsupported format for tenant label name, got %s", conf.tenantLabelName)
+		}
 		if len(lset) == 0 {
 			return errors.New("no external labels configured for receive, uniquely identifying external labels must be configured (ideally with `receive_` prefix); see https://thanos.io/tip/thanos/storage.md#external-labels for details.")
 		}
@@ -681,8 +684,8 @@ type receiveConfig struct {
 	refreshInterval   *model.Duration
 	endpoint          string
 	tenantHeader      string
-	defaultTenantID   string
 	tenantLabelName   string
+	defaultTenantID   string
 	replicaHeader     string
 	replicationFactor uint64
 	forwardTimeout    *model.Duration

diff --git a/cmd/thanos/rule.go b/cmd/thanos/rule.go
@@ -655,7 +655,7 @@ func parseFlagLabels(s []string) (labels.Labels, error) {
 		if len(parts) != 2 {
 			return nil, errors.Errorf("unrecognized label %q", l)
 		}
-		if !model.LabelName.IsValid(model.LabelName(string(parts[0]))) {
+		if !model.LabelName.IsValid(model.LabelName(parts[0])) {
 			return nil, errors.Errorf("unsupported format for label %s", l)
 		}
 		val, err := strconv.Unquote(parts[1])