update

Author: midoks

new_cli.sh

@@ -3,6 +3,8 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/hom
 DIR=$(cd "$(dirname "$0")"; pwd)
 MDIR=$(dirname "$DIR")
 
+export LC_ALL="en_US.UTF-8"
+
 # echo $DIR
 
 PATH=$PATH:$DIR/bin
@@ -14,9 +16,6 @@ if [ -f ${DIR}/bin/activate ];then
 	fi
 fi
 
-export LC_ALL="en_US.UTF-8"
-
-
 mw_start_task()
 {
     isStart=$(ps aux |grep 'panel_task.py'|grep -v grep|awk '{print $2}')

panel_task.py

@@ -31,16 +31,6 @@
 import core.db as db
 
 
-# print(mw.getPanelDir())
-
-# print sys.path
-
-# cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-# info = mw.execShell(cmd)
-# p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-# sys.path.append(p)
-
-
 global pre, timeoutCount, logPath, isTask, oldEdate, isCheck
 pre = 0
 timeoutCount = 0
@@ -85,9 +75,12 @@ def service_cmd(method):
         execShell(cmd + ' ' + method)
         return
 
-    cmd = mw.getRunDir() + '/scripts/init.d/mw'
+    cmd = mw.getPanelDir() + '/scripts/init.d/mw'
+    print(cmd)
     if os.path.exists(cmd):
-        execShell(cmd + ' ' + method)
+        print(cmd + ' ' + method)
+        data = execShell(cmd + ' ' + method)
+        print(data)
         return
 
 
@@ -573,7 +566,7 @@ def openrestyRestartAtOnce():
 
 # --------------------------------------Panel Restart Start   --------------------------------------------- #
 def restartPanelService():
-    restartTip = 'data/restart.pl'
+    restartTip = mw.getPanelDir()+'/data/restart.pl'
     while True:
         if os.path.exists(restartTip):
             os.remove(restartTip)
@@ -612,10 +605,10 @@ def run():
     # oar.start()
 
 
-    # # Panel Restart Start
-    # rps = threading.Thread(target=restartPanelService)
-    # rps = setDaemon(rps)
-    # rps.start()
+    # Panel Restart Start
+    rps = threading.Thread(target=restartPanelService)
+    rps = setDaemon(rps)
+    rps.start()
 
     # 面板后台任务
     startPanelTask()

panel_tools.py

@@ -228,16 +228,15 @@ def set_panel_pwd(password, ncli=False):
 
 
 def show_panel_pwd():
-    # 设置面板密码
-    sql = db.Sql()
-    password = sql.table('users').where('id=?', (1,)).getField('password')
-
-    file_pwd = ''
-    if os.path.exists('data/default.pl'):
-        file_pwd = mw.readFile('data/default.pl').strip()
+    # 面板密码展示
+    info = model.getUserByRoot()
+    defailt_pwd_file = mw.getPanelDir()+'/data/default.pl'
+    pwd = ''
+    if os.path.exists(defailt_pwd_file):
+        pwd = mw.readFile(defailt_pwd_file).strip()
 
-    if mw.md5(file_pwd) == password:
-        print('password: ' + file_pwd)
+    if mw.md5(pwd) == info['password']:
+        print('password: ' + pwd)
         return
     print("password has been changed!")
 

scripts/init.d/mw.tpl

@@ -104,7 +104,7 @@ mw_start()
 # /www/server/mdserver-web/tmp/panelTask.pl && service mw restart_task
 mw_stop_task()
 {
-    if [ -f $mw_path/tmp/panelTask.pl ];then
+    if [ -f ${PANEL_DIR}/tmp/panelTask.pl ];then
         echo -e "\033[32mthe task is running and cannot be stopped\033[0m"
         exit 0
     fi
@@ -123,7 +123,7 @@ mw_stop_panel()
 {
     echo -e "stopping mw-panel... \c";
 
-    pidfile=${mw_path}/logs/mw.pid
+    pidfile=${PANEL_DIR}/logs/mw.pid
     if [ -f $pidfile ];then
         pid=`cat $pidfile`
         kill -9 $pid > /dev/null 2>&1

web/admin/crontab/__init__.py

@@ -27,8 +27,8 @@ def list():
     page = request.args.get('p', 1)
     size = 10
     count = Crontab.query.count()
-    print(count)
+    # print(count)
     clist = Crontab.query.paginate(page=int(page), per_page=size)
-    print(clist)
+    # print(clist)
 
     return []

web/admin/dashboard/__init__.py

@@ -32,6 +32,18 @@
 def index():
     return render_template('default/index.html')
 
+# 安全路径
+@blueprint.route('/<path>',endpoint='admin_safe_path',methods=['GET'])
+def admin_safe_path(path):
+    db_path = model.getOption('admin_path')
+    if db_path == path:
+        return render_template('default/login.html')
+
+    unauthorized_status = model.getOption('unauthorized_status')
+    if unauthorized_status == '0':
+        return render_template('default/path.html')
+    return Response(status=int(unauthorized_status))
+
 # 仅针对webhook插件
 @blueprint.route("/hook", methods=['POST', 'GET'])
 def webhook():
@@ -63,19 +75,6 @@ def webhook():
     except Exception as e:
         return str(e)
 
-# 安全路径
-@blueprint.route('/<path>',endpoint='admin_safe_path',methods=['GET'])
-def admin_safe_path(path):
-    db_path = model.getOption('admin_path')
-    if db_path == path:
-        return render_template('default/login.html')
-
-    unauthorized_status = model.getOption('unauthorized_status')
-    if unauthorized_status == '0':
-        return render_template('default/path.html')
-    return Response(status=int(unauthorized_status))
-
-
 # ---------------------------------------------------------------------------------
 # 定义登录入口相关方法
 # ---------------------------------------------------------------------------------

web/admin/firewall/__init__.py

@@ -75,8 +75,21 @@ def set_ping():
     mf = MwFirewall.instance()
     return mf.setPing()
 
+# 添加放行端口
+@blueprint.route('/add_accept_port', endpoint='add_accept_port', methods=['POST'])
+@panel_login_required
+def add_accept_port():
+    mf = MwFirewall.instance()
+    if not mf.getFwStatus():
+        return mw.returnData(False, '防火墙启动时,才能添加规则!')
 
+    port = request.form.get('port', '').strip()
+    ps = request.form.get('ps', '').strip()
+    protocol = request.form.get('protocol', '').strip()
+    stype = request.form.get('type', '').strip()
 
+    data = mf.addAcceptPort(port, ps, stype, protocol=protocol)
+    return mw.getJson(data)
 
 
 

web/admin/model/__init__.py

@@ -8,6 +8,7 @@
 # Author: midoks <[email protected]>
 # ---------------------------------------------------------------------------------
 
+
 from .initdb import *
 
 from .logs import addLog,clearLog
@@ -25,5 +26,11 @@
 from .user import getUserByName,getUserById,getUserByRoot
 from .user import setUserByRoot
 
+from .firewall import addFirewall
+
 from .temp_login import getTempLoginByToken,clearTempLogin
 
+
+
+
+

web/admin/model/firewall.py

@@ -0,0 +1,41 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <[email protected]>
+# ---------------------------------------------------------------------------------
+
+from admin.model import db, Firewall
+
+import core.mw as mw
+
+
+
+def addFirewall(port,
+    protocol: str | None = 'tcp',
+    ps: str | None = '备注'
+) -> bool:
+    '''
+    设置配置的值
+    :port -> str 端口 (必填)
+    :protocol -> str 协议 (可选|tcp,udp,tcp/udp)
+    :ps -> str 备注 (可选)
+    '''
+    now_time = mw.formatDate()
+    add_data = Firewall(
+        port=port, 
+        protocol=protocol,
+        add_time=now_time,
+        update_time=now_time)
+    db.session.add(add_data)
+    db.session.commit()
+    return True
+
+
+def getFirewallCountByPort(port):
+    return Firewall.query.filter(Tasks.port==port).count()
+
+

web/admin/model/logs.py

@@ -13,13 +13,7 @@
 import time
 
 from admin.model import db, Logs
-
-def formatDate(format="%Y-%m-%d %H:%M:%S", times=None):
-    # 格式化指定时间戳
-    if not times:
-        times = int(time.time())
-    time_local = time.localtime(times)
-    return time.strftime(format, time_local)
+import core.mw as mw
 
 def clearLog():
     try:
@@ -42,12 +36,12 @@ def addLog(type, log,
     :log -> str 日志内容 (必填)
     :uid -> int 用户ID
     '''
-    add_time = formatDate()
+    now_time = mw.formatDate()
     add_logs = Logs(
         uid=uid,
         log=log, 
         type=type,
-        add_time=add_time)
+        add_time=now_time)
     db.session.add(add_logs)
     db.session.commit()
     db.session.close()