mirror of
https://github.com/aaPanel/aaPanel.git
synced 2026-08-17 21:25:47 +02:00
Update to 7.7.0
Since version 7.7.0, we recommend yours update python to 3.12. [+] Using nginx technology to load static files improves access speed [+] Refactor homepage, website, FTP, and database using vue3 [+] Table loading changed to skeleton screen [+] Add Website statistics-v2 professional plug-in [+] Add Home page - top 5 resource occupancy [+] Add protection for Files management (requires Tamper-proof for Enterprise 3.7) [+] Website, FTP, Databases page add program status [+] Add FTP log analysis (only supports Centos) [+] Add password-free login to phpMyAdmin [+] Add Proxy Project in Website (Supported when web service uses Nginx) [+] Add WP Toolkit (Pro version only) [+] Redesigned Docker module [+] Add WP Toolkit Protection [+] Add WP Toolkit Backup and Restore [+] Add WP Toolkit Migrated [+] Add WP Toolkit Clone site (supports new domain and subdomain) [+] Add WP Toolkit Create site from backup of other panel [+] Add WP Toolkit support for Cron automatic backup (only save Local disk) [+] Add WP Toolkit operation log [+] Add Integrity check for WP Toolkit [+] Add WP Toolkit plug-in management and themes management [*] Optimize phpMyAdmin formula access method [*] Optimize Home page PHP display problem [*] Optimize jump to the login interface after the login expires [*] Optimize automatic renewal of SSL at some times [*] Optimize Let's Encrypt to increase application success rate [-] Fix Logs Audit cannot be opened [-] Fix apache URL rewrite issue [-] Fix phpmyadmin installation problem [-] Fix the problem that some servers cannot install software [-] Fix upload file error [-] Fix left menu hiding problem [-] Fix aaPanel Mobile QR code display problem [-] Fix problem that third-party plug-ins are not displayed in the App Store [-] Fix issue where the menu bar is blank when opening new tabs [-] Fixed panel not being accessible in some cases [-] Fix the issue where Curl warning caused the inability to apply for SSL [-] Fix Quota issues for Website, FTP, Databases [-] Fix file interface display problem on mobile terminal
This commit is contained in:
Jack
+16
-16
@@ -1,10 +1,10 @@
|
||||
#coding: utf-8
|
||||
#-------------------------------------------------------------------
|
||||
# 宝塔Linux面板
|
||||
# aaPanel
|
||||
#-------------------------------------------------------------------
|
||||
# Copyright (c) 2015-2020 宝塔软件(http:#bt.cn) All rights reserved.
|
||||
# Copyright (c) 2015-2020 aaPanel(www.aapanel.com) All rights reserved.
|
||||
#-------------------------------------------------------------------
|
||||
# Author: zhwen <zhw@bt.cn>
|
||||
# Author: zhwen <zhw@aapanel.com>
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
#------------------------------
|
||||
@@ -24,7 +24,7 @@ class PhpExecuteDeny:
|
||||
def get_php_deny(self,args):
|
||||
'''
|
||||
# 添加某个网站禁止运行PHP
|
||||
author: zhwen<zhw@bt.cn>
|
||||
author: zhwen<zhw@aapanel.com>
|
||||
:param args: website 网站名 str
|
||||
:return:
|
||||
'''
|
||||
@@ -45,7 +45,7 @@ class PhpExecuteDeny:
|
||||
deny_name = [i.split('_')[-1] for i in data]
|
||||
result = []
|
||||
for i in deny_name:
|
||||
reg = '#BEGIN_DENY_{}\n\s*location\s*\~\*\s*\^(.*)\.\*.*\((.*)\)\$'.format(i)
|
||||
reg = '#BEGIN_DENY_{}\n\\s*location\\s*\\~\\*\\s*\\^(.*)\\.\\*.*\\((.*)\\)\\$'.format(i)
|
||||
deny_directory = re.search(reg,conf).groups()[0]
|
||||
deny_suffix = re.search(reg,conf).groups()[1]
|
||||
result.append({'name':i,'dir':deny_directory,'suffix':deny_suffix})
|
||||
@@ -59,7 +59,7 @@ class PhpExecuteDeny:
|
||||
deny_name = [i.split('_')[-1] for i in data]
|
||||
result = []
|
||||
for i in deny_name:
|
||||
reg = '#BEGIN_DENY_{}\n\s*<Directory\s*\~\s*"(.*)\.\*.*\((.*)\)\$'.format(i)
|
||||
reg = '#BEGIN_DENY_{}\n\\s*<Directory\\s*\\~\\s*"(.*)\\.\\*.*\\((.*)\\)\\$'.format(i)
|
||||
deny_directory = re.search(reg,conf).groups()[0]
|
||||
deny_suffix = re.search(reg,conf).groups()[1]
|
||||
result.append({'name':i,'dir':deny_directory,'suffix':deny_suffix})
|
||||
@@ -73,7 +73,7 @@ class PhpExecuteDeny:
|
||||
deny_name = [i.split('_')[-1] for i in data]
|
||||
result = []
|
||||
for i in deny_name:
|
||||
reg = '#BEGIN_DENY_{}\n\s*rules\s*RewriteRule\s*\^(.*)\.\*.*\((.*)\)\$'.format(i)
|
||||
reg = '#BEGIN_DENY_{}\n\\s*rules\\s*RewriteRule\\s*\\^(.*)\\.\\*.*\\((.*)\\)\\$'.format(i)
|
||||
deny_directory = re.search(reg, conf).groups()[0]
|
||||
deny_suffix = re.search(reg,conf).groups()[1]
|
||||
result.append({'name':i,'dir':deny_directory,'suffix':deny_suffix})
|
||||
@@ -82,7 +82,7 @@ class PhpExecuteDeny:
|
||||
def set_php_deny(self,args):
|
||||
'''
|
||||
# 添加某个网站禁止运行PHP
|
||||
author: zhwen<zhw@bt.cn>
|
||||
author: zhwen<zhw@aapanel.com>
|
||||
:param args: website 网站名 str
|
||||
:param args: deny_name 规则名称 str
|
||||
:param args: suffix 禁止访问的后续名 str
|
||||
@@ -122,7 +122,7 @@ class PhpExecuteDeny:
|
||||
if not conf:
|
||||
return False
|
||||
if not dir and not suffix:
|
||||
reg = '\s*#BEGIN_DENY_{n}\n(.|\n)*#END_DENY_{n}\n'.format(n=name)
|
||||
reg = '\\s*#BEGIN_DENY_{n}\n(.|\n)*#END_DENY_{n}\n'.format(n=name)
|
||||
conf = re.sub(reg,'',conf)
|
||||
else:
|
||||
new = '''
|
||||
@@ -143,10 +143,10 @@ class PhpExecuteDeny:
|
||||
if not conf:
|
||||
return False
|
||||
if not dir and not suffix:
|
||||
reg = '\s*#BEGIN_DENY_{n}\n(.|\n)*#END_DENY_{n}'.format(n=name)
|
||||
reg = '\\s*#BEGIN_DENY_{n}\n(.|\n)*#END_DENY_{n}'.format(n=name)
|
||||
conf = re.sub(reg,'',conf)
|
||||
else:
|
||||
new = '''
|
||||
new = r'''
|
||||
#BEGIN_DENY_{n}
|
||||
<Directory ~ "{d}.*\.(s)$">
|
||||
Order allow,deny
|
||||
@@ -156,7 +156,7 @@ class PhpExecuteDeny:
|
||||
'''.format(n=name,d=dir,s=suffix)
|
||||
if '#BEGIN_DENY_{}'.format(name) in conf:
|
||||
return True
|
||||
conf = re.sub('#DENY\s*FILES',new+'\n #DENY FILES',conf)
|
||||
conf = re.sub(r'#DENY\s*FILES',new+'\n #DENY FILES',conf)
|
||||
public.writeFile(self.ap_website_conf,conf)
|
||||
return True
|
||||
|
||||
@@ -165,17 +165,17 @@ class PhpExecuteDeny:
|
||||
if not conf:
|
||||
return False
|
||||
if not dir and not suffix:
|
||||
reg = '#BEGIN_DENY_{n}\n(.|\n)*#END_DENY_{n}\s*'.format(n=name)
|
||||
reg = '#BEGIN_DENY_{n}\n(.|\n)*#END_DENY_{n}\\s*'.format(n=name)
|
||||
conf = re.sub(reg,'',conf)
|
||||
else:
|
||||
new = '''
|
||||
new = r'''
|
||||
#BEGIN_DENY_{n}
|
||||
rules RewriteRule ^{d}.*\.({s})$ - [F,L]
|
||||
#END_DENY_{n}
|
||||
'''.format(n=name,d=dir,s=suffix)
|
||||
if '#BEGIN_DENY_{}'.format(name) in conf:
|
||||
return True
|
||||
conf = re.sub('autoLoadHtaccess\s*1','autoLoadHtaccess 1'+new,conf)
|
||||
conf = re.sub(r'autoLoadHtaccess\s*1','autoLoadHtaccess 1'+new,conf)
|
||||
public.writeFile(self.ols_website_conf,conf)
|
||||
return True
|
||||
|
||||
@@ -183,7 +183,7 @@ class PhpExecuteDeny:
|
||||
def del_php_deny(self,args):
|
||||
'''
|
||||
# 添加某个网站禁止运行PHP
|
||||
author: zhwen<zhw@bt.cn>
|
||||
author: zhwen<zhw@aapanel.com>
|
||||
:param args: website 网站名 str
|
||||
:param args: deny_name 规则名称 str
|
||||
:return:
|
||||
|
||||
Reference in New Issue
Block a user