diff --git a/web/admin/firewall/__init__.py b/web/admin/firewall/__init__.py index 006119c0b..d57c998c7 100644 --- a/web/admin/firewall/__init__.py +++ b/web/admin/firewall/__init__.py @@ -13,8 +13,6 @@ from flask import Blueprint, render_template from flask import request from admin.user_login_check import panel_login_required -from admin.model import db, Firewall - from utils.firewall import Firewall as MwFirewall diff --git a/web/admin/setup/__init__.py b/web/admin/setup/__init__.py index 6747b01d4..cd0d5d2b5 100644 --- a/web/admin/setup/__init__.py +++ b/web/admin/setup/__init__.py @@ -15,6 +15,7 @@ from .option import init_option from .init_db_system import init_db_system from .init_cmd import init_cmd +from utils.firewall import Firewall as MwFirewall import thisdb import config @@ -29,3 +30,6 @@ def init(): init_cmd() init_db_system() + # 自动识别防火墙配置 + MwFirewall.instance().aIF() + diff --git a/web/utils/firewall.py b/web/utils/firewall.py index 9b39ac475..4e7bd014f 100644 --- a/web/utils/firewall.py +++ b/web/utils/firewall.py @@ -47,6 +47,16 @@ class Firewall(object): elif mw.isAppleSystem(): self.__isMac = True + # 自动识别防火墙配置 | Automatically identify firewall + def aIF(): + if self.__isFirewalld: + self.AIF_Firewalld() + + def AIF_Firewalld(): + # firewall-cmd --list-all | grep ' ports' + data = mw.execShell("firewall-cmd --list-all | grep ' ports'") + print(data) + def getList(self, page=1,size=10): info = thisdb.getFirewallList(page=page, size=size)