From 66f582df580a82e36b2ea97e1cff73e979287324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Mon, 10 Jan 2022 10:28:23 +0800 Subject: [PATCH] =?UTF-8?q?WAF=E8=A7=84=E5=88=99=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E4=BF=A1=E6=81=AF/=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../default/servers/components/waf/createRulePopup.go | 2 ++ internal/web/actions/default/servers/components/waf/group.go | 1 + .../default/servers/groups/group/settings/waf/group.go | 1 + .../web/actions/default/servers/server/settings/waf/group.go | 1 + web/public/js/components/server/http-firewall-rule-label.js | 5 ++++- web/public/js/components/server/http-firewall-rules-box.js | 3 +++ .../@default/servers/components/waf/createRulePopup.html | 4 ++++ web/views/@default/servers/components/waf/group.html | 2 +- .../@default/servers/groups/group/settings/waf/group.html | 2 +- web/views/@default/servers/server/settings/waf/group.html | 2 +- 10 files changed, 19 insertions(+), 4 deletions(-) diff --git a/internal/web/actions/default/servers/components/waf/createRulePopup.go b/internal/web/actions/default/servers/components/waf/createRulePopup.go index cf24cc2d..042c8fde 100644 --- a/internal/web/actions/default/servers/components/waf/createRulePopup.go +++ b/internal/web/actions/default/servers/components/waf/createRulePopup.go @@ -61,6 +61,7 @@ func (this *CreateRulePopupAction) RunPost(params struct { OptionsJSON []byte Value string Case bool + Description string Must *actions.Must }) { @@ -91,6 +92,7 @@ func (this *CreateRulePopupAction) RunPost(params struct { rule.Operator = params.Operator rule.Value = params.Value rule.IsCaseInsensitive = params.Case + rule.Description = params.Description if len(params.OptionsJSON) > 0 { options := []maps.Map{} diff --git a/internal/web/actions/default/servers/components/waf/group.go b/internal/web/actions/default/servers/components/waf/group.go index e2cc338f..a113edb2 100644 --- a/internal/web/actions/default/servers/components/waf/group.go +++ b/internal/web/actions/default/servers/components/waf/group.go @@ -87,6 +87,7 @@ func (this *GroupAction) RunGet(params struct { "operator": rule.Operator, "value": rule.Value, "isCaseInsensitive": rule.IsCaseInsensitive, + "description": rule.Description, "isComposed": firewallconfigs.CheckCheckpointIsComposed(rule.Prefix()), "checkpointOptions": rule.CheckpointOptions, "err": errString, diff --git a/internal/web/actions/default/servers/groups/group/settings/waf/group.go b/internal/web/actions/default/servers/groups/group/settings/waf/group.go index 9b58d071..28d5884e 100644 --- a/internal/web/actions/default/servers/groups/group/settings/waf/group.go +++ b/internal/web/actions/default/servers/groups/group/settings/waf/group.go @@ -85,6 +85,7 @@ func (this *GroupAction) RunGet(params struct { "operator": rule.Operator, "value": rule.Value, "isCaseInsensitive": rule.IsCaseInsensitive, + "description": rule.Description, "isComposed": firewallconfigs.CheckCheckpointIsComposed(rule.Prefix()), "checkpointOptions": rule.CheckpointOptions, "err": errString, diff --git a/internal/web/actions/default/servers/server/settings/waf/group.go b/internal/web/actions/default/servers/server/settings/waf/group.go index 9b58d071..28d5884e 100644 --- a/internal/web/actions/default/servers/server/settings/waf/group.go +++ b/internal/web/actions/default/servers/server/settings/waf/group.go @@ -85,6 +85,7 @@ func (this *GroupAction) RunGet(params struct { "operator": rule.Operator, "value": rule.Value, "isCaseInsensitive": rule.IsCaseInsensitive, + "description": rule.Description, "isComposed": firewallconfigs.CheckCheckpointIsComposed(rule.Prefix()), "checkpointOptions": rule.CheckpointOptions, "err": errString, diff --git a/web/public/js/components/server/http-firewall-rule-label.js b/web/public/js/components/server/http-firewall-rule-label.js index d914f9f1..ae1f2bcf 100644 --- a/web/public/js/components/server/http-firewall-rule-label.js +++ b/web/public/js/components/server/http-firewall-rule-label.js @@ -14,7 +14,7 @@ Vue.component("http-firewall-rule-label", { }, template: `
-
+
{{rule.name}}[{{rule.param}}] @@ -33,6 +33,9 @@ Vue.component("http-firewall-rule-label", { {{rule.value}} + + （{{rule.description}}） + 规则错误
` diff --git a/web/public/js/components/server/http-firewall-rules-box.js b/web/public/js/components/server/http-firewall-rules-box.js index 1235ea3e..e1d3d77a 100644 --- a/web/public/js/components/server/http-firewall-rules-box.js +++ b/web/public/js/components/server/http-firewall-rules-box.js @@ -55,6 +55,9 @@ Vue.component("http-firewall-rules-box", { | {{paramFilter.code}} {{rule.operator}} {{rule.value}} + + （{{rule.description}}） +
diff --git a/web/views/@default/servers/components/waf/createRulePopup.html b/web/views/@default/servers/components/waf/createRulePopup.html index 86be3393..60d65324 100644 --- a/web/views/@default/servers/components/waf/createRulePopup.html +++ b/web/views/@default/servers/components/waf/createRulePopup.html @@ -140,6 +140,10 @@ + + + 备注 + diff --git a/web/views/@default/servers/components/waf/group.html b/web/views/@default/servers/components/waf/group.html index 2531b1f1..b66e6733 100644 --- a/web/views/@default/servers/components/waf/group.html +++ b/web/views/@default/servers/components/waf/group.html @@ -46,7 +46,7 @@ - {{set.name}} + {{set.name}}

diff --git a/web/views/@default/servers/groups/group/settings/waf/group.html b/web/views/@default/servers/groups/group/settings/waf/group.html index 8abcf2f1..792afdc1 100644 --- a/web/views/@default/servers/groups/group/settings/waf/group.html +++ b/web/views/@default/servers/groups/group/settings/waf/group.html @@ -41,7 +41,7 @@ - {{set.name}} + {{set.name}}

diff --git a/web/views/@default/servers/server/settings/waf/group.html b/web/views/@default/servers/server/settings/waf/group.html index f4d8bec6..8ca3e339 100644 --- a/web/views/@default/servers/server/settings/waf/group.html +++ b/web/views/@default/servers/server/settings/waf/group.html @@ -42,7 +42,7 @@ - {{set.name}} + {{set.name}}