From 8a4d70c37ce5ce143beec51c3bf1fe1ad4382e95 Mon Sep 17 00:00:00 2001
From: cschantz <admin@server.local>
Date: Tue, 17 Feb 2026 18:42:04 -0500
Subject: [PATCH] Standardize bot-blocker.sh menu validation, colors, and
 yes/no prompts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

IMPROVEMENTS:
- Added input validation for menu choice (0-5) with retry loop
- Added color codes to menu options (${CYAN}1)${NC} and ${RED}0)${NC})
- Removed wildcard case that accepted invalid input silently
- Standardized yes/no prompts to use confirm() library function
- Improved user prompt to show valid range (0-5)

VALIDATION DETAILS:
- Menu choice: Only accepts 0-5, rejects invalid with clear error message
- Retry loop: User stays in menu until valid choice is entered
- Yes/no prompts: Now use confirm() function for consistency
  - Line 45: "Create directory?"
  - Line 146: "Re-apply configuration?"

MENU STANDARDS COMPLIANCE:
✓ Input validation (CRITICAL)
✓ Color codes (IMPORTANT - standardized to CYAN/RED)
✓ Error messages on invalid input (IMPORTANT)
✓ Retry logic for failed validation (IMPORTANT)
✓ Standardized yes/no prompts (IMPORTANT)

Lines modified: ~30 (validation, colors, confirm() function)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
---
 modules/security/bot-blocker.sh | 44 ++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/modules/security/bot-blocker.sh b/modules/security/bot-blocker.sh
index 359a4a3..62091ca 100755
--- a/modules/security/bot-blocker.sh
+++ b/modules/security/bot-blocker.sh
@@ -45,13 +45,11 @@ check_apache_config_exists() {
     if [ ! -d "$conf_dir" ]; then
         print_warning "Apache config directory doesn't exist: $conf_dir"
         echo ""
-        read -p "Create directory? (yes/no): " create_dir
-        if [ "$create_dir" = "yes" ]; then
-            mkdir -p "$conf_dir"
-            print_success "Created directory: $conf_dir"
-        else
+        if ! confirm "Create directory?"; then
             return 1
         fi
+        mkdir -p "$conf_dir"
+        print_success "Created directory: $conf_dir"
     fi
 
     if [ ! -f "$APACHE_CONF" ]; then
@@ -145,8 +143,7 @@ enable_bot_blocking() {
     if is_bot_blocking_enabled; then
         print_warning "Bot blocking is already enabled"
         echo ""
-        read -p "Re-apply configuration? (yes/no): " reapply
-        if [ "$reapply" != "yes" ]; then
+        if ! confirm "Re-apply configuration?"; then
             return 0
         fi
         disable_bot_blocking_silent
@@ -454,25 +451,37 @@ show_menu() {
     echo ""
     echo -e "${BOLD}Configuration:${NC}"
     echo ""
-    echo "  1) Enable Bot Blocking   - Block malicious bots and scrapers"
-    echo "  2) Disable Bot Blocking  - Remove blocking rules"
-    echo "  3) View Configuration    - Show current rules"
+    echo -e "  ${CYAN}1)${NC} Enable Bot Blocking   - Block malicious bots and scrapers"
+    echo -e "  ${CYAN}2)${NC} Disable Bot Blocking  - Remove blocking rules"
+    echo -e "  ${CYAN}3)${NC} View Configuration    - Show current rules"
     echo ""
     echo -e "${BOLD}Maintenance:${NC}"
     echo ""
-    echo "  4) Test Configuration    - Validate Apache syntax"
-    echo "  5) Manage Backups        - View and restore backups"
+    echo -e "  ${CYAN}4)${NC} Test Configuration    - Validate Apache syntax"
+    echo -e "  ${CYAN}5)${NC} Manage Backups        - View and restore backups"
     echo ""
-    echo "  0) Back to Security Menu"
+    echo -e "  ${RED}0)${NC} Back to Security Menu"
     echo ""
     echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-    echo -n "Select option: "
+    echo -n "Select option (0-5): "
 }
 
 main() {
     while true; do
         show_menu
-        read -r choice
+
+        # Validate choice input
+        while true; do
+            read -r choice
+
+            if ! [[ "$choice" =~ ^[0-5]$ ]]; then
+                echo ""
+                print_error "Invalid choice. Please enter 0-5"
+                echo ""
+                continue
+            fi
+            break
+        done
 
         case $choice in
             1) enable_bot_blocking ;;
@@ -484,11 +493,6 @@ main() {
                 clear
                 exit 0
                 ;;
-            *)
-                echo ""
-                print_error "Invalid option"
-                sleep 1
-                ;;
         esac
     done
 }