1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-09-13 18:15:31 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Make firewall operations compatible with OpenWrt (#9257)

Browse source
This commit is contained in:
ssongliu 2025-06-24 14:21:13 +08:00 • committed by GitHub
parent a6363ce4e5
commit 8f939ad5be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/app/service/image_repo.go
View file

@ -14,6 +14,7 @@ import (
"github.com/1Panel-dev/1Panel/backend/global"
"github.com/1Panel-dev/1Panel/backend/utils/cmd"
"github.com/1Panel-dev/1Panel/backend/utils/common"
"github.com/1Panel-dev/1Panel/backend/utils/systemctl"
"github.com/jinzhu/copier"
"github.com/pkg/errors"
)
@ -105,8 +106,7 @@ func (u *ImageRepoService) Create(req dto.ImageRepoCreate) error {
cancel()
return errors.New("the docker service cannot be restarted")
default:
stdout, err := cmd.Exec("systemctl is-active docker")
if string(stdout) == "active\n" && err == nil {
if ok, _ := systemctl.IsActive("docker"); ok {
global.LOG.Info("docker restart with new conf successful!")
return nil
}

19
backend/utils/firewall/client/firewalld.go
View file

@ -10,6 +10,7 @@ import (
"github.com/1Panel-dev/1Panel/backend/constant"
"github.com/1Panel-dev/1Panel/backend/global"
"github.com/1Panel-dev/1Panel/backend/utils/cmd"
"github.com/1Panel-dev/1Panel/backend/utils/systemctl"
)
var ForwardListRegex = regexp.MustCompile(`^port=(\d{1,5}):proto=(.+?):toport=(\d{1,5}):toaddr=(.*)$`)
@ -41,27 +42,15 @@ func (f *Firewall) Version() (string, error) {
}
func (f *Firewall) Start() error {
stdout, err := cmd.Exec("systemctl start firewalld")
if err != nil {
return fmt.Errorf("enable the firewall failed, err: %s", stdout)
}
return nil
return systemctl.Start("firewalld")
}
func (f *Firewall) Stop() error {
stdout, err := cmd.Exec("systemctl stop firewalld")
if err != nil {
return fmt.Errorf("stop the firewall failed, err: %s", stdout)
}
return nil
return systemctl.Stop("firewalld")
}
func (f *Firewall) Restart() error {
stdout, err := cmd.Exec("systemctl restart firewalld")
if err != nil {
return fmt.Errorf("restart the firewall failed, err: %s", stdout)
}
return nil
return systemctl.Restart("firewalld")
}
func (f *Firewall) Reload() error {