Auth TLS: Improve redirect RegEx. (#12322)

k8s-infra-cherrypick-robot · strongjz · web-flow · commit 2d201230e9dc · 2024-11-07T07:05:30.000Z
Co-authored-by: James Strong &lt;strong.james.e@gmail.com&gt;
diff --git a/internal/ingress/annotations/authtls/main.go b/internal/ingress/annotations/authtls/main.go
@@ -42,7 +42,7 @@ const (
 
 var (
 	authVerifyClientRegex = regexp.MustCompile(`^(on|off|optional|optional_no_ca)$`)
-	redirectRegex         = regexp.MustCompile(`^((https?://)?[A-Za-z0-9\-.]*(:\d+)?/[A-Za-z0-9\-.]*)?$`)
+	redirectRegex         = regexp.MustCompile(`^((https?://)?[A-Za-z0-9\-.]+(:\d+)?)?(/[A-Za-z0-9\-.]+)*/?$`)
 )
 
 var authTLSAnnotations = parser.Annotation{

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ const (`
`42`	`42`
`43`	`43`	`var (`
`44`	`44`	authVerifyClientRegex = regexp.MustCompile(`^(on\|off\|optional\|optional_no_ca)$`)
`45`		- redirectRegex = regexp.MustCompile(`^((https?://)?[A-Za-z0-9\-.](:\d+)?/[A-Za-z0-9\-.])?$`)
	`45`	+ redirectRegex = regexp.MustCompile(`^((https?://)?[A-Za-z0-9\-.]+(:\d+)?)?(/[A-Za-z0-9\-.]+)*/?$`)
`46`	`46`	`)`
`47`	`47`
`48`	`48`	`var authTLSAnnotations = parser.Annotation{`