🐛 bug: fix route constraints problems

helpers.go

@@ -698,18 +698,22 @@ const (
 
 // Route Constraints
 const (
-	ConstraintInt        = "int"
-	ConstraintBool       = "bool"
-	ConstraintFloat      = "float"
-	ConstraintAlpha      = "alpha"
-	ConstraintGuid       = "guid"
-	ConstraintMinLen     = "minLen"
-	ConstraintMaxLen     = "maxLen"
-	ConstraintExactLen   = "exactLen"
-	ConstraintBetweenLen = "betweenLen"
-	ConstraintMin        = "min"
-	ConstraintMax        = "max"
-	ConstraintRange      = "range"
-	ConstraintDatetime   = "datetime"
-	ConstraintRegex      = "regex"
+	ConstraintInt             = "int"
+	ConstraintBool            = "bool"
+	ConstraintFloat           = "float"
+	ConstraintAlpha           = "alpha"
+	ConstraintGuid            = "guid"
+	ConstraintMinLen          = "minLen"
+	ConstraintMaxLen          = "maxLen"
+	ConstraintExactLen        = "exactLen"
+	ConstraintBetweenLen      = "betweenLen"
+	ConstraintMinLenLower     = "minlen"
+	ConstraintMaxLenLower     = "maxlen"
+	ConstraintExactLenLower   = "exactlen"
+	ConstraintBetweenLenLower = "betweenlen"
+	ConstraintMin             = "min"
+	ConstraintMax             = "max"
+	ConstraintRange           = "range"
+	ConstraintDatetime        = "datetime"
+	ConstraintRegex           = "regex"
 )

path.go

@@ -261,7 +261,7 @@ func (routeParser *routeParser) analyseParameterPart(pattern string) (string, *r
 
 	if hasConstraint := (parameterConstraintStart != -1 && parameterConstraintEnd != -1); hasConstraint {
 		constraintString := pattern[parameterConstraintStart+1 : parameterConstraintEnd]
-		userconstraints := strings.Split(constraintString, string(parameterConstraintSeparatorChars))
+		userconstraints := splitNonEscaped(constraintString, string(parameterConstraintSeparatorChars))
 		constraints = make([]*Constraint, 0, len(userconstraints))
 
 		for _, c := range userconstraints {
@@ -272,7 +272,7 @@ func (routeParser *routeParser) analyseParameterPart(pattern string) (string, *r
 			if start != -1 && end != -1 {
 				constraint := &Constraint{
 					ID:   getParamConstraintType(c[:start]),
-					Data: strings.Split(RemoveEscapeChar(c[start+1:end]), string(parameterConstraintDataSeparatorChars)),
+					Data: splitNonEscaped(RemoveEscapeChar(c[start+1:end]), string(parameterConstraintDataSeparatorChars)),
 				}
 
 				// Precompile regex if has regex constraint
@@ -384,6 +384,21 @@ func findNextNonEscapedCharsetPosition(search string, charset []byte) int {
 	return pos
 }
 
+// splitNonEscaped slices s into all substrings separated by sep and returns a slice of the substrings between those separators
+// This function also takes a care of escape char when splitting.
+func splitNonEscaped(s, sep string) []string {
+	var result []string
+	i := findNextNonEscapedCharsetPosition(s, []byte(sep))
+
+	for i > -1 {
+		result = append(result, s[:i])
+		s = s[i+len(sep):]
+		i = findNextNonEscapedCharsetPosition(s, []byte(sep))
+	}
+
+	return append(result, s)
+}
+
 // getMatch parses the passed url and tries to match it against the route segments and determine the parameter positions
 func (routeParser *routeParser) getMatch(detectionPath, path string, params *[maxParams]string, partialCheck bool) bool {
 	var i, paramsIterator, partLen int
@@ -526,13 +541,13 @@ func getParamConstraintType(constraintPart string) TypeConstraint {
 		return alphaConstraint
 	case ConstraintGuid:
 		return guidConstraint
-	case ConstraintMinLen:
+	case ConstraintMinLen, ConstraintMinLenLower:
 		return minLenConstraint
-	case ConstraintMaxLen:
+	case ConstraintMaxLen, ConstraintMaxLenLower:
 		return maxLenConstraint
-	case ConstraintExactLen:
+	case ConstraintExactLen, ConstraintExactLenLower:
 		return exactLenConstraint
-	case ConstraintBetweenLen:
+	case ConstraintBetweenLen, ConstraintBetweenLenLower:
 		return betweenLenConstraint
 	case ConstraintMin:
 		return minConstraint

path_test.go

@@ -549,6 +549,12 @@ func Test_Path_matchParams(t *testing.T) {
 		{url: "/api/v1/25", params: []string{"25"}, match: true},
 		{url: "/api/v1/true", params: []string{"true"}, match: false},
 	})
+	testCase("/api/v1/:param<int\\;range(10,30)>", []testparams{
+		{url: "/api/v1/entity", params: []string{"entity"}, match: true},
+		{url: "/api/v1/87283827683", params: []string{"87283827683"}, match: true},
+		{url: "/api/v1/25", params: []string{"25"}, match: true},
+		{url: "/api/v1/true", params: []string{"true"}, match: true},
+	})
 }
 
 func Test_Utils_GetTrimmedParam(t *testing.T) {
@@ -755,28 +761,10 @@ func Benchmark_Path_matchParams(t *testing.B) {
 		{url: "/api/v1/25", params: []string{"25"}, match: true},
 		{url: "/api/v1/true", params: []string{"true"}, match: false},
 	})
-}
-
-func Test_Path_matchParams0(t *testing.T) {
-	t.Parallel()
-	type testparams struct {
-		url          string
-		params       []string
-		match        bool
-		partialCheck bool
-	}
-	var ctxParams [maxParams]string
-	testCase := func(r string, cases []testparams) {
-		parser := parseRoute(r)
-		for _, c := range cases {
-			match := parser.getMatch(c.url, c.url, &ctxParams, c.partialCheck)
-			utils.AssertEqual(t, c.match, match, fmt.Sprintf("route: '%s', url: '%s'", r, c.url))
-			if match && len(c.params) > 0 {
-				utils.AssertEqual(t, c.params[0:len(c.params)], ctxParams[0:len(c.params)], fmt.Sprintf("route: '%s', url: '%s'", r, c.url))
-			}
-		}
-	}
-	testCase("/api/v1/:param<datetime(2006-01-02)>", []testparams{
-		{url: "/api/v1/2005-11-01", params: []string{"2005-11-01"}, match: true},
+	benchCase("/api/v1/:param<int\\;range(10,30)>", []testparams{
+		{url: "/api/v1/entity", params: []string{"entity"}, match: true},
+		{url: "/api/v1/87283827683", params: []string{"87283827683"}, match: true},
+		{url: "/api/v1/25", params: []string{"25"}, match: true},
+		{url: "/api/v1/true", params: []string{"true"}, match: true},
 	})
 }