From 0a1251ad0bbf3aebb517d2c30bd017f646999e8c Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Tue, 24 Dec 2024 23:05:27 +0800 Subject: [PATCH 1/2] Update firewall.py --- web/utils/firewall.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/web/utils/firewall.py b/web/utils/firewall.py index 655a58743..a0a0b5231 100644 --- a/web/utils/firewall.py +++ b/web/utils/firewall.py @@ -132,6 +132,17 @@ class Firewall(object): else: pass + def reloadSshd(self): + if self.__isUfw: + mw.execShell("service ssh restart") + elif self.__isIptables: + mw.execShell("/etc/init.d/sshd restart") + elif self.__isFirewalld: + mw.execShell("systemctl restart sshd.service") + else: + return False + return True + def getFwStatus(self): if self.__isUfw: cmd = "/usr/sbin/ufw status| grep Status | awk -F ':' '{print $2}'" @@ -251,6 +262,9 @@ class Firewall(object): conf = re.sub(rep, "Port " + port + "\n", conf) mw.writeFile(file, conf) + if not self.reloadSshd(): + return mw.returnData(False, '重启sshd失败,尝试手动重启:service ssh restart!') + self.addAcceptPort(port, 'SSH端口修改', 'port') self.reload() return mw.returnData(True, '修改成功!') From 0b47b56fb5c9503f4cfb70adee2d3d2b83c08cf7 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Tue, 24 Dec 2024 23:05:46 +0800 Subject: [PATCH 2/2] Update firewall.py --- web/utils/firewall.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/utils/firewall.py b/web/utils/firewall.py index a0a0b5231..81e5bd17d 100644 --- a/web/utils/firewall.py +++ b/web/utils/firewall.py @@ -261,12 +261,12 @@ class Firewall(object): rep = r"#*Port\s+([0-9]+)\s*\n" conf = re.sub(rep, "Port " + port + "\n", conf) mw.writeFile(file, conf) + + self.addAcceptPort(port, 'SSH端口修改', 'port') + self.reload() if not self.reloadSshd(): return mw.returnData(False, '重启sshd失败,尝试手动重启:service ssh restart!') - - self.addAcceptPort(port, 'SSH端口修改', 'port') - self.reload() return mw.returnData(True, '修改成功!') def setFw(self, status):