单个服务里也增加国家/地区、省份封禁

internal/web/actions/default/servers/server/settings/waf/init.go

@@ -17,8 +17,8 @@ func init() {
 			GetPost("", new(IndexAction)).
 			Get("/ipadmin/allowList", new(ipadmin.AllowListAction)).
 			Get("/ipadmin/denyList", new(ipadmin.DenyListAction)).
-			//GetPost("/ipadmin", new(ipadmin.IndexAction)).
-			//GetPost("/ipadmin/provinces", new(ipadmin.ProvincesAction)).
+			GetPost("/ipadmin/countries", new(ipadmin.CountriesAction)).
+			GetPost("/ipadmin/provinces", new(ipadmin.ProvincesAction)).
 			GetPost("/ipadmin/createIPPopup", new(ipadmin.CreateIPPopupAction)).
 			GetPost("/ipadmin/updateIPPopup", new(ipadmin.UpdateIPPopupAction)).
 			Post("/ipadmin/deleteIP", new(ipadmin.DeleteIPAction)).

internal/web/actions/default/servers/server/settings/waf/ipadmin/countries.go

@@ -13,17 +13,22 @@ import (
 	"strings"
 )
 
-type IndexAction struct {
+type CountriesAction struct {
 	actionutils.ParentAction
 }
 
-func (this *IndexAction) Init() {
-	this.Nav("", "", "ipadmin")
+func (this *CountriesAction) Init() {
+	this.Nav("", "setting", "country")
+	this.SecondMenu("waf")
 }
 
-func (this *IndexAction) RunGet(params struct {
+func (this *CountriesAction) RunGet(params struct {
 	FirewallPolicyId int64
+	ServerId         int64
 }) {
+	this.Data["featureIsOn"] = true
+	this.Data["firewallPolicyId"] = params.FirewallPolicyId
+
 	this.Data["subMenuItem"] = "region"
 
 	// 当前选中的地区
@@ -57,10 +62,18 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	this.Data["countries"] = countryMaps
 
+	// WAF是否启用
+	webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["wafIsOn"] = webConfig.FirewallRef != nil && webConfig.FirewallRef.IsOn
+
 	this.Show()
 }
 
-func (this *IndexAction) RunPost(params struct {
+func (this *CountriesAction) RunPost(params struct {
 	FirewallPolicyId int64
 	CountryIds       []int64
 

internal/web/actions/default/servers/server/settings/waf/ipadmin/provinces.go

@@ -19,12 +19,16 @@ type ProvincesAction struct {
 }
 
 func (this *ProvincesAction) Init() {
-	this.Nav("", "", "ipadmin")
+	this.Nav("", "setting", "province")
+	this.SecondMenu("waf")
 }
 
 func (this *ProvincesAction) RunGet(params struct {
 	FirewallPolicyId int64
+	ServerId         int64
 }) {
+	this.Data["featureIsOn"] = true
+	this.Data["firewallPolicyId"] = params.FirewallPolicyId
 	this.Data["subMenuItem"] = "province"
 
 	// 当前选中的省份
@@ -59,6 +63,14 @@ func (this *ProvincesAction) RunGet(params struct {
 	}
 	this.Data["provinces"] = provinceMaps
 
+	// WAF是否启用
+	webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["wafIsOn"] = webConfig.FirewallRef != nil && webConfig.FirewallRef.IsOn
+
 	this.Show()
 }