WAF支持更多动作

internal/web/actions/default/servers/components/waf/updateSetPopup.go

@@ -9,7 +9,6 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
-	"strings"
 )
 
 type UpdateSetPopupAction struct {
@@ -79,6 +78,14 @@ func (this *UpdateSetPopupAction) RunGet(params struct {
 	}
 	this.Data["setConfig"] = setConfig
 
+	// action configs
+	actionConfigs, err := dao.SharedHTTPFirewallPolicyDAO.FindHTTPFirewallActionConfigs(this.AdminContext(), setConfig.Actions)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["actionConfigs"] = actionConfigs
+
 	this.Show()
 }
 
@@ -86,10 +93,10 @@ func (this *UpdateSetPopupAction) RunPost(params struct {
 	GroupId int64
 	SetId   int64
 
-	Name      string
-	RulesJSON []byte
-	Connector string
-	Action    string
+	Name        string
+	RulesJSON   []byte
+	Connector   string
+	ActionsJSON []byte
 
 	Must *actions.Must
 }) {
@@ -115,26 +122,28 @@ func (this *UpdateSetPopupAction) RunPost(params struct {
 	err = json.Unmarshal(params.RulesJSON, &rules)
 	if err != nil {
 		this.ErrorPage(err)
+		return
 	}
 	if len(rules) == 0 {
 		this.Fail("请添加至少一个规则")
 	}
 
+	var actionConfigs = []*firewallconfigs.HTTPFirewallActionConfig{}
+	if len(params.ActionsJSON) > 0 {
+		err = json.Unmarshal(params.ActionsJSON, &actionConfigs)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+	if len(actionConfigs) == 0 {
+		this.Fail("请添加至少一个动作")
+	}
+
 	setConfig.Name = params.Name
 	setConfig.Connector = params.Connector
 	setConfig.Rules = rules
-	setConfig.Action = params.Action
-	setConfig.ActionOptions = maps.Map{}
-
-	for k, v := range this.ParamsMap {
-		if len(v) == 0 {
-			continue
-		}
-		index := strings.Index(k, "action_")
-		if index > -1 {
-			setConfig.ActionOptions[k[len("action_"):]] = v[0]
-		}
-	}
+	setConfig.Actions = actionConfigs
 
 	setConfigJSON, err := json.Marshal(setConfig)
 	if err != nil {