github
/
1Panel
mirror of https://github.com/1Panel-dev/1Panel
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 修改防火墙状态判断方式 (#3258)

pull/3260/head
ssongliu 2023-12-11 10:48:06 +08:00 committed by GitHub
parent fcba07d37a
commit 2aea2d3dfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/app/dto/fail2ban.go
View File

@ -6,6 +6,7 @@ type Fail2BanBaseInfo struct {
IsExist bool `json:"isExist"` IsExist bool `json:"isExist"`
Version string `json:"version"` Version string `json:"version"`
Port int `json:"port"`
MaxRetry int `json:"maxRetry"` MaxRetry int `json:"maxRetry"`
BanTime string `json:"banTime"` BanTime string `json:"banTime"`
FindTime string `json:"findTime"` FindTime string `json:"findTime"`

27
backend/app/service/fail2ban.go
View File

@ -9,7 +9,7 @@ import (
"github.com/1Panel-dev/1Panel/backend/app/dto" "github.com/1Panel-dev/1Panel/backend/app/dto"
"github.com/1Panel-dev/1Panel/backend/buserr" "github.com/1Panel-dev/1Panel/backend/buserr"
"github.com/1Panel-dev/1Panel/backend/utils/systemctl" "github.com/1Panel-dev/1Panel/backend/utils/firewall"
"github.com/1Panel-dev/1Panel/backend/utils/toolbox" "github.com/1Panel-dev/1Panel/backend/utils/toolbox"
) )
@ -100,16 +100,18 @@ func (u *Fail2BanService) Operate(operation string) error {
func (u *Fail2BanService) UpdateConf(req dto.Fail2BanUpdate) error { func (u *Fail2BanService) UpdateConf(req dto.Fail2BanUpdate) error {
if req.Key == "banaction" { if req.Key == "banaction" {
switch req.Value { if req.Value == "firewallcmd-ipset" || req.Value == "ufw" {
case "firewallcmd-ipset": client, err := firewall.NewFirewallClient()
isActive, _ := systemctl.IsActive("firewalld") if err != nil {
if !isActive { return err
return buserr.WithName("ErrBanAction", "firewalld")
} }
case "ufw": status, _ := client.Status()
isActive, _ := systemctl.IsActive("ufw") if status != "running" {
if !isActive { service := "firewalld"
return buserr.WithName("ErrBanAction", "ufw") if req.Value == "ufw" {
service = "ufw"
}
return buserr.WithName("ErrBanAction", service)
} }
} }
} }
@ -209,6 +211,11 @@ func (u *Fail2BanService) OperateSSHD(req dto.Fail2BanSet) error {
} }
func loadFailValue(line string, baseInfo *dto.Fail2BanBaseInfo) { func loadFailValue(line string, baseInfo *dto.Fail2BanBaseInfo) {
if strings.HasPrefix(line, "port") {
itemValue := strings.ReplaceAll(line, "port", "")
itemValue = strings.ReplaceAll(itemValue, "=", "")
baseInfo.Port, _ = strconv.Atoi(strings.TrimSpace(itemValue))
}
if strings.HasPrefix(line, "maxretry") { if strings.HasPrefix(line, "maxretry") {
itemValue := strings.ReplaceAll(line, "maxretry", "") itemValue := strings.ReplaceAll(line, "maxretry", "")
itemValue = strings.ReplaceAll(itemValue, "=", "") itemValue = strings.ReplaceAll(itemValue, "=", "")