From 3774cda2ff85241f87b879cf3584052ecd952afd Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Sat, 29 Jan 2022 21:43:42 +0800
Subject: [PATCH] =?UTF-8?q?WAF=E8=A7=84=E5=88=99=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=88=86=E7=BB=84?=
 =?UTF-8?q?ID=E3=80=81=E8=A7=84=E5=88=99=E9=9B=86ID=E3=80=81=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/waf/rule_group.go | 4 +++-
 internal/waf/rule_set.go   | 4 +++-
 internal/waf/waf.go        | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

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()))
 			}
 		}
 	}