From 99a15ffc8295d5c77f2645d9a84f8a6feb898589 Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 17 Jan 2023 03:46:04 +0800 Subject: [PATCH 01/63] Update mw.py --- class/core/mw.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/class/core/mw.py b/class/core/mw.py index a111c912cc..3ebfba4df3 100755 --- a/class/core/mw.py +++ b/class/core/mw.py @@ -454,6 +454,12 @@ def getDate(): return time.strftime('%Y-%m-%d %X', time.localtime()) +def getDataFromInt(val): + time_format = '%Y-%m-%d %H:%M:%S' + time_str = time.localtime(val) + return time.strftime(time_format, time_str) + + def writeLog(stype, msg, args=()): # 写日志 try: From 1558e93f33e2cb1d9317abd0ad964994d0246a05 Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 17 Jan 2023 15:37:22 +0800 Subject: [PATCH 02/63] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 73b5a21507..292b5ddd39 100644 --- a/.gitignore +++ b/.gitignore @@ -157,6 +157,7 @@ data/bind_domain.pl plugins/l2tp plugins/openlitespeed plugins/system_safe +plugins/tamper_proof plugins/gdrive plugins/mtproxy plugins/zimg From ec78197317ac67094f359e2ee81d66d7271cfcb6 Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 17 Jan 2023 15:58:27 +0800 Subject: [PATCH 03/63] Update plugins_api.py --- class/core/plugins_api.py | 42 +++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/class/core/plugins_api.py b/class/core/plugins_api.py index 54641a6f6a..4005de3184 100755 --- a/class/core/plugins_api.py +++ b/class/core/plugins_api.py @@ -214,10 +214,7 @@ def hookInstallFile(self, hook_name, info): isNeedAdd = False if isNeedAdd: - tmp = {} - tmp['title'] = info['title'] - tmp['name'] = info['name'] - data.append(tmp) + data.append(info) mw.writeFile(hookPath, json.dumps(data)) def hookUninstallFile(self, hook_name, info): @@ -233,21 +230,40 @@ def hookUninstallFile(self, hook_name, info): mw.writeFile(hookPath, json.dumps(data)) def hookInstall(self, info): + valid_hook = ['backup', 'database'] + valid_list_hook = ['menu'] if 'hook' in info: hooks = info['hook'] - for x in hooks: - if x in ['backup', 'database']: - self.hookInstallFile(x, info) - return True + hooks_type = type(hooks) + if hooks_type == list: + for h in hooks: + tag = h['tag'] + if tag in valid_list_hook: + self.hookInstallFile(tag, h[tag]) + + elif hooks_type == str: + for x in hooks: + if x in valid_hook: + self.hookInstallFile(x, info) + return True return False def hookUninstall(self, info): + valid_hook = ['backup', 'database'] + valid_list_hook = ['menu'] if 'hook' in info: - hooks = info['hook'] - for x in hooks: - if x in ['backup', 'database']: - self.hookUninstallFile(x, info) - return True + ooks = info['hook'] + hooks_type = type(hooks) + if hooks_type == list: + for h in hooks: + tag = h['tag'] + if tag in valid_list_hook: + self.hookUninstallFile(tag, h[tag]) + elif hooks_type == str: + for x in hooks: + if x in valid_hook: + self.hookUninstallFile(x, info) + return True return False def uninstallOldApi(self): From b35ae736a377b9321895395375f44c5ce8e2c723 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Jan 2023 00:57:25 +0800 Subject: [PATCH 04/63] up --- class/core/config_api.py | 15 +++++++++++--- class/core/mw.py | 4 ++++ class/core/plugins_api.py | 41 +++++++++++++++++++++++++++++++++++---- 3 files changed, 53 insertions(+), 7 deletions(-) diff --git a/class/core/config_api.py b/class/core/config_api.py index b8d0c54493..df0342f639 100755 --- a/class/core/config_api.py +++ b/class/core/config_api.py @@ -781,12 +781,21 @@ def get(self): "id=?", (1,)).getField('username') # databases hook 获取 - database_file = 'data/hook_database.json' - if os.path.exists(database_file): - df = mw.readFile(database_file) + database_hook_file = 'data/hook_database.json' + if os.path.exists(database_hook_file): + df = mw.readFile(database_hook_file) df = json.loads(df) data['hook_database'] = df else: data['hook_database'] = [] + # menu hook 获取 + menu_hook_file = 'data/hook_menu.json' + if os.path.exists(menu_hook_file): + df = mw.readFile(menu_hook_file) + df = json.loads(df) + data['hook_menu'] = df + else: + data['hook_menu'] = [] + return data diff --git a/class/core/mw.py b/class/core/mw.py index 3ebfba4df3..c1a25626a1 100755 --- a/class/core/mw.py +++ b/class/core/mw.py @@ -1281,6 +1281,10 @@ def toSize(size): return str(round(size, 2)) + ' ' + b +def getPathSuffix(path): + return os.path.splitext(path)[-1] + + def getMacAddress(): # 获取mac import uuid diff --git a/class/core/plugins_api.py b/class/core/plugins_api.py index 4005de3184..89a99f2209 100755 --- a/class/core/plugins_api.py +++ b/class/core/plugins_api.py @@ -27,7 +27,7 @@ import threading import multiprocessing - +from flask import render_template from flask import request @@ -75,12 +75,35 @@ def listApi(self): data = self.getPluginList(sType, int(sPage)) return mw.getJson(data) + def menuGetAbsPath(self, tag, path): + if path[0:1] == '/': + return path + else: + return mw.getPluginDir() + '/' + tag + '/' + path + + def menuApi(self): + import config_api + data = config_api.config_api().get() + tag = request.args.get('tag', '') + menu_file = 'data/hook_menu.json' + content = '' + if os.path.exists(menu_file): + t = mw.readFile(menu_file) + tlist = json.loads(t) + for menu_data in tlist: + if 'path' in menu_data: + tpath = self.menuGetAbsPath(tag, menu_data['path']) + content = mw.readFile(tpath) + data['plugin_content'] = content + return render_template('plugin_menu.html', data=data) + def fileApi(self): name = request.args.get('name', '') if name.strip() == '': return '' f = request.args.get('f', '') + if f.strip() == '': return '' @@ -88,8 +111,18 @@ def fileApi(self): if not os.path.exists(file): return '' - c = open(file, 'rb').read() - return c + suffix = mw.getPathSuffix(file) + # c = open(file, 'rb').read() + content = mw.readFile(file) + print("ddd:", suffix) + if suffix == '.css': + + from flask import Response + from flask import make_response + v = Response(content, headers={'Content-Type': 'css/text'}) + return make_response(v) + + return content def indexListApi(self): data = self.getIndexList() @@ -252,7 +285,7 @@ def hookUninstall(self, info): valid_hook = ['backup', 'database'] valid_list_hook = ['menu'] if 'hook' in info: - ooks = info['hook'] + hooks = info['hook'] hooks_type = type(hooks) if hooks_type == list: for h in hooks: From b4b9b6eb1f80b52daf612b502d05b91a64bca63f Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Jan 2023 00:57:30 +0800 Subject: [PATCH 05/63] Create plugin_menu.html --- route/templates/default/plugin_menu.html | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 route/templates/default/plugin_menu.html diff --git a/route/templates/default/plugin_menu.html b/route/templates/default/plugin_menu.html new file mode 100644 index 0000000000..2e4ca72df4 --- /dev/null +++ b/route/templates/default/plugin_menu.html @@ -0,0 +1,4 @@ +{% extends "layout.html" %} +{% block content %} +{{data['plugin_content']}} +{% endblock %} \ No newline at end of file From 4e16773ed82f71a2b6d6f36056d255a10bc45458 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Jan 2023 00:57:38 +0800 Subject: [PATCH 06/63] Update layout.html --- route/templates/default/layout.html | 51 ++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 8 deletions(-) diff --git a/route/templates/default/layout.html b/route/templates/default/layout.html index 3f3b5831b2..830a2bdbdb 100755 --- a/route/templates/default/layout.html +++ b/route/templates/default/layout.html @@ -23,6 +23,14 @@ gtag('js', new Date()); gtag('config', 'G-FC74BB2RGD'); + + + {% for menu in data['hook_menu'] %} + {% if menu['js_path'] %} + + + {% endif %} + {% endfor %} @@ -33,12 +41,18 @@

{{data['ip']}}

    -
  • 首页
    • +
  • 首页
  • 网站
  • 监控
  • 安全
  • 文件
  • 计划任务
    • + + {% for menu in data['hook_menu'] %} +
  • + {{menu['title']}} +
    • + {% endfor %}
  • 软件管理1
  • 面板设置
  • 退出
    • @@ -77,6 +91,14 @@

    {{data['ip']}}

    - @@ -128,4 +156,11 @@

    {{data['ip']}}

    +{% for menu in data['hook_menu'] %} +{% if menu['js_path'] %} + + +{% endif %} +{% endfor %} + \ No newline at end of file From 8aa4084373b05de38aa6626d0f143d349efed3a8 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Jan 2023 01:03:23 +0800 Subject: [PATCH 07/63] Update plugins_api.py --- class/core/plugins_api.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/class/core/plugins_api.py b/class/core/plugins_api.py index 89a99f2209..636ff19bad 100755 --- a/class/core/plugins_api.py +++ b/class/core/plugins_api.py @@ -112,16 +112,14 @@ def fileApi(self): return '' suffix = mw.getPathSuffix(file) - # c = open(file, 'rb').read() - content = mw.readFile(file) - print("ddd:", suffix) if suffix == '.css': - + content = mw.readFile(file) from flask import Response from flask import make_response - v = Response(content, headers={'Content-Type': 'css/text'}) + v = Response(content, headers={ + 'Content-Type': 'text/css; charset="utf-8"'}) return make_response(v) - + content = open(file, 'rb').read() return content def indexListApi(self): From 2a97c0f8b34683dac74adb3c97acc38e493423f1 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Jan 2023 01:12:24 +0800 Subject: [PATCH 08/63] Update plugin_menu.html --- route/templates/default/plugin_menu.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/route/templates/default/plugin_menu.html b/route/templates/default/plugin_menu.html index 2e4ca72df4..647c286165 100644 --- a/route/templates/default/plugin_menu.html +++ b/route/templates/default/plugin_menu.html @@ -1,4 +1,4 @@ {% extends "layout.html" %} {% block content %} -{{data['plugin_content']}} +{{data['plugin_content']|safe }} {% endblock %} \ No newline at end of file From 1388c697e0d3063420983b04a4f0bc1b97d1ab72 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Jan 2023 01:38:06 +0800 Subject: [PATCH 09/63] =?UTF-8?q?iptables=E5=AE=89=E8=A3=85=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- class/core/firewall_api.py | 2 ++ scripts/install/rhel.sh | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/class/core/firewall_api.py b/class/core/firewall_api.py index 7a5f78df08..38fe807d72 100755 --- a/class/core/firewall_api.py +++ b/class/core/firewall_api.py @@ -359,6 +359,8 @@ def setFwIptables(self, status): _list = mw.M('firewall').field('id,port,ps,addtime').limit( '0,1000').order('id desc').select() + mw.execShell('iptables -P INPUT DROP') + mw.execShell('iptables -P OUTPUT ACCEPT') for x in _list: port = x['port'] if mw.isIpAddr(port): diff --git a/scripts/install/rhel.sh b/scripts/install/rhel.sh index da25365005..b7e3ab9760 100644 --- a/scripts/install/rhel.sh +++ b/scripts/install/rhel.sh @@ -43,7 +43,11 @@ if [ -f /usr/sbin/iptables ];then iptables_status=`systemctl status iptables | grep 'inactive'` if [ "${iptables_status}" != '' ];then service iptables restart - + + # iptables -P FORWARD DROP + iptables -P INPUT DROP + iptables -P OUTPUT ACCEPT + iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 22 -j ACCEPT iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 80 -j ACCEPT iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 443 -j ACCEPT From 19e6055b7cbc5a3de8f1675984e7f0ef0dccd09d Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Jan 2023 01:38:18 +0800 Subject: [PATCH 10/63] Update install.sh --- plugins/webssh/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/webssh/install.sh b/plugins/webssh/install.sh index 6925212654..6c7ecedec6 100755 --- a/plugins/webssh/install.sh +++ b/plugins/webssh/install.sh @@ -11,12 +11,13 @@ serverPath=$(dirname "$rootPath") install_tmp=${rootPath}/tmp/mw_install.pl +VERSION=$2 Install_webssh() { echo '正在安装脚本文件...' > $install_tmp mkdir -p $serverPath/webssh - echo '1.0' > $serverPath/webssh/version.pl + echo "${VERSION}" > $serverPath/webssh/version.pl echo '安装完成' > $install_tmp } From 42ba0ea2857974110c8fdcf644a1106041916333 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Jan 2023 17:27:33 +0800 Subject: [PATCH 11/63] =?UTF-8?q?=E4=BC=98=E5=8C=96iptables=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- class/core/firewall_api.py | 3 ++- scripts/install/debian.sh | 12 ++++++++---- scripts/install/rhel.sh | 3 ++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/class/core/firewall_api.py b/class/core/firewall_api.py index 38fe807d72..69dbc2664a 100755 --- a/class/core/firewall_api.py +++ b/class/core/firewall_api.py @@ -33,7 +33,8 @@ class firewall_api: __isMac = False def __init__(self): - if os.path.exists('/usr/sbin/iptables'): + iptables_file = mw.systemdCfgDir() + '/iptables.service' + if os.path.exists(iptables_file): self.__isIptables = True if os.path.exists('/usr/sbin/firewalld'): self.__isFirewalld = True diff --git a/scripts/install/debian.sh b/scripts/install/debian.sh index b3c78a09c7..5b5f8a05fd 100644 --- a/scripts/install/debian.sh +++ b/scripts/install/debian.sh @@ -50,7 +50,6 @@ if [ -f /usr/sbin/ufw ];then # ufw allow 7200/tcp # ufw allow 3306/tcp # ufw allow 30000:40000/tcp - fi if [ -f /usr/sbin/ufw ];then @@ -58,8 +57,13 @@ if [ -f /usr/sbin/ufw ];then fi if [ ! -f /usr/sbin/ufw ];then + # look + # firewall-cmd --list-all + apt install -y firewalld systemctl enable firewalld + #取消服务锁定 + systemctl unmask firewalld systemctl start firewalld firewall-cmd --permanent --zone=public --add-port=22/tcp @@ -75,10 +79,10 @@ if [ ! -f /usr/sbin/ufw ];then sed -i 's#IndividualCalls=no#IndividualCalls=yes#g' /etc/firewalld/firewalld.conf firewall-cmd --reload -fi -#安装时不开启 -systemctl stop firewalld + #安装时不开启 + systemctl stop firewalld +fi #fix zlib1g-dev fail echo -e "\e[0;32mfix zlib1g-dev install question start\e[0m" diff --git a/scripts/install/rhel.sh b/scripts/install/rhel.sh index b7e3ab9760..a7deb36611 100644 --- a/scripts/install/rhel.sh +++ b/scripts/install/rhel.sh @@ -47,7 +47,8 @@ if [ -f /usr/sbin/iptables ];then # iptables -P FORWARD DROP iptables -P INPUT DROP iptables -P OUTPUT ACCEPT - + iptables -A INPUT -p tcp -s 127.0.0.1 -j ACCEPT + iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 22 -j ACCEPT iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 80 -j ACCEPT iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 443 -j ACCEPT From a6842f26799e1d3c527ba5d94df9aed033c65ec9 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Jan 2023 17:42:56 +0800 Subject: [PATCH 12/63] Update firewall_api.py --- class/core/firewall_api.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/class/core/firewall_api.py b/class/core/firewall_api.py index 69dbc2664a..ec650207ee 100755 --- a/class/core/firewall_api.py +++ b/class/core/firewall_api.py @@ -255,26 +255,15 @@ def setSshPortApi(self): conf = re.sub(rep, "Port " + port + "\n", conf) mw.writeFile(file, conf) + self.addAcceptPortArgs(port, 'SSH端口修改', 'port') if self.__isUfw: - mw.execShell('ufw allow ' + port + '/tcp') mw.execShell("service ssh restart") elif self.__isIptables: - mw.execShell( - 'iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT') mw.execShell("/etc/init.d/sshd restart") elif self.__isFirewalld: - mw.execShell('setenforce 0') - mw.execShell( - 'sed -i "s#SELINUX=enforcing#SELINUX=disabled#" /etc/selinux/config') mw.execShell("systemctl restart sshd.service") else: - pass - - self.firewallReload() - # mw.M('firewall').where( - # "ps=?", ('SSH远程管理服务',)).setField('port', port) - msg = "改SSH端口为[{}]成功!".format(port) - mw.writeLog("防火墙管理", msg) + return mw.returnJson(False, '修改失败!') return mw.returnJson(True, '修改成功!') def setSshStatusApi(self): From 24e6c57eecfc1f7ea2a2bd4193df47dc39f93d12 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 18 Jan 2023 17:58:23 +0800 Subject: [PATCH 13/63] Update firewall.js --- route/static/app/firewall.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/route/static/app/firewall.js b/route/static/app/firewall.js index 933685d63b..2423f11140 100755 --- a/route/static/app/firewall.js +++ b/route/static/app/firewall.js @@ -123,6 +123,9 @@ function getSshInfo(){ } $("#firewall_status").html(fStatus); + showAccept(1); + getLogs(1); + },'json'); } From c49bc6f82349db28e8c35e9f05554f4fed857f47 Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 19 Jan 2023 18:04:00 +0800 Subject: [PATCH 14/63] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 35c715e82e..267edae254 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,6 @@ PHP[72-81]支持phpMyAdmin[5.2.0] # 特别赞助 - [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.la/) -- [奈飞丝 - 奈飞中国 Netflix MOD首发](https://naifeis.com/index.php#/register?code=k7P7V6Ur) # AD - VPS推荐 - 🙏 From 7cf64673f9b34d61042371a0dc8c6db99d11560b Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 19 Jan 2023 22:18:35 +0800 Subject: [PATCH 15/63] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=88=87=E6=8D=A2linux?= =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E6=BA=90=E7=9A=84=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/init.d/mw.tpl | 11 +++++++++++ tools.py | 33 ++++++++++++++++++--------------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl index 8563e93414..df632147a9 100755 --- a/scripts/init.d/mw.tpl +++ b/scripts/init.d/mw.tpl @@ -215,6 +215,17 @@ mw_update_dev() cd /www/server/mdserver-web } +mw_mirror() +{ + cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"") + if [ ! -z "$cn" ];then + bash <(curl -sSL https://gitee.com/SuperManito/LinuxMirrors/raw/main/ChangeMirrors.sh) + else + bash <(curl -sSL https://raw.githubusercontent.com/midoks/change-linux-mirrors/main/change-mirrors.sh) + fi + cd /www/server/mdserver-web +} + mw_install_app() { bash $mw_path/scripts/quick/app.sh diff --git a/tools.py b/tools.py index aaf8798208..0cb7b43c75 100755 --- a/tools.py +++ b/tools.py @@ -47,20 +47,21 @@ def mwcli(mw_input=0): raw_tip = "======================================================" if not mw_input: print("===============mdserver-web cli tools=================") - print("(1) 重启面板服务") - print("(2) 停止面板服务") - print("(3) 启动面板服务") - print("(4) 重载面板服务") - print("(5) 修改面板端口") - print("(10) 查看面板默认信息") - print("(11) 修改面板密码") - print("(12) 修改面板用户名") - print("(13) 显示面板错误日志") - print("(20) 关闭BasicAuth认证") - print("(21) 解除域名绑定") - print("(100) 开启PHP52显示") - print("(101) 关闭PHP52显示") - print("(0) 取消") + print("(1) 重启面板服务") + print("(2) 停止面板服务") + print("(3) 启动面板服务") + print("(4) 重载面板服务") + print("(5) 修改面板端口") + print("(10) 查看面板默认信息") + print("(11) 修改面板密码") + print("(12) 修改面板用户名") + print("(13) 显示面板错误日志") + print("(20) 关闭BasicAuth认证") + print("(21) 解除域名绑定") + print("(100) 开启PHP52显示") + print("(101) 关闭PHP52显示") + print("(200) 切换Linux系统软件源") + print("(0) 取消") print(raw_tip) try: mw_input = input("请输入命令编号：") @@ -69,7 +70,7 @@ def mwcli(mw_input=0): except: mw_input = 0 - nums = [1, 2, 3, 4, 5, 10, 11, 12, 13, 20, 21, 100, 101] + nums = [1, 2, 3, 4, 5, 10, 11, 12, 13, 20, 21, 100, 101, 200] if not mw_input in nums: print(raw_tip) print("已取消!") @@ -135,6 +136,8 @@ def mwcli(mw_input=0): cont = re.sub("\"5.2.17\",", cont) mw.writeFile(php_conf, cont) print("|-执行PHP52隐藏成功!") + elif mw_input == 200: + os.system(INIT_CMD + " mirror") def set_panel_pwd(password, ncli=False): From ad2e9958f8e2e7b0c5eea23bc94b7a1d7e90ecb3 Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 19 Jan 2023 22:24:15 +0800 Subject: [PATCH 16/63] Update mw.tpl --- scripts/init.d/mw.tpl | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl index df632147a9..fae1bd3a96 100755 --- a/scripts/init.d/mw.tpl +++ b/scripts/init.d/mw.tpl @@ -291,6 +291,7 @@ case "$1" in 'close_admin_path') mw_close_admin_path;; 'unbind_domain') mw_unbind_domain;; 'debug') mw_debug;; + 'mirror') mw_mirror;; 'default') cd $mw_path port=7200 From d2d5a0e12ff75ad615a940591981c0da818e4ac2 Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 20 Jan 2023 02:11:07 +0800 Subject: [PATCH 17/63] up --- plugins/webssh/index.html | 2 - plugins/webssh/info.json | 14 +- plugins/webssh/js/webssh.js | 67 ++-- plugins/webssh/menu/index.css | 620 +++++++++++++++++++++++++++++++++ plugins/webssh/menu/index.html | 119 +++++++ 5 files changed, 796 insertions(+), 26 deletions(-) create mode 100644 plugins/webssh/menu/index.css create mode 100755 plugins/webssh/menu/index.html diff --git a/plugins/webssh/index.html b/plugins/webssh/index.html index a53f8768ef..59bacbcf16 100755 --- a/plugins/webssh/index.html +++ b/plugins/webssh/index.html @@ -1,7 +1,5 @@ + From 6929c5a17339979f2a859c54bbacd3bf34811de5 Mon Sep 17 00:00:00 2001 From: midoks Date: Mon, 23 Jan 2023 04:21:02 +0800 Subject: [PATCH 34/63] Update requirements.txt --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index b7802c548e..becf6e2f1f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,6 +19,7 @@ configparser==5.2.0 python-engineio==4.3.2 python-socketio>=4.2.0 flask-socketio==5.2.0 +flask_sockets=0.2.1 zmq==0.0.0 paramiko>=2.8.0 pymongo From d387546986d503fa8fd14e8af6be3236bc31eb51 Mon Sep 17 00:00:00 2001 From: midoks Date: Mon, 23 Jan 2023 04:21:52 +0800 Subject: [PATCH 35/63] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index becf6e2f1f..135d82cb1e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,7 +19,7 @@ configparser==5.2.0 python-engineio==4.3.2 python-socketio>=4.2.0 flask-socketio==5.2.0 -flask_sockets=0.2.1 +flask_sockets==0.2.1 zmq==0.0.0 paramiko>=2.8.0 pymongo From 6b3dae61690fb004c3f7e2471e4f8ebb7186593e Mon Sep 17 00:00:00 2001 From: midoks Date: Mon, 23 Jan 2023 20:21:00 +0800 Subject: [PATCH 36/63] Update webstats_common.lua --- plugins/webstats/lua/webstats_common.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/webstats/lua/webstats_common.lua b/plugins/webstats/lua/webstats_common.lua index 686b037925..b1ab6cfd6a 100644 --- a/plugins/webstats/lua/webstats_common.lua +++ b/plugins/webstats/lua/webstats_common.lua @@ -200,8 +200,9 @@ end function _M.get_http_origin(self) local data = "" - local headers = ngx.req.get_headers() + local method = ngx.req.get_method() if not headers then return data end + local headers = ngx.req.get_headers() if method ~='GET' then -- API disabled in the context of log_by_lua* -- ngx.req.read_body() From 2c3ad7ea99ca8205c2eb9ea808e2bc9538a8f9c8 Mon Sep 17 00:00:00 2001 From: midoks Date: Mon, 23 Jan 2023 20:30:01 +0800 Subject: [PATCH 37/63] Update webstats_common.lua --- plugins/webstats/lua/webstats_common.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/webstats/lua/webstats_common.lua b/plugins/webstats/lua/webstats_common.lua index b1ab6cfd6a..6ccd8dff1a 100644 --- a/plugins/webstats/lua/webstats_common.lua +++ b/plugins/webstats/lua/webstats_common.lua @@ -200,10 +200,10 @@ end function _M.get_http_origin(self) local data = "" - local method = ngx.req.get_method() - if not headers then return data end local headers = ngx.req.get_headers() - if method ~='GET' then + if not headers then return data end + local req_method = ngx.req.get_method() + if req_method ~='GET' then -- API disabled in the context of log_by_lua* -- ngx.req.read_body() From 832f3b45ebf8323e02ab57f89d063d5637668f2f Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 25 Jan 2023 03:20:55 +0800 Subject: [PATCH 38/63] up --- class/core/ssh_terminal.py | 446 ++++++++++++++++++++++++++++ plugins/webssh/js/webssh.js | 240 ++++++--------- plugins/webssh/menu/index.css | 4 + plugins/webssh/menu/index.html | 4 +- route/__init__.py | 49 ++- route/static/js/term-websocketio.js | 143 +++++++++ route/static/js/term.js | 2 +- route/templates/default/layout.html | 2 +- 8 files changed, 706 insertions(+), 184 deletions(-) create mode 100644 class/core/ssh_terminal.py create mode 100644 route/static/js/term-websocketio.js diff --git a/class/core/ssh_terminal.py b/class/core/ssh_terminal.py new file mode 100644 index 0000000000..9dcdc590a4 --- /dev/null +++ b/class/core/ssh_terminal.py @@ -0,0 +1,446 @@ +# coding: utf-8 + +# --------------------------------------------------------------------------------- +# MW-Linux面板 +# --------------------------------------------------------------------------------- +# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved. +# --------------------------------------------------------------------------------- +# Author: midoks +# --------------------------------------------------------------------------------- + +# --------------------------------------------------------------------------------- +# 公共操作 +# --------------------------------------------------------------------------------- + +import json +import time +import os +import sys +import socket +import threading +import re + +from io import BytesIO, StringIO + +import mw +import paramiko + +from flask_socketio import SocketIO, emit, send + + +class ssh_terminal: + + __debug_file = 'logs/terminal.log' + __log_type = 'SSH终端' + + # websocketio 唯一标识 + __sid = '' + + __host = None + __port = 22 + __user = None + __pass = None + __pkey = None + __key_passwd = None + + __rep_ssh_config = False + __rep_ssh_service = False + __sshd_config_backup = None + + __connecting = False + __ssh = None + __tp = None + __ps = None + + def __init__(self): + pass + + def debug(self, msg): + msg = "{} - {}:{} => {} \n".format(mw.formatDate(), + self.__host, self.__port, msg) + # self.history_send(msg) + mw.writeFile(self.__debug_file, msg, 'a+') + + def returnMsg(self, status, msg): + return {'status': status, 'msg': msg} + + def restartSsh(self, act='reload'): + ''' + 重启ssh 无参数传递 + ''' + version = mw.readFile('/etc/redhat-release') + if not os.path.exists('/etc/redhat-release'): + mw.execShell('service ssh ' + act) + elif version.find(' 7.') != -1 or version.find(' 8.') != -1: + mw.execShell("systemctl " + act + " sshd.service") + else: + mw.execShell("/etc/init.d/sshd " + act) + + def isRunning(self, rep=False): + try: + if rep and self.__rep_ssh_service: + self.restartSsh('stop') + return True + + status = self.getSshStatus() + if not status: + self.restartSsh('start') + self.__rep_ssh_service = True + return True + return False + except: + return False + + def setSshdConfig(self, rep=False): + self.isRunning(rep) + if rep and not self.__rep_ssh_config: + return False + + try: + sshd_config_file = '/etc/ssh/sshd_config' + if not os.path.exists(sshd_config_file): + return False + + sshd_config = mw.readFile(sshd_config_file) + if not sshd_config: + return False + + if rep: + if self.__sshd_config_backup: + mw.writeFile(sshd_config_file, self.__sshd_config_backup) + self.restartSsh() + return True + + pin = r'^\s*PubkeyAuthentication\s+(yes|no)' + pubkey_status = re.findall(pin, sshd_config, re.I) + if pubkey_status: + if pubkey_status[0] == 'yes': + pubkey_status = True + else: + pubkey_status = False + + pin = r'^\s*RSAAuthentication\s+(yes|no)' + rsa_status = re.findall(pin, sshd_config, re.I) + if rsa_status: + if rsa_status[0] == 'yes': + rsa_status = True + else: + rsa_status = False + + self._sshd_config_backup = sshd_config + is_write = False + if not pubkey_status: + sshd_config = re.sub( + r'\n#?PubkeyAuthentication\s\w+', '\nPubkeyAuthentication yes', sshd_config) + is_write = True + if not rsa_status: + sshd_config = re.sub( + r'\n#?RSAAuthentication\s\w+', '\nRSAAuthentication yes', sshd_config) + is_write = True + + if is_write: + mw.writeFile(sshd_config_file, sshd_config) + self.__rep_ssh_config = True + self.restartSsh() + else: + self.__sshd_config_backup = None + return True + except: + return False + + def setSid(self, sid): + self.__sid = sid + + def connect(self): + # self.connectBySocket() + if self.__host in ['127.0.0.1', 'localhost']: + return self.connectLocalSsh() + else: + return self.connectBySocket() + + def connectLocalSsh(self): + self.createSshInfo() + self.__ps = paramiko.SSHClient() + self.__ps.set_missing_host_key_policy(paramiko.AutoAddPolicy()) + + self.__port = mw.getSSHPort() + try: + self.__ps.connect(self.__host, self.__port, timeout=60) + except Exception as e: + self.__ps.connect('127.0.0.1', self.__port) + except Exception as e: + self.__ps.connect('localhost', self.__port) + except Exception as e: + self.setSshdConfig(True) + self.__ps.close() + e = str(e) + if e.find('websocket error!') != -1: + return self.returnMsg(True, '连接成功') + if e.find('Authentication timeout') != -1: + self.debug("认证超时{}".format(e)) + return self.returnMsg(False, '认证超时,请按回车重试!{}'.format(e)) + if e.find('Connection reset by peer') != -1: + self.debug('目标服务器主动拒绝连接') + return self.returnMsg(False, '目标服务器主动拒绝连接') + if e.find('Error reading SSH protocol banner') != -1: + self.debug('协议头响应超时') + return self.returnMsg(False, '协议头响应超时，与目标服务器之间的网络质量太糟糕：' + e) + if not e: + self.debug('SSH协议握手超时') + return self.returnMsg(False, "SSH协议握手超时，与目标服务器之间的网络质量太糟糕") + err = mw.getTracebackInfo() + self.debug(err) + return self.returnMsg(False, "未知错误: {}".format(err)) + + self.debug('local-ssh:认证成功，正在构建会话通道') + self.__ssh = self.__ps.invoke_shell(term='xterm', width=83, height=21) + self.__ssh.setblocking(0) + self.__connect_time = time.time() + self.__last_send = [] + mw.writeLog(self.__log_type, '成功登录到SSH服务器 [{}:{}]'.format( + self.__host, self.__port)) + self.debug('local-ssh:通道已构建') + return self.returnMsg(True, '连接成功!') + + def connectBySocket(self): + if not self.__host: + return self.returnMsg(False, '错误的连接地址') + if not self.__user: + self.__user = 'root' + if not self.__port: + self.__port = 22 + + if self.__host in ['127.0.0.1', 'localhost']: + self.__port = mw.getSSHPort() + + self.setSshdConfig(True) + num = 0 + while num < 5: + num += 1 + try: + self.debug('正在尝试第{}次连接'.format(num)) + if self.__rep_ssh_config: + time.sleep(0.1) + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.settimeout(2 + num) + sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 8192) + sock.connect((self.__host, self.__port)) + break + except Exception as e: + if num == 5: + self.setSshdConfig(True) + self.debug('重试连接失败,{}'.format(e)) + if self.__host in ['127.0.0.1', 'localhost']: + return self.returnMsg(False, '连接目标服务器失败: {}'.format("Authentication failed ," + self.__user + "@" + self.__host + ":" + str(self.__port))) + return self.returnMsg(False, '连接目标服务器失败, {}:{}'.format(self.__host, self.__port)) + else: + time.sleep(0.2) + + # print(sock) + self.__tp = paramiko.Transport(sock) + try: + self.__tp.start_client() + self.__tp.banner_timeout = 60 + if not self.__pass or not self.__pkey: + return self.returnMsg(False, '密码或私钥不能都为空: {}:{}'.format(self.__host, self.__port)) + + if self.__pkey: + self.debug('正在认证私钥') + if sys.version_info[0] == 2: + try: + self.__pkey = self.__pkey.encode('utf-8') + except: + pass + p_file = BytesIO(self.__pkey) + else: + p_file = StringIO(self.__pkey) + + try: + pkey = paramiko.RSAKey.from_private_key(p_file) + except: + try: + p_file.seek(0) # 重置游标 + pkey = paramiko.Ed25519Key.from_private_key(p_file) + except: + try: + p_file.seek(0) + pkey = paramiko.ECDSAKey.from_private_key( + p_file) + except: + p_file.seek(0) + pkey = paramiko.DSSKey.from_private_key(p_file) + + self.__tp.auth_publickey(username=self.__user, key=pkey) + else: + try: + self.__tp.auth_none(self.__user) + except Exception as e: + e = str(e) + if e.find('keyboard-interactive') >= 0: + self._auth_interactive() + else: + self.debug('正在认证密码') + self.__tp.auth_password( + username=self.__user, password=self.__pass) + except Exception as e: + self.setSshdConfig(True) + self.__tp.close() + e = str(e) + if e.find('websocket error!') != -1: + return self.returnMsg(True, '连接成功') + if e.find('Authentication timeout') != -1: + self.debug("认证超时{}".format(e)) + return self.returnMsg(False, '认证超时,请按回车重试!{}'.format(e)) + if e.find('Authentication failed') != -1: + self.debug('认证失败{}'.format(e)) + return self.returnMsg(False, '帐号或密码错误: {}'.format(e + "," + self.__user + "@" + self.__host + ":" + str(self.__port))) + if e.find('Bad authentication type; allowed types') != -1: + self.debug('认证失败{}'.format(e)) + if self.__host in ['127.0.0.1', 'localhost'] and self.__pass == 'none': + return self.returnMsg(False, '帐号或密码错误: {}'.format("Authentication failed ," + self.__user + "@" + self.__host + ":" + str(self.__port))) + return self.returnMsg(False, '不支持的身份验证类型: {}'.format(e)) + if e.find('Connection reset by peer') != -1: + self.debug('目标服务器主动拒绝连接') + return self.returnMsg(False, '目标服务器主动拒绝连接') + if e.find('Error reading SSH protocol banner') != -1: + self.debug('协议头响应超时') + return self.returnMsg(False, '协议头响应超时，与目标服务器之间的网络质量太糟糕：' + e) + if not e: + self.debug('SSH协议握手超时') + return self.returnMsg(False, "SSH协议握手超时，与目标服务器之间的网络质量太糟糕") + err = mw.getTracebackInfo() + self.debug(err) + return self.returnMsg(False, "未知错误: {}".format(err)) + + self.debug('认证成功，正在构建会话通道') + self.__ssh = self.__tp.open_session() + self.__ssh.get_pty(term='xterm', width=100, height=34) + self.__ssh.invoke_shell() + self.__connect_time = time.time() + self.__last_send = [] + mw.writeLog(self.__log_type, '成功登录到SSH服务器 [{}:{}]'.format( + self.__host, self.__port)) + self.debug('通道已构建') + return self.returnMsg(True, '连接成功.') + + def setAttr(self, info): + self.__host = info['host'].strip() + + if 'port' in info: + self.__port = int(info['port']) + if 'username' in info: + self.__user = info['username'] + if 'pkey' in info: + self.__pkey = info['pkey'] + if 'password' in info: + self.__pass = info['password'] + if 'pkey_passwd' in info: + self.__key_passwd = info['pkey_passwd'] + try: + result = self.connect() + except Exception as ex: + if str(ex).find("NoneType") == -1: + raise ex + return result + + def send(self): + pass + + def close(self): + try: + if self.__ssh: + self.__ssh.close() + if self.__tp: # 关闭宿主服务 + self.__tp.close() + if self.__ps: + self.__ps.close() + except: + pass + + def heartbeat(self): + while True: + time.sleep(0.1) + if self.__tp and self.__tp.is_active(): + self.__tp.send_ignore() + else: + break + + if self.__ps and self.__ps.is_active(): + self.__ps.send_ignore() + else: + break + + def wsSend(self, recv): + try: + t = recv.decode("utf-8") + return emit('server_response', {'data': t}) + except Exception as e: + return emit('server_response', {'data': recv}) + + def run(self, sid, info): + self.__sid = sid + if not self.__sid: + return self.wsSend('WebSocketIO无效') + + if self.__connecting and not 'host' in info: + return + + if not self.__ssh: + self.__connecting = True + result = self.setAttr(info) + self.__connecting = False + else: + result = self.returnMsg(True, '已连接') + + if result['status']: + if type(info) == str: + time.sleep(0.1) + self.__ssh.send(info) + + try: + time.sleep(0.005) + recv = self.__ssh.recv(8192) + return self.wsSend(recv) + except Exception as ex: + return self.wsSend('') + else: + return self.wsSend(result['msg']) + + def getSshDir(self): + if mw.isAppleSystem(): + user = mw.execShell( + "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip() + return '/Users/' + user + '/.ssh' + return '/root/.ssh' + + def createRsa(self): + ssh_dir = self.getSshDir() + ssh_ak = ssh_dir + '/authorized_keys' + if not os.path.exists(ssh_ak): + mw.execShell('touch ' + ssh_ak) + if not os.path.exists(ssh_dir + '/id_rsa.pub') and os.path.exists(ssh_dir + '/id_rsa'): + cmd = 'echo y | ssh-keygen -q -t rsa -P "" -f ' + ssh_dir + '/id_rsa' + mw.execShell(cmd) + else: + cmd = 'ssh-keygen -q -t rsa -P "" -f ' + ssh_dir + '/id_rsa' + mw.execShell(cmd) + cmd = 'cat ' + ssh_dir + '/id_rsa.pub >> ' + ssh_dir + '/authorized_keys' + mw.execShell(cmd) + cmd = 'chmod 600 ' + ssh_dir + '/authorized_keys' + mw.execShell(cmd) + + def createSshInfo(self): + ssh_dir = self.getSshDir() + if not os.path.exists(ssh_dir + '/id_rsa') or not os.path.exists(ssh_dir + '/id_rsa.pub'): + self.createRsa() + # 检查是否写入authorized_keys + cmd = "cat " + ssh_dir + "/id_rsa.pub | awk '{print $3}'" + data = mw.execShell(cmd) + if data[0] != "": + cmd = "cat " + ssh_dir + "/authorized_keys | grep " + data[0] + ak_data = mw.execShell(cmd) + if ak_data[0] == "": + cmd = 'cat ' + ssh_dir + '/id_rsa.pub >> ' + ssh_dir + '/authorized_keys' + mw.execShell(cmd) + cmd = 'chmod 600 ' + ssh_dir + '/authorized_keys' + mw.execShell(cmd) diff --git a/plugins/webssh/js/webssh.js b/plugins/webssh/js/webssh.js index 70565d9128..c71e3dfa44 100755 --- a/plugins/webssh/js/webssh.js +++ b/plugins/webssh/js/webssh.js @@ -1,6 +1,6 @@ - - +//全局 +var host_ssh_list = []; function appPost(method,args,callback){ var _args = null; @@ -110,8 +110,30 @@ function webShell_Load(){ webShell_cmd(); }); + // 切换服务器终端视图 + $('.term_item_tab .list').on('click', 'span.item', function (ev) { + var index = $(this).index(), data = $(this).data(); + if ($(this).hasClass('addServer')) { + } else if ($(this).hasClass('tab_tootls')) { + } else { + $(this).addClass('active').siblings().removeClass('active'); + $('.term_content_tab .term_item:eq(' + index + ')').addClass('active').siblings().removeClass('active'); + var item = host_ssh_list[data.id]; + // item.term.focus(); + // item.term.FitAddon.fit(); + // item.resize({ cols: item.term.cols, rows: item.term.rows }); + } + }); + + $('.term_item_tab').on('click', '.icon-trem-close', function () { + var id = $(this).parent().data('id'); + webShell_removeTermView(id); + }) + //服务器列表和常用命令 - webShell_getHostList();//默认调用 + webShell_getHostList(); + + //服务器列表和命令切换 $('.term_tootls .tab-nav span').click(function(){ var list_type = $(this).attr('data-type'); if (!$(this).hasClass('on')){ @@ -243,155 +265,46 @@ function webShell_getCmdList(){ function webShell_Menu2(){ - new Terms('#ECFEfRWM8', { ssh_info: { host: "127.0.0.1", ps: "22", id: 'ECFEfRWM8' } }); + var random = 'localhost'; + host_ssh_list[random] = new Terms_WebSocketIO('#'+random, { ssh_info: { host: "127.0.0.1", ps: "22", id: random } }); } -function webShell_Menu() { - var termCols = 83; - var termRows = 20; - var sendTotal = 0; - if(!socket)socket = io.connect(); - var term = new Terminal({ cols: termCols, rows: termRows, screenKeys: true, useStyle: true}); - - term.open(); - term.setOption('cursorBlink', true); - term.setOption('fontSize', 14); - gterm = term; - - socket.on('server_response', function (data) { - term.write(data.data); - if (data.data == '\r\n登出\r\n' || - data.data == '登出\r\n' || - data.data == '\r\nlogout\r\n' || - data.data == 'logout\r\n') { - setTimeout(function () { - layer.closeAll(); - term.destroy(); - clearInterval(interval); - }, 500); - } - }); - - $(window).unload(function(){ - 　 term.destroy(); - clearInterval(interval); - }); - - if (socket) { - socket.emit('connect_event', ''); - interval = setInterval(function () { - socket.emit('connect_event', ''); - }, 1000); +function webShell_openTermView(info) { + console.log(info); + if (typeof info === "undefined") { + info = { host: '127.0.0.1', ps: '本地服务器' } } - - term.on('data', function (data) { - socket.emit('webssh', data); - }); - - $(".shell_btn_close").click(function(){ - layer.close(term_box); - term.destroy(); - clearInterval(interval); - }) - - setTimeout(function () { - $('.terminal').detach().appendTo('#ECFEfRWM8'); - $("#ECFEfRWM8").show(); - socket.emit('webssh', "\n"); - term.focus(); - - // 鼠标右键事件 - var can = $("#term"); - can.contextmenu(function (e) { - var winWidth = can.width(); - var winHeight = can.height(); - var mouseX = e.pageX; - var mouseY = e.pageY; - var menuWidth = $(".contextmenu").width(); - var menuHeight = $(".contextmenu").height(); - var minEdgeMargin = 10; - if (mouseX + menuWidth + minEdgeMargin >= winWidth && - mouseY + menuHeight + minEdgeMargin >= winHeight) { - menuLeft = mouseX - menuWidth - minEdgeMargin + "px"; - menuTop = mouseY - menuHeight - minEdgeMargin + "px"; - } - else if (mouseX + menuWidth + minEdgeMargin >= winWidth) { - menuLeft = mouseX - menuWidth - minEdgeMargin + "px"; - menuTop = mouseY + minEdgeMargin + "px"; - } - else if (mouseY + menuHeight + minEdgeMargin >= winHeight) { - menuLeft = mouseX + minEdgeMargin + "px"; - menuTop = mouseY - menuHeight - minEdgeMargin + "px"; - } - else { - menuLeft = mouseX + minEdgeMargin + "px"; - menuTop = mouseY + minEdgeMargin + "px"; - }; - - var selectText = term.getSelection() - var style_str = ''; - var paste_str = ''; - if (!selectText) { - if (!getCookie('shell_copy_body')) { - paste_str = 'style="color: #bbb;" disable'; - } - style_str = 'style="color: #bbb;" disable'; - } else { - setCookie('ssh_selection', selectText); - } - - - var menudiv = ''; - $("body").append(menudiv); - $(".contextmenu").css({ - "left": menuLeft, - "top": menuTop - }); - return false; - }); - can.click(function () { - remove_ssh_menu(); - }); + var random = getRandomString(9); + var tab_content = $('.term_content_tab'); + var item_list = $('.term_item_tab .list'); + tab_content.find('.term_item').removeClass('active').siblings().removeClass('active'); + tab_content.append('
    '); + item_list.find('.item').removeClass('active'); + if (info.ps == ''){ + info.ps = info.host; + } + item_list.append('
    ' + info.ps + '
    '); + host_ssh_list[random] = new Terms_WebSocketIO('#' + random, { ssh_info: { host: info.host, ps: info.ps, id: random } }); +} - clipboard = new ClipboardJS('.shell_copy_btn'); - clipboard.on('success', function (e) { - layer.msg('复制成功!'); - setCookie('shell_copy_body', e.text) - remove_ssh_menu(); - term.focus(); - }); - clipboard.on('error', function (e) { - layer.msg('复制失败，浏览器不兼容!'); - setCookie('shell_copy_body', e.text) - remove_ssh_menu(); - term.focus(); - }); - - $(".shellbutton").click(function () { - var tobj = $("textarea[name='ssh_copy']"); - var ptext = tobj.val(); - tobj.val(''); - if ($(this).text().indexOf('Alt') != -1) { - ptext +="\n"; - } - socket.emit('webssh', ptext); - term.focus(); - }) - $("textarea[name='ssh_copy']").keydown(function (e) { - - if (e.ctrlKey && e.keyCode == 13) { - $(".shell_btn_1").click(); - } else if (e.altKey && e.keyCode == 13) { - $(".shell_btn_1").click(); - } - }); +function webShell_removeTermView(id){ + var item = $('[data-id="' + id + '"]'), next = item.next(), prev = item.prev(); + $('#' + id).remove(); + item.remove(); + try { + host_ssh_list[id].close(); + } catch (error) { + } - }, 100); + delete host_ssh_list[id]; + if (item.hasClass('active')) { + if (next.length > 0) { + next.click(); + } else { + prev.click(); + } + } } function webShell_getHostList(info){ @@ -401,7 +314,7 @@ function webShell_getHostList(info){ var tli = ''; for (var i = 0; i < alist.length; i++) { - tli+='
  • \ + tli+='
  • \ \ '+alist[i]['host']+'\ \ @@ -430,11 +343,42 @@ function webShell_getHostList(info){ }); }); + + $('.tootls_host_list').on('click', 'li', function (e) { + var index = $(this).index(); + var host = $(this).data('host'); + $(this).find('i').addClass('active'); + if ($('.item[data-host="' + host + '"]').length > 0) { + layer.msg('已经打开!', { icon: 0, time: 3000 }) + // layer.msg('如需多会话窗口，请右键终端标题复制会话!', { icon: 0, time: 3000 }); + } else { + webShell_openTermView(alist[index]); + } + }); + + // tab切换 + $('.term_tootls .tab-nav span').click(function () { + if ($(this).hasClass('on')) return; + var index = $(this).index(); + $(this).siblings('.on').removeClass('on'); + $(this).addClass('on'); + $('.term_tootls .tab-con .tab-block').removeClass('on'); + $('.term_tootls .tab-con .tab-block').eq(index).addClass('on'); + var type = $(this).attr('data-type'); + switch (type) { + case 'host': + that.reader_host_list(); + break; + case 'shell': + that.reader_command_list(); + break; + } + }); + }); } function webShell_addServer(info=[]){ - console.log(info); layer.open({ type: 1, title: '添加主机信息', diff --git a/plugins/webssh/menu/index.css b/plugins/webssh/menu/index.css index 35f25dc81f..249c427b7d 100644 --- a/plugins/webssh/menu/index.css +++ b/plugins/webssh/menu/index.css @@ -10,6 +10,10 @@ /* menu end */ +.xterm{ + position: inherit; +} + .tab-nav { border-bottom: #cacad9 1px solid; } diff --git a/plugins/webssh/menu/index.html b/plugins/webssh/menu/index.html index 4603213207..f7f8a4958c 100755 --- a/plugins/webssh/menu/index.html +++ b/plugins/webssh/menu/index.html @@ -7,7 +7,7 @@
    - +
    本地服务器
    @@ -23,7 +23,7 @@
    -
    +
    diff --git a/route/__init__.py b/route/__init__.py index 3c9cabfc40..ff55188c48 100755 --- a/route/__init__.py +++ b/route/__init__.py @@ -12,8 +12,7 @@ # reload(sys) # sys.setdefaultencoding('utf-8') - - +import paramiko from datetime import timedelta from flask import Flask @@ -612,7 +611,7 @@ def clear_ssh(): ps -t /dev/$i |grep -v TTY | awk '{print $1}' | xargs kill -9 done -#getHostAddr +# getHostAddr PLIST=`who | grep "${ip}" | awk '{print $2}'` for i in $PLIST do @@ -647,45 +646,32 @@ def connect_ssh(): return True -# methods=["GET", "OPTIONS", "HEAD"] -# pip3 install flask==1.1.2 -# pip3 install Werkzeug==1.0.1 -@sockets.route('/webssh', methods=["GET", "OPTIONS", "HEAD"]) -def webssh(ws): - print("connection start") - while not ws.closed: - msg = ws.receive() # 同步阻塞 - print(msg) - now = datetime.datetime.now().isoformat() - ws.send(now) # 发送数据 - time.sleep(1) +shell_client = None -# def handle_route_websocket(app_socket): -# @app_socket.route('/webssh') -# def page_websocket_test(ws): -# now = time.strftime('%Y-%m-%d-%H-%M-%S', time.localtime(time.time())) -# while not ws.closed: -# # 回传给clicent -# message = ws.receive() # 接收到消息 -# if message is not None: -# print("client says(%s): %s" % (now, message)) -# ws.send(str("回执：server已收到消息!-- %s " % now)) -# ws.send(str(json.dumps(message))) # 回传给clicent -# else: -# print(now, "no receive") +@socketio.on('webssh_websocketio') +def webssh_websocketio(data): + if not isLogined(): + emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'}) + return + global shell_client + if not shell_client: + import ssh_terminal + shell_client = ssh_terminal.ssh_terminal() -# handle_route_websocket(sockets) + print("request.sid", request.sid) + shell_client.run(request.sid, data) + return @socketio.on('webssh') def webssh(msg): - print('webssh cmd:' + msg) + global shell, ssh if not isLogined(): emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'}) return None - global shell, ssh + ssh_success = True if not shell: ssh_success = connect_ssh() @@ -729,7 +715,6 @@ def connected_msg(msg): # print 'connected_msg:' + str(e) try: - import paramiko ssh = paramiko.SSHClient() # 启动尝试时连接 diff --git a/route/static/js/term-websocketio.js b/route/static/js/term-websocketio.js new file mode 100644 index 0000000000..517d3ce567 --- /dev/null +++ b/route/static/js/term-websocketio.js @@ -0,0 +1,143 @@ +function Terms_WebSocketIO (el, config) { + + console.log(config); + if (typeof config == "undefined") { + config = {}; + } + this.el = el; + this.id = config.ssh_info.id || ''; + this.ws = null; //websocket对象 + this.route = 'webssh_websocketio'; // 访问的方法 + this.term = null; //term对象 + this.info = null; // 请求数据 + this.last_body = null; + this.fontSize = 14; //终端字体大小 + this.ssh_info = config.ssh_info; + this.term_timer = null; + this.run(); +} + +var socket, gterm; + +Terms_WebSocketIO.prototype = { + // websocket持久化连接 + connect: function (callback) { + if(!this.ws){ + this.ws = io.connect(); + } + }, + + //连接服务器成功 + on_open: function (ws_event) { + var http_token = $("#request_token_head").attr('token'); + this.ssh_info['x-http-token'] = http_token; + + this.send(JSON.stringify(this.ssh_info || { 'x-http-token': http_token })) + this.term.FitAddon.fit(); + this.resize({ cols: this.term.cols, rows: this.term.rows }); + }, + + //服务器消息事件 + on_message: function (ws_event) { + // console.log(ws_event.data); + this.term.write(ws_event.data); + if (ws_event.data == '\r\n登出\r\n' || ws_event.data == '登出\r\n' || + ws_event.data == '\r\nlogout\r\n' || ws_event.data == 'logout\r\n'|| + ws_event.data == '\r\nexit\r\n' || ws_event.data == 'exit\r\n') { + this.term.destroy(); + clearInterval(this.term_timer); + } + }, + + //websocket关闭事件 + on_close: function (ws_event) { + this.ws = null; + }, + + //websocket错误事件 + on_error: function (ws_event) { + if (ws_event.target.readyState === 3) { + // var msg = '错误: 无法创建WebSocket连接，请在面板设置页面关闭【开发者模式】'; + // layer.msg(msg,{time:5000}) + // if(Term.state === 3) return + // Term.term.write(msg) + // Term.state = 3; + } else { + console.log(ws_event) + } + }, + //发送数据 + //@param event 唯一事件名称 + //@param data 发送的数据 + //@param callback 服务器返回结果时回调的函数,运行完后将被回收 + send: function (data, num) { + var that = this; + //如果没有连接，则尝试连接服务器 + if (!this.ws || this.bws.readyState == 3 || this.bws.readyState == 2) { + this.connect(); + } + //判断当前连接状态,如果!=1，则100ms后尝试重新发送 + if (this.ws.readyState === 1) { + this.ws.send(data); + } else { + if (this.state === 3) return; + if (!num) num = 0; + if (num < 5) { + num++; + setTimeout(function () { that.send(data, num++); }, 100) + } + } + }, + + //关闭连接 + close: function () { + this.ws.close(); + this.set_term_icon(0); + }, + resize: function (size) { + if (this.ws) { + size['resize'] = 1; + this.send(JSON.stringify(size)); + } + + }, + run: function (ssh_info) { + this.connect(); + + var that = this; + var termCols = 83; + var termRows = 21; + this.term = new Terminal({ cols: termCols, rows: termRows, screenKeys: true, useStyle: true}); + + this.term.open($('#'+this.id)[0]); + this.term.setOption('cursorBlink', true); + this.term.setOption('fontSize', this.fontSize); + + // console.log(this.term.cols,this.term.rows); + // this.term.fit(); + // console.log(this.term.cols,this.term.rows); + + // this.term.FitAddon = new window.FitAddon(); + // this.term.loadAddon(this.term.FitAddon); + // this.term.WebLinksAddon = new WebLinksAddon.WebLinksAddon(); + // this.term.loadAddon(this.term.WebLinksAddon); + + this.ws.on('server_response', function (ev) { that.on_message(ev)}); + + if (this.ws) { + that.ws.emit('webssh_websocketio', ''); + this.term_timer = setInterval(function () { + that.ws.emit('webssh_websocketio', ''); + }, 500); + } + + this.term.on('data', function (data) { + that.ws.emit('webssh_websocketio', data); + }); + + // $('.terminal').detach().appendTo('#'+this.id); + this.ws.emit('webssh_websocketio', this.ssh_info); + this.ws.emit('webssh_websocketio', '\n'); + this.term.focus(); + } +} diff --git a/route/static/js/term.js b/route/static/js/term.js index 53cb7935dc..47fb7ac9c2 100644 --- a/route/static/js/term.js +++ b/route/static/js/term.js @@ -57,6 +57,7 @@ Terms.prototype = { } }, + //websocket关闭事件 on_close: function (ws_event) { this.set_term_icon(0); @@ -65,7 +66,6 @@ Terms.prototype = { /** * @name 设置终端标题状态 - * @author chudong<2020-08-10> * @param {number} status 终端状态 * @return void */ diff --git a/route/templates/default/layout.html b/route/templates/default/layout.html index fd92b83086..2d55fe8ace 100755 --- a/route/templates/default/layout.html +++ b/route/templates/default/layout.html @@ -75,7 +75,7 @@

    {{data['ip']}}

    - + From 1c74ce3c589c0d5c22e6667da2db84cf208d2735 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 25 Jan 2023 16:20:03 +0800 Subject: [PATCH 39/63] ssh 60% --- class/core/ssh_terminal.py | 82 +++++++++++++++++++---------- plugins/webssh/js/webssh.js | 5 +- route/__init__.py | 2 +- route/static/js/term-websocketio.js | 55 +++++-------------- 4 files changed, 72 insertions(+), 72 deletions(-) diff --git a/class/core/ssh_terminal.py b/class/core/ssh_terminal.py index 9dcdc590a4..362d278f0c 100644 --- a/class/core/ssh_terminal.py +++ b/class/core/ssh_terminal.py @@ -52,13 +52,18 @@ class ssh_terminal: __tp = None __ps = None + __ssh_list = {} + def __init__(self): - pass + ht = threading.Thread(target=self.heartbeat) + ht.start() + ht.join() def debug(self, msg): msg = "{} - {}:{} => {} \n".format(mw.formatDate(), self.__host, self.__port, msg) - # self.history_send(msg) + if not mw.isDebugMode(): + return mw.writeFile(self.__debug_file, msg, 'a+') def returnMsg(self, status, msg): @@ -193,10 +198,15 @@ def connectLocalSsh(self): return self.returnMsg(False, "未知错误: {}".format(err)) self.debug('local-ssh:认证成功，正在构建会话通道') - self.__ssh = self.__ps.invoke_shell(term='xterm', width=83, height=21) - self.__ssh.setblocking(0) - self.__connect_time = time.time() - self.__last_send = [] + # self.__ssh = self.__ps.invoke_shell(term='xterm', width=83, height=21) + # self.__ssh.setblocking(0) + # self.__connect_time = time.time() + # self.__last_send = [] + + ssh = self.__ps.invoke_shell( + term='xterm', width=83, height=21) + ssh.setblocking(0) + self.__ssh_list[self.__sid] = ssh mw.writeLog(self.__log_type, '成功登录到SSH服务器 [{}:{}]'.format( self.__host, self.__port)) self.debug('local-ssh:通道已构建') @@ -210,9 +220,6 @@ def connectBySocket(self): if not self.__port: self.__port = 22 - if self.__host in ['127.0.0.1', 'localhost']: - self.__port = mw.getSSHPort() - self.setSshdConfig(True) num = 0 while num < 5: @@ -230,18 +237,16 @@ def connectBySocket(self): if num == 5: self.setSshdConfig(True) self.debug('重试连接失败,{}'.format(e)) - if self.__host in ['127.0.0.1', 'localhost']: - return self.returnMsg(False, '连接目标服务器失败: {}'.format("Authentication failed ," + self.__user + "@" + self.__host + ":" + str(self.__port))) return self.returnMsg(False, '连接目标服务器失败, {}:{}'.format(self.__host, self.__port)) else: time.sleep(0.2) - # print(sock) + # print(self.__host, sock) self.__tp = paramiko.Transport(sock) try: self.__tp.start_client() self.__tp.banner_timeout = 60 - if not self.__pass or not self.__pkey: + if not self.__pass and not self.__pkey: return self.returnMsg(False, '密码或私钥不能都为空: {}:{}'.format(self.__host, self.__port)) if self.__pkey: @@ -313,11 +318,16 @@ def connectBySocket(self): return self.returnMsg(False, "未知错误: {}".format(err)) self.debug('认证成功，正在构建会话通道') - self.__ssh = self.__tp.open_session() - self.__ssh.get_pty(term='xterm', width=100, height=34) - self.__ssh.invoke_shell() - self.__connect_time = time.time() - self.__last_send = [] + # self.__ssh = self.__tp.open_session() + # self.__ssh.get_pty(term='xterm', width=100, height=34) + # self.__ssh.invoke_shell() + # self.__connect_time = time.time() + # self.__last_send = [] + + ssh = self.__tp.open_session() + ssh.get_pty(term='xterm', width=100, height=34) + ssh.invoke_shell() + self.__ssh_list[self.__sid] = ssh mw.writeLog(self.__log_type, '成功登录到SSH服务器 [{}:{}]'.format( self.__host, self.__port)) self.debug('通道已构建') @@ -326,6 +336,13 @@ def connectBySocket(self): def setAttr(self, info): self.__host = info['host'].strip() + # 外部连接获取 + if not self.__host in ['127.0.0.1', 'localhost']: + dst_info = mw.getServerDir() + '/webssh/host/' + self.__host + '/info.json' + if os.path.exists(dst_info): + _t = mw.readFile(dst_info) + info = json.loads(_t) + if 'port' in info: self.__port = int(info['port']) if 'username' in info: @@ -336,8 +353,11 @@ def setAttr(self, info): self.__pass = info['password'] if 'pkey_passwd' in info: self.__key_passwd = info['pkey_passwd'] + + print(self.__host, self.__pass, self.__key_passwd) try: result = self.connect() + print(result) except Exception as ex: if str(ex).find("NoneType") == -1: raise ex @@ -359,7 +379,8 @@ def close(self): def heartbeat(self): while True: - time.sleep(0.1) + time.sleep(1) + print("heartbeat:__ssh_list:", len(self.__ssh_list)) if self.__tp and self.__tp.is_active(): self.__tp.send_ignore() else: @@ -378,6 +399,7 @@ def wsSend(self, recv): return emit('server_response', {'data': recv}) def run(self, sid, info): + # sid = mw.md5(sid) self.__sid = sid if not self.__sid: return self.wsSend('WebSocketIO无效') @@ -385,21 +407,27 @@ def run(self, sid, info): if self.__connecting and not 'host' in info: return - if not self.__ssh: - self.__connecting = True - result = self.setAttr(info) - self.__connecting = False - else: + result = self.returnMsg(False, '') + if not sid in self.__ssh_list: + if type(info) == dict: + self.__connecting = True + result = self.setAttr(info) + self.__connecting = False + + if sid in self.__ssh_list: result = self.returnMsg(True, '已连接') if result['status']: if type(info) == str: time.sleep(0.1) - self.__ssh.send(info) - + if self.__ssh_list[sid].exit_status_ready(): + self.wsSend("已关闭!\r\n") + del(self.__ssh_list[sid]) + return + self.__ssh_list[sid].send(info) try: time.sleep(0.005) - recv = self.__ssh.recv(8192) + recv = self.__ssh_list[sid].recv(8192) return self.wsSend(recv) except Exception as ex: return self.wsSend('') diff --git a/plugins/webssh/js/webssh.js b/plugins/webssh/js/webssh.js index c71e3dfa44..3774609b4d 100755 --- a/plugins/webssh/js/webssh.js +++ b/plugins/webssh/js/webssh.js @@ -154,7 +154,7 @@ function webShell_Load(){ } }); - webShell_Menu2(); + webShell_Menu(); } @@ -264,8 +264,9 @@ function webShell_getCmdList(){ } -function webShell_Menu2(){ +function webShell_Menu(){ var random = 'localhost'; + // host_ssh_list[random] = new Terms_WebSocketIO('#'+random, { ssh_info: { host: "38.6.224.67", ps: "22", id: random } }); host_ssh_list[random] = new Terms_WebSocketIO('#'+random, { ssh_info: { host: "127.0.0.1", ps: "22", id: random } }); } diff --git a/route/__init__.py b/route/__init__.py index ff55188c48..62c188831f 100755 --- a/route/__init__.py +++ b/route/__init__.py @@ -660,7 +660,7 @@ def webssh_websocketio(data): import ssh_terminal shell_client = ssh_terminal.ssh_terminal() - print("request.sid", request.sid) + # print("request.sid", request.sid) shell_client.run(request.sid, data) return diff --git a/route/static/js/term-websocketio.js b/route/static/js/term-websocketio.js index 517d3ce567..b9831b6bf5 100644 --- a/route/static/js/term-websocketio.js +++ b/route/static/js/term-websocketio.js @@ -1,6 +1,4 @@ function Terms_WebSocketIO (el, config) { - - console.log(config); if (typeof config == "undefined") { config = {}; } @@ -17,9 +15,12 @@ function Terms_WebSocketIO (el, config) { this.run(); } -var socket, gterm; - Terms_WebSocketIO.prototype = { + + registerCloseCallBack:function(callback){ + this.callback_close = callback; + }, + // websocket持久化连接 connect: function (callback) { if(!this.ws){ @@ -29,64 +30,35 @@ Terms_WebSocketIO.prototype = { //连接服务器成功 on_open: function (ws_event) { - var http_token = $("#request_token_head").attr('token'); - this.ssh_info['x-http-token'] = http_token; - - this.send(JSON.stringify(this.ssh_info || { 'x-http-token': http_token })) this.term.FitAddon.fit(); this.resize({ cols: this.term.cols, rows: this.term.rows }); }, //服务器消息事件 on_message: function (ws_event) { - // console.log(ws_event.data); this.term.write(ws_event.data); if (ws_event.data == '\r\n登出\r\n' || ws_event.data == '登出\r\n' || ws_event.data == '\r\nlogout\r\n' || ws_event.data == 'logout\r\n'|| ws_event.data == '\r\nexit\r\n' || ws_event.data == 'exit\r\n') { this.term.destroy(); clearInterval(this.term_timer); + this.ws.disconnect(); + this.ws.close(); + if (this.callback_close){ + this.callback_close(); + } } }, - //websocket关闭事件 on_close: function (ws_event) { this.ws = null; }, - //websocket错误事件 on_error: function (ws_event) { - if (ws_event.target.readyState === 3) { - // var msg = '错误: 无法创建WebSocket连接，请在面板设置页面关闭【开发者模式】'; - // layer.msg(msg,{time:5000}) - // if(Term.state === 3) return - // Term.term.write(msg) - // Term.state = 3; - } else { - console.log(ws_event) - } }, - //发送数据 - //@param event 唯一事件名称 - //@param data 发送的数据 - //@param callback 服务器返回结果时回调的函数,运行完后将被回收 + send: function (data, num) { - var that = this; - //如果没有连接，则尝试连接服务器 - if (!this.ws || this.bws.readyState == 3 || this.bws.readyState == 2) { - this.connect(); - } - //判断当前连接状态,如果!=1，则100ms后尝试重新发送 - if (this.ws.readyState === 1) { - this.ws.send(data); - } else { - if (this.state === 3) return; - if (!num) num = 0; - if (num < 5) { - num++; - setTimeout(function () { that.send(data, num++); }, 100) - } - } + }, //关闭连接 @@ -134,8 +106,7 @@ Terms_WebSocketIO.prototype = { this.term.on('data', function (data) { that.ws.emit('webssh_websocketio', data); }); - - // $('.terminal').detach().appendTo('#'+this.id); + this.ws.emit('webssh_websocketio', this.ssh_info); this.ws.emit('webssh_websocketio', '\n'); this.term.focus(); From a30792178a514ca8dfe848c0cd311c741c2f9499 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 25 Jan 2023 16:50:10 +0800 Subject: [PATCH 40/63] up --- class/core/ssh_terminal.py | 2 +- plugins/webssh/js/webssh.js | 18 +++++++++++++++--- route/static/js/term-websocketio.js | 20 ++++---------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/class/core/ssh_terminal.py b/class/core/ssh_terminal.py index 362d278f0c..3589a66303 100644 --- a/class/core/ssh_terminal.py +++ b/class/core/ssh_terminal.py @@ -421,7 +421,7 @@ def run(self, sid, info): if type(info) == str: time.sleep(0.1) if self.__ssh_list[sid].exit_status_ready(): - self.wsSend("已关闭!\r\n") + self.wsSend("logout\r\n") del(self.__ssh_list[sid]) return self.__ssh_list[sid].send(info) diff --git a/plugins/webssh/js/webssh.js b/plugins/webssh/js/webssh.js index 3774609b4d..4c1e058726 100755 --- a/plugins/webssh/js/webssh.js +++ b/plugins/webssh/js/webssh.js @@ -263,11 +263,21 @@ function webShell_getCmdList(){ }); } +function Terms_WebSocketIO_Create(ip,random){ + var n = new Terms_WebSocketIO('#'+random, { ssh_info: { host: ip, ps: "22", id: random } }); + n.registerCloseCallBack(function(){ + webShell_removeTermView(random); + layer.msg('已经关闭【'+ip+'】', { icon: 1, time: 3000 }); + }); + return n; +} + function webShell_Menu(){ var random = 'localhost'; // host_ssh_list[random] = new Terms_WebSocketIO('#'+random, { ssh_info: { host: "38.6.224.67", ps: "22", id: random } }); - host_ssh_list[random] = new Terms_WebSocketIO('#'+random, { ssh_info: { host: "127.0.0.1", ps: "22", id: random } }); + host_ssh_list[random] = Terms_WebSocketIO_Create('127.0.0.1',random); + } function webShell_openTermView(info) { @@ -285,12 +295,14 @@ function webShell_openTermView(info) { info.ps = info.host; } item_list.append('
    ' + info.ps + '
    '); - host_ssh_list[random] = new Terms_WebSocketIO('#' + random, { ssh_info: { host: info.host, ps: info.ps, id: random } }); + host_ssh_list[random] = Terms_WebSocketIO_Create(info.host, random); } function webShell_removeTermView(id){ - var item = $('[data-id="' + id + '"]'), next = item.next(), prev = item.prev(); + var item = $('[data-id="' + id + '"]'); + var next = item.next(); + var prev = item.prev(); $('#' + id).remove(); item.remove(); try { diff --git a/route/static/js/term-websocketio.js b/route/static/js/term-websocketio.js index b9831b6bf5..cd2d6372f8 100644 --- a/route/static/js/term-websocketio.js +++ b/route/static/js/term-websocketio.js @@ -12,6 +12,8 @@ function Terms_WebSocketIO (el, config) { this.fontSize = 14; //终端字体大小 this.ssh_info = config.ssh_info; this.term_timer = null; + + this.callback_close = null; this.run(); } @@ -44,28 +46,14 @@ Terms_WebSocketIO.prototype = { clearInterval(this.term_timer); this.ws.disconnect(); this.ws.close(); + + console.log('message',this.callback_close,typeof(this.callback_close)); if (this.callback_close){ this.callback_close(); } } }, - on_close: function (ws_event) { - this.ws = null; - }, - - on_error: function (ws_event) { - }, - - send: function (data, num) { - - }, - - //关闭连接 - close: function () { - this.ws.close(); - this.set_term_icon(0); - }, resize: function (size) { if (this.ws) { size['resize'] = 1; From 515d25648f5e50396f9e16e3e962058fce51d6ea Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 25 Jan 2023 17:17:14 +0800 Subject: [PATCH 41/63] =?UTF-8?q?ssh=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- class/core/config_api.py | 2 +- route/static/app/public.js | 20 +++++++++++--------- route/static/css/site.css | 38 ++++++++------------------------------ 3 files changed, 20 insertions(+), 40 deletions(-) diff --git a/class/core/config_api.py b/class/core/config_api.py index df0342f639..f935d6f038 100755 --- a/class/core/config_api.py +++ b/class/core/config_api.py @@ -27,7 +27,7 @@ class config_api: - __version = '0.12.1' + __version = '0.12.1.1' __api_addr = 'data/api.json' def __init__(self): diff --git a/route/static/app/public.js b/route/static/app/public.js index 4dba813a55..17b19ec455 100755 --- a/route/static/app/public.js +++ b/route/static/app/public.js @@ -1545,7 +1545,7 @@ function webShell() { var term_box = layer.open({ type: 1, title: "本地终端", - area: ['685px','435px'], + area: ['685px','463px'], closeBtn: 1, shadeClose: false, content: '
    \ @@ -1556,18 +1556,22 @@ function webShell() { \
    \
    ', + success:function(){ + $(".shell_btn_close").click(function(){ + layer.close(term_box); + term.destroy(); + clearInterval(interval); + }); + }, cancel: function () { term.destroy(); clearInterval(interval); } }); - $(".shell_btn_close").click(function(){ - layer.close(term_box); - term.destroy(); - clearInterval(interval); - }) + setTimeout(function () { + $('.terminal').detach().appendTo('#term'); $("#term").show(); socket.emit('webssh', "\n"); @@ -1654,16 +1658,14 @@ function webShell() { } socket.emit('webssh', ptext); term.focus(); - }) + }); $("textarea[name='ssh_copy']").keydown(function (e) { - if (e.ctrlKey && e.keyCode == 13) { $(".shell_btn_1").click(); } else if (e.altKey && e.keyCode == 13) { $(".shell_btn_1").click(); } }); - }, 100); } diff --git a/route/static/css/site.css b/route/static/css/site.css index ea98249ece..a24b1cb8ee 100755 --- a/route/static/css/site.css +++ b/route/static/css/site.css @@ -4399,7 +4399,8 @@ html .menu .menu_exit:hover { font-size: 14px; text-align:center; } -.cloading{ + +.cloading { background-image: url("data:image/gif;base64,R0lGODlhJQAlAJECAL3L2AYrTv///wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFCgACACwAAAAAJQAlAAACi5SPqcvtDyGYIFpF690i8xUw3qJBwUlSadmcLqYmGQu6KDIeM13beGzYWWy3DlB4IYaMk+Dso2RWkFCfLPcRvFbZxFLUDTt21BW56TyjRep1e20+i+eYMR145W2eefj+6VFmgTQi+ECVY8iGxcg35phGo/iDFwlTyXWphwlm1imGRdcnuqhHeop6UAAAIfkEBQoAAgAsEAACAAQACwAAAgWMj6nLXAAh+QQFCgACACwVAAUACgALAAACFZQvgRi92dyJcVJlLobUdi8x4bIhBQAh+QQFCgACACwXABEADAADAAACBYyPqcsFACH5BAUKAAIALBUAFQAKAAsAAAITlGKZwWoMHYxqtmplxlNT7ixGAQAh+QQFCgACACwQABgABAALAAACBYyPqctcACH5BAUKAAIALAUAFQAKAAsAAAIVlC+BGL3Z3IlxUmUuhtR2LzHhsiEFACH5BAUKAAIALAEAEQAMAAMAAAIFjI+pywUAIfkEBQoAAgAsBQAFAAoACwAAAhOUYJnAagwdjGq2amXGU1PuLEYBACH5BAUKAAIALBAAAgAEAAsAAAIFhI+py1wAIfkEBQoAAgAsFQAFAAoACwAAAhWUL4AIvdnciXFSZS6G1HYvMeGyIQUAIfkEBQoAAgAsFwARAAwAAwAAAgWEj6nLBQAh+QQFCgACACwVABUACgALAAACE5RgmcBqDB2MarZqZcZTU+4sRgEAIfkEBQoAAgAsEAAYAAQACwAAAgWEj6nLXAAh+QQFCgACACwFABUACgALAAACFZQvgAi92dyJcVJlLobUdi8x4bIhBQAh+QQFCgACACwBABEADAADAAACBYSPqcsFADs="); background-repeat: no-repeat; background-position: center 45px; @@ -4409,32 +4410,7 @@ html .menu .menu_exit:hover { text-align: center; font-size: 14px; } -/*6.0终端样式*/ -.term-box{ - padding:0 10px 10px; - background-color:#333333; -} -.shell-text-input .bt-input-text-shell{ - width:100%; - padding:10px 10px 0; - border:0 none; - height:60px; - overflow:auto; - resize:none; -} -.shell-text-input .bt-input-text-shell:focus,.shell-text-input .bt-input-text-shell:active{ - border:0 none; - outline:none; -} -.shell-btn-group{ - height:30px; - position:absolute; - bottom:10px; - right:10px; -} -.shell_btn_close{ - margin-right:8px; -} + /*重启*/ .rebt-con { height: 106px; @@ -4794,7 +4770,7 @@ select[disabled]{ /*6.0终端样式*/ .term-box{ - padding:0 10px 10px; + padding:5px 10px 10px; background-color:#333333; } .shell-text-input .bt-input-text-shell{ @@ -4805,14 +4781,16 @@ select[disabled]{ overflow:auto; resize:none; } + .shell-text-input .bt-input-text-shell:focus,.shell-text-input .bt-input-text-shell:active{ border:0 none; outline:none; } -.shell-btn-group{ + +.shell-btn-group { height:30px; position:absolute; - bottom:10px; + bottom:20px; right:10px; } .shell_btn_close { From ea033733630141fe35f5e46b475fb8a455ecc8b7 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 25 Jan 2023 19:42:17 +0800 Subject: [PATCH 42/63] Update ssh_terminal.py --- class/core/ssh_terminal.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/class/core/ssh_terminal.py b/class/core/ssh_terminal.py index 3589a66303..a6272ec612 100644 --- a/class/core/ssh_terminal.py +++ b/class/core/ssh_terminal.py @@ -55,9 +55,10 @@ class ssh_terminal: __ssh_list = {} def __init__(self): - ht = threading.Thread(target=self.heartbeat) - ht.start() - ht.join() + # ht = threading.Thread(target=self.heartbeat) + # ht.start() + # ht.join() + pass def debug(self, msg): msg = "{} - {}:{} => {} \n".format(mw.formatDate(), @@ -379,17 +380,14 @@ def close(self): def heartbeat(self): while True: - time.sleep(1) + time.sleep(3) print("heartbeat:__ssh_list:", len(self.__ssh_list)) - if self.__tp and self.__tp.is_active(): - self.__tp.send_ignore() - else: - break + # self.debug("heartbeat:__ssh_list:" + str(len(self.__ssh_list))) + # if self.__tp and self.__tp.is_active(): + # self.__tp.send_ignore() - if self.__ps and self.__ps.is_active(): - self.__ps.send_ignore() - else: - break + # if self.__ps and self.__ps.is_active(): + # self.__ps.send_ignore() def wsSend(self, recv): try: From aaabe5628e5dace767d69e405e7de87c224ea184 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 25 Jan 2023 19:54:39 +0800 Subject: [PATCH 43/63] Update debian.sh --- scripts/update/debian.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/update/debian.sh b/scripts/update/debian.sh index d410cc65b2..e23dc24524 100644 --- a/scripts/update/debian.sh +++ b/scripts/update/debian.sh @@ -3,11 +3,15 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin export PATH export DEBIAN_FRONTEND=noninteractive -apt install -y locate -locale-gen en_US.UTF-8 -export LC_CTYPE=en_US.UTF-8 -export LC_ALL=en_US.UTF-8 -export LANG=en_US.UTF-8 +# apt install -y locate +# locale-gen C.UTF-8 +# export LC_CTYPE=C.UTF-8 +# export LC_ALL=C.UTF-8 +# export LANG=C.UTF-8 + + +# echo "LC_ALL=en_US.UTF-8" > /etc/default/locale +# echo "LANG=en_US.UTF-8" > /etc/default/locale if grep -Eq "Ubuntu" /etc/*-release; then From 49a606baa2cda5f9374fd2f7d5d18d30f3799bff Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 25 Jan 2023 19:55:54 +0800 Subject: [PATCH 44/63] Update mw.tpl --- scripts/init.d/mw.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl index fae1bd3a96..beff4e60d6 100755 --- a/scripts/init.d/mw.tpl +++ b/scripts/init.d/mw.tpl @@ -14,7 +14,7 @@ PATH=/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin -export LANG=en_US.UTF-8 +# export LANG=en_US.UTF-8 mw_path={$SERVER_PATH} PATH=$PATH:$mw_path/bin From 73140716349613fa776ad1546e1b52d43315daa4 Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 26 Jan 2023 02:05:39 +0800 Subject: [PATCH 45/63] =?UTF-8?q?ssh=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- class/core/mw.py | 92 +++++++++++++++++++++++- route/__init__.py | 142 ++++--------------------------------- route/static/app/public.js | 6 +- 3 files changed, 106 insertions(+), 134 deletions(-) diff --git a/class/core/mw.py b/class/core/mw.py index c1a25626a1..e81f99e0b9 100755 --- a/class/core/mw.py +++ b/class/core/mw.py @@ -1493,8 +1493,94 @@ def getMyORMDb(): o = ormDb.ORM() return o + +##################### ssh start ######################################### +def getSshDir(): + if isAppleSystem(): + user = execShell("who | sed -n '2, 1p' |awk '{print $1}'")[0].strip() + return '/Users/' + user + '/.ssh' + return '/root/.ssh' + + +def createRsa(): + ssh_dir = getSshDir() + # mw.execShell("rm -f /root/.ssh/*") + if not os.path.exists(ssh_dir + '/authorized_keys'): + execShell('touch ' + ssh_dir + '/authorized_keys') + + if not os.path.exists(ssh_dir + '/id_rsa.pub') and os.path.exists(ssh_dir + '/id_rsa'): + execShell('echo y | ssh-keygen -q -t rsa -P "" -f ' + + ssh_dir + '/id_rsa') + else: + execShell('ssh-keygen -q -t rsa -P "" -f ' + ssh_dir + '/id_rsa') + + execShell('cat ' + ssh_dir + '/id_rsa.pub >> ' + + ssh_dir + '/authorized_keys') + execShell('chmod 600 ' + ssh_dir + '/authorized_keys') + + +def createSshInfo(): + ssh_dir = getSshDir() + if not os.path.exists(ssh_dir + '/id_rsa') or not os.path.exists(ssh_dir + '/id_rsa.pub'): + createRsa() + + # 检查是否写入authorized_keys + data = execShell("cat " + ssh_dir + "/id_rsa.pub | awk '{print $3}'") + if data[0] != "": + cmd = "cat " + ssh_dir + "/authorized_keys | grep " + data[0] + ak_data = execShell(cmd) + if ak_data[0] == "": + cmd = 'cat ' + ssh_dir + '/id_rsa.pub >> ' + ssh_dir + '/authorized_keys' + execShell(cmd) + execShell('chmod 600 ' + ssh_dir + '/authorized_keys') + + +def connectSsh(): + import paramiko + ssh = paramiko.SSHClient() + createSshInfo() + ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) + + port = getSSHPort() + try: + ssh.connect('127.0.0.1', port, timeout=5) + except Exception as e: + ssh.connect('localhost', port, timeout=5) + except Exception as e: + ssh.connect(getHostAddr(), port, timeout=30) + except Exception as e: + return False + + shell = ssh.invoke_shell(term='xterm', width=83, height=21) + shell.setblocking(0) + return shell + + +def clearSsh(): + # 服务器IP + ip = getHostAddr() + sh = ''' +#!/bin/bash +PLIST=`who | grep localhost | awk '{print $2}'` +for i in $PLIST +do + ps -t /dev/$i |grep -v TTY | awk '{print $1}' | xargs kill -9 +done + +# getHostAddr +PLIST=`who | grep "${ip}" | awk '{print $2}'` +for i in $PLIST +do + ps -t /dev/$i |grep -v TTY | awk '{print $1}' | xargs kill -9 +done +''' + if not isAppleSystem(): + info = execShell(sh) + print(info[0], info[1]) +##################### ssh end ######################################### + # --------------------------------------------------------------------------------- -# 打印相关 +# 打印相关 START # --------------------------------------------------------------------------------- @@ -1513,3 +1599,7 @@ def echoEnd(tag): def echoInfo(msg): print("|-{}".format(msg)) + +# --------------------------------------------------------------------------------- +# 打印相关 END +# --------------------------------------------------------------------------------- diff --git a/route/__init__.py b/route/__init__.py index 62c188831f..364ead7ef2 100755 --- a/route/__init__.py +++ b/route/__init__.py @@ -555,97 +555,7 @@ def index(reqClass=None, reqAction=None, reqData=None): ##################### ssh start ########################### -ssh = None shell = None - - -def get_ssh_dir(): - if mw.isAppleSystem(): - user = mw.execShell( - "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip() - return '/Users/' + user + '/.ssh' - return '/root/.ssh' - -ssh_dir = get_ssh_dir() - - -def create_rsa(): - # mw.execShell("rm -f /root/.ssh/*") - if not os.path.exists(ssh_dir + '/authorized_keys'): - mw.execShell('touch ' + ssh_dir + '/authorized_keys') - - if not os.path.exists(ssh_dir + '/id_rsa.pub') and os.path.exists(ssh_dir + '/id_rsa'): - mw.execShell( - 'echo y | ssh-keygen -q -t rsa -P "" -f ' + ssh_dir + '/id_rsa') - else: - mw.execShell('ssh-keygen -q -t rsa -P "" -f ' + ssh_dir + '/id_rsa') - - mw.execShell('cat ' + ssh_dir + '/id_rsa.pub >> ' + - ssh_dir + '/authorized_keys') - mw.execShell('chmod 600 ' + ssh_dir + '/authorized_keys') - - -def create_ssh_info(): - if not os.path.exists(ssh_dir + '/id_rsa') or not os.path.exists(ssh_dir + '/id_rsa.pub'): - create_rsa() - - # 检查是否写入authorized_keys - data = mw.execShell("cat " + ssh_dir + "/id_rsa.pub | awk '{print $3}'") - if data[0] != "": - cmd = "cat " + ssh_dir + "/authorized_keys | grep " + data[0] - ak_data = mw.execShell(cmd) - if ak_data[0] == "": - cmd = 'cat ' + ssh_dir + '/id_rsa.pub >> ' + ssh_dir + '/authorized_keys' - mw.execShell(cmd) - mw.execShell('chmod 600 ' + ssh_dir + '/authorized_keys') - - -def clear_ssh(): - # 服务器IP - ip = mw.getHostAddr() - sh = ''' -#!/bin/bash -PLIST=`who | grep localhost | awk '{print $2}'` -for i in $PLIST -do - ps -t /dev/$i |grep -v TTY | awk '{print $1}' | xargs kill -9 -done - -# getHostAddr -PLIST=`who | grep "${ip}" | awk '{print $2}'` -for i in $PLIST -do - ps -t /dev/$i |grep -v TTY | awk '{print $1}' | xargs kill -9 -done -''' - if not mw.isAppleSystem(): - info = mw.execShell(sh) - print(info[0], info[1]) - - -def connect_ssh(): - # print 'connect_ssh ....' - # clear_ssh() - global shell, ssh - - create_ssh_info() - - ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) - - try: - ssh.connect(mw.getHostAddr(), mw.getSSHPort(), timeout=5) - except Exception as e: - ssh.connect('127.0.0.1', mw.getSSHPort()) - except Exception as e: - ssh.connect('localhost', mw.getSSHPort()) - except Exception as e: - return False - - shell = ssh.invoke_shell(term='xterm', width=83, height=21) - shell.setblocking(0) - return True - - shell_client = None @@ -667,52 +577,25 @@ def webssh_websocketio(data): @socketio.on('webssh') def webssh(msg): - global shell, ssh + global shell if not isLogined(): emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'}) return None - ssh_success = True - if not shell: - ssh_success = connect_ssh() if not shell: - emit('server_response', {'data': '连接SSH服务失败!\r\n'}) - return + shell = mw.connectSsh() + if shell.exit_status_ready(): - ssh_success = connect_ssh() - if not ssh_success: - emit('server_response', {'data': '连接SSH服务失败!\r\n'}) - return - shell.send(msg) - try: - time.sleep(0.005) - recv = shell.recv(4096) - emit('server_response', {'data': recv.decode("utf-8")}) - except Exception as ex: - pass - # print 'webssh:' + str(ex) + shell = mw.connectSsh() - -@socketio.on('connect_event') -def connected_msg(msg): - if not isLogined(): - emit('server_response', {'data': '会话丢失，请重新登陆面板!\r\n'}) - return None - global shell, ssh - ssh_success = True - if not shell: - ssh_success = connect_ssh() - # print(ssh_success) - if not ssh_success: - emit('server_response', {'data': '连接SSH服务失败!\r\n'}) - return - try: - recv = shell.recv(8192) - # print recv.decode("utf-8") - emit('server_response', {'data': recv.decode("utf-8")}) - except Exception as e: - pass - # print 'connected_msg:' + str(e) + if shell: + shell.send(msg) + try: + time.sleep(0.005) + recv = shell.recv(4096) + emit('server_response', {'data': recv.decode("utf-8")}) + except Exception as ex: + emit('server_response', {'data': str(ex)}) try: ssh = paramiko.SSHClient() @@ -722,5 +605,4 @@ def connected_msg(msg): except Exception as e: print("本地终端无法使用") - ##################### ssh end ########################### diff --git a/route/static/app/public.js b/route/static/app/public.js index 17b19ec455..22d4035902 100755 --- a/route/static/app/public.js +++ b/route/static/app/public.js @@ -1531,10 +1531,10 @@ function webShell() { }); if (socket) { - socket.emit('connect_event', ''); + socket.emit('webssh', ''); interval = setInterval(function () { - socket.emit('connect_event', ''); - }, 1000); + socket.emit('webssh', ''); + }, 500); } term.on('data', function (data) { From bf064d89f4aae225774cc7417617f91bfd23fd5d Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 26 Jan 2023 02:06:02 +0800 Subject: [PATCH 46/63] up --- class/core/ssh_terminal.py | 125 ++++++++++++++++------------ plugins/webssh/js/webssh.js | 36 ++++++-- plugins/webssh/menu/index.css | 22 ++--- plugins/webssh/menu/index.html | 7 +- route/static/js/term-websocketio.js | 79 ++++++++++-------- 5 files changed, 164 insertions(+), 105 deletions(-) diff --git a/class/core/ssh_terminal.py b/class/core/ssh_terminal.py index a6272ec612..67cd662280 100644 --- a/class/core/ssh_terminal.py +++ b/class/core/ssh_terminal.py @@ -53,12 +53,11 @@ class ssh_terminal: __ps = None __ssh_list = {} + __ssh_last_request_time = {} def __init__(self): - # ht = threading.Thread(target=self.heartbeat) - # ht.start() - # ht.join() - pass + ht = threading.Thread(target=self.heartbeat) + ht.start() def debug(self, msg): msg = "{} - {}:{} => {} \n".format(mw.formatDate(), @@ -208,6 +207,7 @@ def connectLocalSsh(self): term='xterm', width=83, height=21) ssh.setblocking(0) self.__ssh_list[self.__sid] = ssh + self.__ssh_last_request_time[self.__sid] = time.time() mw.writeLog(self.__log_type, '成功登录到SSH服务器 [{}:{}]'.format( self.__host, self.__port)) self.debug('local-ssh:通道已构建') @@ -329,6 +329,7 @@ def connectBySocket(self): ssh.get_pty(term='xterm', width=100, height=34) ssh.invoke_shell() self.__ssh_list[self.__sid] = ssh + self.__ssh_last_request_time[self.__sid] = time.time() mw.writeLog(self.__log_type, '成功登录到SSH服务器 [{}:{}]'.format( self.__host, self.__port)) self.debug('通道已构建') @@ -355,10 +356,10 @@ def setAttr(self, info): if 'pkey_passwd' in info: self.__key_passwd = info['pkey_passwd'] - print(self.__host, self.__pass, self.__key_passwd) + # print(self.__host, self.__pass, self.__key_passwd) try: result = self.connect() - print(result) + # print(result) except Exception as ex: if str(ex).find("NoneType") == -1: raise ex @@ -378,16 +379,13 @@ def close(self): except: pass - def heartbeat(self): - while True: - time.sleep(3) - print("heartbeat:__ssh_list:", len(self.__ssh_list)) - # self.debug("heartbeat:__ssh_list:" + str(len(self.__ssh_list))) - # if self.__tp and self.__tp.is_active(): - # self.__tp.send_ignore() - - # if self.__ps and self.__ps.is_active(): - # self.__ps.send_ignore() + def resize(self, data): + try: + self.__ssh_list[self.__sid].resize_pty( + width=data['cols'], height=data['rows']) + return True + except: + return False def wsSend(self, recv): try: @@ -396,42 +394,6 @@ def wsSend(self, recv): except Exception as e: return emit('server_response', {'data': recv}) - def run(self, sid, info): - # sid = mw.md5(sid) - self.__sid = sid - if not self.__sid: - return self.wsSend('WebSocketIO无效') - - if self.__connecting and not 'host' in info: - return - - result = self.returnMsg(False, '') - if not sid in self.__ssh_list: - if type(info) == dict: - self.__connecting = True - result = self.setAttr(info) - self.__connecting = False - - if sid in self.__ssh_list: - result = self.returnMsg(True, '已连接') - - if result['status']: - if type(info) == str: - time.sleep(0.1) - if self.__ssh_list[sid].exit_status_ready(): - self.wsSend("logout\r\n") - del(self.__ssh_list[sid]) - return - self.__ssh_list[sid].send(info) - try: - time.sleep(0.005) - recv = self.__ssh_list[sid].recv(8192) - return self.wsSend(recv) - except Exception as ex: - return self.wsSend('') - else: - return self.wsSend(result['msg']) - def getSshDir(self): if mw.isAppleSystem(): user = mw.execShell( @@ -470,3 +432,62 @@ def createSshInfo(self): mw.execShell(cmd) cmd = 'chmod 600 ' + ssh_dir + '/authorized_keys' mw.execShell(cmd) + + def heartbeat(self): + while True: + time.sleep(3) + + cur_time = time.time() + print("heartbeat:cur_time:", cur_time) + print("heartbeat:__ssh_list:", len(self.__ssh_list)) + for x in self.__ssh_list: + ssh_last_time = self.__ssh_last_request_time[x] + print(x, self.__ssh_list[x]) + # self.debug("heartbeat:__ssh_list:" + str(len(self.__ssh_list))) + # if self.__tp and self.__tp.is_active(): + # self.__tp.send_ignore() + + # if self.__ps and self.__ps.is_active(): + # self.__ps.send_ignore() + + def run(self, sid, info): + # sid = mw.md5(sid) + self.__sid = sid + if not self.__sid: + return self.wsSend('WebSocketIO无效') + + if self.__connecting and not 'host' in info: + return + + result = self.returnMsg(False, '') + if not sid in self.__ssh_list: + if type(info) == dict and 'host' in info: + self.__connecting = True + result = self.setAttr(info) + self.__connecting = False + + if sid in self.__ssh_list: + if 'resize' in info: + self.resize(info) + result = self.returnMsg(True, '已连接') + + print("req.__ssh_list:", str(len(self.__ssh_list))) + print("req.:cmd:", sid, info) + if result['status']: + if type(info) == str: + time.sleep(0.1) + cur_ssh = self.__ssh_list[sid] + if cur_ssh.exit_status_ready(): + self.wsSend("logout\r\n") + del(self.__ssh_list[sid]) + return + + cur_ssh.send(info) + try: + time.sleep(0.005) + recv = cur_ssh.recv(8192) + return self.wsSend(recv) + except Exception as ex: + return self.wsSend('') + else: + return self.wsSend(result['msg']) diff --git a/plugins/webssh/js/webssh.js b/plugins/webssh/js/webssh.js index 4c1e058726..43349f32e7 100755 --- a/plugins/webssh/js/webssh.js +++ b/plugins/webssh/js/webssh.js @@ -2,6 +2,14 @@ //全局 var host_ssh_list = []; +//刷新页面 +$(window).unload(function(){ + for (i in host_ssh_list) { + host_ssh_list[i].close(); + } + return false; +}); + function appPost(method,args,callback){ var _args = null; if (typeof(args) == 'string'){ @@ -68,10 +76,20 @@ $(document).ready(function(){ } }); +function webShell_Resize(){ + var cur_ssh = $('.term_item_tab .list .active'); + var data = $(cur_ssh).data(); + var item = host_ssh_list[data.id]; + item.term.focus(); + item.term.fit(); + item.resize({ cols: item.term.cols, rows: item.term.rows}); +} + function webShell_Load(){ changeDivH(); $(window).resize(function(){ changeDivH(); + webShell_Resize(); }); $('.term_content_tab .term-tool-button').click(function(){ @@ -86,8 +104,11 @@ function webShell_Load(){ $(this).removeClass('tool-hide').addClass('tool-show'); $(this).find('span').removeClass('glyphicon-menu-right').addClass('glyphicon-menu-left'); } + webShell_Resize(); }); + + $('.full_exit_screen').click(function(ele){ if($(this).hasClass('glyphicon-resize-full')){ requestFullScreen($('#term_box_view')[0]); @@ -112,16 +133,14 @@ function webShell_Load(){ // 切换服务器终端视图 $('.term_item_tab .list').on('click', 'span.item', function (ev) { - var index = $(this).index(), data = $(this).data(); + var index = $(this).index(); + var data = $(this).data(); if ($(this).hasClass('addServer')) { } else if ($(this).hasClass('tab_tootls')) { } else { $(this).addClass('active').siblings().removeClass('active'); $('.term_content_tab .term_item:eq(' + index + ')').addClass('active').siblings().removeClass('active'); - var item = host_ssh_list[data.id]; - // item.term.focus(); - // item.term.FitAddon.fit(); - // item.resize({ cols: item.term.cols, rows: item.term.rows }); + webShell_Resize(); } }); @@ -155,6 +174,8 @@ function webShell_Load(){ }); webShell_Menu(); + // webShell_Resize(); + // $('.term_content_tab .term-tool-button').click(); } @@ -277,11 +298,9 @@ function webShell_Menu(){ var random = 'localhost'; // host_ssh_list[random] = new Terms_WebSocketIO('#'+random, { ssh_info: { host: "38.6.224.67", ps: "22", id: random } }); host_ssh_list[random] = Terms_WebSocketIO_Create('127.0.0.1',random); - } function webShell_openTermView(info) { - console.log(info); if (typeof info === "undefined") { info = { host: '127.0.0.1', ps: '本地服务器' } } @@ -296,6 +315,8 @@ function webShell_openTermView(info) { } item_list.append('
    ' + info.ps + '
    '); host_ssh_list[random] = Terms_WebSocketIO_Create(info.host, random); + + webShell_Resize(); } @@ -308,6 +329,7 @@ function webShell_removeTermView(id){ try { host_ssh_list[id].close(); } catch (error) { + console.log(error); } delete host_ssh_list[id]; diff --git a/plugins/webssh/menu/index.css b/plugins/webssh/menu/index.css index 249c427b7d..c90814271e 100644 --- a/plugins/webssh/menu/index.css +++ b/plugins/webssh/menu/index.css @@ -310,27 +310,29 @@ color: #bbb; color: #4c4c4c; } -.term_content_tab .term_item { - height: 100%; - width: 100%; - display: none; -} -.term_content_tab .term_item.active { - display: inline-block; -} .term_content_tab { - background-color: #000; + background-color: rgb(51, 51, 51); position: absolute; top: 38px; left: 0; right: 0; bottom: 0; - padding: 10px 5px 10px 10px; + padding: 10px 10px 10px 10px; overflow: hidden; } +.term_content_tab .term_item { + height: 100%; + width: 100%; + display: none; +} + +.term_content_tab .term_item.active { + display: inline-block; +} + .term-tool-button { position: absolute; right: -7px; diff --git a/plugins/webssh/menu/index.html b/plugins/webssh/menu/index.html index f7f8a4958c..2ef622f5e1 100755 --- a/plugins/webssh/menu/index.html +++ b/plugins/webssh/menu/index.html @@ -9,7 +9,10 @@
    -
    本地服务器
     +
    + 本地服务器 +
    +
    @@ -23,7 +26,7 @@
    -
    +
    diff --git a/route/static/js/term-websocketio.js b/route/static/js/term-websocketio.js index cd2d6372f8..482503fb25 100644 --- a/route/static/js/term-websocketio.js +++ b/route/static/js/term-websocketio.js @@ -23,80 +23,91 @@ Terms_WebSocketIO.prototype = { this.callback_close = callback; }, - // websocket持久化连接 - connect: function (callback) { + connectWs: function (callback) { if(!this.ws){ this.ws = io.connect(); } }, - //连接服务器成功 - on_open: function (ws_event) { - this.term.FitAddon.fit(); - this.resize({ cols: this.term.cols, rows: this.term.rows }); + connectSsh:function(){ + this.send(this.ssh_info); + this.send('\n'); + }, + + close:function(){ + this.ws.disconnect(); + this.ws.close(); }, - //服务器消息事件 on_message: function (ws_event) { this.term.write(ws_event.data); + console.log(ws_event.data); if (ws_event.data == '\r\n登出\r\n' || ws_event.data == '登出\r\n' || ws_event.data == '\r\nlogout\r\n' || ws_event.data == 'logout\r\n'|| ws_event.data == '\r\nexit\r\n' || ws_event.data == 'exit\r\n') { this.term.destroy(); - clearInterval(this.term_timer); this.ws.disconnect(); this.ws.close(); + clearInterval(this.term_timer); - console.log('message',this.callback_close,typeof(this.callback_close)); if (this.callback_close){ this.callback_close(); } } }, - resize: function (size) { - if (this.ws) { - size['resize'] = 1; - this.send(JSON.stringify(size)); - } + + on_connect:function(ws_event){ + + }, + + on_exit:function(ws_event){ + + }, + + send:function(data){ + this.ws.emit(this.route, data); + }, + + resize: function (size) { + if (this.ws) { + size['resize'] = 1; + this.send(size) + } }, run: function (ssh_info) { - this.connect(); + this.connectWs(); var that = this; var termCols = 83; var termRows = 21; - this.term = new Terminal({ cols: termCols, rows: termRows, screenKeys: true, useStyle: true}); + this.term = new Terminal({fontSize: this.fontSize,screenKeys: true, useStyle: true}); this.term.open($('#'+this.id)[0]); this.term.setOption('cursorBlink', true); - this.term.setOption('fontSize', this.fontSize); - - // console.log(this.term.cols,this.term.rows); - // this.term.fit(); - // console.log(this.term.cols,this.term.rows); - - // this.term.FitAddon = new window.FitAddon(); - // this.term.loadAddon(this.term.FitAddon); - // this.term.WebLinksAddon = new WebLinksAddon.WebLinksAddon(); - // this.term.loadAddon(this.term.WebLinksAddon); - this.ws.on('server_response', function (ev) { that.on_message(ev)}); + this.ws.on('connect', function (ev) { that.on_connect(ev)}); + this.ws.on('exit', function (ev) { that.on_exit(ev)}); if (this.ws) { - that.ws.emit('webssh_websocketio', ''); + that.send(''); this.term_timer = setInterval(function () { - that.ws.emit('webssh_websocketio', ''); - }, 500); + that.send(''); + }, 600); } this.term.on('data', function (data) { - that.ws.emit('webssh_websocketio', data); + try { + that.send(data) + } catch (e) { + that.term.write('\r\n连接丢失,正在尝试重新连接!\r\n'); + that.connectSsh(); + } }); - - this.ws.emit('webssh_websocketio', this.ssh_info); - this.ws.emit('webssh_websocketio', '\n'); + that.term.write('\r\n请稍等,正在链接中...\r\n'); + + this.connectSsh(); this.term.focus(); } } From b4d090021c99f096b0ea9afddaabf826ca218a90 Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 26 Jan 2023 03:14:50 +0800 Subject: [PATCH 47/63] up --- class/core/ssh_terminal.py | 127 +++++++++++----------------- plugins/webssh/js/webssh.js | 22 ++--- route/__init__.py | 8 -- route/static/js/term-websocketio.js | 35 +++++--- 4 files changed, 86 insertions(+), 106 deletions(-) diff --git a/class/core/ssh_terminal.py b/class/core/ssh_terminal.py index 67cd662280..8d46714b45 100644 --- a/class/core/ssh_terminal.py +++ b/class/core/ssh_terminal.py @@ -54,6 +54,7 @@ class ssh_terminal: __ssh_list = {} __ssh_last_request_time = {} + __ssh_connecting = {} def __init__(self): ht = threading.Thread(target=self.heartbeat) @@ -164,7 +165,7 @@ def connect(self): return self.connectBySocket() def connectLocalSsh(self): - self.createSshInfo() + mw.createSshInfo() self.__ps = paramiko.SSHClient() self.__ps.set_missing_host_key_policy(paramiko.AutoAddPolicy()) @@ -207,7 +208,6 @@ def connectLocalSsh(self): term='xterm', width=83, height=21) ssh.setblocking(0) self.__ssh_list[self.__sid] = ssh - self.__ssh_last_request_time[self.__sid] = time.time() mw.writeLog(self.__log_type, '成功登录到SSH服务器 [{}:{}]'.format( self.__host, self.__port)) self.debug('local-ssh:通道已构建') @@ -329,7 +329,6 @@ def connectBySocket(self): ssh.get_pty(term='xterm', width=100, height=34) ssh.invoke_shell() self.__ssh_list[self.__sid] = ssh - self.__ssh_last_request_time[self.__sid] = time.time() mw.writeLog(self.__log_type, '成功登录到SSH服务器 [{}:{}]'.format( self.__host, self.__port)) self.debug('通道已构建') @@ -394,61 +393,35 @@ def wsSend(self, recv): except Exception as e: return emit('server_response', {'data': recv}) - def getSshDir(self): - if mw.isAppleSystem(): - user = mw.execShell( - "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip() - return '/Users/' + user + '/.ssh' - return '/root/.ssh' - - def createRsa(self): - ssh_dir = self.getSshDir() - ssh_ak = ssh_dir + '/authorized_keys' - if not os.path.exists(ssh_ak): - mw.execShell('touch ' + ssh_ak) - if not os.path.exists(ssh_dir + '/id_rsa.pub') and os.path.exists(ssh_dir + '/id_rsa'): - cmd = 'echo y | ssh-keygen -q -t rsa -P "" -f ' + ssh_dir + '/id_rsa' - mw.execShell(cmd) - else: - cmd = 'ssh-keygen -q -t rsa -P "" -f ' + ssh_dir + '/id_rsa' - mw.execShell(cmd) - cmd = 'cat ' + ssh_dir + '/id_rsa.pub >> ' + ssh_dir + '/authorized_keys' - mw.execShell(cmd) - cmd = 'chmod 600 ' + ssh_dir + '/authorized_keys' - mw.execShell(cmd) - - def createSshInfo(self): - ssh_dir = self.getSshDir() - if not os.path.exists(ssh_dir + '/id_rsa') or not os.path.exists(ssh_dir + '/id_rsa.pub'): - self.createRsa() - # 检查是否写入authorized_keys - cmd = "cat " + ssh_dir + "/id_rsa.pub | awk '{print $3}'" - data = mw.execShell(cmd) - if data[0] != "": - cmd = "cat " + ssh_dir + "/authorized_keys | grep " + data[0] - ak_data = mw.execShell(cmd) - if ak_data[0] == "": - cmd = 'cat ' + ssh_dir + '/id_rsa.pub >> ' + ssh_dir + '/authorized_keys' - mw.execShell(cmd) - cmd = 'chmod 600 ' + ssh_dir + '/authorized_keys' - mw.execShell(cmd) + def wsSendConnect(self): + return emit('connect', {'data': 'ok'}) def heartbeat(self): + # limit_cos = 10 while True: time.sleep(3) - cur_time = time.time() - print("heartbeat:cur_time:", cur_time) - print("heartbeat:__ssh_list:", len(self.__ssh_list)) - for x in self.__ssh_list: + for x in list(self.__ssh_list.keys()): ssh_last_time = self.__ssh_last_request_time[x] - print(x, self.__ssh_list[x]) - # self.debug("heartbeat:__ssh_list:" + str(len(self.__ssh_list))) - # if self.__tp and self.__tp.is_active(): - # self.__tp.send_ignore() + sid_off_cos = cur_time - ssh_last_time + + print("heartbeat off cos :", x, sid_off_cos) + + if sid_off_cos > 3: + cur_ssh = self.__ssh_list[x] + if not cur_ssh: + del(self.__ssh_list[x]) + del(self.__ssh_last_request_time[x]) + continue - # if self.__ps and self.__ps.is_active(): - # self.__ps.send_ignore() + if cur_ssh.exit_status_ready(): + del(self.__ssh_list[x]) + del(self.__ssh_last_request_time[x]) + continue + + cur_ssh.send("exit\r\n") + del(self.__ssh_list[x]) + del(self.__ssh_last_request_time[x]) def run(self, sid, info): # sid = mw.md5(sid) @@ -456,38 +429,38 @@ def run(self, sid, info): if not self.__sid: return self.wsSend('WebSocketIO无效') - if self.__connecting and not 'host' in info: - return - - result = self.returnMsg(False, '') + self.__ssh_last_request_time[sid] = time.time() if not sid in self.__ssh_list: if type(info) == dict and 'host' in info: - self.__connecting = True result = self.setAttr(info) - self.__connecting = False + if result['status']: + return self.wsSendConnect() + else: + return self.wsSend(result['msg']) + result = self.returnMsg(False, '') if sid in self.__ssh_list: if 'resize' in info: self.resize(info) result = self.returnMsg(True, '已连接') - print("req.__ssh_list:", str(len(self.__ssh_list))) - print("req.:cmd:", sid, info) - if result['status']: - if type(info) == str: - time.sleep(0.1) - cur_ssh = self.__ssh_list[sid] - if cur_ssh.exit_status_ready(): - self.wsSend("logout\r\n") - del(self.__ssh_list[sid]) - return - - cur_ssh.send(info) - try: - time.sleep(0.005) - recv = cur_ssh.recv(8192) - return self.wsSend(recv) - except Exception as ex: - return self.wsSend('') - else: - return self.wsSend(result['msg']) + print("req.__ssh_list:", len(self.__ssh_list)) + print("req.:cmd:", sid, info) + if result['status']: + if type(info) == str: + time.sleep(0.1) + cur_ssh = self.__ssh_list[sid] + if cur_ssh.exit_status_ready(): + self.wsSend("logout\r\n") + del(self.__ssh_list[sid]) + return + + cur_ssh.send(info) + try: + time.sleep(0.005) + recv = cur_ssh.recv(8192) + return self.wsSend(recv) + except Exception as ex: + return self.wsSend('') + else: + return self.wsSend(result['msg']) diff --git a/plugins/webssh/js/webssh.js b/plugins/webssh/js/webssh.js index 43349f32e7..4381851e4a 100755 --- a/plugins/webssh/js/webssh.js +++ b/plugins/webssh/js/webssh.js @@ -78,11 +78,13 @@ $(document).ready(function(){ function webShell_Resize(){ var cur_ssh = $('.term_item_tab .list .active'); - var data = $(cur_ssh).data(); - var item = host_ssh_list[data.id]; - item.term.focus(); - item.term.fit(); - item.resize({ cols: item.term.cols, rows: item.term.rows}); + if (cur_ssh.length > 0){ + var data = $(cur_ssh).data(); + var item = host_ssh_list[data.id]; + item.term.focus(); + item.term.fit(); + item.resize({ cols: item.term.cols, rows: item.term.rows}); + } } function webShell_Load(){ @@ -174,8 +176,6 @@ function webShell_Load(){ }); webShell_Menu(); - // webShell_Resize(); - // $('.term_content_tab .term-tool-button').click(); } @@ -284,12 +284,16 @@ function webShell_getCmdList(){ }); } -function Terms_WebSocketIO_Create(ip,random){ +function Terms_WebSocketIO_Create(ip, random){ var n = new Terms_WebSocketIO('#'+random, { ssh_info: { host: ip, ps: "22", id: random } }); n.registerCloseCallBack(function(){ webShell_removeTermView(random); layer.msg('已经关闭【'+ip+'】', { icon: 1, time: 3000 }); }); + + n.registerConnectedCallBack(function(){ + webShell_Resize(); + }); return n; } @@ -315,8 +319,6 @@ function webShell_openTermView(info) { } item_list.append('
    ' + info.ps + '
    '); host_ssh_list[random] = Terms_WebSocketIO_Create(info.host, random); - - webShell_Resize(); } diff --git a/route/__init__.py b/route/__init__.py index 364ead7ef2..4a8c649aa4 100755 --- a/route/__init__.py +++ b/route/__init__.py @@ -597,12 +597,4 @@ def webssh(msg): except Exception as ex: emit('server_response', {'data': str(ex)}) -try: - ssh = paramiko.SSHClient() - - # 启动尝试时连接 - # connect_ssh() -except Exception as e: - print("本地终端无法使用") - ##################### ssh end ########################### diff --git a/route/static/js/term-websocketio.js b/route/static/js/term-websocketio.js index 482503fb25..56f8798bb9 100644 --- a/route/static/js/term-websocketio.js +++ b/route/static/js/term-websocketio.js @@ -13,7 +13,10 @@ function Terms_WebSocketIO (el, config) { this.ssh_info = config.ssh_info; this.term_timer = null; + this.is_connected = false; + this.callback_close = null; + this.callback_connected = null; this.run(); } @@ -23,10 +26,12 @@ Terms_WebSocketIO.prototype = { this.callback_close = callback; }, + registerConnectedCallBack:function(callback){ + this.callback_connected = callback; + }, + connectWs: function (callback) { - if(!this.ws){ - this.ws = io.connect(); - } + this.ws = io.connect(); }, connectSsh:function(){ @@ -35,13 +40,13 @@ Terms_WebSocketIO.prototype = { }, close:function(){ + console.log('try close...'); this.ws.disconnect(); this.ws.close(); }, on_message: function (ws_event) { this.term.write(ws_event.data); - console.log(ws_event.data); if (ws_event.data == '\r\n登出\r\n' || ws_event.data == '登出\r\n' || ws_event.data == '\r\nlogout\r\n' || ws_event.data == 'logout\r\n'|| ws_event.data == '\r\nexit\r\n' || ws_event.data == 'exit\r\n') { @@ -59,7 +64,11 @@ Terms_WebSocketIO.prototype = { on_connect:function(ws_event){ - + // console.log(ws_event); + this.is_connected = true; + if (this.callback_connected){ + this.callback_connected(); + } }, on_exit:function(ws_event){ @@ -93,16 +102,20 @@ Terms_WebSocketIO.prototype = { if (this.ws) { that.send(''); this.term_timer = setInterval(function () { - that.send(''); + if (that.is_connected){ + that.send(''); + } }, 600); } this.term.on('data', function (data) { - try { - that.send(data) - } catch (e) { - that.term.write('\r\n连接丢失,正在尝试重新连接!\r\n'); - that.connectSsh(); + if (that.is_connected){ + try { + that.send(data) + } catch (e) { + that.term.write('\r\n连接丢失,正在尝试重新连接!\r\n'); + that.connectSsh(); + } } }); that.term.write('\r\n请稍等,正在链接中...\r\n'); From 08a91ed0f233be6e316814e1c3243889c7b175f6 Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 26 Jan 2023 04:11:51 +0800 Subject: [PATCH 48/63] =?UTF-8?q?ssh=E7=BB=88=E7=AB=AF=E6=94=B6=E5=B0=BE?= =?UTF-8?q?=E9=98=B6=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- class/core/config_api.py | 2 +- class/core/ssh_terminal.py | 45 ++++++++++------------------- plugins/webssh/js/webssh.js | 25 ++-------------- route/__init__.py | 1 - route/static/js/term-websocketio.js | 6 ++-- 5 files changed, 22 insertions(+), 57 deletions(-) diff --git a/class/core/config_api.py b/class/core/config_api.py index f935d6f038..da1e792b94 100755 --- a/class/core/config_api.py +++ b/class/core/config_api.py @@ -27,7 +27,7 @@ class config_api: - __version = '0.12.1.1' + __version = '0.12.1.2' __api_addr = 'data/api.json' def __init__(self): diff --git a/class/core/ssh_terminal.py b/class/core/ssh_terminal.py index 8d46714b45..7a84c84c66 100644 --- a/class/core/ssh_terminal.py +++ b/class/core/ssh_terminal.py @@ -9,7 +9,7 @@ # --------------------------------------------------------------------------------- # --------------------------------------------------------------------------------- -# 公共操作 +# SSH终端操作 # --------------------------------------------------------------------------------- import json @@ -157,14 +157,14 @@ def setSshdConfig(self, rep=False): def setSid(self, sid): self.__sid = sid - def connect(self): + def connect(self, sid): # self.connectBySocket() if self.__host in ['127.0.0.1', 'localhost']: - return self.connectLocalSsh() + return self.connectLocalSsh(sid) else: - return self.connectBySocket() + return self.connectBySocket(sid) - def connectLocalSsh(self): + def connectLocalSsh(self, sid): mw.createSshInfo() self.__ps = paramiko.SSHClient() self.__ps.set_missing_host_key_policy(paramiko.AutoAddPolicy()) @@ -199,21 +199,16 @@ def connectLocalSsh(self): return self.returnMsg(False, "未知错误: {}".format(err)) self.debug('local-ssh:认证成功，正在构建会话通道') - # self.__ssh = self.__ps.invoke_shell(term='xterm', width=83, height=21) - # self.__ssh.setblocking(0) - # self.__connect_time = time.time() - # self.__last_send = [] - ssh = self.__ps.invoke_shell( term='xterm', width=83, height=21) ssh.setblocking(0) - self.__ssh_list[self.__sid] = ssh + self.__ssh_list[sid] = ssh mw.writeLog(self.__log_type, '成功登录到SSH服务器 [{}:{}]'.format( self.__host, self.__port)) self.debug('local-ssh:通道已构建') return self.returnMsg(True, '连接成功!') - def connectBySocket(self): + def connectBySocket(self, sid): if not self.__host: return self.returnMsg(False, '错误的连接地址') if not self.__user: @@ -319,22 +314,17 @@ def connectBySocket(self): return self.returnMsg(False, "未知错误: {}".format(err)) self.debug('认证成功，正在构建会话通道') - # self.__ssh = self.__tp.open_session() - # self.__ssh.get_pty(term='xterm', width=100, height=34) - # self.__ssh.invoke_shell() - # self.__connect_time = time.time() - # self.__last_send = [] ssh = self.__tp.open_session() ssh.get_pty(term='xterm', width=100, height=34) ssh.invoke_shell() - self.__ssh_list[self.__sid] = ssh + self.__ssh_list[sid] = ssh mw.writeLog(self.__log_type, '成功登录到SSH服务器 [{}:{}]'.format( self.__host, self.__port)) self.debug('通道已构建') return self.returnMsg(True, '连接成功.') - def setAttr(self, info): + def setAttr(self, sid, info): self.__host = info['host'].strip() # 外部连接获取 @@ -357,7 +347,7 @@ def setAttr(self, info): # print(self.__host, self.__pass, self.__key_passwd) try: - result = self.connect() + result = self.connect(sid) # print(result) except Exception as ex: if str(ex).find("NoneType") == -1: @@ -378,9 +368,9 @@ def close(self): except: pass - def resize(self, data): + def resize(self, sid, data): try: - self.__ssh_list[self.__sid].resize_pty( + self.__ssh_list[sid].resize_pty( width=data['cols'], height=data['rows']) return True except: @@ -405,7 +395,7 @@ def heartbeat(self): ssh_last_time = self.__ssh_last_request_time[x] sid_off_cos = cur_time - ssh_last_time - print("heartbeat off cos :", x, sid_off_cos) + # print("heartbeat off cos :", x, sid_off_cos) if sid_off_cos > 3: cur_ssh = self.__ssh_list[x] @@ -424,7 +414,6 @@ def heartbeat(self): del(self.__ssh_last_request_time[x]) def run(self, sid, info): - # sid = mw.md5(sid) self.__sid = sid if not self.__sid: return self.wsSend('WebSocketIO无效') @@ -432,7 +421,7 @@ def run(self, sid, info): self.__ssh_last_request_time[sid] = time.time() if not sid in self.__ssh_list: if type(info) == dict and 'host' in info: - result = self.setAttr(info) + result = self.setAttr(sid, info) if result['status']: return self.wsSendConnect() else: @@ -441,11 +430,8 @@ def run(self, sid, info): result = self.returnMsg(False, '') if sid in self.__ssh_list: if 'resize' in info: - self.resize(info) + self.resize(sid, info) result = self.returnMsg(True, '已连接') - - print("req.__ssh_list:", len(self.__ssh_list)) - print("req.:cmd:", sid, info) if result['status']: if type(info) == str: time.sleep(0.1) @@ -454,7 +440,6 @@ def run(self, sid, info): self.wsSend("logout\r\n") del(self.__ssh_list[sid]) return - cur_ssh.send(info) try: time.sleep(0.005) diff --git a/plugins/webssh/js/webssh.js b/plugins/webssh/js/webssh.js index 4381851e4a..4e94786d2a 100755 --- a/plugins/webssh/js/webssh.js +++ b/plugins/webssh/js/webssh.js @@ -81,9 +81,9 @@ function webShell_Resize(){ if (cur_ssh.length > 0){ var data = $(cur_ssh).data(); var item = host_ssh_list[data.id]; - item.term.focus(); item.term.fit(); item.resize({ cols: item.term.cols, rows: item.term.rows}); + item.term.focus(); } } @@ -284,8 +284,9 @@ function webShell_getCmdList(){ }); } +var n; function Terms_WebSocketIO_Create(ip, random){ - var n = new Terms_WebSocketIO('#'+random, { ssh_info: { host: ip, ps: "22", id: random } }); + n = new Terms_WebSocketIO('#'+random, { ssh_info: { host: ip, ps: "22", id: random } }); n.registerCloseCallBack(function(){ webShell_removeTermView(random); layer.msg('已经关闭【'+ip+'】', { icon: 1, time: 3000 }); @@ -392,26 +393,6 @@ function webShell_getHostList(info){ webShell_openTermView(alist[index]); } }); - - // tab切换 - $('.term_tootls .tab-nav span').click(function () { - if ($(this).hasClass('on')) return; - var index = $(this).index(); - $(this).siblings('.on').removeClass('on'); - $(this).addClass('on'); - $('.term_tootls .tab-con .tab-block').removeClass('on'); - $('.term_tootls .tab-con .tab-block').eq(index).addClass('on'); - var type = $(this).attr('data-type'); - switch (type) { - case 'host': - that.reader_host_list(); - break; - case 'shell': - that.reader_command_list(); - break; - } - }); - }); } diff --git a/route/__init__.py b/route/__init__.py index 4a8c649aa4..04e2f067c3 100755 --- a/route/__init__.py +++ b/route/__init__.py @@ -570,7 +570,6 @@ def webssh_websocketio(data): import ssh_terminal shell_client = ssh_terminal.ssh_terminal() - # print("request.sid", request.sid) shell_client.run(request.sid, data) return diff --git a/route/static/js/term-websocketio.js b/route/static/js/term-websocketio.js index 56f8798bb9..9b15c99d9d 100644 --- a/route/static/js/term-websocketio.js +++ b/route/static/js/term-websocketio.js @@ -32,15 +32,15 @@ Terms_WebSocketIO.prototype = { connectWs: function (callback) { this.ws = io.connect(); + console.log(this.ws); }, connectSsh:function(){ this.send(this.ssh_info); - this.send('\n'); + // this.send('\n'); }, close:function(){ - console.log('try close...'); this.ws.disconnect(); this.ws.close(); }, @@ -80,7 +80,7 @@ Terms_WebSocketIO.prototype = { }, resize: function (size) { - if (this.ws) { + if (this.ws && this.is_connected) { size['resize'] = 1; this.send(size) } From 77b6391d9e1af505a40e543c38212971b7e0207d Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 26 Jan 2023 04:21:25 +0800 Subject: [PATCH 49/63] Update ssh_terminal.py --- class/core/ssh_terminal.py | 1 - 1 file changed, 1 deletion(-) diff --git a/class/core/ssh_terminal.py b/class/core/ssh_terminal.py index 7a84c84c66..bbc7048916 100644 --- a/class/core/ssh_terminal.py +++ b/class/core/ssh_terminal.py @@ -54,7 +54,6 @@ class ssh_terminal: __ssh_list = {} __ssh_last_request_time = {} - __ssh_connecting = {} def __init__(self): ht = threading.Thread(target=self.heartbeat) From 7cab1492c0e2dae8ecc89055725f22069d0cb6c9 Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 26 Jan 2023 04:21:49 +0800 Subject: [PATCH 50/63] Update ssh_terminal.py --- class/core/ssh_terminal.py | 1 - 1 file changed, 1 deletion(-) diff --git a/class/core/ssh_terminal.py b/class/core/ssh_terminal.py index bbc7048916..9246ff3eee 100644 --- a/class/core/ssh_terminal.py +++ b/class/core/ssh_terminal.py @@ -47,7 +47,6 @@ class ssh_terminal: __rep_ssh_service = False __sshd_config_backup = None - __connecting = False __ssh = None __tp = None __ps = None From c7154eea7b6466ef1e8ea00a1bd682dab8c6a884 Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 26 Jan 2023 19:35:43 +0800 Subject: [PATCH 51/63] Update files.js --- route/static/app/files.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/route/static/app/files.js b/route/static/app/files.js index 9747710771..055db4d137 100755 --- a/route/static/app/files.js +++ b/route/static/app/files.js @@ -506,7 +506,7 @@ function getFiles(Path) { BarTools += ' '; } setCookie('open_dir_path',rdata.PATH); - BarTools += ' \ + BarTools += ' \ '; var copyName = getCookie('copyFileName'); var cutName = getCookie('cutFileName'); From 17a92518b4db7431493e580459ca5969117e9a69 Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 26 Jan 2023 19:35:51 +0800 Subject: [PATCH 52/63] Update term-websocketio.js --- route/static/js/term-websocketio.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/route/static/js/term-websocketio.js b/route/static/js/term-websocketio.js index 9b15c99d9d..c4a3054d72 100644 --- a/route/static/js/term-websocketio.js +++ b/route/static/js/term-websocketio.js @@ -32,7 +32,7 @@ Terms_WebSocketIO.prototype = { connectWs: function (callback) { this.ws = io.connect(); - console.log(this.ws); + // console.log(this.ws); }, connectSsh:function(){ From c952be4e4518b8ac93bcec6b926eacd2293dc839 Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 26 Jan 2023 22:49:55 +0800 Subject: [PATCH 53/63] up --- class/core/mw.py | 1 + class/core/ssh_terminal.py | 29 +++++++------- plugins/webssh/index.py | 27 +++++++++++++ plugins/webssh/js/webssh.js | 75 ++++++++++++++++++++++++++++--------- 4 files changed, 99 insertions(+), 33 deletions(-) diff --git a/class/core/mw.py b/class/core/mw.py index e81f99e0b9..65140e9026 100755 --- a/class/core/mw.py +++ b/class/core/mw.py @@ -1503,6 +1503,7 @@ def getSshDir(): def createRsa(): + # ssh-keygen -t rsa -P "" -C "midoks@163.com" ssh_dir = getSshDir() # mw.execShell("rm -f /root/.ssh/*") if not os.path.exists(ssh_dir + '/authorized_keys'): diff --git a/class/core/ssh_terminal.py b/class/core/ssh_terminal.py index 9246ff3eee..3baad80cc7 100644 --- a/class/core/ssh_terminal.py +++ b/class/core/ssh_terminal.py @@ -37,6 +37,7 @@ class ssh_terminal: __sid = '' __host = None + __type = '0' __port = 22 __user = None __pass = None @@ -243,28 +244,24 @@ def connectBySocket(self, sid): if not self.__pass and not self.__pkey: return self.returnMsg(False, '密码或私钥不能都为空: {}:{}'.format(self.__host, self.__port)) - if self.__pkey: + if self.__pkey != '' and self.__type != '0': self.debug('正在认证私钥') - if sys.version_info[0] == 2: - try: - self.__pkey = self.__pkey.encode('utf-8') - except: - pass - p_file = BytesIO(self.__pkey) - else: - p_file = StringIO(self.__pkey) - + p_file = StringIO(str(self.__pkey.replace('\\n', '\n'))) + # p_file = "/tmp/t_ssh_pkey.txt" + # mw.writeFile(p_file, self.__pkey.replace('\\n', '\n')) + # mw.execShell('chmod 600 ' + p_file) try: + p_file.seek(0) pkey = paramiko.RSAKey.from_private_key(p_file) except: try: p_file.seek(0) # 重置游标 - pkey = paramiko.Ed25519Key.from_private_key(p_file) + pkey = paramiko.Ed25519Key.from_private_key( + p_file) except: try: p_file.seek(0) - pkey = paramiko.ECDSAKey.from_private_key( - p_file) + pkey = paramiko.ECDSAKey.from_private_key(p_file) except: p_file.seek(0) pkey = paramiko.DSSKey.from_private_key(p_file) @@ -285,8 +282,7 @@ def connectBySocket(self, sid): self.setSshdConfig(True) self.__tp.close() e = str(e) - if e.find('websocket error!') != -1: - return self.returnMsg(True, '连接成功') + # print(e) if e.find('Authentication timeout') != -1: self.debug("认证超时{}".format(e)) return self.returnMsg(False, '认证超时,请按回车重试!{}'.format(e)) @@ -332,6 +328,9 @@ def setAttr(self, sid, info): _t = mw.readFile(dst_info) info = json.loads(_t) + if 'type' in info: + self.__type = info['type'] + if 'port' in info: self.__port = int(info['port']) if 'username' in info: diff --git a/plugins/webssh/index.py b/plugins/webssh/index.py index 8e410b5aed..02619f2ef2 100755 --- a/plugins/webssh/index.py +++ b/plugins/webssh/index.py @@ -112,6 +112,33 @@ def getSshInfo(self, file): rdata = mw.readFile(file) return json.loads(rdata) + def get_server_by_host(self): + args = self.getArgs() + check = self.checkArgs(args, ['host']) + if not check[0]: + return check[1] + + info_file = self.__host_dir + '/' + args['host'] + '/info.json' + if os.path.exists(info_file): + try: + info_tmp = self.getSshInfo(info_file) + host_info = {} + host_info['host'] = args['host'] + host_info['port'] = info_tmp['port'] + host_info['ps'] = info_tmp['ps'] + host_info['type'] = info_tmp['type'] + if 'password' in info_tmp: + host_info['password'] = info_tmp['password'] + if 'pkey' in info_tmp: + host_info['pkey'] = info_tmp['pkey'] + if 'pkey_passwd' in info_tmp: + host_info['pkey_passwd'] = info_tmp['pkey_passwd'] + except Exception as e: + return mw.returnJson(False, '错误:' + str(e)) + + return mw.returnJson(True, 'ok!', host_info) + return mw.returnJson(False, '不存在此配置') + def get_server_list(self): host_list = [] for name in os.listdir(self.__host_dir): diff --git a/plugins/webssh/js/webssh.js b/plugins/webssh/js/webssh.js index 4e94786d2a..2441af1d28 100755 --- a/plugins/webssh/js/webssh.js +++ b/plugins/webssh/js/webssh.js @@ -354,7 +354,7 @@ function webShell_getHostList(info){ for (var i = 0; i < alist.length; i++) { tli+='
  • \ \ - '+alist[i]['host']+'\ + '+alist[i]['host']+'\ \ \ \ @@ -364,13 +364,13 @@ function webShell_getHostList(info){ $('.tootls_host_list').html(tli); - $('.data-host-list .glyphicon-edit').click(function(){ + $('.data-host-list .glyphicon-edit').click(function(e){ var index = $(this).parent().parent().attr('data-index'); var info = alist[index]; webShell_addServer(info); }); - $('.data-host-list .glyphicon-trash').click(function(){ + $('.data-host-list .glyphicon-trash').click(function(e){ var index = $(this).parent().parent().attr('data-index'); var t = alist[index]; appPost('del_server', {host:t['host']}, function(rdata){ @@ -382,16 +382,17 @@ function webShell_getHostList(info){ }); - $('.tootls_host_list').on('click', 'li', function (e) { - var index = $(this).index(); - var host = $(this).data('host'); - $(this).find('i').addClass('active'); + $('.tootls_host_list .host').on('click', function (e) { + var _this = $(this).parent(); + var index = $(_this).index(); + var host = $(_this).data('host'); + $(_this).find('i').addClass('active'); if ($('.item[data-host="' + host + '"]').length > 0) { - layer.msg('已经打开!', { icon: 0, time: 3000 }) - // layer.msg('如需多会话窗口，请右键终端标题复制会话!', { icon: 0, time: 3000 }); + layer.msg('已经打开!', { icon: 0, time: 3000 }); } else { webShell_openTermView(alist[index]); } + e.preventDefault(); }); }); } @@ -420,7 +421,7 @@ function webShell_addServer(info=[]){ 验证方式\
    \
    \ - \ + \ \
    \ @@ -452,6 +453,38 @@ function webShell_addServer(info=[]){
    \ ', success:function(){ + if (typeof(info['host'])!='undefined'){ + $('input[name="host"]').val(info['host']); + appPost('get_server_by_host',{host:info['host']},function(rdata){ + var rdata = $.parseJSON(rdata.data); + var jdata = rdata.data; + if (jdata['type'] == 0){ + $('input[name="password"]').val(jdata['password']); + } else{ + $('textarea[name="pkey"]').val(jdata['pkey']); + $('input[name="pkey_passwd"]').val(jdata['pkey_passwd']); + } + $('input[name="ps"]').val(jdata['ps']); + $('.auth_type_checkbox').each(function(){ + if ($(this).data('ctype') == jdata['type']){ + $(this).addClass('btn-success'); + } else { + $(this).removeClass('btn-success'); + } + }); + if (jdata['type'] == 0){ + $('.c_password_view').removeClass('show').addClass('show'); + $('.c_pkey_view').removeClass('show').addClass('hide'); + $('.key_pwd_line').removeClass('show').addClass('hide'); + + }else{ + $('.c_password_view').removeClass('show').addClass('hide'); + $('.c_pkey_view').removeClass('show').addClass('show'); + $('.key_pwd_line').removeClass('show').addClass('show'); + } + }); + } + $('.auth_type_checkbox').click(function(){ var ctype = $(this).attr('data-ctype'); $('.auth_type_checkbox').removeClass('btn-success'); @@ -473,18 +506,20 @@ function webShell_addServer(info=[]){ var host = $('input[name="host"]').val(); var port = $('input[name="port"]').val(); var username = $('input[name="username"]').val(); - - var type = $('.auth_type_checkbox').attr('data-ctype'); + var password = ''; + var pkey = ''; + var pkey_passwd = ''; + var type = $('.btn-group .btn-success').attr('data-ctype'); if (type == "0"){ - var password = $('input[name="password"]').val(); + password = $('input[name="password"]').val(); } else{ - var pkey = $('input[name="pkey"]').val(); - var pkey_passwd = $('input[name="pkey_passwd"]').val(); + pkey = $('textarea[name="pkey"]').val(); + pkey_passwd = $('input[name="pkey_passwd"]').val(); } var ps = $('input[name="ps"]').val(); - appPost('add_server',{ + var req_data = { type:type, host:host, port:port, @@ -492,8 +527,12 @@ function webShell_addServer(info=[]){ password:password, pkey:pkey, pkey_passwd:pkey_passwd, - ps - },function(rdata){ + ps:ps, + }; + + console.log(req_data); + + appPost('add_server',req_data,function(rdata){ layer.close(l); var rdata = $.parseJSON(rdata.data); showMsg(rdata.msg, function(){ From d5fc46460341439cd64a6d38b223534edd3032e6 Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 27 Jan 2023 00:40:06 +0800 Subject: [PATCH 54/63] ssh update 90% --- class/core/ssh_terminal.py | 6 ++++- plugins/webssh/js/webssh.js | 17 +++++++++++++++ route/static/js/term-websocketio.js | 34 +++++++++++++++++++---------- 3 files changed, 44 insertions(+), 13 deletions(-) diff --git a/class/core/ssh_terminal.py b/class/core/ssh_terminal.py index 3baad80cc7..a813e62204 100644 --- a/class/core/ssh_terminal.py +++ b/class/core/ssh_terminal.py @@ -383,6 +383,9 @@ def wsSend(self, recv): def wsSendConnect(self): return emit('connect', {'data': 'ok'}) + def wsSendReConnect(self): + return emit('reconnect', {'data': 'ok'}) + def heartbeat(self): # limit_cos = 10 while True: @@ -393,7 +396,6 @@ def heartbeat(self): sid_off_cos = cur_time - ssh_last_time # print("heartbeat off cos :", x, sid_off_cos) - if sid_off_cos > 3: cur_ssh = self.__ssh_list[x] if not cur_ssh: @@ -423,6 +425,8 @@ def run(self, sid, info): return self.wsSendConnect() else: return self.wsSend(result['msg']) + else: + return self.wsSendReConnect() result = self.returnMsg(False, '') if sid in self.__ssh_list: diff --git a/plugins/webssh/js/webssh.js b/plugins/webssh/js/webssh.js index 2441af1d28..a62a030ff4 100755 --- a/plugins/webssh/js/webssh.js +++ b/plugins/webssh/js/webssh.js @@ -293,8 +293,25 @@ function Terms_WebSocketIO_Create(ip, random){ }); n.registerConnectedCallBack(function(){ + var that = this; + $('.term_item_tab .item').each(function(){ + var id = $(this).data('id'); + if (id == that.id){ + $(this).find('.icon').removeClass('icon-warning').addClass('icon-sucess'); + } + }); webShell_Resize(); }); + + n.registerExitCallBack(function(){ + var that = this; + $('.term_item_tab .item').each(function(){ + var id = $(this).data('id'); + if (id == that.id){ + $(this).find('.icon').removeClass('icon-sucess').addClass('icon-warning'); + } + }); + }); return n; } diff --git a/route/static/js/term-websocketio.js b/route/static/js/term-websocketio.js index c4a3054d72..145598f5ea 100644 --- a/route/static/js/term-websocketio.js +++ b/route/static/js/term-websocketio.js @@ -30,6 +30,10 @@ Terms_WebSocketIO.prototype = { this.callback_connected = callback; }, + registerExitCallBack:function(callback){ + this.callback_exit = callback; + }, + connectWs: function (callback) { this.ws = io.connect(); // console.log(this.ws); @@ -61,18 +65,24 @@ Terms_WebSocketIO.prototype = { } }, - - on_connect:function(ws_event){ - // console.log(ws_event); this.is_connected = true; if (this.callback_connected){ this.callback_connected(); } }, - on_exit:function(ws_event){ + on_reconnect:function(ws_event){ + this.is_connected = false; + // if (this.callback_connected){ + // this.callback_connected(); + // } + }, + on_exit:function(){ + if (this.callback_exit){ + this.callback_exit(); + } }, send:function(data){ @@ -97,29 +107,29 @@ Terms_WebSocketIO.prototype = { this.term.setOption('cursorBlink', true); this.ws.on('server_response', function (ev) { that.on_message(ev)}); this.ws.on('connect', function (ev) { that.on_connect(ev)}); + this.ws.on('reconnect', function (ev) { that.on_reconnect(ev)}); this.ws.on('exit', function (ev) { that.on_exit(ev)}); if (this.ws) { - that.send(''); this.term_timer = setInterval(function () { if (that.is_connected){ that.send(''); + } else{ + that.on_exit(); } }, 600); } this.term.on('data', function (data) { if (that.is_connected){ - try { - that.send(data) - } catch (e) { - that.term.write('\r\n连接丢失,正在尝试重新连接!\r\n'); - that.connectSsh(); - } + that.send(data); + } else{ + that.term.write('\r\n连接丢失,正在尝试重新连接!\r\n'); + that.connectSsh(); } }); - that.term.write('\r\n请稍等,正在链接中...\r\n'); + this.term.write('\r\n请稍等,正在链接中...\r\n'); this.connectSsh(); this.term.focus(); } From a2298ade04bbc9e491ba72b4af0f8ea538c76c6e Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 27 Jan 2023 00:53:34 +0800 Subject: [PATCH 55/63] Update webssh.js --- plugins/webssh/js/webssh.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/webssh/js/webssh.js b/plugins/webssh/js/webssh.js index a62a030ff4..c130b383d4 100755 --- a/plugins/webssh/js/webssh.js +++ b/plugins/webssh/js/webssh.js @@ -456,7 +456,7 @@ function webShell_addServer(info=[]){ \ \ \ -
    \ +