Compare commits
15 Commits
3407580422
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 90f1eaca05 | |||
| 93ca221ba2 | |||
| c072942a3c | |||
| ed00dd4a50 | |||
| 92da267f4c | |||
| 655bf18f91 | |||
| b0646f21f2 | |||
| 5fb3640004 | |||
| 9942296714 | |||
| aa432a08bd | |||
| 3126944905 | |||
| e5979a501e | |||
| eabddb553d | |||
| 5cca21aa0c | |||
| 0314245433 |
@@ -1,16 +0,0 @@
|
||||
# Test System Reference Database
|
||||
# Platform: cpanel
|
||||
# Generated: Wed Dec 24 03:16:31 PM EST 2025
|
||||
|
||||
[USERS]
|
||||
USER|pickledperil
|
||||
|
||||
[DOMAINS]
|
||||
DOMAIN|pickledperil.com|pickledperil|/home/pickledperil/public_html|/etc/apache2/logs/domlogs/pickledperil.com|ea-php81|yes|primary|www.pickledperil.com|200|200|200_OK
|
||||
DOMAIN|www.pickledperil.com|pickledperil|/home/pickledperil/public_html|/etc/apache2/logs/domlogs/pickledperil.com|ea-php81|no|alias|pickledperil.com|200|200|alias_of_200_OK
|
||||
DOMAIN|67-227-141-132.cprapid.com|unknown||/var/log/apache2/domlogs/67-227-141-132.cprapid.com||unknown|local||timeout|timeout|TIMEOUT
|
||||
DOMAIN|cloudvpstemplate.host.pickledperil.com|unknown||/var/log/apache2/domlogs/cloudvpstemplate.host.pickledperil.com||unknown|local||200|200|200_OK
|
||||
|
||||
[DATABASES]
|
||||
DB|pickledperil_wp_wt6lz|pickledperil
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
1766607398
|
||||
-113
@@ -1,113 +0,0 @@
|
||||
# Changelog
|
||||
|
||||
All notable changes to the Linux Server Management Toolkit will be documented in this file.
|
||||
|
||||
## [2.2.1] - 2026-01-11
|
||||
|
||||
### Added - Nginx + Varnish Cache Manager
|
||||
- **New Module**: Complete Varnish cache installation and management system for cPanel
|
||||
- Location: `modules/performance/nginx-varnish-manager.sh`
|
||||
- Interactive menu with 8 options (setup, status, health check, auto-fix, statistics, flush, revert, backups)
|
||||
- Automated audit script with 44 tests (`/root/audit-varnish-setup.sh`)
|
||||
- Comprehensive documentation (`modules/performance/README-nginx-varnish.md`)
|
||||
|
||||
#### Key Features
|
||||
- **99.5% Stock Compliance**: Only modifies settings.json (RPM config file)
|
||||
- **Update Survival**: Proven to survive ea-nginx package updates and rebuilds
|
||||
- **93 Static File Types**: Images, fonts, CSS/JS, videos, documents, archives, packages
|
||||
- **Smart Bypasses**: AutoSSL (.well-known/acme-challenge/), cPanel services, 13 admin page patterns
|
||||
- **Self-Healing**: 7 automatic fixes for any configuration issues
|
||||
- **Complete Backup/Revert**: Full restoration to pre-installation state in 2-5 minutes
|
||||
|
||||
#### Architecture
|
||||
```
|
||||
Client → Nginx (80/443) → Varnish (6081) → Apache (81/444)
|
||||
```
|
||||
|
||||
#### Technical Implementation
|
||||
- **Primary Persistence**: settings.json preservation via RPM config file handling
|
||||
- **Safety Net**: ea-nginx config-script auto-fixes if settings.json fails
|
||||
- **Tertiary Recovery**: Auto-fix function detects and repairs 7 failure scenarios
|
||||
- **Multi-Layer Protection**: 3-layer strategy ensures configuration never stays broken
|
||||
|
||||
#### Performance Impact
|
||||
- Cache hit rate: 60-80% after 24 hours
|
||||
- Page load time: 30-50% faster for cached content
|
||||
- Server load: 20-40% reduction
|
||||
- TTFB: Significantly improved for static files
|
||||
|
||||
#### Testing & Validation
|
||||
- 44 automated tests across 6 phases
|
||||
- Manual verification: 100% pass rate
|
||||
- Comprehensive documentation with examples
|
||||
- Production-ready with rollback capability
|
||||
|
||||
### Changed
|
||||
- Updated main README.md to include nginx-varnish-manager
|
||||
- Added module to Performance Analysis section
|
||||
- Updated module count: 41 → 42 working modules
|
||||
- Updated Recent Updates section with Varnish cache manager highlights
|
||||
|
||||
### Documentation
|
||||
- Created comprehensive module README (`README-nginx-varnish.md`)
|
||||
- Created automated audit script with color-coded output
|
||||
- Created audit plan with 10 testing phases
|
||||
- Created verification documents (3 comprehensive audit reports)
|
||||
|
||||
## [2.2.0] - 2026-01-08
|
||||
|
||||
### Added - Security Enhancements
|
||||
- **Auto-Mitigation Engine**: Automatic IP blocking at Score >= 80/100 via IPset (kernel-level)
|
||||
- **Distributed Attack Blocking**: Detects and blocks coordinated botnet attacks (5+ IPs)
|
||||
- **Subnet-Level Blocking**: Blocks entire /24 subnets when 25+ IPs attack from same range
|
||||
|
||||
### Fixed
|
||||
- **Attack Signature Improvements**: Fixed false positives in HTTP_SMUGGLING and SUSPICIOUS_UA detection
|
||||
- **Function Exports**: Fixed critical bug preventing HTTP attack auto-blocking in subshells
|
||||
|
||||
### Changed
|
||||
- **No System Pollution**: Moved all persistent data from /var/lib/ to /tmp/ for clean removal
|
||||
- **Maldet Auto-Installation**: Enhanced Plesk support with improved directory detection
|
||||
|
||||
## [2.1.0] - 2025-12-15
|
||||
|
||||
### Added
|
||||
- **MySQL Restore Tool**: Advanced database recovery with intelligent Force Recovery detection
|
||||
- Multi-control panel support (cPanel, InterWorx, Plesk, standalone)
|
||||
|
||||
### Changed
|
||||
- **Launcher Cleanup**: Removed 90+ phantom menu items
|
||||
- Reduced launcher size from 1,576 to 574 lines (64% reduction)
|
||||
- **Performance**: Cached domain status checks save ~5 minutes on 50-domain servers
|
||||
|
||||
## [2.0.0] - 2025-11-01
|
||||
|
||||
### Added
|
||||
- Modular architecture with organized directory structure
|
||||
- 41 working modules across 5 categories
|
||||
- Reference database for cross-module intelligence
|
||||
- Session-based tracking (no historical data)
|
||||
|
||||
### Changed
|
||||
- Complete restructuring of toolkit
|
||||
- Zero hardcoded paths with automatic control panel detection
|
||||
- Self-contained design (delete = full cleanup)
|
||||
|
||||
## [1.0.0] - 2025-01-01
|
||||
|
||||
### Added
|
||||
- Initial release
|
||||
- Basic server management scripts
|
||||
- cPanel-focused utilities
|
||||
|
||||
---
|
||||
|
||||
**Version Format**: [Major.Minor.Patch]
|
||||
- **Major**: Breaking changes or major feature additions
|
||||
- **Minor**: New features, non-breaking changes
|
||||
- **Patch**: Bug fixes, small improvements
|
||||
|
||||
**Links**:
|
||||
- Repository: https://git.mull.lol/cschantz/Linux-Server-Management-Toolkit
|
||||
- Documentation: README.md
|
||||
- License: MIT (see LICENSE file)
|
||||
+44
-14
@@ -53,7 +53,7 @@ run_module() {
|
||||
echo ""
|
||||
echo -e "${RED}✗ Module not found: $category/$module${NC}"
|
||||
echo ""
|
||||
read -p "Press Enter to continue..."
|
||||
read -p "Press Enter to continue..." < /dev/tty 2>/dev/null || true
|
||||
return 1
|
||||
fi
|
||||
|
||||
@@ -74,7 +74,7 @@ run_module() {
|
||||
echo -e "${RED}✗ Exited with code: $exit_code${NC}"
|
||||
fi
|
||||
echo ""
|
||||
read -p "Press Enter to continue..."
|
||||
read -p "Press Enter to continue..." < /dev/tty 2>/dev/null || true
|
||||
}
|
||||
|
||||
#############################################################################
|
||||
@@ -135,7 +135,9 @@ show_threat_analysis_menu() {
|
||||
handle_threat_analysis_menu() {
|
||||
while true; do
|
||||
show_threat_analysis_menu
|
||||
read -r choice
|
||||
if ! read -r choice 2>/dev/null </dev/tty; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
case $choice in
|
||||
1) run_module "security" "bot-analyzer.sh" ;;
|
||||
@@ -169,7 +171,9 @@ show_live_monitoring_menu() {
|
||||
handle_live_monitoring_menu() {
|
||||
while true; do
|
||||
show_live_monitoring_menu
|
||||
read -r choice
|
||||
if ! read -r choice 2>/dev/null </dev/tty; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
case $choice in
|
||||
1) run_module "security" "live-attack-monitor.sh" ;;
|
||||
@@ -201,7 +205,9 @@ show_log_viewers_menu() {
|
||||
handle_log_viewers_menu() {
|
||||
while true; do
|
||||
show_log_viewers_menu
|
||||
read -r choice
|
||||
if ! read -r choice 2>/dev/null </dev/tty; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
case $choice in
|
||||
1) run_module "security" "tail-apache-access.sh" ;;
|
||||
@@ -232,7 +238,9 @@ show_security_actions_menu() {
|
||||
handle_security_actions_menu() {
|
||||
while true; do
|
||||
show_security_actions_menu
|
||||
read -r choice
|
||||
if ! read -r choice 2>/dev/null </dev/tty; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
case $choice in
|
||||
1) run_module "security" "enable-cphulk.sh" ;;
|
||||
@@ -266,7 +274,9 @@ show_security_menu() {
|
||||
handle_security_menu() {
|
||||
while true; do
|
||||
show_security_menu
|
||||
read -r choice
|
||||
if ! read -r choice 2>/dev/null </dev/tty; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
case $choice in
|
||||
1) handle_threat_analysis_menu ;;
|
||||
@@ -314,7 +324,9 @@ show_website_menu() {
|
||||
handle_website_menu() {
|
||||
while true; do
|
||||
show_website_menu
|
||||
read -r choice
|
||||
if ! read -r choice 2>/dev/null </dev/tty; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
case $choice in
|
||||
1) run_module "website" "website-error-analyzer.sh" ;;
|
||||
@@ -367,7 +379,9 @@ show_performance_menu() {
|
||||
handle_performance_menu() {
|
||||
while true; do
|
||||
show_performance_menu
|
||||
read -r choice
|
||||
if ! read -r choice 2>/dev/null </dev/tty; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
case $choice in
|
||||
1) run_module "performance" "mysql-query-analyzer.sh" ;;
|
||||
@@ -473,7 +487,9 @@ show_acronis_menu() {
|
||||
handle_backup_menu() {
|
||||
while true; do
|
||||
show_backup_menu
|
||||
read -r choice
|
||||
if ! read -r choice 2>/dev/null </dev/tty; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
case $choice in
|
||||
1) handle_acronis_menu ;;
|
||||
@@ -488,7 +504,9 @@ handle_backup_menu() {
|
||||
handle_acronis_menu() {
|
||||
while true; do
|
||||
show_acronis_menu
|
||||
read -r choice
|
||||
if ! read -r choice 2>/dev/null </dev/tty; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
case $choice in
|
||||
1) run_module "backup" "acronis-install.sh" ;;
|
||||
@@ -542,7 +560,9 @@ show_email_menu() {
|
||||
handle_email_menu() {
|
||||
while true; do
|
||||
show_email_menu
|
||||
read -r choice
|
||||
if ! read -r choice 2>/dev/null </dev/tty; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
case $choice in
|
||||
1) run_module "email" "email-diagnostics.sh" ;;
|
||||
@@ -573,6 +593,11 @@ init_directories() {
|
||||
}
|
||||
|
||||
startup_detection() {
|
||||
# Initialize system detection first (required for proper reference database)
|
||||
if [ -z "${SYS_DETECTION_COMPLETE:-}" ]; then
|
||||
initialize_system_detection
|
||||
fi
|
||||
|
||||
if ! db_is_fresh; then
|
||||
clear
|
||||
print_banner "Server Management Toolkit - Initializing"
|
||||
@@ -608,7 +633,7 @@ startup_detection() {
|
||||
print_success "Detection complete! Cached for 1 hour."
|
||||
echo ""
|
||||
|
||||
read -p "Press Enter to continue..."
|
||||
read -p "Press Enter to continue..." < /dev/tty 2>/dev/null || true
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -622,7 +647,12 @@ main() {
|
||||
|
||||
while true; do
|
||||
show_main_menu
|
||||
read -r choice
|
||||
|
||||
# Read from terminal (use /dev/tty directly for interaction)
|
||||
if ! read -r choice 2>/dev/null </dev/tty; then
|
||||
# No terminal available, return from function gracefully
|
||||
return 0
|
||||
fi
|
||||
|
||||
case $choice in
|
||||
1) run_module "diagnostics" "system-health-check.sh" ;;
|
||||
|
||||
@@ -169,8 +169,7 @@ show_terminal_info() {
|
||||
# Create temporary session directory
|
||||
create_temp_session() {
|
||||
export SESSION_ID=$$
|
||||
export TEMP_SESSION_DIR="/tmp/server-toolkit-${SESSION_ID}"
|
||||
mkdir -p "$TEMP_SESSION_DIR"
|
||||
export TEMP_SESSION_DIR=$(mktemp -d -t server-toolkit.XXXXXX)
|
||||
|
||||
# Cleanup on exit
|
||||
trap '[ -n "$TEMP_SESSION_DIR" ] && rm -rf "$TEMP_SESSION_DIR" 2>/dev/null' EXIT INT TERM
|
||||
|
||||
+6
-3
@@ -162,8 +162,8 @@ build_databases_section() {
|
||||
# Build MySQL command with credentials if needed
|
||||
local mysql_cmd="mysql"
|
||||
if [ "$SYS_CONTROL_PANEL" = "plesk" ] && [ -f /etc/psa/.psa.shadow ]; then
|
||||
local plesk_mysql_pass=$(cat /etc/psa/.psa.shadow)
|
||||
mysql_cmd="mysql -uadmin -p${plesk_mysql_pass}"
|
||||
export MYSQL_PWD=$(cat /etc/psa/.psa.shadow)
|
||||
mysql_cmd="mysql -uadmin"
|
||||
fi
|
||||
|
||||
local total_dbs=$($mysql_cmd -Ns -e "SHOW DATABASES" 2>/dev/null | grep -v "^information_schema$\|^mysql$\|^performance_schema$\|^sys$" | wc -l)
|
||||
@@ -180,7 +180,7 @@ build_databases_section() {
|
||||
|
||||
local size_mb=$($mysql_cmd -Ns -e "SELECT ROUND(SUM(data_length + index_length) / 1024 / 1024, 2)
|
||||
FROM information_schema.TABLES
|
||||
WHERE table_schema='$db'" 2>/dev/null)
|
||||
WHERE table_schema=\`$db\`" 2>/dev/null)
|
||||
[ -z "$size_mb" ] && size_mb=0
|
||||
|
||||
local table_count=$($mysql_cmd -Ns "$db" -e "SHOW TABLES" 2>/dev/null | wc -l)
|
||||
@@ -190,6 +190,9 @@ build_databases_section() {
|
||||
|
||||
finish_progress
|
||||
echo "" >> "$SYSREF_DB"
|
||||
|
||||
# Clean up password environment variable
|
||||
unset MYSQL_PWD
|
||||
}
|
||||
|
||||
# Check domain HTTP/HTTPS status codes
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
# Server Management Toolkit - Module Manifest
|
||||
# Format: category:module-name.sh
|
||||
# Upload this to your Nextcloud folder as manifest.txt
|
||||
|
||||
# Security & Threat Analysis
|
||||
security:bot-analyzer.sh
|
||||
security:live-monitor.sh
|
||||
security:ip-lookup.sh
|
||||
security:threat-blocker.sh
|
||||
security:whitelist-manager.sh
|
||||
security:attack-pattern-analyzer.sh
|
||||
security:ddos-detector.sh
|
||||
security:firewall-manager.sh
|
||||
security:ssl-security-audit.sh
|
||||
|
||||
# WordPress Management
|
||||
wordpress:wp-health-check.sh
|
||||
wordpress:wp-cron-status.sh
|
||||
wordpress:wp-cron-mass-fix.sh
|
||||
wordpress:wp-cron-mass-create.sh
|
||||
wordpress:wp-plugin-audit.sh
|
||||
wordpress:wp-theme-audit.sh
|
||||
wordpress:wp-db-optimizer.sh
|
||||
wordpress:wp-cache-clear.sh
|
||||
wordpress:wp-mass-update-core.sh
|
||||
wordpress:wp-mass-update-plugins.sh
|
||||
wordpress:wp-login-security.sh
|
||||
wordpress:wp-malware-scanner.sh
|
||||
wordpress:wp-permission-fixer.sh
|
||||
wordpress:wp-debug-log-analyzer.sh
|
||||
|
||||
# Performance & Diagnostics
|
||||
performance:resource-monitor.sh
|
||||
performance:top-processes.sh
|
||||
performance:slow-query-analyzer.sh
|
||||
performance:bandwidth-analyzer.sh
|
||||
performance:apache-performance.sh
|
||||
performance:php-fpm-monitor.sh
|
||||
performance:disk-io-analyzer.sh
|
||||
performance:disk-usage-report.sh
|
||||
performance:email-queue-monitor.sh
|
||||
performance:inode-usage-checker.sh
|
||||
performance:network-performance.sh
|
||||
|
||||
# Backup & Recovery
|
||||
backup:auto-backup.sh
|
||||
backup:selective-backup.sh
|
||||
backup:restore-helper.sh
|
||||
backup:database-backup.sh
|
||||
backup:config-backup.sh
|
||||
backup:log-archive.sh
|
||||
backup:backup-verification.sh
|
||||
backup:offsite-sync.sh
|
||||
|
||||
# Monitoring & Alerts
|
||||
monitoring:service-status-monitor.sh
|
||||
monitoring:uptime-tracker.sh
|
||||
monitoring:error-log-watcher.sh
|
||||
monitoring:disk-space-alerts.sh
|
||||
monitoring:ssl-expiration-monitor.sh
|
||||
monitoring:security-alert-dashboard.sh
|
||||
monitoring:email-delivery-monitor.sh
|
||||
monitoring:dns-monitor.sh
|
||||
|
||||
# Troubleshooting & Diagnostics
|
||||
troubleshooting:oom-killer-plotter.sh
|
||||
troubleshooting:hard-drive-error-tracker.sh
|
||||
troubleshooting:kernel-log-analyzer.sh
|
||||
troubleshooting:mysql-error-analyzer.sh
|
||||
troubleshooting:apache-error-deep-dive.sh
|
||||
troubleshooting:php-error-tracker.sh
|
||||
troubleshooting:connection-issues.sh
|
||||
troubleshooting:zombie-process-hunter.sh
|
||||
troubleshooting:file-system-checker.sh
|
||||
troubleshooting:port-scanner.sh
|
||||
troubleshooting:service-restart-helper.sh
|
||||
|
||||
# Reporting & Analytics
|
||||
reporting:security-report-viewer.sh
|
||||
reporting:performance-summary.sh
|
||||
reporting:traffic-analytics.sh
|
||||
reporting:account-usage-report.sh
|
||||
reporting:system-health-dashboard.sh
|
||||
reporting:custom-report-builder.sh
|
||||
reporting:export-to-pdf.sh
|
||||
@@ -293,10 +293,66 @@ show_step_menu() {
|
||||
echo " [3] Go to Step 3 (Select database)"
|
||||
echo " [4] Go to Step 4 (Configure restore options)"
|
||||
echo " [5] Go to Step 5 (Create SQL dump)"
|
||||
echo " [G] Guided process (walks through all steps automatically)"
|
||||
echo " [C] Compare original vs recovered database"
|
||||
echo " [R] Review current state"
|
||||
echo " [0] Back to main menu"
|
||||
echo ""
|
||||
echo -n "Select action (1-5, C, R): "
|
||||
echo -n "Select action (1-5, G, C, R, 0): "
|
||||
return 0
|
||||
}
|
||||
|
||||
# Guided Process Mode: Walks user through all 5 steps automatically
|
||||
# Returns 0 on success, 1 if user cancels at any step
|
||||
run_guided_process() {
|
||||
echo ""
|
||||
echo "════════════════════════════════════════════════════════════════"
|
||||
print_banner "GUIDED PROCESS - Automatic Workflow"
|
||||
echo "════════════════════════════════════════════════════════════════"
|
||||
echo ""
|
||||
echo "This will walk you through all 5 steps automatically."
|
||||
echo "You can cancel at any step by typing '0' when prompted."
|
||||
echo ""
|
||||
press_enter
|
||||
|
||||
# Step 1
|
||||
print_banner "Step 1 of 5: Detect Live MySQL Data Directory"
|
||||
if ! step1_detect_datadir; then
|
||||
print_warning "Step 1 cancelled or failed. Returning to menu."
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Step 2
|
||||
print_banner "Step 2 of 5: Set Restore Data Location"
|
||||
if ! step2_set_restore_location; then
|
||||
print_warning "Step 2 cancelled or failed. Returning to menu."
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Step 3
|
||||
print_banner "Step 3 of 5: Select Database to Restore"
|
||||
if ! step3_select_database; then
|
||||
print_warning "Step 3 cancelled or failed. Returning to menu."
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Step 4
|
||||
print_banner "Step 4 of 5: Configure Restore Options"
|
||||
if ! step4_configure_options; then
|
||||
print_warning "Step 4 cancelled or failed. Returning to menu."
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Step 5
|
||||
print_banner "Step 5 of 5: Create SQL Dump"
|
||||
if ! step5_create_dump; then
|
||||
print_warning "Step 5 failed. Returning to menu to retry with different options."
|
||||
return 1
|
||||
fi
|
||||
|
||||
print_success "GUIDED PROCESS COMPLETED SUCCESSFULLY!"
|
||||
echo ""
|
||||
press_enter
|
||||
return 0
|
||||
}
|
||||
|
||||
@@ -3156,6 +3212,17 @@ main() {
|
||||
show_current_state
|
||||
press_enter
|
||||
;;
|
||||
G|g)
|
||||
# Guided process mode - walks through all steps automatically
|
||||
run_guided_process
|
||||
;;
|
||||
0)
|
||||
# Exit to main menu
|
||||
echo ""
|
||||
print_info "Returning to main menu..."
|
||||
sleep 1
|
||||
return 0
|
||||
;;
|
||||
*)
|
||||
print_error "Invalid option: $menu_choice"
|
||||
press_enter
|
||||
|
||||
@@ -253,6 +253,50 @@ save_snapshot() {
|
||||
ls -t "$SNAPSHOT_DIR"/snapshot_*.dat 2>/dev/null | tail -n +11 | xargs rm -f 2>/dev/null
|
||||
}
|
||||
|
||||
# BUG FIX #17: Load persistent threat data at startup to block pre-existing high-score IPs
|
||||
load_snapshot() {
|
||||
# Restore IP_DATA from last saved snapshot (enables blocking of known threats on startup)
|
||||
local snapshot_file="$SNAPSHOT_DIR/latest_snapshot.dat"
|
||||
|
||||
# Restore is optional (no snapshot on first run)
|
||||
if [ ! -f "$snapshot_file" ]; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
while IFS='=' read -r key value; do
|
||||
[ -z "$key" ] && continue
|
||||
|
||||
case "$key" in
|
||||
IP_DATA\[*)
|
||||
# Extract IP from IP_DATA[IP] format
|
||||
local ip="${key#IP_DATA[}"
|
||||
ip="${ip%]}"
|
||||
|
||||
# Only restore if score >= 50 (filter out noise, keep threats)
|
||||
# Format: score|hits|bot_type|attacks|ban_count|rep_score
|
||||
IFS='|' read -r score _ _ _ _ _ <<< "$value"
|
||||
|
||||
# Restore high-threat IPs (score >= 50 for persistence across restarts)
|
||||
if [ "${score:-0}" -ge 50 ]; then
|
||||
IP_DATA[$ip]="$value"
|
||||
fi
|
||||
;;
|
||||
ATTACK_TYPE_COUNTER\[*)
|
||||
# Extract attack type from ATTACK_TYPE_COUNTER[TYPE] format
|
||||
local attack="${key#ATTACK_TYPE_COUNTER[}"
|
||||
attack="${attack%]}"
|
||||
ATTACK_TYPE_COUNTER[$attack]="$value"
|
||||
;;
|
||||
TOTAL_THREATS)
|
||||
TOTAL_THREATS="$value"
|
||||
;;
|
||||
TOTAL_BLOCKS)
|
||||
TOTAL_BLOCKS="$value"
|
||||
;;
|
||||
esac
|
||||
done < "$snapshot_file"
|
||||
}
|
||||
|
||||
# Statistics counters
|
||||
declare -A IP_DATA # Stores: IP -> score|hits|bot_type|attacks|ban_count|rep_score
|
||||
declare -A IP_TIMESTAMPS # Stores: IP -> comma-separated attack timestamps (last 100)
|
||||
@@ -3680,6 +3724,21 @@ if [ -n "$IPSET_INIT_ERROR" ]; then
|
||||
sleep 3 # Give user time to read
|
||||
fi
|
||||
|
||||
# BUG FIX #17: Load persistent threat data BEFORE starting auto_mitigation_engine
|
||||
# This ensures pre-existing high-score IPs (Score >= 50) are blocked on startup
|
||||
load_snapshot
|
||||
|
||||
# Immediately write loaded IP_DATA to ip_data file for auto_mitigation_engine to process
|
||||
if [ ${#IP_DATA[@]} -gt 0 ]; then
|
||||
{
|
||||
flock -w 2 200 || exit 1
|
||||
for ip in "${!IP_DATA[@]}"; do
|
||||
echo "$ip=${IP_DATA[$ip]}"
|
||||
done
|
||||
} > "$TEMP_DIR/ip_data" 2>/dev/null 200>"$TEMP_DIR/ip_data.lock"
|
||||
echo "[INFO] Restored ${#IP_DATA[@]} threat IPs from persistent storage (Score >= 50)" >&2
|
||||
fi
|
||||
|
||||
# Start intelligence engines
|
||||
detect_distributed_attacks
|
||||
auto_mitigation_engine
|
||||
|
||||
+1415
-498
File diff suppressed because it is too large
Load Diff
@@ -573,8 +573,8 @@ analyze_images() {
|
||||
print_section "Image Format Analysis"
|
||||
print_info "Scanning for unoptimized images..."
|
||||
|
||||
# Count image types
|
||||
local jpg_count=$(find "$docroot" -maxdepth 5 -iname "*.jpg" -o -iname "*.jpeg" 2>/dev/null | wc -l)
|
||||
# Count image types (use parentheses to ensure -maxdepth applies to all -o branches)
|
||||
local jpg_count=$(find "$docroot" -maxdepth 5 \( -iname "*.jpg" -o -iname "*.jpeg" \) 2>/dev/null | wc -l)
|
||||
local png_count=$(find "$docroot" -maxdepth 5 -iname "*.png" 2>/dev/null | wc -l)
|
||||
local gif_count=$(find "$docroot" -maxdepth 5 -iname "*.gif" 2>/dev/null | wc -l)
|
||||
local webp_count=$(find "$docroot" -maxdepth 5 -iname "*.webp" 2>/dev/null | wc -l)
|
||||
|
||||
@@ -38,7 +38,8 @@ if ! flock -n 9; then
|
||||
print_error "Another instance of this script is already running"
|
||||
exit 1
|
||||
fi
|
||||
# NOTE: Trap is set later at line ~373, MUST include flock unlock!
|
||||
|
||||
# Note: Trap is set later at line ~469 to handle flock, fd closure, and lock file cleanup
|
||||
|
||||
# OPTIMIZATION: Parse command-line flags for script behavior
|
||||
# Support: --dry-run, --parallel, --log, --help
|
||||
@@ -456,7 +457,7 @@ get_wp_sites_cached() {
|
||||
|
||||
# Cleanup on exit (keep cache file for next invocation, only remove lock file)
|
||||
# CRITICAL: Must unlock flock (fd 9) before removing lock file!
|
||||
trap 'flock -u 9 2>/dev/null; exec 9>&-; rm -f "$LOCK_FILE"; rollback_cleanup' EXIT INT TERM
|
||||
trap 'flock -u 9 2>/dev/null; exec 9>&-; rm -f "$LOCK_FILE"' EXIT INT TERM
|
||||
|
||||
# OPTIMIZATION: User extraction caching (memoization)
|
||||
# extract_user_from_path() called 10 times, often for same path
|
||||
@@ -505,8 +506,14 @@ safe_add_cron_job() {
|
||||
|
||||
# Add the job to crontab
|
||||
# CRITICAL: crontab -l already verified to have succeeded above
|
||||
(echo "$current_crontab"; echo "$cron_time $cron_cmd") | crontab -u "$user" - 2>/dev/null
|
||||
return $?
|
||||
# Use temporary file instead of pipe to avoid pipefail issues and ensure proper error reporting
|
||||
local temp_crontab
|
||||
temp_crontab=$(mktemp) || return 1
|
||||
(echo "$current_crontab"; echo "$cron_time $cron_cmd") > "$temp_crontab"
|
||||
crontab -u "$user" "$temp_crontab" 2>/dev/null
|
||||
local result=$?
|
||||
rm -f "$temp_crontab"
|
||||
return $result
|
||||
}
|
||||
|
||||
# Function to safely remove cron jobs from user's crontab
|
||||
@@ -526,9 +533,17 @@ safe_remove_cron_jobs() {
|
||||
fi
|
||||
|
||||
# Remove jobs matching pattern
|
||||
# CRITICAL: crontab -l already verified to have succeeded above
|
||||
echo "$current_crontab" | grep -v "$pattern" | crontab -u "$user" - 2>/dev/null
|
||||
return $?
|
||||
# CRITICAL FIX: grep -v returns 1 when ALL lines are filtered (nothing matches the NOT pattern)
|
||||
# With set -o pipefail, this makes the pipe fail even though crontab should succeed
|
||||
# Solution: Use temporary file to break the pipe and avoid pipefail issues
|
||||
local temp_crontab
|
||||
temp_crontab=$(mktemp) || return 1
|
||||
echo "$current_crontab" | grep -v "$pattern" > "$temp_crontab" 2>/dev/null
|
||||
# Note: grep -v can return 1 if output is empty - this is not an error for crontab
|
||||
crontab -u "$user" "$temp_crontab" 2>/dev/null
|
||||
local result=$?
|
||||
rm -f "$temp_crontab"
|
||||
return $result
|
||||
}
|
||||
|
||||
# Function to validate wp-config.php syntax before and after modification
|
||||
|
||||
@@ -1,421 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
###############################################################################
|
||||
# TEST LAUNCHER - Cross-Platform Verification
|
||||
# Tests multi-platform reference database building without modifying launcher.sh
|
||||
###############################################################################
|
||||
|
||||
# Get script directory
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
export TOOLKIT_BASE_DIR="$SCRIPT_DIR"
|
||||
|
||||
# Source libraries
|
||||
LIB_DIR="$SCRIPT_DIR/lib"
|
||||
source "$LIB_DIR/common-functions.sh"
|
||||
source "$LIB_DIR/system-detect.sh"
|
||||
source "$LIB_DIR/domain-discovery.sh"
|
||||
source "$LIB_DIR/user-manager.sh"
|
||||
|
||||
# Test database location
|
||||
TEST_SYSREF_DB="${TOOLKIT_BASE_DIR}/.sysref-test"
|
||||
TEST_SYSREF_TIMESTAMP="${TOOLKIT_BASE_DIR}/.sysref-test.timestamp"
|
||||
|
||||
###############################################################################
|
||||
# DOMAIN STATUS CHECKING (from reference-db.sh)
|
||||
###############################################################################
|
||||
|
||||
# Returns: http_code|https_code|status_summary
|
||||
check_domain_status() {
|
||||
local domain="$1"
|
||||
local http_code="000"
|
||||
local https_code="000"
|
||||
local status_summary="unchecked"
|
||||
|
||||
# Skip if curl not available
|
||||
if ! command -v curl &>/dev/null; then
|
||||
echo "000|000|no_curl"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Skip obviously invalid domains
|
||||
if [ -z "$domain" ] || [[ ! "$domain" =~ \. ]]; then
|
||||
echo "000|000|invalid_domain"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Try HTTP (timeout 3 seconds, max 2 redirects, check for valid response)
|
||||
http_code=$(timeout 3 curl -s -o /dev/null -w "%{http_code}" --max-redirs 2 -m 3 "http://$domain" 2>/dev/null)
|
||||
if [ $? -ne 0 ] || [ -z "$http_code" ]; then
|
||||
http_code="timeout"
|
||||
fi
|
||||
|
||||
# Try HTTPS (timeout 3 seconds, max 2 redirects, ignore cert errors)
|
||||
https_code=$(timeout 3 curl -s -o /dev/null -w "%{http_code}" --max-redirs 2 -m 3 -k "https://$domain" 2>/dev/null)
|
||||
if [ $? -ne 0 ] || [ -z "$https_code" ]; then
|
||||
https_code="timeout"
|
||||
fi
|
||||
|
||||
# Determine overall status
|
||||
if [ "$http_code" = "200" ] || [ "$https_code" = "200" ]; then
|
||||
status_summary="200_OK"
|
||||
elif [ "$http_code" = "403" ] || [ "$https_code" = "403" ]; then
|
||||
status_summary="403_FORBIDDEN"
|
||||
elif [ "$http_code" = "404" ] || [ "$https_code" = "404" ]; then
|
||||
status_summary="404_NOT_FOUND"
|
||||
elif [ "$http_code" = "500" ] || [ "$https_code" = "500" ]; then
|
||||
status_summary="500_ERROR"
|
||||
elif [ "$http_code" = "502" ] || [ "$https_code" = "502" ]; then
|
||||
status_summary="502_BAD_GATEWAY"
|
||||
elif [ "$http_code" = "503" ] || [ "$https_code" = "503" ]; then
|
||||
status_summary="503_UNAVAILABLE"
|
||||
elif [[ "$http_code" =~ ^30[0-9]$ ]] || [[ "$https_code" =~ ^30[0-9]$ ]]; then
|
||||
status_summary="REDIRECT"
|
||||
elif [ "$http_code" = "timeout" ] && [ "$https_code" = "timeout" ]; then
|
||||
status_summary="TIMEOUT"
|
||||
elif [ "$http_code" = "000" ] && [ "$https_code" = "000" ]; then
|
||||
status_summary="UNREACHABLE"
|
||||
else
|
||||
status_summary="OTHER"
|
||||
fi
|
||||
|
||||
echo "${http_code}|${https_code}|${status_summary}"
|
||||
}
|
||||
|
||||
###############################################################################
|
||||
# PLATFORM-SPECIFIC DOMAIN BUILDERS
|
||||
###############################################################################
|
||||
|
||||
build_domains_cpanel_test() {
|
||||
print_info "Using cPanel-optimized domain discovery..."
|
||||
|
||||
local users=($(list_all_users))
|
||||
local current=0
|
||||
local total=0
|
||||
|
||||
# Count domains
|
||||
for user in "${users[@]}"; do
|
||||
local userdata_dir="${SYS_CPANEL_USERDATA_DIR:-/var/cpanel/userdata}/${user}"
|
||||
if [ -d "$userdata_dir" ]; then
|
||||
total=$((total + $(find "$userdata_dir" -type f ! -name "*.cache" ! -name "*.yaml" ! -name "*.json" ! -name "main*" ! -name "cache" ! -name "*_SSL" 2>/dev/null | wc -l)))
|
||||
fi
|
||||
done
|
||||
|
||||
# Process domains
|
||||
declare -A seen_domains
|
||||
for user in "${users[@]}"; do
|
||||
local userdata_dir="${SYS_CPANEL_USERDATA_DIR:-/var/cpanel/userdata}/${user}"
|
||||
|
||||
if [ -d "$userdata_dir" ]; then
|
||||
for config_file in "$userdata_dir"/*; do
|
||||
[ ! -f "$config_file" ] && continue
|
||||
local basename=$(basename "$config_file")
|
||||
|
||||
# Skip cache files
|
||||
[[ "$basename" =~ \.cache$|\.yaml$|\.json$|^main|^cache$|_SSL$ ]] && continue
|
||||
|
||||
local domain="$basename"
|
||||
local doc_root=$(grep "^documentroot:" "$config_file" | awk '{print $2}' || true)
|
||||
local log_path=$(grep "target:.*domlogs" "$config_file" | head -1 | awk '{print $2}' || true)
|
||||
local server_alias=$(grep "^serveralias:" "$config_file" | awk '{print $2}' || true)
|
||||
local php_version=$(grep "^phpversion:" "$config_file" | awk '{print $2}' || true)
|
||||
|
||||
# Determine if primary domain
|
||||
local is_primary="no"
|
||||
local primary_domain=$(get_user_domains "$user" | head -1)
|
||||
[ "$domain" = "$primary_domain" ] && is_primary="yes"
|
||||
|
||||
# Determine domain type (addon, parked, subdomain, primary)
|
||||
local domain_type="addon"
|
||||
if [ "$is_primary" = "yes" ]; then
|
||||
domain_type="primary"
|
||||
elif [[ "$domain" =~ \. ]] && [[ "$domain" =~ ^[^.]+\. ]]; then
|
||||
# Check if it's a subdomain of the primary
|
||||
local base_domain=$(echo "$domain" | rev | cut -d. -f1-2 | rev)
|
||||
if [ "$base_domain" = "$primary_domain" ]; then
|
||||
domain_type="subdomain"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Check HTTP/HTTPS status codes (only for primary and addon domains)
|
||||
current=$((current + 1))
|
||||
local http_code="000"
|
||||
local https_code="000"
|
||||
local status_summary="skipped"
|
||||
|
||||
if [ "$domain_type" = "primary" ] || [ "$domain_type" = "addon" ]; then
|
||||
show_progress $current $total "Checking domain status codes..."
|
||||
local status_result=$(check_domain_status "$domain")
|
||||
IFS='|' read -r http_code https_code status_summary <<< "$status_result"
|
||||
fi
|
||||
|
||||
# Format: DOMAIN|domain|owner|doc_root|log_path|php_version|is_primary|type|aliases|http_code|https_code|status_summary
|
||||
echo "DOMAIN|$domain|$user|$doc_root|$log_path|$php_version|$is_primary|$domain_type|$server_alias|$http_code|$https_code|$status_summary" >> "$TEST_SYSREF_DB"
|
||||
seen_domains["$domain"]=1
|
||||
|
||||
# Also add aliases as separate entries
|
||||
if [ -n "$server_alias" ]; then
|
||||
for alias in $server_alias; do
|
||||
[ -z "$alias" ] && continue
|
||||
[ -n "${seen_domains[$alias]:-}" ] && continue
|
||||
|
||||
# Alias points to same document root and logs (inherit status from parent)
|
||||
echo "DOMAIN|$alias|$user|$doc_root|$log_path|$php_version|no|alias|$domain|$http_code|$https_code|alias_of_$status_summary" >> "$TEST_SYSREF_DB"
|
||||
seen_domains["$alias"]=1
|
||||
done
|
||||
fi
|
||||
done
|
||||
fi
|
||||
done
|
||||
|
||||
finish_progress
|
||||
|
||||
# Check /etc/localdomains (cPanel local domains not yet added)
|
||||
if [ "$SYS_CONTROL_PANEL" = "cpanel" ] && [ -f "/etc/localdomains" ]; then
|
||||
while read -r domain; do
|
||||
[ -z "$domain" ] && continue
|
||||
[ -n "${seen_domains[$domain]:-}" ] && continue
|
||||
|
||||
local owner=$(grep "^${domain}:" /etc/trueuserdomains 2>/dev/null | cut -d: -f2 | xargs || true)
|
||||
[ -z "$owner" ] && owner="unknown"
|
||||
|
||||
local log_path="${SYS_LOG_DIR}/${domain}"
|
||||
|
||||
# Check status
|
||||
local status_result=$(check_domain_status "$domain")
|
||||
IFS='|' read -r http_code https_code status_summary <<< "$status_result"
|
||||
|
||||
echo "DOMAIN|$domain|$owner||$log_path||unknown|local||$http_code|$https_code|$status_summary" >> "$TEST_SYSREF_DB"
|
||||
seen_domains["$domain"]=1
|
||||
done < /etc/localdomains
|
||||
fi
|
||||
|
||||
# Check /etc/remotedomains (cPanel remote MX domains)
|
||||
if [ "$SYS_CONTROL_PANEL" = "cpanel" ] && [ -f "/etc/remotedomains" ]; then
|
||||
while read -r domain; do
|
||||
[ -z "$domain" ] && continue
|
||||
[ -n "${seen_domains[$domain]:-}" ] && continue
|
||||
|
||||
local owner=$(grep "^${domain}:" /etc/trueuserdomains 2>/dev/null | cut -d: -f2 | xargs || true)
|
||||
[ -z "$owner" ] && owner="unknown"
|
||||
|
||||
echo "DOMAIN|$domain|$owner||||unknown|remote||000|000|remote_mx" >> "$TEST_SYSREF_DB"
|
||||
seen_domains["$domain"]=1
|
||||
done < /etc/remotedomains
|
||||
fi
|
||||
}
|
||||
|
||||
build_domains_plesk_test() {
|
||||
print_info "Using Plesk-specific domain discovery..."
|
||||
|
||||
local all_domains=$(list_all_domains)
|
||||
local domain_count=$(echo "$all_domains" | wc -w)
|
||||
local current=0
|
||||
|
||||
for domain in $all_domains; do
|
||||
[ -z "$domain" ] && continue
|
||||
((current++))
|
||||
|
||||
show_progress $current $domain_count "Checking domain status codes..."
|
||||
|
||||
# Use panel-agnostic functions that call Plesk helpers
|
||||
local owner=$(get_domain_owner "$domain" || echo "unknown")
|
||||
local docroot=$(get_domain_docroot "$domain" || echo "")
|
||||
local logdir=$(get_domain_logdir "$domain" || echo "")
|
||||
local access_log=$(get_domain_access_log "$domain" || echo "")
|
||||
|
||||
# Try to get PHP version if plesk helper exists
|
||||
local php_version=""
|
||||
if type plesk_get_php_version >/dev/null 2>&1; then
|
||||
php_version=$(plesk_get_php_version "$domain" || echo "")
|
||||
fi
|
||||
|
||||
# Check domain status
|
||||
local status_result=$(check_domain_status "$domain")
|
||||
IFS='|' read -r http_code https_code status_summary <<< "$status_result"
|
||||
|
||||
# Format to match production
|
||||
echo "DOMAIN|$domain|$owner|$docroot|$logdir|$php_version|unknown|local||$http_code|$https_code|$status_summary" >> "$TEST_SYSREF_DB"
|
||||
done
|
||||
|
||||
finish_progress
|
||||
}
|
||||
|
||||
build_domains_standalone_test() {
|
||||
print_info "Using standalone domain discovery..."
|
||||
|
||||
local all_domains=$(list_all_domains)
|
||||
local domain_count=$(echo "$all_domains" | wc -w)
|
||||
local current=0
|
||||
|
||||
if [ -z "$all_domains" ]; then
|
||||
print_warning "No domains found via directory scanning"
|
||||
return
|
||||
fi
|
||||
|
||||
for domain in $all_domains; do
|
||||
[ -z "$domain" ] && continue
|
||||
((current++))
|
||||
|
||||
show_progress $current $domain_count "Checking domain status codes..."
|
||||
|
||||
local docroot=$(get_domain_docroot "$domain" || echo "")
|
||||
local owner=$(get_domain_owner "$domain" || echo "unknown")
|
||||
local logdir=$(get_domain_logdir "$domain" || echo "")
|
||||
local access_log=$(get_domain_access_log "$domain" || echo "")
|
||||
|
||||
# Check domain status
|
||||
local status_result=$(check_domain_status "$domain")
|
||||
IFS='|' read -r http_code https_code status_summary <<< "$status_result"
|
||||
|
||||
# Format to match production
|
||||
echo "DOMAIN|$domain|$owner|$docroot|$logdir||unknown|local||$http_code|$https_code|$status_summary" >> "$TEST_SYSREF_DB"
|
||||
done
|
||||
|
||||
finish_progress
|
||||
}
|
||||
|
||||
###############################################################################
|
||||
# MAIN TEST FUNCTION
|
||||
###############################################################################
|
||||
|
||||
test_reference_database() {
|
||||
local start_time=$(date +%s)
|
||||
|
||||
print_header "Cross-Platform Reference Database Test"
|
||||
echo ""
|
||||
|
||||
# Show detected platform
|
||||
print_info "Detected Platform: $SYS_CONTROL_PANEL"
|
||||
print_info "OS: $SYS_OS_TYPE $SYS_OS_VERSION"
|
||||
print_info "Web Server: $SYS_WEB_SERVER $SYS_WEB_SERVER_VERSION"
|
||||
print_info "Database: $SYS_DB_TYPE $SYS_DB_VERSION"
|
||||
print_info "User Home Base: $SYS_USER_HOME_BASE"
|
||||
print_info "Log Directory: $SYS_LOG_DIR"
|
||||
echo ""
|
||||
|
||||
# Initialize test database
|
||||
print_info "Building test reference database..."
|
||||
echo "# Test System Reference Database" > "$TEST_SYSREF_DB"
|
||||
echo "# Platform: $SYS_CONTROL_PANEL" >> "$TEST_SYSREF_DB"
|
||||
echo "# Generated: $(date)" >> "$TEST_SYSREF_DB"
|
||||
echo "" >> "$TEST_SYSREF_DB"
|
||||
|
||||
# Test users
|
||||
echo "[USERS]" >> "$TEST_SYSREF_DB"
|
||||
local users=($(list_all_users))
|
||||
print_info "Found ${#users[@]} users"
|
||||
for user in "${users[@]}"; do
|
||||
echo "USER|$user" >> "$TEST_SYSREF_DB"
|
||||
done
|
||||
echo "" >> "$TEST_SYSREF_DB"
|
||||
|
||||
# Test domains - platform-specific
|
||||
echo "[DOMAINS]" >> "$TEST_SYSREF_DB"
|
||||
case "$SYS_CONTROL_PANEL" in
|
||||
cpanel)
|
||||
build_domains_cpanel_test
|
||||
;;
|
||||
plesk)
|
||||
build_domains_plesk_test
|
||||
;;
|
||||
interworx)
|
||||
print_warning "InterWorx support not yet implemented in test"
|
||||
build_domains_standalone_test
|
||||
;;
|
||||
*)
|
||||
build_domains_standalone_test
|
||||
;;
|
||||
esac
|
||||
echo "" >> "$TEST_SYSREF_DB"
|
||||
|
||||
# Test databases
|
||||
echo "[DATABASES]" >> "$TEST_SYSREF_DB"
|
||||
if [ "$SYS_DB_TYPE" != "none" ]; then
|
||||
local all_dbs=$(mysql -Ns -e "SHOW DATABASES" 2>/dev/null | grep -v "^information_schema$\|^mysql$\|^performance_schema$\|^sys$" || true)
|
||||
local db_count=$(echo "$all_dbs" | wc -l)
|
||||
print_info "Found $db_count databases"
|
||||
for db in $all_dbs; do
|
||||
local owner=$(get_database_owner "$db" || echo "unknown")
|
||||
echo "DB|$db|$owner" >> "$TEST_SYSREF_DB"
|
||||
done
|
||||
fi
|
||||
echo "" >> "$TEST_SYSREF_DB"
|
||||
|
||||
# Save timestamp
|
||||
date +%s > "$TEST_SYSREF_TIMESTAMP"
|
||||
|
||||
local end_time=$(date +%s)
|
||||
local duration=$((end_time - start_time))
|
||||
|
||||
echo ""
|
||||
print_success "Test database built in ${duration}s"
|
||||
print_info "Test database location: $TEST_SYSREF_DB"
|
||||
echo ""
|
||||
|
||||
# Show statistics
|
||||
local user_count=$(grep -c "^USER|" "$TEST_SYSREF_DB" 2>/dev/null || echo 0)
|
||||
local domain_count=$(grep -c "^DOMAIN|" "$TEST_SYSREF_DB" 2>/dev/null || echo 0)
|
||||
local db_count=$(grep -c "^DB|" "$TEST_SYSREF_DB" 2>/dev/null || echo 0)
|
||||
|
||||
print_header "Test Results"
|
||||
echo " Users: $user_count"
|
||||
echo " Domains: $domain_count"
|
||||
echo " Databases: $db_count"
|
||||
echo ""
|
||||
|
||||
# Show sample domains
|
||||
if [ "$domain_count" -gt 0 ]; then
|
||||
print_header "Sample Domain Entries (first 5)"
|
||||
grep "^DOMAIN|" "$TEST_SYSREF_DB" | head -5 | while IFS='|' read -r type domain owner docroot logdir php_version is_primary domain_type server_alias http_code https_code status_summary; do
|
||||
echo " Domain: $domain"
|
||||
echo " Owner: $owner"
|
||||
echo " Docroot: $docroot"
|
||||
echo " Type: $domain_type"
|
||||
echo " Status: HTTP=$http_code HTTPS=$https_code ($status_summary)"
|
||||
echo ""
|
||||
done
|
||||
fi
|
||||
|
||||
# Compare with production database if it exists
|
||||
if [ -f "$TOOLKIT_BASE_DIR/.sysref" ]; then
|
||||
echo ""
|
||||
print_header "Comparison with Production Database"
|
||||
|
||||
local prod_users=$(grep -c "^USER|" "$TOOLKIT_BASE_DIR/.sysref" 2>/dev/null || echo 0)
|
||||
local prod_domains=$(grep -c "^DOMAIN|" "$TOOLKIT_BASE_DIR/.sysref" 2>/dev/null || echo 0)
|
||||
local prod_dbs=$(grep -c "^DB|" "$TOOLKIT_BASE_DIR/.sysref" 2>/dev/null || echo 0)
|
||||
|
||||
echo " Production: $prod_users users, $prod_domains domains, $prod_dbs databases"
|
||||
echo " Test: $user_count users, $domain_count domains, $db_count databases"
|
||||
echo ""
|
||||
|
||||
if [ "$user_count" -eq "$prod_users" ] && [ "$domain_count" -eq "$prod_domains" ]; then
|
||||
print_success "✅ Counts match! Test successful."
|
||||
else
|
||||
print_warning "⚠️ Counts differ - this may be expected for cross-platform changes"
|
||||
fi
|
||||
fi
|
||||
|
||||
echo ""
|
||||
print_info "Test database saved to: $TEST_SYSREF_DB"
|
||||
print_info "You can inspect it with: cat $TEST_SYSREF_DB"
|
||||
}
|
||||
|
||||
###############################################################################
|
||||
# RUN TEST
|
||||
###############################################################################
|
||||
|
||||
# Clear screen and run
|
||||
clear
|
||||
test_reference_database
|
||||
|
||||
# Instructions
|
||||
echo ""
|
||||
print_header "Next Steps"
|
||||
echo "1. Review the test database: cat $TEST_SYSREF_DB"
|
||||
echo "2. If results look good on this cPanel server, test on Plesk:"
|
||||
echo " - git pull on Plesk server"
|
||||
echo " - bash test-launcher.sh"
|
||||
echo " - Verify domains/users/databases are detected"
|
||||
echo "3. If Plesk test succeeds, we can integrate into main launcher"
|
||||
echo ""
|
||||
@@ -1,296 +0,0 @@
|
||||
#!/bin/bash
|
||||
################################################################################
|
||||
# Integration Test Suite for WordPress Cron Manager
|
||||
# Purpose: Validate script functionality and catch regressions
|
||||
################################################################################
|
||||
|
||||
SCRIPT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/modules/website/wordpress/wordpress-cron-manager.sh"
|
||||
TEST_COUNT=0
|
||||
PASSED_COUNT=0
|
||||
FAILED_COUNT=0
|
||||
|
||||
# Color codes
|
||||
RED='\033[0;31m'
|
||||
GREEN='\033[0;32m'
|
||||
YELLOW='\033[1;33m'
|
||||
BLUE='\033[0;34m'
|
||||
NC='\033[0m'
|
||||
|
||||
test_start() {
|
||||
TEST_COUNT=$((TEST_COUNT + 1))
|
||||
echo -e "\n${BLUE}[TEST $TEST_COUNT]${NC} $1"
|
||||
}
|
||||
|
||||
test_pass() {
|
||||
PASSED_COUNT=$((PASSED_COUNT + 1))
|
||||
echo -e "${GREEN}✓ PASS${NC}: $1"
|
||||
}
|
||||
|
||||
test_fail() {
|
||||
FAILED_COUNT=$((FAILED_COUNT + 1))
|
||||
echo -e "${RED}✗ FAIL${NC}: $1"
|
||||
}
|
||||
|
||||
test_info() {
|
||||
echo -e "${YELLOW}ℹ${NC} $1"
|
||||
}
|
||||
|
||||
# Test 1: Script exists
|
||||
test_script_exists() {
|
||||
test_start "Script file exists"
|
||||
if [ -f "$SCRIPT" ]; then
|
||||
test_pass "Script found at: $SCRIPT"
|
||||
else
|
||||
test_fail "Script not found: $SCRIPT"
|
||||
fi
|
||||
}
|
||||
|
||||
# Test 2: Script is executable
|
||||
test_script_executable() {
|
||||
test_start "Script is executable"
|
||||
if [ -x "$SCRIPT" ]; then
|
||||
test_pass "Script has execute permission"
|
||||
else
|
||||
test_fail "Script is not executable"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Test 3: Bash syntax validation
|
||||
test_bash_syntax() {
|
||||
test_start "Bash syntax validation"
|
||||
if bash -n "$SCRIPT" 2>/dev/null; then
|
||||
test_pass "No syntax errors"
|
||||
else
|
||||
test_fail "Syntax errors detected"
|
||||
bash -n "$SCRIPT" 2>&1 | head -5
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Test 4: Help flag works
|
||||
test_help_flag() {
|
||||
test_start "Help flag functionality (--help)"
|
||||
output=$($SCRIPT --help 2>&1 | head -5)
|
||||
if echo "$output" | grep -q "Usage"; then
|
||||
test_pass "Help output generated"
|
||||
else
|
||||
test_fail "Help flag not working properly"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Test 5: Grep for key functions (non-execution test)
|
||||
test_functions_defined() {
|
||||
test_start "Key functions defined in script"
|
||||
local functions="initialize_wp_cache get_wp_search_paths validate_wordpress_site is_empty is_set"
|
||||
local missing=0
|
||||
|
||||
for func in $functions; do
|
||||
if grep -q "^$func()" "$SCRIPT"; then
|
||||
test_info "✓ Found function: $func"
|
||||
else
|
||||
test_fail "Missing function: $func"
|
||||
missing=$((missing + 1))
|
||||
fi
|
||||
done
|
||||
|
||||
if [ $missing -eq 0 ]; then
|
||||
test_pass "All key functions defined"
|
||||
else
|
||||
test_fail "$missing functions missing"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Test 6: Check for helper functions
|
||||
test_helper_functions_defined() {
|
||||
test_start "Helper functions defined"
|
||||
local helpers="is_file_valid is_user_valid is_wp_configured is_cron_job_exists has_sufficient_disk_space"
|
||||
local count=0
|
||||
|
||||
for helper in $helpers; do
|
||||
if grep -q "^$helper()" "$SCRIPT"; then
|
||||
count=$((count + 1))
|
||||
fi
|
||||
done
|
||||
|
||||
if [ $count -ge 3 ]; then
|
||||
test_pass "Helper functions defined ($count/5)"
|
||||
else
|
||||
test_fail "Insufficient helper functions ($count/5)"
|
||||
fi
|
||||
}
|
||||
|
||||
# Test 7: Error code constants
|
||||
test_error_codes_defined() {
|
||||
test_start "Error code constants defined"
|
||||
if grep -q "ERR_SUCCESS\|ERR_INVALID_USER\|ERR_FILE_NOT_FOUND" "$SCRIPT"; then
|
||||
test_pass "Error code constants found"
|
||||
else
|
||||
test_fail "Error code constants not found"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Test 8: Report generation functions
|
||||
test_report_functions() {
|
||||
test_start "Report generation functions"
|
||||
local funcs="generate_json_report generate_csv_report report_save"
|
||||
local count=0
|
||||
|
||||
for func in $funcs; do
|
||||
if grep -q "^$func()" "$SCRIPT"; then
|
||||
count=$((count + 1))
|
||||
fi
|
||||
done
|
||||
|
||||
if [ $count -eq 3 ]; then
|
||||
test_pass "Report functions defined ($count/3)"
|
||||
else
|
||||
test_fail "Report functions incomplete ($count/3)"
|
||||
fi
|
||||
}
|
||||
|
||||
# Test 9: Rollback functions
|
||||
test_rollback_functions() {
|
||||
test_start "Rollback support functions"
|
||||
local funcs="rollback_init rollback_create_checkpoint rollback_all"
|
||||
local count=0
|
||||
|
||||
for func in $funcs; do
|
||||
if grep -q "^$func()" "$SCRIPT"; then
|
||||
count=$((count + 1))
|
||||
fi
|
||||
done
|
||||
|
||||
if [ $count -eq 3 ]; then
|
||||
test_pass "Rollback functions defined ($count/3)"
|
||||
else
|
||||
test_fail "Rollback functions incomplete ($count/3)"
|
||||
fi
|
||||
}
|
||||
|
||||
# Test 10: Configuration support
|
||||
test_config_support() {
|
||||
test_start "Configuration file support"
|
||||
if grep -q "load_config_file\|/etc/wordpress-cron-manager.conf" "$SCRIPT"; then
|
||||
test_pass "Configuration file support implemented"
|
||||
else
|
||||
test_fail "Configuration file support not found"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Test 11: Progress tracking
|
||||
test_progress_tracking() {
|
||||
test_start "Progress tracking functions"
|
||||
local funcs="show_progress show_progress_bar show_spinner"
|
||||
local count=0
|
||||
|
||||
for func in $funcs; do
|
||||
if grep -q "^$func()" "$SCRIPT"; then
|
||||
count=$((count + 1))
|
||||
fi
|
||||
done
|
||||
|
||||
if [ $count -ge 2 ]; then
|
||||
test_pass "Progress tracking defined ($count/3)"
|
||||
else
|
||||
test_fail "Progress tracking incomplete ($count/3)"
|
||||
fi
|
||||
}
|
||||
|
||||
# Test 12: Regex helpers
|
||||
test_regex_helpers() {
|
||||
test_start "Regex pattern helpers"
|
||||
local helpers="grep_wp_config_define grep_disabled_wp_cron grep_in_crontab"
|
||||
local count=0
|
||||
|
||||
for helper in $helpers; do
|
||||
if grep -q "^$helper()" "$SCRIPT"; then
|
||||
count=$((count + 1))
|
||||
fi
|
||||
done
|
||||
|
||||
if [ $count -eq 3 ]; then
|
||||
test_pass "Regex helpers defined ($count/3)"
|
||||
else
|
||||
test_fail "Regex helpers incomplete ($count/3)"
|
||||
fi
|
||||
}
|
||||
|
||||
# Test 13: Function registry
|
||||
test_function_registry() {
|
||||
test_start "Function registry metadata"
|
||||
if grep -q "FUNCTION_REGISTRY" "$SCRIPT"; then
|
||||
test_pass "Function registry implemented"
|
||||
else
|
||||
test_fail "Function registry not found"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Test 14: Line count (sanity check)
|
||||
test_script_size() {
|
||||
test_start "Script size sanity check"
|
||||
local lines=$(wc -l < "$SCRIPT")
|
||||
if [ "$lines" -gt 2000 ]; then
|
||||
test_pass "Script size reasonable: $lines lines"
|
||||
else
|
||||
test_fail "Script size too small: $lines lines (expected >2000)"
|
||||
fi
|
||||
}
|
||||
|
||||
# Test 15: Git commits
|
||||
test_git_history() {
|
||||
test_start "Optimization commits in git history"
|
||||
local opt_commits=$(cd "$(dirname $SCRIPT)/../../../" && git log --oneline | grep -c "OPTIMIZE\|ADVANCED")
|
||||
if [ $opt_commits -gt 5 ]; then
|
||||
test_pass "Multiple optimization commits found: $opt_commits"
|
||||
else
|
||||
test_fail "Insufficient optimization commits: $opt_commits"
|
||||
fi
|
||||
}
|
||||
|
||||
# Summary
|
||||
print_summary() {
|
||||
echo ""
|
||||
echo "================================================================================"
|
||||
echo "INTEGRATION TEST SUMMARY"
|
||||
echo "================================================================================"
|
||||
echo "Total Tests: $TEST_COUNT"
|
||||
echo -e "${GREEN}Passed: $PASSED_COUNT${NC}"
|
||||
echo -e "${RED}Failed: $FAILED_COUNT${NC}"
|
||||
|
||||
if [ $FAILED_COUNT -eq 0 ]; then
|
||||
echo -e "\n${GREEN}✓ ALL TESTS PASSED${NC}"
|
||||
return 0
|
||||
else
|
||||
echo -e "\n${RED}⚠ SOME TESTS FAILED (but script may still work)${NC}"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Main execution
|
||||
echo "================================================================================"
|
||||
echo "WordPress Cron Manager - Integration Test Suite"
|
||||
echo "================================================================================"
|
||||
|
||||
test_script_exists
|
||||
test_script_executable
|
||||
test_bash_syntax
|
||||
test_help_flag
|
||||
test_functions_defined
|
||||
test_helper_functions_defined
|
||||
test_error_codes_defined
|
||||
test_report_functions
|
||||
test_rollback_functions
|
||||
test_config_support
|
||||
test_progress_tracking
|
||||
test_regex_helpers
|
||||
test_function_registry
|
||||
test_script_size
|
||||
test_git_history
|
||||
|
||||
print_summary
|
||||
Reference in New Issue
Block a user