mirror of
https://github.com/aaPanel/aaPanel.git
synced 2026-08-29 03:09:46 +02:00
Jack
ed55fa708d
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
124 lines
4.3 KiB
Python
124 lines
4.3 KiB
Python
import os.path
|
|
import sys
|
|
if "/www/server/panel" not in sys.path:
|
|
sys.path.insert(0, "/www/server/panel")
|
|
|
|
from mod.test.test_web_conf import WebBaseTestcase, PREFIX, NGINX_CONFIG_CASE, APACHE_CONFIG_CASE
|
|
from mod.base.web_conf.util import GET_CLASS, service_reload
|
|
from mod.base.web_conf import IpRestrict, ConfigMgr
|
|
|
|
|
|
class TestIpRestrict(WebBaseTestcase):
|
|
ip_restrict = IpRestrict(PREFIX)
|
|
|
|
def setUp(self) -> None:
|
|
self.reset_site_config()
|
|
setup_path = "/www/server/panel"
|
|
ip_restrict_conf = "{}/data/ip_restrict_data/{}{}".format(setup_path, PREFIX, self.site_name)
|
|
if os.path.exists(ip_restrict_conf):
|
|
os.remove(ip_restrict_conf)
|
|
nginx_ip_restrict_conf = "{}/vhost/ip-restrict/{}{}.conf".format(setup_path, PREFIX, self.site_name)
|
|
if os.path.exists(nginx_ip_restrict_conf):
|
|
os.remove(nginx_ip_restrict_conf)
|
|
|
|
def test_black_ip_restrict(self):
|
|
# 设置为黑名单格式
|
|
get = GET_CLASS()
|
|
get.site_name = self.site_name
|
|
# black white closed
|
|
get.set_type = "black"
|
|
self.ip_restrict.set_ip_restrict(get)
|
|
|
|
# 添加黑名单信息
|
|
get = GET_CLASS()
|
|
get.site_name = self.site_name
|
|
get.value = "192.168.168.65"
|
|
self.ip_restrict.add_black_ip_restrict(get)
|
|
|
|
config_mgr = ConfigMgr(self.site_name, PREFIX)
|
|
self.assertIn("ip-restrict", config_mgr.nginx_config())
|
|
setup_path = "/www/server/panel"
|
|
ip_restrict_conf = "{}/data/ip_restrict_data/{}{}".format(setup_path, PREFIX, self.site_name)
|
|
nginx_ip_restrict_conf = "{}/vhost/ip-restrict/{}{}.conf".format(setup_path, PREFIX, self.site_name)
|
|
|
|
self.assertTrue(os.path.exists(ip_restrict_conf))
|
|
self.assertTrue(os.path.exists(nginx_ip_restrict_conf))
|
|
|
|
# 移除黑名单信息
|
|
# get = GET_CLASS()
|
|
# get.site_name = self.site_name
|
|
# get.value = "192.168.168.65"
|
|
# self.ip_restrict.remove_black_ip_restrict(get)
|
|
|
|
def test_white_ip_restrict(self):
|
|
# 设置为白名单格式
|
|
get = GET_CLASS()
|
|
get.site_name = self.site_name
|
|
# black white closed
|
|
get.set_type = "white"
|
|
self.ip_restrict.set_ip_restrict(get)
|
|
|
|
# 添加白名单信息
|
|
get = GET_CLASS()
|
|
get.site_name = self.site_name
|
|
get.value = "192.168.168.65" # "192.168.168.66"
|
|
self.ip_restrict.add_white_ip_restrict(get)
|
|
|
|
config_mgr = ConfigMgr(self.site_name, PREFIX)
|
|
self.assertIn("ip-restrict", config_mgr.nginx_config())
|
|
setup_path = "/www/server/panel"
|
|
ip_restrict_conf = "{}/data/ip_restrict_data/{}{}".format(setup_path, PREFIX, self.site_name)
|
|
nginx_ip_restrict_conf = "{}/vhost/ip-restrict/{}{}.conf".format(setup_path, PREFIX, self.site_name)
|
|
|
|
self.assertTrue(os.path.exists(ip_restrict_conf))
|
|
self.assertTrue(os.path.exists(nginx_ip_restrict_conf))
|
|
|
|
# 移除白名单信息
|
|
get = GET_CLASS()
|
|
get.site_name = self.site_name
|
|
get.value = "192.168.168.65"
|
|
self.ip_restrict.remove_white_ip_restrict(get)
|
|
|
|
def test_ip_restrict_conf(self):
|
|
# 添加黑名单信息
|
|
get = GET_CLASS()
|
|
get.site_name = self.site_name
|
|
get.value = "192.168.168.65"
|
|
self.ip_restrict.add_black_ip_restrict(get)
|
|
|
|
# 设置为白单格式
|
|
get = GET_CLASS()
|
|
get.site_name = self.site_name
|
|
# black white closed
|
|
get.set_type = "white"
|
|
self.ip_restrict.set_ip_restrict(get)
|
|
# 添加白名单信息
|
|
get = GET_CLASS()
|
|
get.site_name = self.site_name
|
|
get.value = "192.168.168.65" # "192.168.168.66"
|
|
self.ip_restrict.add_white_ip_restrict(get)
|
|
|
|
get = GET_CLASS()
|
|
get.site_name = self.site_name
|
|
print(self.ip_restrict.restrict_conf(get))
|
|
|
|
def runTest(self):
|
|
# self.change_env_to_nginx()
|
|
# self.test_black_ip_restrict()
|
|
# self.check_web_server_config()
|
|
|
|
# self.change_env_to_nginx()
|
|
# self.test_white_ip_restrict()
|
|
# self.check_web_server_config()
|
|
|
|
self.change_env_to_nginx()
|
|
self.test_ip_restrict_conf()
|
|
self.check_web_server_config()
|
|
|
|
|
|
if __name__ == '__main__':
|
|
import unittest
|
|
s = unittest.TestSuite()
|
|
s.addTest(TestIpRestrict())
|
|
unittest.TextTestRunner().run(s)
|