[proxy]路径规则增加"是否终止往下匹配"选项

Author: iwind

teaconfigs/location.go

@@ -70,6 +70,8 @@ type LocationConfig struct {
 	// - cond ${requestPath} regexp .*\.png
 	Cond []*shared.RequestCond `yaml:"cond" json:"cond"`
 
+	IsBreak bool `yaml:"isBreak" json:"isBreak"` // 终止向下解析
+
 	Pages           []*PageConfig   `yaml:"pages" json:"pages"`                   // 特殊页
 	Shutdown        *ShutdownConfig `yaml:"shutdown" json:"shutdown"`             // 关闭页
 	ShutdownPageOn1 bool            `yaml:"shutdownPageOn" json:"shutdownPageOn"` // deprecated: v0.1.8, 是否开启临时关闭页面

teaproxy/request.go

@@ -558,6 +558,11 @@ func (this *Request) configure(server *teaconfigs.ServerConfig, redirects int, b
 					this.locationContext = nil
 					return nil
 				}
+
+				// break
+				if location.IsBreak {
+					break
+				}
 			}
 			this.locationContext = nil
 		}

teaweb/actions/default/proxy/locations/add.go

@@ -66,10 +66,13 @@ func (this *AddAction) Run(params struct {
 
 // 保存提交
 func (this *AddAction) RunPost(params struct {
-	ServerId             string
-	Name                 string
-	Pattern              string
-	PatternType          int
+	ServerId    string
+	Name        string
+	Pattern     string
+	PatternType int
+
+	IsBreak bool
+
 	Root                 string
 	Charset              string
 	Index                []string
@@ -129,6 +132,7 @@ func (this *AddAction) RunPost(params struct {
 
 	location.SetPattern(params.Pattern, params.PatternType, params.IsCaseInsensitive, params.IsReverse)
 	location.On = params.On
+	location.IsBreak = params.IsBreak
 	location.CacheOn = true
 	location.Name = params.Name
 	location.Root = params.Root

teaweb/actions/default/proxy/locations/detail.go

@@ -28,6 +28,7 @@ func (this *DetailAction) Run(params struct {
 		"type":            location.PatternType(),
 		"pattern":         location.PatternString(),
 		"name":            location.Name,
+		"isBreak":         location.IsBreak,
 		"caseInsensitive": location.IsCaseInsensitive(),
 		"reverse":         location.IsReverse(),
 		"root":            location.Root,

teaweb/actions/default/proxy/locations/index.go

@@ -3,6 +3,7 @@ package locations
 import (
 	"github.com/TeaWeb/code/teaconfigs"
 	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/maps"
 )
 
@@ -22,14 +23,18 @@ func (this *IndexAction) Run(params struct {
 
 	locations := []maps.Map{}
 	for _, location := range server.Locations {
-		location.Validate()
+		err := location.Validate()
+		if err != nil {
+			logs.Error(err)
+		}
 		locations = append(locations, maps.Map{
 			"on":                location.On,
 			"id":                location.Id,
 			"name":              location.Name,
 			"type":              location.PatternType(),
 			"pattern":           location.PatternString(),
 			"patternTypeName":   teaconfigs.FindLocationPatternTypeName(location.PatternType()),
+			"isBreak":           location.IsBreak,
 			"isCaseInsensitive": location.IsCaseInsensitive(),
 			"isReverse":         location.IsReverse(),
 			"rewrite":           location.Rewrite,

teaweb/actions/default/proxy/locations/update.go

@@ -60,6 +60,7 @@ func (this *UpdateAction) Run(params struct {
 		"pattern":           location.PatternString(),
 		"type":              location.PatternType(),
 		"name":              location.Name,
+		"isBreak":           location.IsBreak,
 		"isReverse":         location.IsReverse(),
 		"isCaseInsensitive": location.IsCaseInsensitive(),
 		"root":              location.Root,
@@ -104,10 +105,13 @@ func (this *UpdateAction) Run(params struct {
 
 // 保存修改
 func (this *UpdateAction) RunPost(params struct {
-	ServerId             string
-	LocationId           string
-	Pattern              string
-	PatternType          int
+	ServerId    string
+	LocationId  string
+	Pattern     string
+	PatternType int
+
+	IsBreak bool
+
 	Name                 string
 	Root                 string
 	URLPrefix            string `alias:"urlPrefix"`
@@ -170,6 +174,7 @@ func (this *UpdateAction) RunPost(params struct {
 
 	location.SetPattern(params.Pattern, params.PatternType, params.IsCaseInsensitive, params.IsReverse)
 	location.On = params.On
+	location.IsBreak = params.IsBreak
 	location.Name = params.Name
 	location.Root = params.Root
 	location.URLPrefix = params.URLPrefix