From 3d5c06bf08f0ede7206e0ef39966d6be2106a225 Mon Sep 17 00:00:00 2001
From: Gzngskxgr20 <74984541+Athameral@users.noreply.github.com>
Date: Sun, 21 Apr 2024 02:29:27 +0800
Subject: [PATCH] Update x-ui.sh with ufw port settings (#2230)

* Update x-ui.sh with ufw port settings

It really costs time when adding rules for a large range, if for loop is used in bash. Changed it to built-in port range support in ufw.
---
 x-ui.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/x-ui.sh b/x-ui.sh
index a9ef1601..073ab63e 100644
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -591,8 +591,9 @@ open_ports() {
 
     # Check if the firewall is inactive
     if ufw status | grep -q "Status: active"; then
-        echo "firewall is already active"
+        echo "Firewall is already active"
     else
+        echo "Activating firewall..."
         # Open the necessary ports
         ufw allow ssh
         ufw allow http
@@ -619,17 +620,18 @@ open_ports() {
             # Split the range into start and end ports
             start_port=$(echo $port | cut -d'-' -f1)
             end_port=$(echo $port | cut -d'-' -f2)
-            # Loop through the range and open each port
-            for ((i = start_port; i <= end_port; i++)); do
-                ufw allow $i
-            done
+            ufw allow $start_port:$end_port
         else
             ufw allow "$port"
         fi
     done
 
     # Confirm that the ports are open
-    ufw status | grep $ports
+    echo "The following ports are now open:"
+    ufw status | grep "ALLOW" | grep -Eo "[0-9]+(/[a-z]+)?"
+
+    echo "Firewall status:"
+    ufw status verbose
 }
 
 delete_ports() {
@@ -649,10 +651,8 @@ delete_ports() {
             # Split the range into start and end ports
             start_port=$(echo $port | cut -d'-' -f1)
             end_port=$(echo $port | cut -d'-' -f2)
-            # Loop through the range and delete each port
-            for ((i = start_port; i <= end_port; i++)); do
-                ufw delete allow $i
-            done
+            # Delete the port range
+            ufw delete allow $start_port:$end_port
         else
             ufw delete allow "$port"
         fi
@@ -660,7 +660,7 @@ delete_ports() {
 
     # Confirm that the ports are deleted
     echo "Deleted the specified ports:"
-    ufw status | grep $ports
+    ufw status | grep "ALLOW" | grep -Eo "[0-9]+(/[a-z]+)?"
 }
 
 update_geo() {