chore: Fix escaping regex special characters (#3840)

aws · May 1, 2023 · a3ac553 · a3ac553
1 parent 6a5a705
commit a3ac553
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/pkg/apis/v1alpha1/register.go b/pkg/apis/v1alpha1/register.go
@@ -44,9 +44,9 @@ var (
 	RestrictedTagPatterns = []*regexp.Regexp{
 		// Adheres to cluster name pattern matching as specified in the API spec
 		// https://docs.aws.amazon.com/eks/latest/APIReference/API_CreateCluster.html
-		regexp.MustCompile(`^kubernetes.io/cluster/[0-9A-Za-z][A-Za-z0-9\-_]*$`),
-		regexp.MustCompile(fmt.Sprintf("^%s$", v1alpha5.ProvisionerNameLabelKey)),
-		regexp.MustCompile(fmt.Sprintf("^%s$", v1alpha5.ManagedByLabelKey)),
+		regexp.MustCompile(`^kubernetes\.io/cluster/[0-9A-Za-z][A-Za-z0-9\-_]*$`),
+		regexp.MustCompile(fmt.Sprintf("^%s$", regexp.QuoteMeta(v1alpha5.ProvisionerNameLabelKey))),
+		regexp.MustCompile(fmt.Sprintf("^%s$", regexp.QuoteMeta(v1alpha5.ManagedByLabelKey))),
 	}
 	AMIFamilyBottlerocket = "Bottlerocket"
 	AMIFamilyAL2          = "AL2"

diff --git a/pkg/apis/v1alpha1/suite_test.go b/pkg/apis/v1alpha1/suite_test.go
@@ -76,6 +76,20 @@ var _ = Describe("Validation", func() {
 			}
 			Expect(ant.Validate(ctx)).To(Succeed())
 		})
+		It("should succeed by validating that regex is properly escaped", func() {
+			ant.Spec.Tags = map[string]string{
+				"karpenterzsh/provisioner-name": "value",
+			}
+			Expect(ant.Validate(ctx)).To(Succeed())
+			ant.Spec.Tags = map[string]string{
+				"kubernetesbio/cluster/test": "value",
+			}
+			Expect(ant.Validate(ctx)).To(Succeed())
+			ant.Spec.Tags = map[string]string{
+				"karpenterzsh/managed-by": "test",
+			}
+			Expect(ant.Validate(ctx)).To(Succeed())
+		})
 		It("should fail if tags contain a restricted domain key", func() {
 			ant.Spec.Tags = map[string]string{
 				"karpenter.sh/provisioner-name": "value",