实现gzip

pkg/serverconfigs/shared/http_request_cond_group.go

@@ -7,26 +7,48 @@ type HTTPRequestCondGroup struct {
 	Conds       []*HTTPRequestCond `yaml:"conds" json:"conds"`             // 条件列表
 	IsReverse   bool               `yaml:"isReverse" json:"isReverse"`     // 是否反向匹配
 	Description string             `yaml:"description" json:"description"` // 说明
+
+	requestConds  []*HTTPRequestCond
+	responseConds []*HTTPRequestCond
 }
 
 // 初始化
 func (this *HTTPRequestCondGroup) Init() error {
+	if len(this.Connector) == 0 {
+		this.Connector = "or"
+	}
+	
 	if len(this.Conds) > 0 {
 		for _, cond := range this.Conds {
 			err := cond.Init()
 			if err != nil {
 				return err
 			}
+
+			if cond.IsRequest {
+				this.requestConds = append(this.requestConds, cond)
+			} else {
+				this.responseConds = append(this.responseConds, cond)
+			}
 		}
 	}
 	return nil
 }
 
-func (this *HTTPRequestCondGroup) Match(formatter func(source string) string) bool {
-	if !this.IsOn {
+func (this *HTTPRequestCondGroup) MatchRequest(formatter func(source string) string) bool {
+	return this.match(this.requestConds, formatter)
+}
+
+func (this *HTTPRequestCondGroup) MatchResponse(formatter func(source string) string) bool {
+	return this.match(this.responseConds, formatter)
+}
+
+func (this *HTTPRequestCondGroup) match(conds []*HTTPRequestCond, formatter func(source string) string) bool {
+	if !this.IsOn || len(conds) == 0 {
 		return !this.IsReverse
 	}
-	for _, cond := range this.Conds {
+	ok := false
+	for _, cond := range conds {
 		isMatched := cond.Match(formatter)
 		if this.Connector == "or" && isMatched {
 			return !this.IsReverse
@@ -34,6 +56,13 @@ func (this *HTTPRequestCondGroup) Match(formatter func(source string) string) bo
 		if this.Connector == "and" && !isMatched {
 			return this.IsReverse
 		}
+		if isMatched {
+			// 对于OR来说至少要有一个返回true
+			ok = true
+		}
 	}
-	return !this.IsReverse
+	if this.IsReverse {
+		return !ok
+	}
+	return ok
 }