From eb2c6cab8123c056f93976530afef03aaef97187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?= <i@haozi.net>
Date: Tue, 18 Jun 2024 10:09:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=98=B2=E7=81=AB?=
 =?UTF-8?q?=E5=A2=99=E5=90=AF=E5=81=9C=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/http/controllers/safe_controller.go | 18 ++++++++++++++++++
 scripts/install_panel.sh                |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/app/http/controllers/safe_controller.go b/app/http/controllers/safe_controller.go
index 65e9b160..0ea88eb8 100644
--- a/app/http/controllers/safe_controller.go
+++ b/app/http/controllers/safe_controller.go
@@ -39,14 +39,32 @@ func (r *SafeController) SetFirewallStatus(ctx http.Context) http.Response {
 	if ctx.Request().InputBool("status") {
 		if tools.IsRHEL() {
 			err = tools.ServiceStart("firewalld")
+			if err == nil {
+				err = tools.ServiceEnable("firewalld")
+			}
 		} else {
 			_, err = tools.Exec("echo y | ufw enable")
+			if err == nil {
+				err = tools.ServiceStart("ufw")
+			}
+			if err == nil {
+				err = tools.ServiceEnable("ufw")
+			}
 		}
 	} else {
 		if tools.IsRHEL() {
 			err = tools.ServiceStop("firewalld")
+			if err == nil {
+				err = tools.ServiceDisable("firewalld")
+			}
 		} else {
 			_, err = tools.Exec("ufw disable")
+			if err == nil {
+				err = tools.ServiceStop("ufw")
+			}
+			if err == nil {
+				err = tools.ServiceDisable("ufw")
+			}
 		}
 	}
 
diff --git a/scripts/install_panel.sh b/scripts/install_panel.sh
index 335842d1..9e06bd10 100644
--- a/scripts/install_panel.sh
+++ b/scripts/install_panel.sh
@@ -289,6 +289,8 @@ Init_Panel() {
     elif [ "${OS}" == "debian" ]; then
         apt-get install ufw -y
         echo y | ufw enable
+        systemctl enable ufw
+        systemctl start ufw
         ufw allow 22/tcp
         ufw allow 80/tcp
         ufw allow 443/tcp