mirror of
https://github.com/aaPanel/aaPanel.git
synced 2026-08-24 00:22:27 +02:00
Jack
1459724ba3
[+] Add Mail Server to the left menu. [+] Add Mail Server - WebMail (requires Mail Server upgrade 5.1) [+] Add WP Toolkit Plugin, Theme installation. [+] Add Mail Server Login info. [+] Add Mail Server WebMail One-click Login (requires Mail Server upgrade 5.2). [+] Redesigned Security - Firewall. [*] Optimized Mass Mail sending speed. [*] Optimized the CPU usage problem of aaPanel startup service. [-] Fix apache application, renew SSL issue. [-] Fix Let's Encrypt account registeration failed. [-] Fix openlitespeed using capital letters on domain name caused the website cannot be accessed issue. [-] Fix problem of failure to reset root password in some versions of MariaDB. [-] Fix an error in modifying Permission in some cases of MySQL. [-] Fix the Website category display problem.
103 lines
4.1 KiB
Python
103 lines
4.1 KiB
Python
# coding: utf-8
|
|
# -------------------------------------------------------------------
|
|
# 宝塔Linux面板
|
|
# -------------------------------------------------------------------
|
|
# Copyright (c) 2014-2099 宝塔软件(http://bt.cn) All rights reserved.
|
|
# -------------------------------------------------------------------
|
|
# Author: wzz <wzz@bt.cn>
|
|
# -------------------------------------------------------------------
|
|
|
|
# ------------------------------
|
|
# 系统防火墙模型 - 底层基类
|
|
# ------------------------------
|
|
|
|
import sys
|
|
import subprocess
|
|
if "/www/server/panel/class" not in sys.path:
|
|
sys.path.insert(0, "/www/server/panel/class")
|
|
import public
|
|
|
|
|
|
class Base(object):
|
|
|
|
def __init__(self):
|
|
pass
|
|
|
|
# 2024/3/22 下午 3:18 通用返回
|
|
def _result(self, status: bool, msg: str) -> dict:
|
|
'''
|
|
@name 通用返回
|
|
@author wzz <2024/3/22 下午 3:19>
|
|
@param status: True/False
|
|
msg: 提示信息
|
|
@return dict{"status":True/False,"msg":"提示信息"}
|
|
'''
|
|
return {"status": status, "msg": msg}
|
|
# status_int = 0 if status else -1
|
|
# return public.return_message(status_int, 0, msg)
|
|
|
|
# def _result_list(self, msg: list) -> dict:
|
|
# '''
|
|
# @name 通用返回 list转通用格式
|
|
# @author wzz <2024/3/22 下午 3:19>
|
|
# @param msg: 提示信息
|
|
# @return dict{
|
|
# "status": 0,
|
|
# "timestamp": 时间戳,
|
|
# "message": {
|
|
# "result": []
|
|
# }
|
|
# }
|
|
# '''
|
|
# return public.return_message(0, 0, msg)
|
|
|
|
# 2024/3/22 下午 4:55 检查是否设置了net.ipv4.ip_forward = 1，没有则设置
|
|
def check_ip_forward(self) -> dict:
|
|
'''
|
|
@name 检查是否设置了net.ipv4.ip_forward = 1，没有则设置
|
|
@param "data":{"参数名":""} <数据类型> 参数描述
|
|
@return dict{"status":True/False,"msg":"提示信息"}
|
|
'''
|
|
stdout, stderr = public.ExecShell("sysctl net.ipv4.ip_forward")
|
|
if "net.ipv4.ip_forward = 1" not in stdout:
|
|
# 2024/3/22 下午 4:56 永久设置
|
|
stdout, stderr = public.ExecShell("echo net.ipv4.ip_forward=1 >> /etc/sysctl.conf")
|
|
if stderr:
|
|
return self._result(False, "Setting net.ipv4.ip_forward failed, err: {}".format(stderr))
|
|
|
|
stdout, stderr = public.ExecShell("sysctl -p")
|
|
if stderr:
|
|
return self._result(False, "Setting net.ipv4.ip_forward failed, err: {}".format(stderr))
|
|
return self._result(True, "Set net.ipv4.ip_forward successfully")
|
|
return self._result(True, "net.ipv4.ip_forward has been set")
|
|
|
|
# 2024/3/18 上午 11:35 处理192.168.1.100-192.168.1.200这种ip范围
|
|
# 返回192.168.1.100,192.168.1.101,192.168.1...,192.168.1.200列表
|
|
def handle_ip_range(self, ip):
|
|
'''
|
|
@name 处理192.168.1.100-192.168.1.200这种ip范围的ip列表
|
|
@author wzz <2024/3/19 下午 4:58>
|
|
@param "data":{"参数名":""} <数据类型> 参数描述
|
|
@return dict{"status":True/False,"msg":"提示信息"}
|
|
'''
|
|
ip_range = ip.split("-")
|
|
ip_start = ip_range[0]
|
|
ip_end = ip_range[1]
|
|
ip_start = ip_start.split(".")
|
|
ip_end = ip_end.split(".")
|
|
ip_start = [int(i) for i in ip_start]
|
|
ip_end = [int(i) for i in ip_end]
|
|
ip_list = []
|
|
for i in range(ip_start[0], ip_end[0] + 1):
|
|
for j in range(ip_start[1], ip_end[1] + 1):
|
|
for k in range(ip_start[2], ip_end[2] + 1):
|
|
for l in range(ip_start[3], ip_end[3] + 1):
|
|
ip_list.append("{}.{}.{}.{}".format(i, j, k, l))
|
|
return ip_list
|
|
def run_command(self, command):
|
|
try:
|
|
result = subprocess.run(command, shell=True, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
|
|
return result.stdout, result.stderr
|
|
except subprocess.CalledProcessError as e:
|
|
return e.stdout, e.stderr
|