diff --git a/internal/waf/rule_group.go b/internal/waf/rule_group.go index a05e50d..5d54ace 100644 --- a/internal/waf/rule_group.go +++ b/internal/waf/rule_group.go @@ -1,7 +1,9 @@ package waf import ( + "errors" "github.com/TeaOSLab/EdgeNode/internal/waf/requests" + "github.com/iwind/TeaGo/types" ) // rule group @@ -30,7 +32,7 @@ func (this *RuleGroup) Init(waf *WAF) error { for _, set := range this.RuleSets { err := set.Init(waf) if err != nil { - return err + return errors.New("init set '" + types.String(set.Id) + "' failed: " + err.Error()) } } } diff --git a/internal/waf/rule_set.go b/internal/waf/rule_set.go index 60c1d9e..1ed184f 100644 --- a/internal/waf/rule_set.go +++ b/internal/waf/rule_set.go @@ -1,12 +1,14 @@ package waf import ( + "errors" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" "github.com/TeaOSLab/EdgeNode/internal/utils" "github.com/TeaOSLab/EdgeNode/internal/waf/requests" "github.com/iwind/TeaGo/lists" "github.com/iwind/TeaGo/maps" + "github.com/iwind/TeaGo/types" "net/http" "sort" ) @@ -47,7 +49,7 @@ func (this *RuleSet) Init(waf *WAF) error { for _, rule := range this.Rules { err := rule.Init() if err != nil { - return err + return errors.New("init rule '" + rule.Param + " " + rule.Operator + " " + types.String(rule.Value) + "' failed: " + err.Error()) } } } diff --git a/internal/waf/waf.go b/internal/waf/waf.go index 6c4a40f..16f3983 100644 --- a/internal/waf/waf.go +++ b/internal/waf/waf.go @@ -8,6 +8,7 @@ import ( "github.com/TeaOSLab/EdgeNode/internal/waf/requests" "github.com/iwind/TeaGo/Tea" "github.com/iwind/TeaGo/files" + "github.com/iwind/TeaGo/types" "gopkg.in/yaml.v3" "io/ioutil" "net/http" @@ -89,7 +90,7 @@ func (this *WAF) Init() (resultErrors []error) { err := group.Init(this) if err != nil { // 这里我们不阻止其他规则正常加入 - resultErrors = append(resultErrors, err) + resultErrors = append(resultErrors, errors.New("init group '"+types.String(group.Id)+"' failed: "+err.Error())) } } }