WEBDIENSTE/aaPanel
1
0
Fork 0
mirror of https://github.com/aaPanel/aaPanel.git synced 2026-09-22 09:24:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

v6.8.4

Browse Source 
1. After the update, the software and panel directory permissions will be set to strict mode (it will be restored automatically after modification)
2. Increase the panel comprehensive anti-riot mechanism
3. Enhance the security of the panel session<br>
4. Enhanced panel entry verification mechanism
5. Optimize the terminal
6. Optimize the panel memory release mechanism
Note 1: Version 6.8.2/6.9.11 has security issues, please be sure to upgrade to the latest version
Note 2: After this update is successful, it will automatically log out and you need to log in again
This commit is contained in:
jose
2020-09-01 16:24:02 +08:00
parent 32cc87c132
commit 5e2cbf9a5c
51 changed files with 5641 additions and 1719 deletions
Download Patch File Download Diff File Expand all files Collapse all files
class/system.py
+17 -11
View File
@@ -12,19 +12,19 @@ try:
except:
pass
class system:
setupPath = None;
setupPath = None
ssh = None
shell = None
def __init__(self):
self.setupPath = public.GetConfigValue('setup_path');
self.setupPath = public.GetConfigValue('setup_path')
def GetConcifInfo(self,get=None):
#取环境配置信息
if not 'config' in session:
session['config'] = public.M('config').where("id=?",('1',)).field('webserver,sites_path,backup_path,status,mysql_root').find();
session['config'] = public.M('config').where("id=?",('1',)).field('webserver,sites_path,backup_path,status,mysql_root').find()
if not 'email' in session['config']:
session['config']['email'] = public.M('users').where("id=?",('1',)).getField('email');
session['config']['email'] = public.M('users').where("id=?",('1',)).getField('email')
data = {}
data = session['config']
data['webserver'] = session['config']['webserver']
@@ -66,8 +66,8 @@ class system:
if rtmp:
phpport = rtmp.groups()[0]
if conf.find('AUTH_START') != -1: pauth = True;
if conf.find(self.setupPath + '/stop') == -1: pstatus = True;
if conf.find('AUTH_START') != -1: pauth = True
if conf.find(self.setupPath + '/stop') == -1: pstatus = True
configFile = self.setupPath + '/nginx/conf/enable-php.conf'
conf = public.readFile(configFile)
rep = "php-cgi-([0-9]+)\.sock"
@@ -75,7 +75,7 @@ class system:
if rtmp:
phpversion = rtmp.groups()[0]
except:
pass;
pass
elif os.path.exists(self.setupPath+'/apache'):
data['webserver'] = 'apache'
@@ -93,8 +93,8 @@ class system:
rtmp = re.search(rep,conf)
if rtmp:
phpport = rtmp.groups()[0]
if conf.find('AUTH_START') != -1: pauth = True;
if conf.find(self.setupPath + '/stop') == -1: pstatus = True;
if conf.find('AUTH_START') != -1: pauth = True
if conf.find(self.setupPath + '/stop') == -1: pstatus = True
except:
pass
elif os.path.exists('/usr/local/lsws/bin/lswsctrl'):
@@ -480,10 +480,16 @@ class system:
ntime = time.time()
networkInfo = {}
up = cache.get('up')
down = cache.get('down')
if not up:
up = networkIo[0]
if not down:
down = networkIo[1]
networkInfo['upTotal'] = networkIo[0]
networkInfo['downTotal'] = networkIo[1]
networkInfo['up'] = round(float(networkIo[0] - cache.get("up")) / 1024 / (ntime - otime),2)
networkInfo['down'] = round(float(networkIo[1] - cache.get("down")) / 1024 / (ntime - otime),2)
networkInfo['up'] = round(float(networkIo[0] - up) / 1024 / (ntime - otime),2)
networkInfo['down'] = round(float(networkIo[1] - down) / 1024 / (ntime - otime),2)
networkInfo['downPackets'] =networkIo[3]
networkInfo['upPackets'] =networkIo[2]