Skip to content

fix: 解决更新端口不更新防火墙规则的问题 #7169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wanghe-fit2cloud merged 1 commit into from
Nov 25, 2024
Merged

fix: 解决更新端口不更新防火墙规则的问题 #7169

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions cmd/server/cmd/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import (
"github.com/1Panel-dev/1Panel/backend/utils/cmd"
"github.com/1Panel-dev/1Panel/backend/utils/common"
"github.com/1Panel-dev/1Panel/backend/utils/encrypt"
"github.com/1Panel-dev/1Panel/backend/utils/firewall"
fireClient "github.com/1Panel-dev/1Panel/backend/utils/firewall/client"
"github.com/spf13/cobra"
"golang.org/x/term"
)
Expand Down Expand Up @@ -187,6 +189,7 @@ func port() {
fmt.Printf("错误：初始化数据库连接失败，%v\n", err)
return
}
oldPortStr := getSettingByKey(db, "ServerPort")
if err := setSettingByKey(db, "ServerPort", newPortStr); err != nil {
fmt.Printf("错误：面板端口修改失败，%v\n", err)
return
Expand All @@ -195,6 +198,18 @@ func port() {
fmt.Printf("修改成功！\n\n")
fmt.Printf("面板端口：%s\n", newPortStr)

if client, err := firewall.NewFirewallClient(); err == nil {
if err := client.Port(fireClient.FireInfo{Port: newPortStr, Protocol: "tcp", Strategy: "accept"}, "add"); err != nil {
fmt.Printf("添加防火墙端口规则失败，%v，请您手动将 %s 端口添加至防火墙规则中。\n", newPortStr, err)
}
if err := client.Port(fireClient.FireInfo{Port: oldPortStr, Protocol: "tcp", Strategy: "accept"}, "remove"); err != nil {
fmt.Printf("错误：防火墙端口删除失败，%v\n", err)
}
if err := client.Reload(); err != nil {
fmt.Printf("防火墙重载失败，%v，请您手动重载防火墙。\n", err)
}
}

std, err := cmd.Exec("1pctl restart")
if err != nil {
fmt.Println(std)
Expand Down
Loading