From ce7bd5d106f883121ad18ba7c6fea7191cb1372d Mon Sep 17 00:00:00 2001 From: jose Date: Sat, 30 May 2020 10:30:36 +0800 Subject: [PATCH] File management adds video playback File sharing adds directory sharing and video playback functions Optimize file sharing UI Publish system firewall plugin Release Amazon storage plugin Other details adjustment --- BTPanel/__init__.py | 174 +++- BTPanel/static/css/site.css | 41 +- BTPanel/static/js/files.js | 121 ++- BTPanel/static/js/public.js | 2 +- BTPanel/static/js/soft.js | 2 +- BTPanel/templates/default/down.html | 1256 ++++++++++++++++++++++++++- BTPanel/templates/default/lan.js | 1042 ---------------------- class/ajax.py | 29 +- class/common.py | 2 +- class/db.py | 8 +- class/files.py | 41 +- class/jobs.py | 12 + class/panelBackup.py | 17 +- class/panelMessage.py | 134 +++ class/panelPlugin.py | 90 +- class/panelSite.py | 2 + class/panelVideo.py | 68 ++ class/panelWaf.py | 190 +--- class/php_info.php | 2 +- class/public.py | 21 +- class/setPanelLets.py | 4 +- 21 files changed, 1916 insertions(+), 1342 deletions(-) delete mode 100644 BTPanel/templates/default/lan.js create mode 100644 class/panelMessage.py create mode 100644 class/panelVideo.py diff --git a/BTPanel/__init__.py b/BTPanel/__init__.py index c3976ebf..590d6c18 100644 --- a/BTPanel/__init__.py +++ b/BTPanel/__init__.py @@ -144,7 +144,9 @@ admin_path_checks = [ '/panel', '/acme', '/down', - '/api' + '/api', + '/tips', + '/message' ] if admin_path in admin_path_checks: admin_path = '/bt' @@ -210,7 +212,7 @@ def reload_mod(): @app.before_request def request_check(): - if not public.path_safe_check(request.path): return abort(404) + #if not public.path_safe_check(request.path): return abort(404) if request.path in ['/service_status']: return if not request.path in ['/safe','/hook','/public','/mail_sys','/down']: @@ -218,7 +220,7 @@ def request_check(): if ip_check: return ip_check if request.path.find('/static/') != -1 or request.path == '/code': - if not 'login' in session and not 'admin_auth' in session: + if not 'login' in session and not 'admin_auth' in session and not 'down' in session: session.clear() return abort(401) domain_check = public.check_domain_panel() @@ -272,6 +274,11 @@ def close(): data['lan'] = public.getLan('close') return render_template('close.html',data=data) +@app.route('/tips',methods=method_get) +def tips(): + return render_template('tips.html') + + route_path = os.path.join(admin_path,'') if route_path[-1] == '/': route_path = route_path[:-1] if route_path[0] != '/': route_path = '/' + route_path @@ -395,7 +402,7 @@ def FtpPort(): try: file = public.GetConfigValue('setup_path')+'/pure-ftpd/etc/pure-ftpd.conf' conf = public.readFile(file) - rep = "\n#?\s*Bind\s+[0-9]+\.[0-9]+\.[0-9]+\.+[0-9]+,([0-9]+)" + rep = r"\n#?\s*Bind\s+[0-9]+\.[0-9]+\.[0-9]+\.+[0-9]+,([0-9]+)" port = re.search(rep,conf).groups()[0] except: port='21' @@ -466,6 +473,15 @@ def acme(pdata = None): 'get_auths','auth_domain','check_auth_status','download_cert','apply_cert','renew_cert','apply_cert_api','apply_dns_auth') return publicObject(acme_v2_object,defs,None,pdata) +@app.route('/message/',methods=method_all) +def message(action = None): + comReturn = comm.local() + if comReturn: return comReturn + import panelMessage + message_object = panelMessage.panelMessage() + defs = ('get_messages','get_message_find','create_message','status_message','remove_message','get_messages_all') + return publicObject(message_object,defs,action,None) + @app.route('/api',methods=method_all) def api(pdata = None): comReturn = comm.local() @@ -520,8 +536,8 @@ def ssh_security(pdata = None): return render_template( 'firewall.html',data=data) import ssh_security firewallObject = ssh_security.ssh_security() - defs = ('get_logs','san_ssh_security','set_password','set_sshkey','stop_key','get_config', - 'stop_password','get_key','return_ip','add_return_ip','del_return_ip','start_jian','stop_jian','get_jian') + defs = ('san_ssh_security','set_password','set_sshkey','stop_key','get_config', + 'stop_password','get_key','return_ip','add_return_ip','del_return_ip','start_jian','stop_jian','get_jian','get_logs') return publicObject(firewallObject,defs,None,pdata) @@ -612,7 +628,7 @@ def files(pdata = None): 'CheckExistsFiles','GetExecLog','GetSearch','ExecShell','GetExecShellMsg','exec_git','exec_composer','create_download_url', 'UploadFile','GetDir','CreateFile','CreateDir','DeleteDir','DeleteFile','get_download_url_list','remove_download_url','modify_download_url', 'CopyFile','CopyDir','MvFile','GetFileBody','SaveFileBody','Zip','UnZip','get_download_url_find', - 'SearchFiles','upload','read_history','re_history','auto_save_temp','get_auto_save_body', + 'SearchFiles','upload','read_history','re_history','auto_save_temp','get_auto_save_body','get_videos', 'GetFileAccess','SetFileAccess','GetDirSize','SetBatchData','BatchPaste','install_rar','get_path_size', 'DownloadFile','GetTaskSpeed','CloseLogs','InstallSoft','UninstallSoft','SaveTmpFile','get_composer_version','exec_composer','update_composer', 'GetTmpFile','del_files_store','add_files_store','get_files_store','del_files_store_types','add_files_store_types','exec_git', @@ -807,6 +823,13 @@ def plugin(pdata = None): @app.route('/public',methods=method_all) def panel_public(): get = get_input() + try: + import panelWaf + panelWaf_data = panelWaf.panelWaf() + if panelWaf_data.is_sql(get.__dict__):return 'ERROR' + if panelWaf_data.is_xss(get.__dict__):return 'ERROR' + except: + pass get.client_ip = public.GetClientIp() if not hasattr(get,'name'): get.name = '' if not hasattr(get,'fun'): return abort(404) @@ -1064,50 +1087,109 @@ def download(): if filename in ['alioss','qiniu','upyun','txcos','ftp']: return panel_cloud() if filename in ['gdrive','gcloud_storage']: return "Google storage products do not currently support downloads" if not os.path.exists(filename): return public.ReturnJson(False,"FILE_NOT_EXISTS"),json_header - mimetype = "application/octet-stream" - extName = filename.split('.')[-1] - if extName in ['png','gif','jpeg','jpg']: mimetype = None - return send_file(filename,mimetype=mimetype, - as_attachment=True, - attachment_filename=os.path.basename(filename), - cache_timeout=0) -@app.route('/down/',methods=method_all) -def down(token=None,mdown=None): - try: - if not token: return abort(404) - if len(token) != 12: return abort(404) - if not re.match(r"^\w+$",token): return abort(404) - find = public.M('download_token').where('token=?',(token,)).find() - if not find: return abort(404) - if time.time() > int(find['expire']): return abort(404) - if not os.path.exists(find['filename']): return abort(404) - if find['password']: - args = get_input() - if 'file_password' in args: - if not re.match(r"^\w+$",args.file_password): - return public.ReturnJson(False,'wrong password!'),json_header - if not args.file_password == find['password']: - return public.ReturnJson(False,'wrong password!'),json_header - else: - pdata = { - "password":True, - "filename":find['filename'].split('/')[-1], - "total":find['total'], - "token":find['token'], - "expire":find['expire'] - } - return render_template('down.html',data = pdata) - - filename = find['filename'] + if request.args.get('play') == 'true': + import panelVideo + start, end = panelVideo.get_range(request) + return panelVideo.partial_response(filename, start, end) + else: mimetype = "application/octet-stream" extName = filename.split('.')[-1] if extName in ['png','gif','jpeg','jpg']: mimetype = None return send_file(filename,mimetype=mimetype, - as_attachment=True, - attachment_filename=os.path.basename(filename), - cache_timeout=0) - except: return abort(404) + as_attachment=True, + attachment_filename=os.path.basename(filename), + cache_timeout=0) + +def get_dir_down(filename,token,find): + import files + args = public.dict_obj() + args.path = filename + to_path = filename.replace(find['filename'],'').strip('/') + + if request.args.get('play') == 'true': + pdata = files.files().get_videos(args) + return public.GetJson(pdata),json_header + else: + pdata = files.files().GetDir(args) + pdata['token'] = token + pdata['src_path'] = find['filename'] + pdata['to_path'] = to_path + pdata['expire'] = public.format_date(times=find['expire']) + pdata['filename'] = (find['filename'].split('/')[-1] + '/' + to_path).strip('/') + return render_template('down.html',data = pdata,to_size=public.to_size) + +@app.route('/down/',methods=method_all) +def down(token=None,fname=None): + try: + fname = request.args.get('fname') + if fname: + if(len(fname) > 256): return abort(404) + if fname: fname = fname.strip('/') + if not token: return abort(404) + if len(token) != 12: return abort(404) + if not request.args.get('play') in ['true',None,'']: + return abort(404) + + if not re.match(r"^\w+$",token): return abort(404) + find = public.M('download_token').where('token=?',(token,)).find() + + if not find: return abort(404) + if time.time() > int(find['expire']): return abort(404) + + if not os.path.exists(find['filename']): return abort(404) + if find['password'] and not token in session: + args = get_input() + if 'file_password' in args: + if not re.match(r"^\w+$",args.file_password): + return public.ReturnJson(False,'Wrong password!'),json_header + if re.match(r"^\d+$",args.file_password): + args.file_password += '.0' + if args.file_password != str(find['password']): + return public.ReturnJson(False,'Wrong password!'),json_header + session[token] = 1 + session['down'] = True + else: + pdata = { + "to_path":"", + "src_path": find['filename'], + "password":True, + "filename":find['filename'].split('/')[-1], + "total":find['total'], + "token":find['token'], + "expire":public.format_date(times=find['expire']) + } + return render_template('down.html',data = pdata) + if not find['password']: + session[token] = 1 + + if session[token] != 1: + return abort(404) + + filename = find['filename'] + if fname: + filename = os.path.join(filename,fname) + if not public.path_safe_check(fname,False): return abort(404) + if os.path.isdir(filename): + return get_dir_down(filename,token,find) + else: + if os.path.isdir(filename): + return get_dir_down(filename,token,find) + + if request.args.get('play') == 'true': + import panelVideo + start, end = panelVideo.get_range(request) + return panelVideo.partial_response(filename, start, end) + else: + mimetype = "application/octet-stream" + extName = filename.split('.')[-1] + if extName in ['png','gif','jpeg','jpg']: mimetype = None + return send_file(filename,mimetype=mimetype, + as_attachment=True, + attachment_filename=os.path.basename(filename), + cache_timeout=0) + except: + return abort(404) @app.route('/cloud',methods=method_get) diff --git a/BTPanel/static/css/site.css b/BTPanel/static/css/site.css index 598616ea..ce26d958 100644 --- a/BTPanel/static/css/site.css +++ b/BTPanel/static/css/site.css @@ -1137,10 +1137,8 @@ html .menu .menu_exit:hover { border-bottom: 1px solid #e6e6e6; color: #666; font-weight: normal; - padding: 5px 10px; - height: 35px; + padding: 8px; font-size: 12.5px; - box-sizing: content-box; } .divtable .table_toolbar{ left: 8px; @@ -6697,4 +6695,41 @@ select[disabled]{ } .php_info_group:last-child{ margin-bottom: 15px; +} + +#btvideo{ + display: inline-block; + height: 360px; +} +.video-list{ + display: inline-block; + width: 250px; + height: 360px; + overflow: auto; +} +.video-list .video-avt{ + background-color: #e8e8e8; +} +.movie_pay .layui-layer-content{ + overflow: hidden !important; +} +.video-list .video-avt td a, +.video-list .video-avt td{ + color: #20a53a; +} +.video-list tr td{ + border-top: 0px; + border-bottom: 1px solid #ddd; +} +.video-list tr:hover{ + cursor: pointer; +} +#btvideo video{ + outline: none; + padding: 0; + display: block; + background-color: #000; +} +.minText{ + white-space: nowrap; } \ No newline at end of file diff --git a/BTPanel/static/js/files.js b/BTPanel/static/js/files.js index df4d180d..6737f5c0 100644 --- a/BTPanel/static/js/files.js +++ b/BTPanel/static/js/files.js @@ -473,7 +473,8 @@ function GetFiles(Path, sort) { if (getCookie("rank") == "a") { $("#set_list").addClass("active"); $("#set_icon").removeClass("active"); - Body += "\ + if (rdata.PATH=='/') rdata.PATH = ''; + Body += "\ \ " + cnametext + fileMsg + "\ " + lan.files.calc_click + "\ @@ -491,7 +492,7 @@ function GetFiles(Path, sort) { } else { $("#set_icon").addClass("active"); $("#set_list").removeClass("active"); - Body += "
\ + Body += "
\ \
\
" + fmp[0] + "
\ @@ -524,6 +525,9 @@ function GetFiles(Path, sort) { if (isText(fmp[0])) { bodyZip = "" + lan.files.file_menu_edit + " | "; } + if (isVideo(fmp[0])) { + bodyZip = "Play | "; + } if (isImage(fmp[0])) { download = "" + lan.files.file_menu_img + " | "; } else { @@ -568,7 +572,7 @@ function GetFiles(Path, sort) { " + lan.files.file_menu_del + "\ "; } else { - Body += "
\ + Body += "
\ \
\
" + fmp[0] + "
\ @@ -600,11 +604,11 @@ function GetFiles(Path, sort) { \ \ ' + lan.files.file_name + ((data['sort'] === 'name' || !data['sort']) ? sort_icon : '') + '\ - ' + lan.files.file_size + ((data['sort'] === 'size') ? sort_icon : '') + '\ - ' + lan.files.file_etime + ((data['sort'] === 'mtime') ? sort_icon : '') + '\ - ' + lan.files.file_auth + ((data['sort'] === 'accept') ? sort_icon : '') + '\ - ' + lan.files.file_own + ((data['sort'] === 'user') ? sort_icon : '') + '\ - ' + lan.files.file_act + '\ + ' + lan.files.file_size + ((data['sort'] === 'size') ? sort_icon : '') + '\ + ' + lan.files.file_etime + ((data['sort'] === 'mtime') ? sort_icon : '') + '\ + ' + lan.files.file_auth + ((data['sort'] === 'accept') ? sort_icon : '') + '\ + ' + lan.files.file_own + ((data['sort'] === 'user') ? sort_icon : '') + '\ + ' + lan.files.file_act + '\ \ \ ' + Body + '\ @@ -639,7 +643,7 @@ function GetFiles(Path, sort) {
' @@ -723,8 +727,12 @@ function GetFiles(Path, sort) { if (e.which == 3) { if (count <= 1) { var a = $(this); - a.contextify(RClick(a.attr("filetype"), a.attr("data-path"), a.find("input").val(), rdata, a.attr('fileshare'),a.attr('data-composer'))); - } else { + a.contextify(RClick(a.attr("filetype"), a.attr("data-path"), a.find("input").val(), rdata,a.attr('fileshare'),a.attr('data-composer'))); + $(this).find('input').prop("checked", true); + $(this).addClass('ui-selected'); + $(this).siblings().removeClass('ui-selected').find('input').prop("checked", false); + } + else { RClickAll(e); } } @@ -773,7 +781,7 @@ function php_file_webshell(file) { } function auto_table_width() { - var oldTable = $(window).height() - $('#tipTools')[0].getBoundingClientRect().height - $('#filePage')[0].getBoundingClientRect().height - $('.footer')[0].getBoundingClientRect().height - 121; + var oldTable = $(window).height() - $('#tipTools')[0].getBoundingClientRect().height - $('#filePage')[0].getBoundingClientRect().height - $('.footer')[0].getBoundingClientRect().height - 111; var oldTable_heigth = $('.oldTable table').height(); $('.oldTable thead th').each(function (index, el) { var table_th = $('.oldTable thead th').length; @@ -1655,21 +1663,63 @@ function GetImage(fileName) { $(".layui-layer").css("top", "30%"); } +// function GetPlay(fileName) { +// var imgUrl = '/download?filename=' + fileName; +// layer.open({ +// type: 1, +// closeBtn: 2, +// title: 'Play [' + fileName + ']', +// area: '500px', +// shadeClose: false, +// content: '
' +// }); +// $(".layui-layer").css("top", "30%"); +// } +function play_file(obj,filename) { + console.log($('#btvideo video').attr('data-filename'),filename) + if($('#btvideo video').attr('data-filename')== filename) return false; + var imgUrl = '/download?filename=' + filename + '&play=true'; + var v = '' + $("#btvideo").html(v); + var p_tmp = filename.split('/') + $(".btvideo-title").html(p_tmp[p_tmp.length-1]); + $(".video-avt").removeClass('video-avt'); + $(obj).parents('tr').addClass('video-avt'); +} function GetPlay(fileName) { + var old_filename = fileName; var imgUrl = '/download?filename=' + fileName; + var p_tmp = fileName.split('/') + var path = p_tmp.slice(0, p_tmp.length - 1).join('/') layer.open({ type: 1, closeBtn: 2, - title: 'Play [' + fileName + ']', - area: '500px', + // maxmin:true, + title: 'Playing [' + p_tmp[p_tmp.length-1] + ']', + area: ["890px","402px"], shadeClose: false, - content: '
' + skin:'movie_pay', + content: '
', + success: function () { + $.post('/files?action=get_videos', { path: path }, function (rdata) { + var video_list = ''; + for (var i = 0; i < rdata.length; i++) { + var filename = path + '/' + rdata[i].name + video_list += ''; + } + video_list += '
File nameSize
' + + rdata[i].name + '' + ToSize(rdata[i].size) + '
'; + $('.video-list').html(video_list); + }); + } }); - $(".layui-layer").css("top", "30%"); } - function GetFileBytes(fileName, fileSize) { window.open('/download?filename=' + encodeURIComponent(fileName)); } @@ -2648,9 +2698,9 @@ function RClick(type, path, name, file_store, file_share,data_composer) { } }) } - //else if (isVideo(type)) { - // options.items.push({ text: '播放', onclick: function () { GetPlay(path) } }, { text: lan.files.file_menu_down, onclick: function () { GetFileBytes(path) } }, { text: lan.files.file_menu_del, onclick: function () { DeleteFile(path) } }); - //} + else if (isVideo(type)) { + options.items.push({ text: 'Play', onclick: function () { GetPlay(path) } }, { text: lan.files.file_menu_down, onclick: function () { GetFileBytes(path) } }, { text: lan.files.file_menu_del, onclick: function () { DeleteFile(path) } }); + } else if (isText(type)) { options.items.push({ text: lan.files.file_menu_edit, @@ -2715,15 +2765,21 @@ function RClick(type, path, name, file_store, file_share,data_composer) { } }); } - if (type !== 'dir') { - options.items.push({ - text: 'Share', - onclick: function () { - create_download_url(name, path, file_share) - } - }); - } - + // if (type !== 'dir') { + // options.items.push({ + // text: 'Share', + // onclick: function () { + // create_download_url(name, path, file_share) + // } + // }); + // } + // if(type !== 'dir'){ + // options.items.push({ text: 'Share', onclick: function () { create_download_url(name,path,file_share) } }); + // } + + options.items.push({ text: 'Share', onclick: function () { + create_download_url(name,path,file_share) } }); + if( type === 'dir' && data_composer === '1'){ options.items.push({ text: 'Composer', onclick: function () { exec_composer(name,path) } }); } @@ -2839,9 +2895,10 @@ function show_composer_log(){ }); } + function create_download_url(fileName, path, fileShare) { fileShare = parseInt(fileShare); - if (fileShare != 0) { + if(fileShare != 0) { $.post('/files?action=get_download_url_find', { id: fileShare }, function (rdata) { diff --git a/BTPanel/static/js/public.js b/BTPanel/static/js/public.js index 132156d6..3c79c1c8 100644 --- a/BTPanel/static/js/public.js +++ b/BTPanel/static/js/public.js @@ -1175,7 +1175,7 @@ var aceEditor = { _this = this; var loadT = layer.open({ type: 1, - area: ['400px', '180px'], + area: ['400px', '200px'], title: lan.public.restore_history_files, content: '
\
\ diff --git a/BTPanel/static/js/soft.js b/BTPanel/static/js/soft.js index 6d5f5e3e..bc32c964 100644 --- a/BTPanel/static/js/soft.js +++ b/BTPanel/static/js/soft.js @@ -2016,7 +2016,7 @@ var soft = { { field: 'opt', title: lan.public.action, - width: 50, + width: 60, templet: function(item) { var opt = '' + lan.soft.install + '' if (item['task'] == '-1' && item.phpversions.indexOf(version) != -1) { diff --git a/BTPanel/templates/default/down.html b/BTPanel/templates/default/down.html index 28f9190d..41b01dc9 100644 --- a/BTPanel/templates/default/down.html +++ b/BTPanel/templates/default/down.html @@ -7,6 +7,22 @@ Extracting files - {{data.filename}} + + + +
-

- -

- - -
-

+
+
Share file【 {{data.filename}} 】
+
Term of validity：{{data.expire}}
+
+ {% if not data['PATH'] %} + +
+
+ Enter the extraction password: +
+ + +
+
+
+ {% else %} + + + +
+ +
+ + + + + + + + + + {% for d in data['DIR'] %} + {% set d = d.split(';') %} + + + + + + {% endfor %} + {% for d in data['FILES'] %} + {% set d = d.split(';') %} + + + + + + {% endfor %} + +
File nameSiteopt
{{d[0]}}{{to_size(d[1])}}Open
{{d[0]}}{{to_size(d[1])}} + {% if d[0].split('.')[-1].lower() in ['avi','mp4','mkv','mpeg','webm','3gp'] %} + Play | + {% elif d[0].split('.')[-1].lower() in ['jpg', 'jpeg', 'png', 'bmp', 'gif', 'tiff', 'ico'] %} + Preview | + {% endif %} + Download +
+
+ +
+ {% endif %}
+ \ No newline at end of file diff --git a/BTPanel/templates/default/lan.js b/BTPanel/templates/default/lan.js deleted file mode 100644 index 6072bab2..00000000 --- a/BTPanel/templates/default/lan.js +++ /dev/null @@ -1,1042 +0,0 @@ -var lan = { - "get":function(key,args){ - var msgs = { - "diskinfo_span_1":"磁盘分区[{1}]的可用容量小于1GB，这可能会导致MySQL自动停止，面板无法访问等问题，请及时清理！", - "process_kill_confirm":"结束进程名[{1}],PID[{2}]后可能会影响服务器的正常运行，继续吗？", - "del":"删除[{1}]", - "del_all_task":"您共选择了[{1}]个任务,删除后将无法恢复,真的要删除吗?", - "del_all_task_ok":"成功删除[{1}]个任务!", - "del_all_task_the":"正在删除[{1}],请稍候...", - "add_all_task_ok":"成功添加[{1}]个计划任务!", - "add":"正在添加[{1}],请稍候...", - "confirm_del":"您真的要删除[{1}]吗？", - "update_num":"一次只能选择{1}个文件上传，剩下的不作处理！", - "service_confirm":"您真的要{1}{2}服务吗？", - "service_the":"正在{1}{2}服务,请稍候...", - "service_ok":"{1}服务已{2}", - "service_err":"{1}服务{2}失败!", - "recycle_bin_confirm":"您确实要把此文件[{1}]放入回收站吗?", - "recycle_bin_confirm_dir":"您确实要把此目录[{1}]放入回收站吗?", - "del_all_ftp":"您共选择了[{1}]个FTP,删除后将无法恢复,真的要删除吗?", - "del_all_ftp_ok":"成功删除{1}个FTP帐户", - "del_all_database":"您共选择了[{1}]个数据库,删除后将无法恢复,真的要删除吗?", - "del_all_database_ok":"成功删除[{1}]个数据库!", - "config_edit_ps":"此处为{1}主配置文件,若您不了解配置规则,请勿随意修改。", - "install_confirm":"您真的要安装{1}-{2}吗?", - "del_all_site":"您共选择了[{1}]个站点,删除后将无法恢复,真的要删除吗?", - "del_all_site_ok":"成功删除[{1}]个站点!", - "ssl_enable":"您已启用[{1}]证书，如需关闭，请点击\"关闭SSL\"按钮。", - "lack_param":"缺少必要参数[{1}]", - "del_ftp":'是否删除[{1}]该FTP账号？', - } - - if(!msgs[key]) return ''; - msg = msgs[key]; - for(var i=0;i注意，开启广告拦截会导致无法快捷登录。", - "task_time":"时间", - "task_name":"名称", - "task_msg_title":"消息提醒", - "task_title":"消息盒子", - "task_tip_read":"标记已读", - "task_tip_all":"全部已读", - "no_data" : "当前没有数据" - }, - - "files":{ - "recycle_bin_re":"恢复", - "recycle_bin_del":"永久删除", - "recycle_bin_on":"文件回收站", - "recycle_bin_on_db":"数据库回收站", - "recycle_bin_ps":"注意：关闭回收站，删除的文件无法恢复！", - "recycle_bin_close":"清空回收站", - "recycle_bin_type1":"全部", - "recycle_bin_type2":"文件夹", - "recycle_bin_type3":"文件", - "recycle_bin_type4":"图片", - "recycle_bin_type5":"文档", - "recycle_bin_type6":"数据库", - "recycle_bin_th1":"文件名", - "recycle_bin_th2":"原位置", - "recycle_bin_th3":"大小", - "recycle_bin_th4":"删除时间", - "recycle_bin_th5":"操作", - "recycle_bin_title":"回收站", - "recycle_bin_re_title":"恢复文件", - "recycle_bin_re_msg":"若您的原位置已有同名文件或目录，将被覆盖，继续吗？", - "recycle_bin_re_the":"正在恢复,请稍候...", - "recycle_bin_del_title":"删除文件", - "recycle_bin_del_msg":"删除操作不可逆，继续吗？", - "recycle_bin_del_the":"正在删除,请稍候...", - "recycle_bin_close_msg":"清空回收站操作会永久删除回收站中的文件，继续吗？", - "recycle_bin_close_the":"正在删除,请稍候...", - "file_menu_copy":"复制", - "file_menu_mv":"剪切", - "file_menu_rename":"重命名", - "file_menu_auth":"权限", - "file_menu_zip":"压缩", - "file_menu_unzip":"解压", - "file_menu_edit":"编辑", - "file_menu_img":"预览", - "file_menu_down":"下载", - "file_menu_del":"删除", - "file_name":"文件名", - "file_size":"大小", - "file_etime":"修改时间", - "file_auth":"权限", - "file_own":"所有者", - "file_read":"读取", - "file_write":"写入", - "file_exec":"执行", - "file_public":"公共", - "file_group":"用户组", - "file_act":"操作", - "get_size":"共{1}个目录与{2}个文件,大小:", - "get":"获取", - "new":"新建", - "new_empty_file":"新建空白文件", - "new_dir":"新建目录", - "dir_name":"目录名称", - "return":"返回上一级", - "shell":"终端", - "paste":"粘贴", - "paste_all":"粘贴所有", - "path_root":"根目录", - "all":"批量", - "set_auth":"设置权限", - "up_title":"上传文件", - "up_add":"添加文件", - "up_start":"开始上传", - "up_coding":"文件编码", - "up_bin":"二进制", - "unzip_title":"解压文件", - "unzip_name":"文件名", - "unzip_name_title":"压缩文件名", - "unzip_to":"解压到", - "unzip_coding":"编码", - "unzip_the":"正在解压,请稍候...", - "zip_title":"压缩文件", - "zip_to":"压缩到", - "zip_the":"正在压缩,请稍候...", - "zip_ok":"服务器正在后台压缩文件,请稍候刷新文件列表查看进度!", - "zip_pass_title":"解压密码", - "zip_pass_msg":"不需要请留空", - "mv_the":"正在移动,请稍候...", - "copy_the":"正在复制,请稍候...", - "copy_ok":"已复制", - "mv_ok":"已剪切", - "shell_title":"执行SHELL (仅支持非交互命令)", - "shell_go":"发送", - "shell_ps":"shell命令", - "down_title":"下载文件", - "down_url":"URL地址", - "down_to":"下载到", - "down_save":"保存文件名", - "down_task":"正在添加到队列，请稍候..", - "del_file":"删除文件", - "del_dir":"删除目录", - "del_all_file":"批量删除文件", - "del_all_msg":"您确实要把这些文件放入回收站吗?", - "file_conver_msg":"即将覆盖以下文件,是否确定？" - }, - - "ftp":{ - "empty":"当前没有FTP数据", - "stop_title":"停用这个帐号", - "start_title":"启用这个帐号", - "stop":"已停用", - "start":"已启用", - "copy":"复制密码", - "open_path":"打开目录", - "edit_pass":"改密", - "ps":"备注信息", - "add_title":"添加FTP帐户", - "add_user":"用户名", - "add_user_tips":'请输入FTP用户名', - "add_pass":"密码", - "add_pass_tips":'请输入FTP密码', - "add_pass_rep":"随机密码", - "add_path":"根目录", - "add_path_tips":'请输入或选择FTP目录', - "add_path_rep":'选择文件目录', - "add_path_title":"帐户根目录，会自动创建同名目录", - "add_path_ps":"FTP所指向的目录", - "add_ps":"备注", - "add_ps_title":"备注信息(小于255个字符)", - "del_all":"是否批量删除选中的FTP账号？", - "del_all_err":"以下FTP帐户删除失败:", - "stop_confirm":"您真的要停止{1}的FTP吗?", - "stop_title":"FTP帐户", - "pass_title":"修改FTP用户密码", - "pass_user":"用户名", - "pass_new":"新密码", - "pass_confirm":"您确定要修改该FTP帐户密码吗?", - "port_title":"修改FTP端口", - "port_name":'端口', - "port_tips":'请填写端口', - "del_ftp_title":'删除FTP', - "del_ftp_all_title":'删除选中FTP' - }, - - "database":{ - "empty":"当前没有数据库数据", - "backup_empty":"无备份", - "backup_ok":"有备份", - "copy_pass":"复制密码", - "input":"导入", - "input_title":"导入数据库", - "admin":"管理", - "admin_title":"数据库管理", - "auth":"权限", - "auth_title":"设置访问权限", - "edit_pass":"改密", - "edit_pass_title":"修改数据库密码", - "del_title":"删除数据库", - "ps":"备注信息", - "add_title":"添加数据库", - "add_name":"数据库名", - "add_name_title":"新的数据库名称", - "add_pass":"密码", - "add_pass_title":"数据库密码", - "add_pass_rep":"随机密码", - "add_auth":"访问权限", - "add_auth_local":"本地服务器", - "add_auth_all":"所有人", - "add_auth_ip":"指定IP", - "add_auth_ip_title":"请输允许访问此数据库的IP地址", - "add_ps":"备注", - "edit_root":"root密码", - "user":"用户名", - "edit_pass_new":"新密码", - "edit_pass_new_title":"新的数据库密码", - "edit_pass_confirm":"您确定要修改数据库密码吗?", - "backup_re":"恢复", - "backup_name":"文件名称", - "backup_size":"文件大小", - "backup_time":"备份时间", - "backup_title":"数据库备份详情", - "backup":"备份", - "input_confirm":"数据库将被覆盖，继续吗?", - "input_the":"正在导入,请稍候...", - "backup_the":"正在备份,请稍候...", - "backup_del_title":"删除备份文件", - "backup_del_confirm":"您真的要删除备份文件吗?", - "del_all_title":"批量删除数据库", - "del_all_err":"以下数据库删除失败:", - "input_title_file":"从文件导入数据库", - "input_local_up":"从本地上传", - "input_ps1":"仅支持sql、zip、(tar.gz|gz|tgz)", - "input_ps2":"zip、tar.gz压缩包结构：test.zip或test.tar.gz压缩包内，必需包含test.sql", - "input_ps3":"若文件过大，您还可以使用SFTP工具，将数据库文件上传到/www/backup/database", - "input_up_type":"请上传sql或zip或tar.gz压缩包", - "auth_err":"此数据库不能修改访问权限", - "auth_title":"设置数据库权限", - "auth_name":"访问权限", - "sync_the":"正在同步,请稍候...", - "phpmyadmin_err":"请先安装phpMyAdmin", - "phpmyadmin":"正在打开phpMyAdmin" - }, - - "soft":{ - "php_main1":"php服务", - "php_main2":"上传限制", - "php_main3":"超时限制", - "php_main4":"配置文件", - "php_main5":"安装扩展", - "php_main6":"禁用函数", - "php_main7":"性能调整", - "php_main8":"负载状态", - "php_main9":"Session配置", - "php_menu_ext":"扩展配置", - "admin":"管理", - "off":"关闭", - "on":"开启", - "stop":"停止", - "start":"启动", - "status":"当前状态", - "restart":"重启", - "reload":"重载配置", - "mysql_mem_err":"机器内存小于1G，不建议使用mysql5.5以上版本
  • 如果数据库经常自动停止，请尝试使用linux工具箱增加SWAP或者升级服务器内存", - "concurrency_m":"自定义", - "concurrency":"并发", - "concurrency_type":"并发方案", - "php_fpm_model":"运行模式", - "php_fpm_ps1":"PHP-FPM运行模式", - "php_fpm_ps2":"允许创建的最大子进程数", - "php_fpm_ps3":"起始进程数（服务启动后初始进程数量）", - "php_fpm_ps4":"最小空闲进程数（清理空闲进程后的保留数量）", - "php_fpm_ps5":"最大空闲进程数（当空闲进程达到此值时清理）", - "php_fpm_err1":"max_spare_servers 不能大于 max_children", - "php_fpm_err2":"min_spare_servers 不能大于 start_servers", - "php_fpm_err3":"min_spare_servers 不能大于 max_spare_servers", - "php_fpm_err4":"start_servers 不能大于 max_children", - "php_fpm_err5":"配置值不能小于1", - "phpinfo":"查看phpinfo()", - "get":"正在获取...", - "get_list":"正在获取列表...", - "the_save":"正在保存数据...", - "config_edit":"配置修改", - "edit_empty":"不修改请留空", - "php_upload_size":"上传大小限制不能小于2M", - "mvc_ps":"MVC架构的程序需要开启,如typecho", - "the_install":"正在安装...", - "the_uninstall":"正在卸载...", - "install_the":"安装中...", - "sleep_install":"等待安装...", - "install":"安装", - "uninstall":"卸载", - "php_ext_name":"名称", - "php_ext_type":"类型", - "php_ext_ps":"说明", - "php_ext_status":"状态", - "php_ext_install_confirm":"您真的要安装{1}吗?", - "php_ext_uninstall_confirm":"您真的要卸载{1}吗?", - "add_install":"正在添加到安装器...", - "install_title":"软件安装", - "insatll_type":"安装方式", - "install_version":"安装版本", - "type_title":"选择安装方式", - "err_install1":"请先卸载Apache", - "err_install2":"请先卸载Nginx", - "err_install3":"请先安装php", - "err_install4":"请先安装MySQL", - "setup":"设置", - "apache22":"警告:当前为php-fpm模式,将不被Apache2.2支持,请重新安装此PHP版本!", - "apache24":"警告:当前为php5_module模式,将不被nginx/apache2.4支持,请重新安装此PHP版本!", - "apache22_err":"Apache2.2不支持多PHP版本共存,请先卸载已安装PHP版本,再安装此版本!", - "mysql_f":"注意: 安装新的MySQL版本,会覆盖数据库数据,请先备份数据库!", - "mysql_d":"抱歉,出于安全考虑,请先到[数据库]管理备份数据库,并中删除所有数据库!", - "fun_ps1":"添加要被禁止的函数名,如: exec", - "fun_ps2":"在此处可以禁用指定函数的调用,以增强环境安全性!", - "fun_ps3":"强烈建议禁用如exec,system等危险函数!", - "fun_msg":"您输入的函数已被禁用!", - "nginx_status":"负载状态", - "nginx_version":"切换版本", - "waf_title":"过滤器", - "web_service":"Web服务", - "waf_not":"您当前Nginx版本不支持waf模块,请安装Nginx1.12,重装Nginx不会丢失您的网站配置!", - "waf_edit":"编辑规则", - "waf_up":"上传限制", - "waf_input1":"URL过滤", - "waf_input2":"Cookie过滤", - "waf_input3":"POST过滤", - "waf_input4":"防CC攻击", - "waf_input5":"记录防御信息", - "waf_input6":"CC攻击触发频率(次)", - "waf_input7":"CC攻击触发周期", - "waf_input8":"IP白名单", - "waf_input9":"IP黑名单", - "waf_ip":"IP地址", - "waf_up_title":"文件上传后缀黑名单", - "waf_up_from1":"添加禁止上传的扩展名,如: zip", - "waf_up_from2":"扩展名", - "waf_url_white":"URL白名单", - "waf_index":"警告内容", - "waf_cloud":"从云端更新", - "waf_update":"正在更新规则文件,请稍候..", - "waf_cc_err":"CC防御配置值超出可用值 (频率1-3000|周期1-1800)", - "php_version":"php版本", - "save_path":"存储位置", - "service":"服务", - "safe":"安全设置", - "log":"日志", - "mysql_to_msg":"迁移数据库文件过程中将会停止数据库运行,继续吗?", - "mysql_to_msg1":"正在迁移文件,请稍候...", - "mysql_to":"迁移", - "mysql_log_close":"清空", - "mysql_log_bin":"二进制日志", - "mysql_log_err":"错误日志", - "mysql_log_ps1":"当前没有日志内容!", - "mysql_port_title":"修改数据库端口可能会导致您的站点无法连接数据库,确定要修改吗?", - "select_version":"选择版本", - "version_to":"切换", - "pma_port":"访问端口", - "pma_port_title":"phpmyadmin访问端口", - "pma_pass":"密码访问", - "pma_user":"授权账号", - "pma_pass1":"访问密码", - "pma_pass2":"重复密码", - "pma_ps":"为phpmyadmin增加一道访问安全锁", - "pma_pass_close":"您真的要关闭访问认证吗?", - "pma_pass_empty":"授权用户或密码不能为空!", - "menu_temp":"正在获取模板...", - "menu_phpsafe":"php守护已启动，无需设置", - "qiniu_lise":"正在从云端获取...", - "qiniu_file_title":"文件列表", - "qiniu_th1":"名称", - "qiniu_th2":"类型", - "qiniu_th3":"大小", - "qiniu_th4":"更新时间", - "mysql_del_err":"抱歉,为安全考虑,请先到[数据库]管理备份数据库并中删除所有数据库!", - "uninstall_confirm":"您真的要卸载[{1}-{2}]吗?", - "from_err":"表单错误!", - "lib_the":"正在提交配置,请稍候...", - "lib_config":"配置", - "lib_insatll_confirm":"您真的要安装[{1}]插件吗？", - "lib_uninsatll_confirm":"您真的要卸载[{1}]插件吗？", - "lib_install":"安装插件", - "lib_uninstall":"卸载插件", - "lib_install_the":"正在安装,请稍候...", - "lib_uninstall_the":"正在卸载,请稍候...", - "mysql_set_msg":"优化方案", - "mysql_set_select":"请选择", - "mysql_set_maxmem":"最大使用内存", - "mysql_set_key_buffer_size":"用于索引的缓冲区大小", - "mysql_set_query_cache_size":"查询缓存,不开启请设为0", - "mysql_set_tmp_table_size":"临时表缓存大小", - "mysql_set_innodb_buffer_pool_size":"Innodb缓冲区大小", - "mysql_set_innodb_log_buffer_size":"Innodb日志缓冲区大小", - "mysql_set_sort_buffer_size":"每个线程排序的缓冲大小", - "mysql_set_read_buffer_size":"读入缓冲区大小", - "mysql_set_read_rnd_buffer_size":"随机读取缓冲区大小", - "mysql_set_join_buffer_size":"关联表缓存大小", - "mysql_set_thread_stack":"每个线程的堆栈大小", - "mysql_set_binlog_cache_size":"二进制日志缓存大小(4096的倍数)", - "mysql_set_thread_cache_size":"线程池大小", - "mysql_set_table_open_cache":"表缓存(最大不要超过2048)", - "mysql_set_max_connections":"最大连接数", - "mysql_set_restart":"重启数据库", - "mysql_set_conn":"连接数", - "mysql_set_err":"错误,内存分配过高!

    物理内存: {1}MB
    最大使用内存: {2}MB
    可能造成的后果: 导致数据库不稳定,甚至无法启动MySQLd服务!

    ", - "mysql_status_title1":"启动时间", - "mysql_status_title2":"总连接次数", - "mysql_status_title3":"发送", - "mysql_status_title4":"接收", - "mysql_status_title5":"每秒查询", - "mysql_status_title6":"每秒事务", - "mysql_status_title7":"File", - "mysql_status_title8":"Position", - "mysql_status_title9":"活动/峰值连接数", - "mysql_status_title10":"线程缓存命中率", - "mysql_status_title11":"索引命中率", - "mysql_status_title12":"Innodb索引命中率", - "mysql_status_title13":"查询缓存命中率", - "mysql_status_title14":"创建临时表到磁盘", - "mysql_status_title15":"已打开的表", - "mysql_status_title16":"没有使用索引的量", - "mysql_status_title17":"没有索引的JOIN量", - "mysql_status_title18":"排序后的合并次数", - "mysql_status_title19":"锁表次数", - "mysql_status_ps1":"若值过大,增加max_connections", - "mysql_status_ps2":"若过低,增加thread_cache_size", - "mysql_status_ps3":"若过低,增加key_buffer_size", - "mysql_status_ps4":"若过低,增加innodb_buffer_pool_size", - "mysql_status_ps5":"若过低,增加query_cache_size", - "mysql_status_ps6":"若过大,尝试增加tmp_table_size", - "mysql_status_ps7":"若过大,增加table_cache_size", - "mysql_status_ps8":"若不为0,请检查数据表的索引是否合理", - "mysql_status_ps9":"若不为0,请检查数据表的索引是否合理", - "mysql_status_ps10":"若值过大,增加sort_buffer_size", - "mysql_status_ps11":"若值过大,请考虑增加您的数据库性能" - }, - - "site":{ - "running":"正在运行", - "running_title":"停用这个站点", - "running_text":"运行中", - "stopped":"已停止", - "stopped_title":"启用这个站点", - "backup_yes":"有备份", - "backup_no":"无备份", - "web_end_time":"永久", - "open_path_txt":"打开目录", - "set":"设置", - "site_del_title":"删除站点", - "site_no_data":"当前没有站点数据", - "site_null":"null", - "site_bak":"备注信息", - "saving_txt":"正在保存...", - "domain_err_txt":"域名格式不正确，请重新输入!", - "ftp":"FTP账号资料", - "ftp_tips":"只要将网站上传至以上FTP即可访问!", - "user":"用户", - "password":"密码", - "database_txt":"数据库账号资料", - "database":"数据库", - "database_name":"数据库名", - "database_set":"数据库设置", - "success_txt":"成功创建站点", - "php_ver":"PHP版本", - "site_add":"添加网站", - "domain":"域名", - "port":"端口", - "note":"备注", - "note_ph":"网站备注", - "web_root_dir":"网站根目录", - "web_dir":"网站目录", - "root_dir":"根目录", - "yes":"创建", - "no":"不创建", - "ftp_set":"FTP设置", - "ftp_help":"创建站点的同时，为站点创建一个对应FTP帐户，并且FTP目录指向站点所在目录。", - "database_help":"创建站点的同时，为站点创建一个对应的数据库帐户，方便不同站点使用不同数据库。", - "domain_help":"每行填写一个域名，默认为80端口
    泛解析添加方法 *.domain.com
    如另加端口格式为 www.domain.com:88", - "domain_len_msg":"不要超出20个字符", - "anti_XSS_attack":"防跨站攻击", - "write_access_log":"写访问日志", - "run_dir":"运行目录", - "site_help_1":"部分程序需要指定二级目录作为运行目录，如ThinkPHP5，Laravel", - "site_help_2":"选择您的运行目录，点保存即可", - "default_doc_help":"默认文档，每行一个，优先级由上至下。", - "site_stop_txt":"站点停用后将无法访问，您真的要停用这个站点吗？", - "site_start_txt":"即将启动站点，您真的要启用这个站点吗？", - "site_del_info":"是否要删除同名的FTP、数据库、根目录", - "all_del_info":"同时删除站点根目录", - "all_del_site":"批量删除站点", - "del_err":"以下站点删除失败", - "click_access":"点击访问", - "operate":"操作", - "domain_man":"域名管理", - "unresolved":"未解析", - "parsed":"已解析", - "this_domain_un":"该域名未解析", - "analytic_ip":"域名解析IP为", - "current_server_ip":"当前服务器IP", - "parsed_info":"仅供参考,使用CDN的用户请无视", - "domain_empty":"域名不能为空!", - "domain_last_cannot":"最后一个域名不能删除", - "domain_del_confirm":"您真的要从站点中删除这个域名吗？", - "webback_del_confirm":"真的要删除备份包吗?", - "del_bak_file":"删除备份文件", - "filename":"文件名称", - "filesize":"文件大小", - "backuptime":"打包时间", - "backup_title":"打包备份", - "public_set":"全局设置", - "local_site":"本站", - "setindex":"设置网站默认文档", - "default_doc":"默认文档", - "default_site":"默认站点", - "default_site_yes":"设置默认站点", - "default_site_no":"未设置默认站点", - "default_site_help_1":"设置默认站点后,所有未绑定的域名和IP都被定向到默认站点", - "default_site_help_2":"可有效防止恶意解析", - "site_menu_1":"子目录绑定", - "site_menu_2":"网站目录", - "site_menu_3":"流量限制", - "site_menu_4":"伪静态", - "site_menu_5":"默认文档", - "site_menu_6":"配置文件", - "site_menu_7":"SSL", - "site_menu_8":"PHP版本", - "site_menu_9":"Tomcat", - "site_menu_10":"301重定向", - "site_menu_11":"反向代理", - "site_menu_12":"防盗链", - "website_change":"站点修改", - "addtime":"添加时间", - "the_msg":"正在提交任务...", - "start_scan":"开始扫描", - "update_lib":"更新特征库", - "scanned":"已扫描", - "risk_quantity":"风险数量", - "danger_fun":"危险函数", - "danger_fun_no":"未禁用危险函数", - "danger":"危险", - "file":"文件", - "ssh_port":"SSH端口", - "high_risk":"高危", - "sshd_tampering":"sshd文件被篡改", - "xss_attack":"跨站攻击", - "site_xss_attack":"站点未开启防跨站攻击!", - "mod_time":"修改时间", - "code":"代码", - "behavior":"行为", - "risk":"风险", - "details":"详情", - "to_update":"正在更新，请稍候...", - "limit_net_1":"论坛/博客", - "limit_net_2":"图片站", - "limit_net_3":"下载站", - "limit_net_4":"商城", - "limit_net_5":"门户", - "limit_net_6":"企业站", - "limit_net_7":"视频站", - "limit_net_8":"启用流量控制", - "limit_net_9":"限制方案", - "limit_net_10":"并发限制", - "limit_net_11":"限制当前站点最大并发数", - "limit_net_12":"单IP限制", - "limit_net_13":"限制单个IP访问最大并发数", - "limit_net_14":"流量限制", - "limit_net_15":"限制每个请求的流量上限（单位：KB）", - "subdirectories":"子目录", - "url_rewrite_alter":"你真的要为这个子目录创建独立的伪静态规则吗？", - "rule_cov_tool":"规则转换工具", - "a_c_n":"Apache转Nginx", - "save_as_template":"另存为模板", - "url_rw_help_1":"请选择您的应用，若设置伪静态后，网站无法正常访问，请尝试设置回default", - "url_rw_help_2":"您可以对伪静态规则进行修改，修改完后保存即可。", - "config_url":"配置伪静态规则", - "d_s_empty":"域名和子目录名称不能为空", - "s_bin_del":"您真的要删除这个子目录绑定吗？", - "proxy_url":"目标URL", - "proxy_url_info":"请填写完整URL,例：http://www.test.com", - "proxy_domain":"发送域名", - "proxy_domian_info":"发送到目标服务器的域名,例：www.test.com", - "proxy_cache":"开启缓存", - "con_rep":"内容替换", - "con_rep_info":"被替换的文本,可留空", - "to_con":"替换为,可留空", - "proxy_enable":"启用反向代理", - "proxy_help_1":"目标Url必需是可以访问的，否则将直接502", - "proxy_help_2":"默认本站点所有域名访问将被传递到目标服务器，请确保目标服务器已绑定域名", - "proxy_help_3":"若您是被动代理，请在发送域名处填写上目标站点的域名", - "proxy_help_4":"若您不需要内容替换功能，请直接留空", - "proxy_help_5":"可通过purge清理指定URL的缓存,示例：http://test.com/purge/test.png", - "access_domain":"访问域名", - "all_site":"整站", - "target_url":"目标URL", - "eg_url":"请填写完整URL,例：http://www.test.com", - "enable_301":"启用301", - "to301_help_1":"选择[整站]时请不要将目标URL设为同一站点下的域名.", - "to301_help_2":"取消301重定向后，需清空浏览器缓存才能看到生效结果.", - "bt_ssl":"宝塔SSL", - "lets_ssl":"Let\'s Encrypt免费证书", - "other":"其它", - "other_ssl":"其他证书", - "use_other_ssl":"使用其他证书", - "ssl_help_1":"本站点未设置SSL，如需设置SSL，请选择切换类目申请开启SSL

    关闭SSL以后,请务必清除浏览器缓存再访问站点

    ", - "ssl_help_2":"已为您自动生成Let\'s Encrypt免费证书；", - "ssl_help_3":"如需使用其他SSL,请切换其他证书后粘贴您的KEY以及PEM内容，然后保存即可。", - "ssl_key":"密钥(KEY)", - "ssl_crt":"证书(PEM格式)", - "ssl_close":"关闭SSL", - "bt_bind_no":"未绑定宝塔账号，请注册绑定，绑定宝塔账号(非论坛账号)可实现一键部署SSL", - "bt_user":"宝塔账号", - "login":"登录", - "bt_reg":"注册宝塔账号", - "bt_ssl_help_1":"宝塔SSL证书为亚洲诚信证书，需要实名认证才能申请使用", - "bt_ssl_help_2":"已有宝塔账号请登录绑定", - "bt_ssl_help_3":"宝塔SSL申请的是TrustAsia DV SSL CA - G5 原价：1900元/1年，宝塔用户免费！", - "bt_ssl_help_4":"一年满期后免费颁发。", - "btapply":"申请", - "endtime":"到期时间", - "status":"状态", - "bt_ssl_help_5":"申请之前，请确保域名已解析，如未解析会导致审核失败", - "bt_ssl_help_6":"宝塔SSL申请的是免费版TrustAsia DV SSL CA - G5证书，仅支持单个域名申请", - "bt_ssl_help_7":"有效期1年，不支持续签，到期后需要重新申请", - "bt_ssl_help_8":"Let\'s Encrypt免费证书，有效期3个月，支持多域名。默认会自动续签", - "bt_ssl_help_9":"若您的站点使用了CDN或301重定向会导致续签失败", - "bt_ssl_help_10":"粘贴您的*.key以及*.pem内容，然后保存即可[帮助]。", - "phone_input":"请输入手机号码", - "ssl_apply_1":"正在提交订单，请稍后..", - "ssl_apply_2":"正在校验域名，请稍后..", - "ssl_apply_3":"正在部署证书，请稍后..", - "ssl_apply_4":"正在更新证书，请稍后..", - "lets_help_1":"不用实名认证，浏览器兼容较低，申请存在一定失败率", - "lets_help_2":"let's Encrypt证书有效期为3个月", - "lets_help_3":"3个月有效期后自动续签", - "get_ssl_list":"正在获取证书列表，请稍后..", - "order_success":"订单完成", - "deploy":"部署", - "deployed":"已部署", - "domain_wait":"待域名确认", - "domain_validate":"验证域名", - "domain_check":"请检查域名是否解析到本服务器", - "update_ssl":"更新证书", - "get_ssl_err":"证书获取失败", - "get_ssl_err1":"证书获取失败，返回如下错误信息", - "err_type":"错误类型", - "ssl_close_info":"已关闭SSL,请务必清除浏览器缓存后再访问站点!", - "switch":"切换", - "switch_php_help1":"请根据您的程序需求选择版本", - "switch_php_help2":"若非必要,请尽量不要使用PHP5.2,这会降低您的服务器安全性；", - "switch_php_help3":"PHP7不支持mysql扩展，默认安装mysqli以及mysql-pdo。", - "enable_nodejs":"启用Node.js", - "nodejs_help1":"当前版本为Node.js", - "nodejs_help2":"Node.js可以与PHP共存,但无法与Tomcat共存；", - "nodejs_help3":"若您的Node.js应用中有php脚本,访问时请添加.php扩展名", - "a_n_n":"apache2.2暂不支持Tomcat!", - "enable_tomcat":"启用Tomcat", - "tomcat_help1":"当前版本为Tomcat", - "tomcat_help2":"若您需要其它版本,请到软件管理 - 所有软件 中切换；", - "tomcat_help3":"部署顺序: 安装Tomcat >> 创建站点 >> 上传并配置项目 >> 启用Tomcat", - "tomcat_help4":"若您的tomcat应用中有php脚本,访问时请添加.php扩展名", - "tomcat_help5":"开启成功后,大概需要1-5分钟时间生效!", - "tomcat_err_msg":"您没有安装Tomcat，请先安装!", - "tomcat_err_msg1":"请先安装Tomcat!", - "web_config_help":"此处为站点主配置文件,若您不了解配置规则,请勿随意修改.", - "rewritename":"0.当前", - "template_empty":"模板名称不能为空", - "save_rewrite_temp":"保存为Rewrite模板", - "template_name":"模板名称", - "change_defalut_page":"修改默认页", - "err_404":"404错误页", - "empty_page":"空白页", - "default_page_stop":"默认站点停止页" - }, - - "public":{ - "success":"操作成功!", - "error":"操作失败!", - "add_success":"添加成功!", - "del_success":"删除成功", - "save":"保存", - "edit":"修改", - "edit_ok":"修改成功!", - "edit_err":"修改失败!", - "know":"知道了", - "close":"关闭", - "cancel":"取消", - "ok":"确定", - "empty":"清空", - "submit":"提交", - "exec":"执行", - "script":"脚本", - "log":"日志", - "slow_log":"慢日志", - "del":"删除", - "add":"添加", - "the_get":"正在获取,请稍候...", - "fresh":"刷新", - "config":"正在设置...", - "config_ok":"设置成功!", - "the":"正在处理,请稍候...", - "user":"帐号", - "pass":"密码", - "read":"正在读取,请稍候...", - "pre":"百分比", - "num":"次数", - "byte":"字节", - "input_err":"表单不合法,请重新输入!", - "the_add":"正在添加,请稍候...", - "the_del":"正在删除,请稍候...", - "msg":"提示", - "list_empty":"列表为空!", - "all":"所有", - "upload":"上传", - "download":"下载", - "action":"操作", - "warning":"警告", - "return":"返回", - "help":"帮助", - "list":"列表", - "off":"关闭", - "on":"开启" - } -} diff --git a/class/ajax.py b/class/ajax.py index 6ffbb287..385a9aea 100644 --- a/class/ajax.py +++ b/class/ajax.py @@ -666,9 +666,6 @@ class ajax: else: conf_file = "/www/server/panel/vhost/apache/phpmyadmin.conf" rep = "Listen\s*(\d+)" - # else: - # conf_file = "/www/server/panel/vhost/openlitespeed/listen/888.conf" - # rep = "address\s+\*:(\d+)" return {"conf_file":conf_file,"rep":rep} # 设置phpmyadmin路径 @@ -1063,15 +1060,29 @@ class ajax: #取PHP-FPM日志 def GetFpmLogs(self,get): - path = '/www/server/php/' + get.version + '/var/log/php-fpm.log' - if not os.path.exists(path): return public.returnMsg(False,'AJAX_LOG_FILR_NOT_EXISTS') - return public.returnMsg(True,public.GetNumLines(path,1000)) + import re + fpm_path = '/www/server/php/' + get.version + '/etc/php-fpm.conf' + if not os.path.exists(fpm_path): return public.returnMsg(False,'AJAX_LOG_FILR_NOT_EXISTS') + fpm_conf = public.readFile(fpm_path) + log_tmp = re.findall(r"error_log\s*=\s*(.+)",fpm_conf) + if not log_tmp: return public.returnMsg(False,'AJAX_LOG_FILR_NOT_EXISTS') + log_file = log_tmp[0].strip() + if log_file.find('var/log') == 0: + log_file = '/www/server/php/' +get.version + '/'+ log_file + return public.returnMsg(True,public.GetNumLines(log_file,1000)) #取PHP慢日志 def GetFpmSlowLogs(self,get): - path = '/www/server/php/' + get.version + '/var/log/slow.log' - if not os.path.exists(path): return public.returnMsg(False,'AJAX_LOG_FILR_NOT_EXISTS') - return public.returnMsg(True,public.GetNumLines(path,1000)) + import re + fpm_path = '/www/server/php/' + get.version + '/etc/php-fpm.conf' + if not os.path.exists(fpm_path): return public.returnMsg(False,'AJAX_LOG_FILR_NOT_EXISTS') + fpm_conf = public.readFile(fpm_path) + log_tmp = re.findall(r"slowlog\s*=\s*(.+)",fpm_conf) + if not log_tmp: return public.returnMsg(False,'AJAX_LOG_FILR_NOT_EXISTS') + log_file = log_tmp[0].strip() + if log_file.find('var/log') == 0: + log_file = '/www/server/php/' +get.version + '/'+ log_file + return public.returnMsg(True,public.GetNumLines(log_file,1000)) #取指定日志 def GetOpeLogs(self,get): diff --git a/class/common.py b/class/common.py index 91487102..888c3922 100644 --- a/class/common.py +++ b/class/common.py @@ -34,7 +34,7 @@ class panelSetup: ua = ua.lower() if ua.find('spider') != -1 or ua.find('bot') != -1: return redirect('https://www.google.com') - g.version = '6.6.9' + g.version = '6.7.0' g.title = public.GetConfigValue('title') g.uri = request.path if not os.path.exists('data/debug.pl'): diff --git a/class/db.py b/class/db.py index 3a333b3f..65a1c83b 100644 --- a/class/db.py +++ b/class/db.py @@ -103,7 +103,7 @@ class Sql(): i=0 tmp1 = {} for key in fields: - tmp1[key] = row[i] + tmp1[key.strip('`')] = row[i] i += 1 tmp.append(tmp1) del(tmp1) @@ -127,7 +127,7 @@ class Sql(): import re fields = [] for key in field: - s_as = re.search('\s+as\s+',key,flags=re.IGNORECASE) + s_as = re.search(r'\s+as\s+',key,flags=re.IGNORECASE) if s_as: as_tip = s_as.group() key = key.split(as_tip)[1] @@ -139,13 +139,13 @@ class Sql(): tmp_cols = self.query('PRAGMA table_info('+self.__DB_TABLE+')',()) cols = [] for col in tmp_cols: - if len(col) > 2: cols.append(col[1]) + if len(col) > 2: cols.append('`' + col[1] + '`') if len(cols) > 0: self.__OPT_FIELD = ','.join(cols) def getField(self,keyName): #取回指定字段 try: - result = self.field(keyName).select(); + result = self.field(keyName).select() if len(result) != 0: return result[0][keyName] return result diff --git a/class/files.py b/class/files.py index 273bfe45..7fee576e 100644 --- a/class/files.py +++ b/class/files.py @@ -353,7 +353,7 @@ session.save_handler = files'''.format(path, sess_path, sess_path) size = str(stat.st_size) if os.path.isdir(filePath): dirnames.append(filename+';'+size+';' + - mtime+';'+accept+';'+user+';'+link + ';0;' + self.is_composer_json(filePath)) + mtime+';'+accept+';'+user+';'+link + ';' +self.get_download_id(filePath)+';'+ self.is_composer_json(filePath)) else: filenames.append(filename+';'+size+';'+mtime+';'+accept+';'+user+';'+link+';'+self.get_download_id(filePath)) n += 1 @@ -502,6 +502,27 @@ session.save_handler = files'''.format(path, sess_path, sess_path) filename = filename.replace(tmp_path, '') return filename + ';' + size + ';' + mtime + ';' + accept + ';' + user + ';' + link+';'+ down_url + #获取指定目录下的所有视频或音频文件 + def get_videos(self,args): + path = args.path.strip() + v_data = [] + if not os.path.exists(path): return v_data + import mimetypes + for fname in os.listdir(path): + try: + filename = os.path.join(path,fname) + if not os.path.exists(filename): continue + if not os.path.isfile(filename): continue + v_tmp = {} + v_tmp['name'] = fname + v_tmp['type'] = mimetypes.guess_type(filename)[0] + v_tmp['size'] = os.path.getsize(filename) + if not v_tmp['type'].split('/')[0] in ['video']: + continue + v_data.append(v_tmp) + except:continue + return sorted(v_data,key=lambda x:x['name']) + # 计算文件数量 def GetFilesCount(self, path, search): if os.path.isfile(path): @@ -1814,19 +1835,17 @@ cd %s # 生成下载地址 def create_download_url(self, get): if not os.path.exists(get.filename): - return public.returnMsg(False, 'The specified file does not exist!') - if not os.path.isfile(get.filename): - return public.returnMsg(False, 'Cannot generate download address for directory!') + return public.returnMsg(False,'The specified file does not exist!') my_table = 'download_token' mtime = int(time.time()) pdata = { - "filename": get.filename, # 文件名 - "token": public.GetRandomString(12), # 12位随机密钥，用于URL - "expire": mtime + (int(get.expire) * 3600), # 过期时间 - "ps": get.ps, # 备注 - "total": 0, # 下载计数 - "password": get.password, # 提取密码 - "addtime": mtime # 添加时间 + "filename": get.filename, #文件名 + "token": public.GetRandomString(12), #12位随机密钥，用于URL + "expire": mtime + (int(get.expire) * 3600), #过期时间 + "ps":get.ps, #备注 + "total":0, #下载计数 + "password":str(get.password), #提取密码 + "addtime": mtime #添加时间 } # 更新 or 插入 token = public.M(my_table).where('filename=?', (get.filename,)).getField('token') diff --git a/class/jobs.py b/class/jobs.py index ce9d796a..88929074 100644 --- a/class/jobs.py +++ b/class/jobs.py @@ -46,6 +46,18 @@ def control_init(): `password` REAL, `ps` REAL, `addtime` INTEGER +)''' + sql.execute(csql,()) + + + if not sql.table('sqlite_master').where('type=? AND name=?', ('table', 'messages')).count(): + csql = '''CREATE TABLE IF NOT EXISTS `messages` ( +`id` INTEGER PRIMARY KEY AUTOINCREMENT, +`level` TEXT, +`msg` TEXT, +`state` INTEGER DEFAULT 0, +`expire` INTEGER, +`addtime` INTEGER )''' sql.execute(csql,()) diff --git a/class/panelBackup.py b/class/panelBackup.py index 0937a09a..570cfa49 100644 --- a/class/panelBackup.py +++ b/class/panelBackup.py @@ -19,7 +19,7 @@ import time os.chdir('/www/server/panel') sys.path.insert(0,'class/') import public -_VERSION = 1.3 +_VERSION = 1.4 class backup: _path = None @@ -28,8 +28,7 @@ class backup: _inode_min = 10 _db_mysql = None _cloud = None - _local_backdir = None - _is_save_local = not os.path.exists('data/is_save_local_backup.pl') + _is_save_local = os.path.exists('data/is_save_local_backup.pl') def __init__(self,cloud_object = None): ''' @name 数据备份对象 @@ -196,7 +195,7 @@ class backup: num = len(backups) - int(save) if num > 0: self._get_local_backdir() - self.echo_info('-' * 90) + self.echo_info('-' * 88) for backup in backups: #处理目录备份到远程的情况 if backup['filename'].find('|') != -1: @@ -305,7 +304,7 @@ class backup: filename = dfile if self._cloud: - filename = self._cloud._name + filename = dfile + '|' + self._cloud._name + '|' + fname pdata = { 'type': 0, @@ -326,7 +325,7 @@ class backup: if not self._cloud: backups = public.M('backup').where("type=? and pid=? and filename LIKE '%/%'",('0',pid)).field('id,name,filename').select() else: - backups = public.M('backup').where('type=? and pid=? and filename=?',('0',pid,filename)).field('id,name,filename').select() + backups = public.M('backup').where('type=? and pid=? and filename LIKE "%{}%"'.format(self._cloud._name),('0',pid)).field('id,name,filename').select() self.delete_old(backups,save,'site') self.echo_end() @@ -425,7 +424,7 @@ class backup: filename = dfile if self._cloud: - filename = self._cloud._name + filename = dfile + '|' + self._cloud._name + '|' + fname self.echo_info("Database has been backed up to: {}".format(dfile)) if os.path.exists(self._err_log): os.remove(self._err_log) @@ -452,9 +451,7 @@ class backup: if not self._cloud: backups = public.M('backup').where("type=? and pid=? and filename LIKE '%/%'",('1',pid)).field('id,name,filename').select() else: - backups = public.M('backup').where('type=? and pid=? and filename=?',('1',pid,filename)).field('id,name,filename').select() - - self.echo_info(str(backups)) + backups = public.M('backup').where('type=? and pid=? and filename LIKE "%{}%"'.format(self._cloud._name),('1',pid)).field('id,name,filename').select() self.delete_old(backups,save,'database') self.echo_end() return dfile diff --git a/class/panelMessage.py b/class/panelMessage.py new file mode 100644 index 00000000..882a7d28 --- /dev/null +++ b/class/panelMessage.py @@ -0,0 +1,134 @@ +#coding: utf-8 +# +------------------------------------------------------------------- +# | 宝塔Linux面板 +# +------------------------------------------------------------------- +# | Copyright (c) 2015-2099 宝塔软件(http://bt.cn) All rights reserved. +# +------------------------------------------------------------------- +# | Author: 黄文良 <2020-05-18> +# +------------------------------------------------------------------- + +# +------------------------------------------------------------------- +# | 消息提醒 +# +------------------------------------------------------------------- +import os,sys,time +import public +class panelMessage: + + + def __init__(self): + pass + + def get_messages(self,args = None): + ''' + @name 获取消息列表 + @author 黄文良 <2020-05-18> + @return list + ''' + data = public.M('messages').where('state=? and expire>?',(1,int(time.time()))).order("id desc").select() + return data + + def get_messages_all(self,args = None): + ''' + @name 获取所有消息列表 + @author 黄文良 <2020-05-18> + @return list + ''' + data = public.M('messages').order("id desc").select() + return data + + def get_message_find(self,args = None,id = None): + ''' + @name 获取指定消息 + @author 黄文良 <2020-05-18> + @param args dict_obj{ + id: 消息标识 + } + @return dict + ''' + if args: + id = int(args.id) + data = public.M('messages').where('id=?',id).find() + return data + + + def create_message(self,args = None,level=None,msg=None,expire=None): + ''' + @name 创建新的消息 + @author 黄文良 <2020-05-18> + @param args dict_obj{ + level: 消息级别(info/warning/danger/error), + msg: 消息内容 + expire: 过期时间 + } + @return dict + ''' + if args: + level = args.level + msg = args.msg + expire = args.expire + pdata = { + "level":level, + "msg":msg, + "state":1, + "expire":int(time.time()) + (int(expire) * 86400), + "addtime": int(time.time()) + } + + public.M('messages').insert(pdata) + return public.returnMsg(True,'Created successfully!') + + def status_message(self,args = None,id = None,state = None): + ''' + @name 设置消息状态 + @author 黄文良 <2020-05-18> + @param args dict_obj{ + id: 消息标识, + state: 消息状态(0.已忽略, 1.正常) + } + @return dict + ''' + if args: + id = int(args.id) + state = int(args.state) + public.M('messages').where('id=?',id).setField('state',state) + return public.returnMsg(True,'Set up successfully!') + + + def remove_message(self,args = None,id = None): + ''' + @name 删除指定消息 + @author 黄文良 <2020-05-18> + @param args dict_obj{ + id: 消息标识 + } + @return dict + ''' + if args: + id = int(args.id) + public.M('messages').where('id=?',id).delete() + return public.returnMsg(True,'Successfully deleted!') + + def remove_message_level(self,level): + ''' + @name 删除指定消息 + @author 黄文良 <2020-05-18> + @param level string(指定级别或标识) + @return bool + ''' + public.M('messages').where('(level=? or level=? or level=? or level=?) and state=?',(level,level+'15',level+'7',level+'3',1)).delete() + return True + + def is_level(self,level): + ''' + @name 指定消息是否忽略 + @author 黄文良 <2020-05-18> + @param level string(指定级别或标识) + @return bool + ''' + if public.M('messages').where('level=? and state=?',(level,0)).count(): + return False + else: + return True + + + diff --git a/class/panelPlugin.py b/class/panelPlugin.py index 3a71de32..91b8ddd5 100644 --- a/class/panelPlugin.py +++ b/class/panelPlugin.py @@ -82,6 +82,7 @@ class panelPlugin: names = dep.split('|') for name in names: pluginInfo = self.get_soft_find(name) + if not pluginInfo: return True if pluginInfo['setup'] == True: status = True break @@ -330,6 +331,7 @@ class panelPlugin: if softList: public.writeFile(lcoalTmp,json.dumps(softList)) public.ExecShell('rm -f /tmp/bmac_*') self.getCloudPHPExt(get) + self.expire_msg(softList) try: public.writeFile("/tmp/" + cache.get('p_token'),str(softList['pro'])) except:pass @@ -353,6 +355,78 @@ class panelPlugin: softList['list'] = tmpList return softList + #取提醒标记 + def get_level_msg(self,level,s_time,endtime): + ''' + level 提醒标记 + s_time 当前时间戳 + endtime 到期时间戳 + ''' + expire_day = (endtime - s_time) / 86400 + if expire_day < 15 and expire_day > 7: + level = level + '15' + elif expire_day < 7 and expire_day > 3: + level = level + '7' + elif expire_day < 3 and expire_day > 0: + level = level + '3' + return level,expire_day + + #添加到期提醒 + def add_expire_msg(self,title,level,name,expire_day,pid,endtime): + ''' + title 软件标题 + level 提醒标记 + name 软件名称 + expire_day 剩余天数 + ''' + import panelMessage #引用消息提醒模块 + pm = panelMessage.panelMessage() + pm.remove_message_level(level) #删除旧的提醒 + if expire_day > 15: return False + if pm.is_level(level): #是否忽略 + if level != name: #到期还是即将到期 + msg_last = '您的【{}】授权还有{}天到期'.format(title,int(expire_day)) + else: + msg_last = '您的【{}】授权已到期'.format(title) + pl_msg = 'true' + if name in ['pro','ltd']: + pl_msg = 'false' + renew_msg = '立即续费' % (title,pid,name,pl_msg,endtime) + pm.create_message(level=level,expire=7,msg="{}，为了不影响您正常使用【{}】功能，请及时续费，{}".format(msg_last,title,renew_msg)) + return True + return False + + #到期提醒 + def expire_msg(self,data): + ''' + data 插件列表 + ''' + s_time = time.time() + is_plugin = True + #企业版到期提醒 + if not data['ltd'] in [-1]: + level,expire_day = self.get_level_msg('ltd',s_time,data['ltd']) + self.add_expire_msg('企业版',level,'ltd',expire_day,100000032,data['ltd']) + return True + + #专业版到期提醒 + if not data['pro'] in [-1,0]: + level,expire_day = self.get_level_msg('pro',s_time,data['pro']) + self.add_expire_msg('专业版',level,'pro',expire_day,100000011,data['pro']) + is_plugin = False + + #单独购买的插件到期提醒 + for p in data['list']: + #跳过非企业版或专业版插件 + if not p['type'] in [8,12]: continue + #已经是专业版的情况下跳过专业版插件 + if not is_plugin and p['type'] == 8: continue + if not p['endtime'] in [-1,0]: + level,expire_day = self.get_level_msg(p['name'],s_time,p['endtime']) + self.add_expire_msg(p['title'],level,p['name'],expire_day,p['pid'],p['endtime']) + return True + + #提交用户评分 def set_score(self,args): try: @@ -1484,7 +1558,7 @@ class panelPlugin: phpport = '888' if os.path.exists(configFile): conf = public.readFile(configFile) - rep = "listen\s+([0-9]+)\s*;" + rep = r"listen\s+([0-9]+)\s*;" rtmp = re.search(rep,conf) if rtmp: phpport = rtmp.groups()[0] @@ -1494,23 +1568,23 @@ class panelPlugin: configFile = setupPath + '/nginx/conf/enable-php.conf' if not os.path.exists(configFile): public.writeFile(configFile,public.readFile(setupPath + '/nginx/conf/enable-php-54.conf')) conf = public.readFile(configFile) - rep = "php-cgi-([0-9]+)\.sock" + rep = r"php-cgi-([0-9]+)\.sock" rtmp = re.search(rep,conf) if rtmp: phpversion = rtmp.groups()[0] else: - rep = "php-cgi.*\.sock" + rep = r"php-cgi.*\.sock" public.writeFile(configFile,conf) phpversion = '54' configFile = setupPath + '/apache/conf/extra/httpd-vhosts.conf' if os.path.exists(configFile): conf = public.readFile(configFile) - rep = "php-cgi-([0-9]+)\.sock" + rep = r"php-cgi-([0-9]+)\.sock" rtmp = re.search(rep,conf) if rtmp: phpversion = rtmp.groups()[0] - rep = "Listen\s+([0-9]+)\s*\n" + rep = r"Listen\s+([0-9]+)\s*\n" rtmp = re.search(rep,conf) if rtmp: phpport = rtmp.groups()[0] @@ -1572,20 +1646,20 @@ class panelPlugin: phpfpm = public.readFile(file) data = {} try: - rep = "upload_max_filesize\s*=\s*([0-9]+)M" + rep = r"upload_max_filesize\s*=\s*([0-9]+)M" tmp = re.search(rep,phpini).groups() data['max'] = tmp[0] except: data['max'] = '50' try: - rep = "request_terminate_timeout\s*=\s*([0-9]+)\n" + rep = r"request_terminate_timeout\s*=\s*([0-9]+)\n" tmp = re.search(rep,phpfpm).groups() data['maxTime'] = tmp[0] except: data['maxTime'] = 0 try: - rep = u"\n;*\s*cgi\.fix_pathinfo\s*=\s*([0-9]+)\s*\n" + rep = r"\n;*\s*cgi\.fix_pathinfo\s*=\s*([0-9]+)\s*\n" tmp = re.search(rep,phpini).groups() if tmp[0] == '1': diff --git a/class/panelSite.py b/class/panelSite.py index efc16f14..56f84896 100644 --- a/class/panelSite.py +++ b/class/panelSite.py @@ -226,6 +226,8 @@ class panelSite(panelRedirect): urlrewriteFile = urlrewritePath+'/'+self.siteName+'.conf' if not os.path.exists(urlrewritePath): os.makedirs(urlrewritePath) open(urlrewriteFile,'w+').close() + if not os.path.exists(urlrewritePath): + public.writeFile(urlrewritePath,'') return True #重新生成nginx配置文件 diff --git a/class/panelVideo.py b/class/panelVideo.py new file mode 100644 index 00000000..fb730dcf --- /dev/null +++ b/class/panelVideo.py @@ -0,0 +1,68 @@ +#coding: utf-8 +# +------------------------------------------------------------------- +# | 宝塔Linux面板 +# +------------------------------------------------------------------- +# | Copyright (c) 2015-2099 宝塔软件(http://bt.cn) All rights reserved. +# +------------------------------------------------------------------- +# | Author: 黄文良 <2020-05-18> +# +------------------------------------------------------------------- + +# +------------------------------------------------------------------- +# | 流媒体模块 +# +------------------------------------------------------------------- + +import os,sys,re +import mimetypes +import public +from BTPanel import Response + +def get_buff_size(file_size): + buff_size = 2097152 + if file_size < 104857600: + buff_size = 2097152 + elif file_size < 524288000: + buff_size = 4194304 + elif file_size < 1073741824: + buff_size = 8388608 + else: + buff_size = 10485760 + return buff_size + +def partial_response(path, start, end=None): + if not os.path.exists(path): + return Response("file not fount!",404) + file_size = os.path.getsize(path) + buff_size = get_buff_size(file_size) + + if end is None: + end = start + buff_size - 1 + end = min(end, file_size - 1) + end = min(end, start + buff_size - 1) + length = end - start + 1 + + with open(path, 'rb') as fd: + fd.seek(start) + bytes = fd.read(length) + assert len(bytes) == length + + response = Response(bytes,206,mimetype=mimetypes.guess_type(path)[0],direct_passthrough=True,) + response.headers.add('Content-Range', 'bytes {0}-{1}/{2}'.format(start, end, file_size,),) + response.headers.add('Accept-Ranges', 'bytes') + return response + +def get_range(request): + range = request.headers.get('Range') + m = None + if range: + m = re.match(r'bytes=(?P\d+)-(?P\d+)?', range) + if m: + start = m.group('start') + end = m.group('end') + start = int(start) + if end is not None: + end = int(end) + return start, end + else: + return 0, None + + diff --git a/class/panelWaf.py b/class/panelWaf.py index 902d2d43..37fa019a 100644 --- a/class/panelWaf.py +++ b/class/panelWaf.py @@ -1,151 +1,49 @@ #!/usr/bin/python #coding: utf-8 +# Author: <梁凯强>1249648969@qq.com +# panelWaf.py +# code: 面板基础安全类 # +------------------------------------------------------------------- -# | 宝塔Linux面板 -# +------------------------------------------------------------------- -# | Copyright (c) 2015-2017 宝塔软件(http:#bt.cn) All rights reserved. -# +------------------------------------------------------------------- -# | Author: 黄文良 <287962566@qq.com> -# +------------------------------------------------------------------- - import re,json,sys,public,os -class panelWaf: - __ConfigFile = '/www/server/nginx/waf/config.lua' - __WafConfigPath = '/www/server/panel/vhost/wafconf' - #获取配置项 - def GetConfig(self,get): - data = {} - try: - conf = public.readFile(self.__ConfigFile); - configs = ["attacklog","UrlDeny","Redirect","CookieMatch","postMatch","whiteModule","CCDeny","CCrate"]; - #遍历单一配置 - for key in configs: - rep = key + "\s*=\s*\"([\w\/]+)\"\s*\n" - data[key] = re.search(rep,conf).groups()[0] - #遍历列表 - configs = ["black_fileExt","ipWhitelist","ipBlocklist"]; - for key in configs: - rep = key + "\s*=\s*(.+)\n"; - data[key] = json.loads(re.search(rep,conf).groups()[0].replace("{","[").replace("}","]")); - - get.name = 'whiteurl'; - data['uriWhite'] = self.GetWafConf(get); - except: - pass; - data['status'] = self.GetStatus(); - return data; - - #取状态 - def GetStatus(self): - path = "/www/server/nginx/conf/nginx.conf"; - if not os.path.exists(path): return public.returnMsg(False,'WAF_NOT_NGINX'); - conf = public.readFile(path); - status = 1; - if conf.find("#include luawaf.conf;") != -1: status = 0; - if conf.find("luawaf.conf;") == -1: status = -1; - return status; - - #更新规则 - def updateWaf(self,get): - names = ['args','cookie','post','url','user-agent']; - furl = 'http://download.bt.cn/install/waf/wafconf' - fpath = '/www/server/panel/vhost/wafconf' - for name in names: - public.downloadFile(furl + '/' + name,fpath + '/' + name); - public.serviceReload(); - return public.returnMsg(True,'WAF_UPDATE') - - #设置状态 - def SetStatus(self,get): - path = "/www/server/nginx/conf/nginx.conf"; - if not os.path.exists(path): return public.returnMsg(False,'WAF_NOT_NGINX'); - conf = public.readFile(path); - status = self.GetStatus() - if status == -1: return public.returnMsg(False,'WAF_NOT_NGINX_VERSION'); - if status == 0: - conf = conf.replace('#include luawaf.conf;',"include luawaf.conf;"); - else: - conf = conf.replace('include luawaf.conf;',"#include luawaf.conf;"); - - public.writeFile(path,conf); - public.serviceReload(); - return public.returnMsg(True,"SET_SUCCESS"); - - - - #设置配置项 - def SetConfigString(self,get): - conf = public.readFile(self.__ConfigFile); - rep = get.name + "\s*=\s*\"[\w\/]+\"\s*\n" - conf = re.sub(rep,get.name + '="' + get.value.strip() + '"\n',conf) - public.writeFile(self.__ConfigFile,conf); - public.serviceReload(); - return public.returnMsg(True,"SET_SUCCESS"); - - #设置配置项列表 - def SetConfigList(self,get): - conf = public.readFile(self.__ConfigFile); - rep = get.name + "\s*=\s*(.+)\n"; - keyList = json.loads(re.search(rep,conf).groups()[0].replace("{","[").replace("}","]")); - if get.name != 'black_fileExt': - rep2 = "\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}"; - if not re.search(rep2,get.value): return public.returnMsg(False,"WAF_CONF_ERR"); - if get.act == 'del': - if not get.value in keyList: return public.returnMsg(False,"WAF_CONF_NOT_EXISTS"); - tmp = [] - for t in keyList: - if t == get.value: continue; - tmp.append(t); - keyList = tmp; - else: - if get.value in keyList:return public.returnMsg(False,"WAF_CONF_EXISTS"); - keyList.append(get.value.strip()); - keyStr = json.dumps(keyList).replace("[","{").replace("]","}"); - conf = re.sub(rep,get.name + "=" + keyStr + "\n",conf); - public.writeFile(self.__ConfigFile,conf); - public.serviceReload(); - return public.returnMsg(True,"SUCCESS"); - - #获取指定规则列表 - def GetWafConf(self,get): - path = self.__WafConfigPath + '/' + get.name; - if not os.path.exists(path): return public.returnMsg(False,"WAF_CONF_NOT_EXISTS"); - data = public.readFile(path).split("\n") - return data; - - #设置指定规则列表 - def SetWafConf(self,get): - path = self.__WafConfigPath + '/' + get.name; - if not os.path.exists(path): return public.returnMsg(False,"WAF_CONF_NOT_EXISTS"); - data = public.readFile(path).split("\n") - if get.act == "del": - if not get.value in data: return public.returnMsg(False,"WAF_CONF_NOT_EXISTS"); - tmp = [] - for t in data: - if get.value == t: continue; - tmp.append(t); - data = tmp; - else: - if get.value in data: return public.returnMsg(False,"WAF_CONF_EXISTS"); - data.append(get.value); - conf = "" - - for v in data: - conf += v + "\n"; - - public.writeFile(path,conf[:-1]); - public.serviceReload(); - return public.returnMsg(True,"SUCCESS"); - - #取日志 - - +flag_file='/www/server/panel/data/tmp1.json' -if __name__ == "__main__": - if len(sys.argv) > 1: - p = panelWaf(); - if sys.argv[1] == 'add' or sys.argv[1] == 'del': - print p.SetConfigList(sys.argv[2],sys.argv[3],sys.argv[1]); - else: - print p.SetConfigString(sys.argv[1],sys.argv[2]); - print GetConfig(); \ No newline at end of file +try: + import libinjection +except: + if not os.path.exists(flag_file): + public.WriteFile(flag_file,'1') + else: + count_size=public.ReadFile(flag_file) + if count_size.strip().isdigit(): + if int(count_size.strip())>= 5: + exit(False) + else: + public.WriteFile(flag_file, str(int(count_size.strip())+1)) + else:public.WriteFile(flag_file,'1') + if os.path.exists('/www/server/panel/pyenv/bin/python3'): + public.ExecShell('/www/server/panel/pyenv/bin/pip install Cython') + public.ExecShell('/www/server/panel/pyenv/bin/pip install libinjection-python') + else: + public.ExecShell('pip install Cython') + public.ExecShell('pip install libinjection-python') + +class panelWaf: + ##json_data => {"username":"admin","password":"123456!@#$%%^"} + def is_sql(self,json_data): + for i in json_data: + try: + if type(json_data[i])==str: + if libinjection.is_sql_injection(json_data[i])['is_sqli']: + return True + except:continue + else:return False + + ##json_data => {"username":"admin","password":"123456!@#$%%^"} + def is_xss(self,json_data): + for i in json_data: + try: + if type(json_data[i]) == str: + if libinjection.is_xss(json_data[i])['is_xss']: + return True + except:continue + else:return False \ No newline at end of file diff --git a/class/php_info.php b/class/php_info.php index 663e6db9..bf20f4c6 100644 --- a/class/php_info.php +++ b/class/php_info.php @@ -40,7 +40,7 @@ function get_info(){ //文件与字符串处理库 $data['5io_string'] = array(); $data['5io_string']['Xmlrpc'] = get_extension_funcs('xmlrpc')?true:false; - $data['5io_string']['FileInfo'] = get_extension_funcs('fileinfo')?true:false; + $data['5io_string']['FileInfo'] = in_array('fileinfo',$data['modules'])?true:false; $data['5io_string']['Ftp'] = get_extension_funcs('ftp')?true:false; $data['5io_string']['Mbstring'] = get_extension_funcs('mbstring')?true:false; $data['5io_string']['bz2'] = in_array('bz2',$data['modules']); diff --git a/class/public.py b/class/public.py index ac936960..5a396e46 100644 --- a/class/public.py +++ b/class/public.py @@ -239,7 +239,7 @@ def GetJson(data): from json import dumps if data == bytes: data = data.decode('utf-8') try: - return dumps(data) + return dumps(data,ensure_ascii=False) except: return dumps(returnMsg(False,"Wrong response: %s" % str(data))) @@ -665,6 +665,7 @@ def getPanelAddr(): # 字节单位转换 def to_size(size): + if not size: return '0.00 b' size = float(size) d = ('b','KB','MB','GB','TB') s = d[0] @@ -1307,12 +1308,13 @@ def set_own(filename, user, group=None): return True #校验路径安全 -def path_safe_check(path): - checks = ['..', './', '\\', '%', '$', '^', '&', '*', '~', '@', '#'] +def path_safe_check(path,force=True): + checks = ['..','./','\\','%','$','^','&','*','~','#','"',"'",';','|','{','}','`'] for c in checks: if path.find(c) != -1: return False - rep = r"^[\w\s\.\/-]+$" - if not re.match(rep,path): return False + if force: + rep = r"^[\w\s\.\/-]+$" + if not re.match(rep,path): return False return True #取数据库字符集 @@ -1629,9 +1631,12 @@ def import_cdn_plugin(): def get_cdn_hosts(): - if import_cdn_plugin(): return [] - import static_cdn_main - return static_cdn_main.static_cdn_main().get_hosts(None) + try: + if import_cdn_plugin(): return [] + import static_cdn_main + return static_cdn_main.static_cdn_main().get_hosts(None) + except: + return [] def get_cdn_url(): try: diff --git a/class/setPanelLets.py b/class/setPanelLets.py index e2d60a08..f133262f 100644 --- a/class/setPanelLets.py +++ b/class/setPanelLets.py @@ -203,6 +203,6 @@ class setPanelLets: self.__save_cert_source(domain, get.email) return public.returnMsg(True, 'Panel lets set successfully') else: - return create_lets + return public.returnMsg(False, create_lets) else: - return create_site + return public.returnMsg(False, create_site)