TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-04 16:00:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

规则配置结构中增加isComposed属性

Browse Source
This commit is contained in:
刘祥超
2023-02-02 16:13:44 +08:00
parent fcd1ffc893
commit f47c9b9680
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/db/models/http_firewall_rule_dao.go
View File

@@ -82,12 +82,12 @@ func (this *HTTPFirewallRuleDAO) ComposeFirewallRule(tx *dbs.Tx, ruleId int64) (
if rule == nil { if rule == nil {
return nil, nil return nil, nil
} }
config := &firewallconfigs.HTTPFirewallRule{} var config = &firewallconfigs.HTTPFirewallRule{}
config.Id = int64(rule.Id) config.Id = int64(rule.Id)
config.IsOn = rule.IsOn config.IsOn = rule.IsOn
config.Param = rule.Param config.Param = rule.Param
paramFilters := []*firewallconfigs.ParamFilter{} var paramFilters = []*firewallconfigs.ParamFilter{}
if IsNotNull(rule.ParamFilters) { if IsNotNull(rule.ParamFilters) {
err = json.Unmarshal(rule.ParamFilters, &paramFilters) err = json.Unmarshal(rule.ParamFilters, &paramFilters)
if err != nil { if err != nil {
@@ -101,7 +101,7 @@ func (this *HTTPFirewallRuleDAO) ComposeFirewallRule(tx *dbs.Tx, ruleId int64) (
config.IsCaseInsensitive = rule.IsCaseInsensitive config.IsCaseInsensitive = rule.IsCaseInsensitive
if IsNotNull(rule.CheckpointOptions) { if IsNotNull(rule.CheckpointOptions) {
checkpointOptions := map[string]interface{}{} var checkpointOptions = map[string]interface{}{}
err = json.Unmarshal(rule.CheckpointOptions, &checkpointOptions) err = json.Unmarshal(rule.CheckpointOptions, &checkpointOptions)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -109,6 +109,8 @@ func (this *HTTPFirewallRuleDAO) ComposeFirewallRule(tx *dbs.Tx, ruleId int64) (
config.CheckpointOptions = checkpointOptions config.CheckpointOptions = checkpointOptions
} }
config.IsComposed = firewallconfigs.CheckCheckpointIsComposed(config.Prefix())
config.Description = rule.Description config.Description = rule.Description
return config, nil return config, nil