WAF策略中的地区/省份封禁也支持自定义提示HTML

internal/web/actions/default/servers/components/waf/ipadmin/index.go

@@ -40,10 +40,13 @@ func (this *IndexAction) RunGet(params struct {
 
 	var deniedCountryIds = []int64{}
 	var allowedCountryIds = []int64{}
+	var countryHTML string
 	if policyConfig.Inbound != nil && policyConfig.Inbound.Region != nil {
 		deniedCountryIds = policyConfig.Inbound.Region.DenyCountryIds
 		allowedCountryIds = policyConfig.Inbound.Region.AllowCountryIds
+		countryHTML = policyConfig.Inbound.Region.CountryHTML
 	}
+	this.Data["countryHTML"] = countryHTML
 
 	countriesResp, err := this.RPC().RegionCountryRPC().FindAllRegionCountries(this.AdminContext(), &pb.FindAllRegionCountriesRequest{})
 	if err != nil {
@@ -91,6 +94,8 @@ func (this *IndexAction) RunPost(params struct {
 	ExceptURLPatternsJSON []byte
 	OnlyURLPatternsJSON   []byte
 
+	CountryHTML string
+
 	Must *actions.Must
 }) {
 	// 日志
@@ -128,6 +133,13 @@ func (this *IndexAction) RunPost(params struct {
 	}
 	policyConfig.Inbound.Region.CountryExceptURLPatterns = exceptURLPatterns
 
+	// 自定义提示
+	if len(params.CountryHTML) > 32<<10 {
+		this.Fail("提示内容长度不能超出32K")
+		return
+	}
+	policyConfig.Inbound.Region.CountryHTML = params.CountryHTML
+
 	// 限制URL
 	var onlyURLPatterns = []*shared.URLPattern{}
 	if len(params.OnlyURLPatternsJSON) > 0 {

internal/web/actions/default/servers/components/waf/ipadmin/provinces.go

@@ -40,10 +40,13 @@ func (this *ProvincesAction) RunGet(params struct {
 
 	var deniedProvinceIds = []int64{}
 	var allowedProvinceIds = []int64{}
+	var provinceHTML string
 	if policyConfig.Inbound != nil && policyConfig.Inbound.Region != nil {
 		deniedProvinceIds = policyConfig.Inbound.Region.DenyProvinceIds
 		allowedProvinceIds = policyConfig.Inbound.Region.AllowProvinceIds
+		provinceHTML = policyConfig.Inbound.Region.ProvinceHTML
 	}
+	this.Data["provinceHTML"] = provinceHTML
 
 	provincesResp, err := this.RPC().RegionProvinceRPC().FindAllRegionProvincesWithRegionCountryId(this.AdminContext(), &pb.FindAllRegionProvincesWithRegionCountryIdRequest{
 		RegionCountryId: regionconfigs.RegionChinaId,
@@ -92,6 +95,8 @@ func (this *ProvincesAction) RunPost(params struct {
 	ExceptURLPatternsJSON []byte
 	OnlyURLPatternsJSON   []byte
 
+	ProvinceHTML string
+
 	Must *actions.Must
 }) {
 	// 日志
@@ -140,6 +145,13 @@ func (this *ProvincesAction) RunPost(params struct {
 	}
 	policyConfig.Inbound.Region.ProvinceOnlyURLPatterns = onlyURLPatterns
 
+	// 自定义提示
+	if len(params.ProvinceHTML) > 32<<10 {
+		this.Fail("提示内容长度不能超出32K")
+		return
+	}
+	policyConfig.Inbound.Region.ProvinceHTML = params.ProvinceHTML
+
 	inboundJSON, err := json.Marshal(policyConfig.Inbound)
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -158,11 +158,11 @@ func (this *ProvincesAction) RunPost(params struct {
 	}
 	policyConfig.Inbound.Region.ProvinceOnlyURLPatterns = onlyURLPatterns
 
+	// 自定义提示
 	if len(params.ProvinceHTML) > 32<<10 {
 		this.Fail("提示内容长度不能超出32K")
 		return
 	}
-
 	policyConfig.Inbound.Region.ProvinceHTML = params.ProvinceHTML
 
 	err = policyConfig.Init()

web/views/@default/servers/components/waf/ipadmin/index.html

@@ -33,6 +33,13 @@
                 <td>限制URL &nbsp;<tip-icon content="只对这些URL做限制。"></tip-icon></td>
                 <td><url-patterns-box v-model="onlyURLPatterns"></url-patterns-box></td>
             </tr>
+            <tr>
+                <td>提示内容</td>
+                <td>
+                    <textarea v-model="countryHTML" name="countryHTML" rows="3"></textarea>
+                    <p class="comment">当客户端所在区域被封禁时提示页面的HTML内容；不填则表示使用默认的提示内容。</p>
+                </td>
+            </tr>
         </tbody>
     </table>
     <submit-btn></submit-btn>

web/views/@default/servers/components/waf/ipadmin/provinces.html

@@ -33,6 +33,13 @@
                     <td>限制URL &nbsp;<tip-icon content="只对这些URL做限制。"></tip-icon></td>
                     <td><url-patterns-box v-model="onlyURLPatterns"></url-patterns-box></td>
                 </tr>
+                <tr>
+                    <td>提示内容</td>
+                    <td>
+                        <textarea v-model="provinceHTML" name="provinceHTML" rows="3"></textarea>
+                        <p class="comment">当客户端所在省份被封禁时提示页面的HTML内容；不填则表示使用默认的提示内容。</p>
+                    </td>
+                </tr>
             </tbody>
 		</table>
 		<submit-btn></submit-btn>