[TT-12865] Rename config parameter, update usage, support mux params on legacy

cli/linter/schema.json

@@ -550,10 +550,10 @@
         "enable_strict_routes": {
           "type": "boolean"
         },
-        "enable_prefix_matching": {
+        "enable_path_prefix_matching": {
           "type": "boolean"
         },
-        "enable_suffix_matching": {
+        "enable_path_suffix_matching": {
           "type": "boolean"
         },
         "flush_interval": {

config/config.go

@@ -408,7 +408,7 @@ type HttpServerOptionsConfig struct {
 	// Regular expressions and parameterized routes will be left alone regardless of this setting.
 	EnableStrictRoutes bool `json:"enable_strict_routes"`
 
-	// EnablePrefixMatching changes the URL matching from wildcard mode to prefix mode.
+	// EnablePathPrefixMatching changes the URL matching from wildcard mode to prefix mode.
 	// For example, `/json` matches `*/json*` by current default behaviour.
 	// If prefix matching is enabled, the match will be performed as a prefix match (`/json*`).
 	//
@@ -423,16 +423,16 @@ type HttpServerOptionsConfig struct {
 	// - Full listen path and endpoint (`/listen-path/json`)
 	// - Stripped listen path (`/json`) - match.
 	//
-	// For inputs that start with `/`, a prefix match is ensured by prepending
-	// the start of string `^` caret.
+	// For inputs that start with `/`, a prefix match is ensured by
+	// prepending the start of string `^` caret.
 	//
 	// For all other cases, the pattern remains unmodified.
 	//
-	// Combine this option with EnableSuffixMatching to achieve strict
-	// url matching with `/json` being evaluated as `^/json$`.
-	EnablePrefixMatching bool `json:"enable_prefix_matching"`
+	// Combine this option with `enable_path_suffix_matching` to achieve
+	// exact url matching with `/json` being evaluated as `^/json$`.
+	EnablePathPrefixMatching bool `json:"enable_path_prefix_matching"`
 
-	// EnableSuffixMatching changes the URL matching to match as a suffix.
+	// EnablePathSuffixMatching changes the URL matching to match as a suffix.
 	// For example: `/json` is matched as `/json$` against the following paths:
 	//
 	// - Full listen path and versioning URL (`/listen-path/v4/json`)
@@ -444,12 +444,12 @@ type HttpServerOptionsConfig struct {
 	// - Full listen path and endpoint (`/listen-path/json`)
 	// - Stripped listen path (`/json`) - match.
 	//
-	// If the input pattern already ends with a `$` (`/json$`) then
-	// the pattern remains unmodified.
+	// If the input pattern already ends with a `$` (`/json$`)
+	// then the pattern remains unmodified.
 	//
-	// Combine this option with EnablePrefixMatching to achieve strict
-	// url matching with `/json` being evaluated as `^/json$`.
-	EnableSuffixMatching bool `json:"enable_suffix_matching"`
+	// Combine this option with `enable_path_prefix_matching` to achieve
+	// exact url matching with `/json` being evaluated as `^/json$`.
+	EnablePathSuffixMatching bool `json:"enable_path_suffix_matching"`
 
 	// Disable TLS verification. Required if you are using self-signed certificates.
 	SSLInsecureSkipVerify bool `json:"ssl_insecure_skip_verify"`

gateway/api_definition.go

@@ -824,8 +824,8 @@ func (a APIDefinitionLoader) generateRegex(stringSpec string, newSpec *URLSpec,
 		err     error
 	)
 	// Hook per-api settings here via newSpec *URLSpec
-	isPrefixMatch := conf.HttpServerOptions.EnablePrefixMatching
-	isSuffixMatch := conf.HttpServerOptions.EnableSuffixMatching
+	isPrefixMatch := conf.HttpServerOptions.EnablePathPrefixMatching
+	isSuffixMatch := conf.HttpServerOptions.EnablePathSuffixMatching
 	isIgnoreCase := newSpec.IgnoreCase || conf.IgnoreEndpointCase
 
 	pattern = httputil.PreparePathRegexp(stringSpec, isPrefixMatch, isSuffixMatch)

gateway/api_definition_test.go

@@ -419,7 +419,7 @@ func TestConflictingPaths(t *testing.T) {
 
 func TestIgnored(t *testing.T) {
 	ts := StartTest(func(c *config.Config) {
-		c.HttpServerOptions.EnablePrefixMatching = true
+		c.HttpServerOptions.EnablePathPrefixMatching = true
 	})
 	defer ts.Close()
 

gateway/mw_granular_access.go

@@ -41,8 +41,8 @@ func (m *GranularAccessMiddleware) ProcessRequest(w http.ResponseWriter, r *http
 	gwConfig := m.Gw.GetConfig()
 
 	// Hook per-api settings here (m.Spec...)
-	isPrefixMatch := gwConfig.HttpServerOptions.EnablePrefixMatching
-	isSuffixMatch := gwConfig.HttpServerOptions.EnableSuffixMatching
+	isPrefixMatch := gwConfig.HttpServerOptions.EnablePathPrefixMatching
+	isSuffixMatch := gwConfig.HttpServerOptions.EnablePathSuffixMatching
 
 	if isPrefixMatch {
 		urlPaths := []string{
@@ -97,13 +97,7 @@ func (m *GranularAccessMiddleware) ProcessRequest(w http.ResponseWriter, r *http
 			continue
 		}
 
-		pattern := accessSpec.URL
-
-		// Extends legacy by honoring isSuffixMatch.
-		// Append $ if so configured to match end of request path.
-		if isSuffixMatch && !strings.HasSuffix(pattern, "$") {
-			pattern += "$"
-		}
+		pattern := httputil.PreparePathRegexp(accessSpec.URL, false, isSuffixMatch)
 
 		logger.Debug("Checking: ", urlPath, " Against:", pattern)
 

gateway/mw_granular_access_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestGranularAccessMiddleware_ProcessRequest(t *testing.T) {
 	g := StartTest(func(c *config.Config) {
-		c.HttpServerOptions.EnablePrefixMatching = true
+		c.HttpServerOptions.EnablePathPrefixMatching = true
 	})
 	defer g.Close()
 

gateway/session_manager.go

@@ -230,8 +230,8 @@ func (sfr sessionFailReason) String() string {
 
 func (l *SessionLimiter) RateLimitInfo(r *http.Request, api *APISpec, endpoints user.Endpoints) (*user.EndpointRateLimitInfo, bool) {
 	// Hook per-api settings here (m.Spec...)
-	isPrefixMatch := l.config.HttpServerOptions.EnablePrefixMatching
-	isSuffixMatch := l.config.HttpServerOptions.EnableSuffixMatching
+	isPrefixMatch := l.config.HttpServerOptions.EnablePathPrefixMatching
+	isSuffixMatch := l.config.HttpServerOptions.EnablePathSuffixMatching
 
 	urlPaths := []string{
 		api.StripListenPath(r.URL.Path),