Merge pull request #1644 from jackstine/route-validation-RFC-3986

k8s-ci-robot · shaneutt · commit abec5182928b · 2023-02-07T10:12:30.000-05:00
update regex to comply with RFC-3986
diff --git a/apis/v1beta1/validation/httproute.go b/apis/v1beta1/validation/httproute.go
@@ -39,7 +39,7 @@ var (
 	invalidPathSuffixes  = []string{"/..", "/."}
 
 	// All valid path characters per RFC-3986
-	validPathCharacters = "^[A-Za-z0-9\\/\\-._~%!$&'()*+,;=:]+$"
+	validPathCharacters = "^(?:[A-Za-z0-9\\/\\-._~!$&'()*+,;=:@]|[%][0-9a-fA-F]{2})+$"
 )
 
 // ValidateHTTPRoute validates HTTPRoute according to the Gateway API specification.

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ var (`
`39`	`39`	`invalidPathSuffixes = []string{"/..", "/."}`
`40`	`40`
`41`	`41`	`// All valid path characters per RFC-3986`
`42`		`- validPathCharacters = "^[A-Za-z0-9\\/\\-._~%!$&'()*+,;=:]+$"`
	`42`	`+ validPathCharacters = "^(?:[A-Za-z0-9\\/\\-._~!$&'()*+,;=:@]\|[%][0-9a-fA-F]{2})+$"`
`43`	`43`	`)`
`44`	`44`
`45`	`45`	`// ValidateHTTPRoute validates HTTPRoute according to the Gateway API specification.`