From 4ab5bf04ebc26efb96e38e56c931414e2063c8da Mon Sep 17 00:00:00 2001
From: AmoAlireza <79990596+AmoAlireza@users.noreply.github.com>
Date: Mon, 4 Sep 2023 16:50:09 -0700
Subject: [PATCH] Fail2ban banned log command added (#991)

---
 install.sh |  1 +
 x-ui.sh    | 28 ++++++++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/install.sh b/install.sh
index f1fd25e9..9fa3157b 100644
--- a/install.sh
+++ b/install.sh
@@ -171,6 +171,7 @@ install_x-ui() {
     echo -e "x-ui enable       - Enable    x-ui on system startup"
     echo -e "x-ui disable      - Disable   x-ui on system startup"
     echo -e "x-ui log          - Check     x-ui logs"
+    echo -e "x-ui banlog       - Check Fail2ban ban logs"
     echo -e "x-ui update       - Update    x-ui"
     echo -e "x-ui install      - Install   x-ui"
     echo -e "x-ui uninstall    - Uninstall x-ui"
diff --git a/x-ui.sh b/x-ui.sh
index 381e0f45..d193c642 100644
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -298,6 +298,18 @@ show_log() {
     fi
 }
 
+show_banlog() {
+  if test -f "${iplimit_banned_log_path}"; then
+    if [[ -s "${iplimit_banned_log_path}" ]]; then
+      cat ${iplimit_banned_log_path}
+    else
+      echo -e "${red}Log file is empty.${plain}\n"  
+    fi
+  else
+    echo -e "${red}Log file not found. Please Install Fail2ban and IP Limit first.${plain}\n"
+  fi
+}
+
 enable_bbr() {
     if grep -q "net.core.default_qdisc=fq" /etc/sysctl.conf && grep -q "net.ipv4.tcp_congestion_control=bbr" /etc/sysctl.conf; then
         echo -e "${green}BBR is already enabled!${plain}"
@@ -892,16 +904,8 @@ iplimit_main() {
             fi
             iplimit_main ;;
         4)
-            if test -f "${iplimit_banned_log_path}"; then
-                if [[ -s "${iplimit_banned_log_path}" ]]; then
-                    cat ${iplimit_banned_log_path}
-                else
-                    echo -e "${red}Log file is empty.${plain}\n"
-                fi
-            else
-                echo -e "${red}Log file not found. Please Install Fail2ban and IP Limit first.${plain}\n"
-                iplimit_main
-            fi ;;
+            show_banlog
+            ;;
         5)
             service fail2ban status
             ;;
@@ -1012,6 +1016,7 @@ show_usage() {
     echo -e "x-ui enable       - Enable x-ui on system startup"
     echo -e "x-ui disable      - Disable x-ui on system startup"
     echo -e "x-ui log          - Check x-ui logs"
+    echo -e "x-ui banlog       - Check Fail2ban ban logs"
     echo -e "x-ui update       - Update x-ui "
     echo -e "x-ui install      - Install x-ui "
     echo -e "x-ui uninstall    - Uninstall x-ui "
@@ -1153,6 +1158,9 @@ if [[ $# > 0 ]]; then
     "log")
         check_install 0 && show_log 0
         ;;
+    "banlog")
+        check_install 0 && show_banlog 0
+        ;;
     "update")
         check_install 0 && update 0
         ;;