mirror of
https://github.com/aaPanel/aaPanel.git
synced 2026-09-30 13:24:50 +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
@@ -0,0 +1,135 @@
|
||||
import os
|
||||
import time
|
||||
from hashlib import md5
|
||||
from typing import Optional, List, Union, Dict, Any
|
||||
|
||||
from .util import DB, ExecShell, write_file, write_log
|
||||
from .versions_tool import VersionTool
|
||||
|
||||
|
||||
class BackupTool:
|
||||
|
||||
def __init__(self):
|
||||
self._backup_path: Optional[str] = None
|
||||
self._sub_dir_name: str = ""
|
||||
self.exec_log_file = "/tmp/mod_backup_exec.log"
|
||||
|
||||
@staticmethod
|
||||
def _hash_src_name(name: Union[str, bytes]) -> str:
|
||||
if isinstance(name, str):
|
||||
name = name.encode('utf-8')
|
||||
md5_obj = md5()
|
||||
md5_obj.update(name)
|
||||
return md5_obj.hexdigest()
|
||||
|
||||
@property
|
||||
def backup_path(self) -> str:
|
||||
if self._backup_path is None:
|
||||
config_data = DB("config").where("id=?", (1,)).select()
|
||||
if isinstance(config_data, dict):
|
||||
path = config_data["backup_path"]
|
||||
else: # 查询出错
|
||||
path = "/www/backup"
|
||||
self._backup_path = path
|
||||
return self._backup_path
|
||||
|
||||
# sub_dir 可以设置为多级子目录， 如 "site/aaa", 或使用列表传递如：["site", "aaa"]
|
||||
def set_sub_dir(self, sub_dir: Union[str, List[str]]) -> Optional[str]:
|
||||
if isinstance(sub_dir, str):
|
||||
self._sub_dir_name = sub_dir.strip("./")
|
||||
elif isinstance(sub_dir, list):
|
||||
self._sub_dir_name = "/".join(filter(None, [i.strip("./") for i in sub_dir]))
|
||||
else:
|
||||
return "不支持的类型设置"
|
||||
|
||||
def backup(self,
|
||||
src: str, # 源文件位置
|
||||
backup_path: Optional[str] = None, # 备份位置
|
||||
sub_dir: Union[str, List[str]] = None, # 备份目录的子目录
|
||||
site_info: Dict[str, Any] = None, # 关联的站点信息， 必须包含 id 和 name
|
||||
sync=False # 是否同步执行， 默认异步由单独的线程放入后台执行
|
||||
) -> Optional[str]: # 返回执行错误的信息
|
||||
|
||||
if not os.path.exists(src):
|
||||
return "源路径不存在"
|
||||
if backup_path is None:
|
||||
backup_path = self.backup_path
|
||||
|
||||
if not os.path.exists(backup_path):
|
||||
return "备份目录不存在"
|
||||
if sub_dir is not None:
|
||||
set_res = self.set_sub_dir(sub_dir)
|
||||
if set_res is not None:
|
||||
return set_res
|
||||
|
||||
target_path = os.path.join(backup_path, self._sub_dir_name)
|
||||
if not os.path.isdir(target_path):
|
||||
os.makedirs(target_path)
|
||||
zip_name = "{}_{}.tar.gz".format(os.path.basename(src), time.strftime('%Y%m%d_%H%M%S', time.localtime()))
|
||||
if sync:
|
||||
return self._sync_backup(src, target_path, zip_name, site_info)
|
||||
else:
|
||||
return self._async_backup(src, target_path, zip_name, site_info)
|
||||
|
||||
def _sync_backup(self, src: str, target_path: str, zip_name: str, site_info: dict):
|
||||
try:
|
||||
write_file(self.exec_log_file, "")
|
||||
execStr = ("cd {} && "
|
||||
"tar -zcvf '{}' --exclude=.user.ini ./ 2>&1 > {} \n"
|
||||
"echo '---备份执行完成---' >> {}"
|
||||
).format(src, os.path.join(target_path, zip_name), self.exec_log_file, self.exec_log_file)
|
||||
ExecShell(execStr)
|
||||
if site_info is not None and "id" in site_info and "name" in site_info:
|
||||
DB('backup').add(
|
||||
'type,name,pid,filename,size,addtime',
|
||||
(0, zip_name, site_info["id"], os.path.join(target_path, zip_name), 0, self.get_date())
|
||||
)
|
||||
write_log('TYPE_SITE', 'SITE_BACKUP_SUCCESS', (site_info["name"],))
|
||||
except:
|
||||
return "备份执行失败"
|
||||
|
||||
def _async_backup(self, src: str, target_path: str, zip_name: str, site_info: dict):
|
||||
import threading
|
||||
|
||||
hash_name = self._hash_src_name(src)
|
||||
backup_tip_path = "/tmp/mod_backup_tip"
|
||||
if os.path.exists(backup_tip_path):
|
||||
os.makedirs(backup_tip_path)
|
||||
|
||||
tip_file = os.path.join(backup_tip_path, hash_name)
|
||||
if os.path.isfile(tip_file):
|
||||
mtime = os.stat(tip_file).st_mtime
|
||||
if time.time() - mtime > 60 * 20: # 20 分钟未执行，认为出现在不可抗力，导致备份失败，允许再次备份
|
||||
os.remove(tip_file)
|
||||
else:
|
||||
return "备份进行中，请勿继续操作"
|
||||
|
||||
write_file(tip_file, "")
|
||||
|
||||
def _back_p():
|
||||
try:
|
||||
write_file(self.exec_log_file, "")
|
||||
execStr = ("cd {} && "
|
||||
"tar -zcvf '{}' --exclude=.user.ini ./ 2>&1 > {} \n"
|
||||
"echo '---备份执行完成---' >> {}"
|
||||
).format(src, os.path.join(target_path, zip_name), self.exec_log_file, self.exec_log_file)
|
||||
ExecShell(execStr)
|
||||
if site_info is not None and "id" in site_info and "name" in site_info:
|
||||
DB('backup').add(
|
||||
'type,name,pid,filename,size,addtime',
|
||||
(0, zip_name, site_info["id"], os.path.join(target_path, zip_name), 0, self.get_date())
|
||||
)
|
||||
write_log('TYPE_SITE', 'SITE_BACKUP_SUCCESS', (site_info["name"],))
|
||||
except:
|
||||
pass
|
||||
finally:
|
||||
if os.path.exists(tip_file):
|
||||
os.remove(tip_file)
|
||||
|
||||
t = threading.Thread(target=_back_p)
|
||||
t.start()
|
||||
|
||||
@staticmethod
|
||||
def get_date():
|
||||
# 取格式时间
|
||||
return time.strftime('%Y-%m-%d %X', time.localtime())
|
||||
@@ -0,0 +1,65 @@
|
||||
import sys
|
||||
from typing import Optional, Callable, Tuple, Union
|
||||
|
||||
if "/www/server/panel/class" not in sys.path:
|
||||
sys.path.insert(0, "/www/server/panel/class")
|
||||
|
||||
import public
|
||||
|
||||
ExecShell: Callable = public.ExecShell
|
||||
write_log: Callable[[str, str, Tuple], Union[int, str, type(None)]] = public.WriteLog
|
||||
|
||||
|
||||
def write_file(filename: str, s_body: str, mode='w+') -> bool:
|
||||
"""
|
||||
写入文件内容
|
||||
@filename 文件名
|
||||
@s_body 欲写入的内容
|
||||
return bool 若文件不存在则尝试自动创建
|
||||
"""
|
||||
try:
|
||||
fp = open(filename, mode=mode)
|
||||
fp.write(s_body)
|
||||
fp.close()
|
||||
return True
|
||||
except:
|
||||
try:
|
||||
fp = open(filename, mode=mode, encoding="utf-8")
|
||||
fp.write(s_body)
|
||||
fp.close()
|
||||
return True
|
||||
except:
|
||||
return False
|
||||
|
||||
|
||||
def read_file(filename, mode='r') -> Optional[str]:
|
||||
"""
|
||||
读取文件内容
|
||||
@filename 文件名
|
||||
return string(bin) 若文件不存在，则返回None
|
||||
"""
|
||||
import os
|
||||
if not os.path.exists(filename):
|
||||
return None
|
||||
fp = None
|
||||
try:
|
||||
fp = open(filename, mode=mode)
|
||||
f_body = fp.read()
|
||||
except:
|
||||
return None
|
||||
finally:
|
||||
if fp and not fp.closed:
|
||||
fp.close()
|
||||
return f_body
|
||||
|
||||
|
||||
class _DB:
|
||||
|
||||
def __call__(self, table: str):
|
||||
import db
|
||||
with db.Sql() as t:
|
||||
t.table(table)
|
||||
return t
|
||||
|
||||
|
||||
DB = _DB()
|
||||
@@ -0,0 +1,291 @@
|
||||
import json
|
||||
import os
|
||||
import shutil
|
||||
import tarfile
|
||||
import time
|
||||
from hashlib import md5
|
||||
from typing import Optional, List, Union, Dict, Any
|
||||
|
||||
from .util import DB, ExecShell, write_file, write_log, read_file
|
||||
|
||||
|
||||
class VersionTool:
|
||||
_config_file = "/www/server/panel/data/version_config.json"
|
||||
|
||||
def __init__(self):
|
||||
self._config: Optional[Dict[str, List[Dict[str, Any]]]] = None
|
||||
self._pack_class = BasePack
|
||||
self.pack_path = "/www/backup/versions"
|
||||
|
||||
@property
|
||||
def config(self) -> Dict[str, List[Dict[str, Any]]]:
|
||||
if self._config is not None:
|
||||
return self._config
|
||||
|
||||
data = {}
|
||||
try:
|
||||
res = read_file(self._config_file)
|
||||
if isinstance(res, str):
|
||||
data = json.loads(res)
|
||||
except (json.JSONDecoder, TypeError, ValueError):
|
||||
pass
|
||||
self._config = data
|
||||
return self._config
|
||||
|
||||
def save_config(self):
|
||||
if self._config is not None:
|
||||
write_file(self._config_file, json.dumps(self._config))
|
||||
|
||||
def add_to_config(self, data: dict):
|
||||
project_name = data.get("project_name")
|
||||
self._config = None
|
||||
if project_name not in self.config:
|
||||
self.config[project_name] = []
|
||||
self.config[project_name].append(data)
|
||||
self.save_config()
|
||||
|
||||
def set_pack_class(self, pack_cls):
|
||||
self._pack_class = pack_cls
|
||||
|
||||
def version_list(self, project_name: str):
|
||||
if project_name in self.config:
|
||||
return self.config[project_name]
|
||||
return []
|
||||
|
||||
def get_version_info(self, project_name: str, version: str) -> Optional[dict]:
|
||||
if project_name in self.config:
|
||||
for i in self.config[project_name]:
|
||||
if i.get("version") == version:
|
||||
return i
|
||||
return None
|
||||
|
||||
# 把某个路径下的文件打包并发布为一个版本
|
||||
def publish_by_src_path(self,
|
||||
project_name: str, # 名称
|
||||
src_path: str, # 源路径
|
||||
version: str, # 版本号
|
||||
ps: Optional[str] = None, # 备注
|
||||
other: Optional[dict] = None, # 其他信息
|
||||
sync: bool = False, # 是否同步执行
|
||||
):
|
||||
|
||||
if project_name in self.config:
|
||||
for i in self.config[project_name]:
|
||||
if i["version"] == version:
|
||||
return "当前版本已存在"
|
||||
if not os.path.isdir(src_path):
|
||||
return "源路径不存在"
|
||||
|
||||
if ps is None:
|
||||
ps = ''
|
||||
|
||||
if other is None:
|
||||
other = {}
|
||||
|
||||
zip_name = "{}_{}.tar.gz".format(
|
||||
os.path.basename(src_path), time.strftime('%Y%m%d_%H%M%S', time.localtime())
|
||||
)
|
||||
|
||||
data = {
|
||||
"project_name": project_name,
|
||||
"version": version,
|
||||
"ps": ps,
|
||||
"other": other,
|
||||
"zip_name": zip_name,
|
||||
"backup_time": time.strftime('%Y-%m-%d %H:%M:%S', time.localtime())
|
||||
}
|
||||
return self._pack_class(src_path, self.pack_path, zip_name, sync=sync, vt=self, data=data)(**other)
|
||||
|
||||
def recover(self,
|
||||
project_name: str, # 名称
|
||||
version: str, # 版本
|
||||
target_path: str, # 目标路径
|
||||
run_path=None
|
||||
):
|
||||
if not run_path:
|
||||
run_path = target_path
|
||||
if project_name not in self.config:
|
||||
return '项目不存在'
|
||||
|
||||
target = None
|
||||
for i in self.config[project_name]:
|
||||
if i["version"] == version:
|
||||
target = i
|
||||
break
|
||||
|
||||
if target is None:
|
||||
return '版本不存在'
|
||||
|
||||
file = os.path.join(self.pack_path, target["zip_name"])
|
||||
if not os.path.exists(file):
|
||||
return '版本文件丢失'
|
||||
|
||||
tmp_path = '/tmp/version_{}'.format(int(time.time()))
|
||||
tar = tarfile.open(file, mode='r')
|
||||
tar.extractall(tmp_path)
|
||||
user_data = None
|
||||
if os.path.exists(target_path):
|
||||
ExecShell("chattr -i -R {}/".format(target_path))
|
||||
user_data = read_file(run_path + "/.user.ini")
|
||||
ExecShell("rm -rf {}".format(target_path))
|
||||
os.makedirs(target_path)
|
||||
if not os.path.exists(target_path):
|
||||
os.makedirs(target_path)
|
||||
ExecShell(r"\cp -rf {}/* {}".format(tmp_path, target_path))
|
||||
if user_data:
|
||||
write_file(target_path + "/.user.ini", run_path)
|
||||
ExecShell("chattr +i {}/.user.ini".format(run_path))
|
||||
ExecShell("rm -rf {}".format(tmp_path))
|
||||
return True
|
||||
|
||||
def publish_by_file(self,
|
||||
project_name: str, # 名称
|
||||
src_file: str, # 源路径
|
||||
version: str, # 版本号
|
||||
ps: Optional[str] = None, # 备注
|
||||
other: Optional[dict] = None, # 其他信息
|
||||
):
|
||||
|
||||
if project_name in self.config:
|
||||
for i in self.config[project_name]:
|
||||
if i["version"] == version:
|
||||
return "当前版本已存在"
|
||||
|
||||
if not os.path.isfile(src_file):
|
||||
return "源路径不存在"
|
||||
|
||||
if ps is None:
|
||||
ps = ''
|
||||
|
||||
if other is None:
|
||||
other = {}
|
||||
|
||||
zip_name = os.path.basename(src_file)
|
||||
|
||||
data = {
|
||||
"project_name": project_name,
|
||||
"version": version,
|
||||
"ps": ps,
|
||||
"other": other,
|
||||
"zip_name": zip_name,
|
||||
"backup_time": time.strftime('%Y-%m-%d %H:%M:%S', time.localtime())
|
||||
}
|
||||
try:
|
||||
shutil.copy(src_file, self.pack_path + "/" + zip_name)
|
||||
except:
|
||||
return "文件保存失败"
|
||||
self.add_to_config(data)
|
||||
return None
|
||||
|
||||
def remove(self,
|
||||
project_name: str, # 名称
|
||||
version: str, # 版本
|
||||
) -> Optional[str]:
|
||||
|
||||
if project_name not in self.config:
|
||||
return '项目不存在'
|
||||
|
||||
target = None
|
||||
for i in self.config[project_name]:
|
||||
if i["version"] == version:
|
||||
target = i
|
||||
break
|
||||
|
||||
if target is None:
|
||||
return '版本不存在'
|
||||
|
||||
file = os.path.join(self.pack_path, target["zip_name"])
|
||||
if os.path.isfile(file):
|
||||
os.remove(file)
|
||||
|
||||
self.config[project_name].remove(target)
|
||||
|
||||
self.save_config()
|
||||
return None
|
||||
|
||||
def set_ps(self, name: str, version: str, ps: str):
|
||||
[i.update({'ps': ps}) for i in self.config[name] if i["version"] == version]
|
||||
self.save_config()
|
||||
return True
|
||||
|
||||
|
||||
class BasePack:
|
||||
exec_log_file = "/tmp/project_pack.log"
|
||||
|
||||
def __init__(self, src_path, target_path, zip_name, sync=False, vt: VersionTool = None, data: dict = None):
|
||||
self.src_path = src_path
|
||||
self.target_path = target_path
|
||||
self.zip_name = zip_name
|
||||
self.sync = sync
|
||||
self.v = vt
|
||||
self._add_data = data
|
||||
|
||||
def save_config(self):
|
||||
self.v.add_to_config(self._add_data)
|
||||
|
||||
def __call__(self, *args, **kwargs) -> Optional[str]:
|
||||
if not os.path.exists(self.src_path):
|
||||
return "源路径不存在"
|
||||
target_path = "/www/backup/versions"
|
||||
|
||||
if not os.path.isdir(target_path):
|
||||
os.makedirs(target_path)
|
||||
if self.sync:
|
||||
return self._sync_backup(self.src_path, target_path, self.zip_name)
|
||||
else:
|
||||
return self._async_backup(self.src_path, target_path, self.zip_name)
|
||||
|
||||
def _sync_backup(self, src: str, target_path: str, zip_name: str) -> Optional[str]:
|
||||
try:
|
||||
write_file(self.exec_log_file, "")
|
||||
execStr = ("cd {} && "
|
||||
"tar -zcvf '{}' --exclude=.user.ini ./ 2>&1 > {} \n"
|
||||
"echo '---打包执行完成---' >> {}"
|
||||
).format(src, os.path.join(target_path, zip_name), self.exec_log_file, self.exec_log_file)
|
||||
ExecShell(execStr)
|
||||
self.save_config()
|
||||
except:
|
||||
return "打包执行失败"
|
||||
|
||||
def _async_backup(self, src: str, target_path: str, zip_name: str):
|
||||
import threading
|
||||
hash_name = self._hash_src_name(src)
|
||||
backup_tip_path = "/tmp/mod_version_tip"
|
||||
if os.path.exists(backup_tip_path):
|
||||
os.makedirs(backup_tip_path)
|
||||
|
||||
tip_file = os.path.join(backup_tip_path, hash_name)
|
||||
if os.path.isfile(tip_file):
|
||||
mtime = os.stat(tip_file).st_mtime
|
||||
if time.time() - mtime > 60 * 20: # 20 分钟未执行，认为出现在不可抗力，导致备份失败，允许再次备份
|
||||
os.remove(tip_file)
|
||||
else:
|
||||
return "打包进行中，请勿继续操作"
|
||||
|
||||
write_file(tip_file, "")
|
||||
|
||||
def _back_p():
|
||||
try:
|
||||
write_file(self.exec_log_file, "")
|
||||
execStr = ("cd {} && "
|
||||
"tar -zcvf '{}' --exclude=.user.ini ./ 2>&1 > {} \n"
|
||||
"echo '---备份执行完成---' >> {}"
|
||||
).format(src, os.path.join(target_path, zip_name), self.exec_log_file, self.exec_log_file)
|
||||
ExecShell(execStr)
|
||||
self.save_config()
|
||||
except:
|
||||
pass
|
||||
finally:
|
||||
if os.path.exists(tip_file):
|
||||
os.remove(tip_file)
|
||||
|
||||
t = threading.Thread(target=_back_p)
|
||||
t.start()
|
||||
|
||||
@staticmethod
|
||||
def _hash_src_name(name: Union[str, bytes]) -> str:
|
||||
if isinstance(name, str):
|
||||
name = name.encode('utf-8')
|
||||
md5_obj = md5()
|
||||
md5_obj.update(name)
|
||||
return md5_obj.hexdigest()
|
||||
Reference in New Issue
Block a user