gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-02-08 01:20:07 +08:00
Code

fix: 解决 firewalld 防火墙规则 ipv6 下不生效的问题 (#2613)

Browse Source 
Refs #2144
This commit is contained in:
ssongliu 2023-10-21 22:44:52 +08:00 committed by GitHub
parent b38abf852d
commit 8a7e61e9e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/utils/firewall/client/firewalld.go
View File

@ -156,7 +156,7 @@ func (f *Firewall) RichRules(rule FireInfo, operation string) error {
} }
ruleStr = fmt.Sprintf("rule source ipset=%s %s", rule.Address, rule.Strategy) ruleStr = fmt.Sprintf("rule source ipset=%s %s", rule.Address, rule.Strategy)
} else { } else {
ruleStr = "rule family=ipv4 " ruleStr = "rule "
if len(rule.Address) != 0 { if len(rule.Address) != 0 {
ruleStr += fmt.Sprintf("source address=%s ", rule.Address) ruleStr += fmt.Sprintf("source address=%s ", rule.Address)
} }

3
backend/utils/firewall/client/ufw.go
View File

@ -207,6 +207,9 @@ func (f *Ufw) PortForward(info Forward, operation string) error {
func (f *Ufw) loadInfo(line string, fireType string) FireInfo { func (f *Ufw) loadInfo(line string, fireType string) FireInfo {
fields := strings.Fields(line) fields := strings.Fields(line)
var itemInfo FireInfo var itemInfo FireInfo
if strings.Contains(line, "LIMIT") || strings.Contains(line, "ALLOW FWD") {
return itemInfo
}
if len(fields) < 4 { if len(fields) < 4 {
return itemInfo return itemInfo
} }