From 2bea6efdf13d1faa7bfb7834773b04aee2c1e6ec Mon Sep 17 00:00:00 2001
From: iamromulan <50184035+iamromulan@users.noreply.github.com>
Date: Sun, 5 May 2024 04:56:12 -0400
Subject: [PATCH] Restore new version of ttl cgi

---
 simpleadmin/www/cgi-bin/get_ttl_status     |  4 +-
 simpleadmin/www/cgi-bin/get_ttl_status.old | 20 +++++++
 simpleadmin/www/cgi-bin/set_ttl            | 19 +++----
 simpleadmin/www/cgi-bin/set_ttl.old        | 61 ++++++++++++++++++++++
 4 files changed, 93 insertions(+), 11 deletions(-)
 create mode 100644 simpleadmin/www/cgi-bin/get_ttl_status.old
 create mode 100644 simpleadmin/www/cgi-bin/set_ttl.old

diff --git a/simpleadmin/www/cgi-bin/get_ttl_status b/simpleadmin/www/cgi-bin/get_ttl_status
index 03d366b..dc2d54b 100644
--- a/simpleadmin/www/cgi-bin/get_ttl_status
+++ b/simpleadmin/www/cgi-bin/get_ttl_status
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Check iptables for ttlvalue
-ttlvalue=$(iptables -t mangle -vnL | awk '/TTL/ {print $13; exit}')
+ttlvalue=$(/opt/bin/sudo /usr/sbin/iptables -w 5 -t mangle -vnL | grep TTL | awk '{print $13}' | head -n1)
 ttlenabled=true;
 
 # Set Variables
@@ -17,4 +17,4 @@ cat <<EOT
     "isEnabled": $ttlenabled,
     "ttl": $ttlvalue
 }
-EOT
\ No newline at end of file
+EOT
diff --git a/simpleadmin/www/cgi-bin/get_ttl_status.old b/simpleadmin/www/cgi-bin/get_ttl_status.old
new file mode 100644
index 0000000..03d366b
--- /dev/null
+++ b/simpleadmin/www/cgi-bin/get_ttl_status.old
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Check iptables for ttlvalue
+ttlvalue=$(iptables -t mangle -vnL | awk '/TTL/ {print $13; exit}')
+ttlenabled=true;
+
+# Set Variables
+if [ -z "${ttlvalue}" ]; then
+    ttlvalue=0
+    ttlenabled=false
+fi
+
+echo "Content-type: text/json" 
+echo ""
+cat <<EOT
+{
+    "isEnabled": $ttlenabled,
+    "ttl": $ttlvalue
+}
+EOT
\ No newline at end of file
diff --git a/simpleadmin/www/cgi-bin/set_ttl b/simpleadmin/www/cgi-bin/set_ttl
index db0f24c..256c7cb 100644
--- a/simpleadmin/www/cgi-bin/set_ttl
+++ b/simpleadmin/www/cgi-bin/set_ttl
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+PATH=/bin:/usr/sbin:/usr/bin:/sbin:/opt/sbin:/opt/bin:/usrdata/root/bin
 # Get query
 QUERY_STRING=$(echo "${QUERY_STRING}" | sed 's/;//g')
 
@@ -22,28 +22,28 @@ setTTL=$(printf '%b\n' "${ttlvalue//%/\\x}")
 
 if [ -n "${setTTL}" ]; then
     # Stop Service To Remove Rules
-    /usrdata/simplefirewall/ttl-override stop
+    /opt/bin/sudo /usrdata/simplefirewall/ttl-override stop
 
     # Check iptables is still set
-    ttlcheck=$(iptables -t mangle -vnL | grep TTL | awk '{print $13}')
+    ttlcheck=$(/opt/bin/sudo /usr/sbin/iptables -w 5 -t mangle -vnL | grep TTL | awk '{print $13}')
 
     # If TTL is still set manually remove values
-    if [ !-z "${ttlcheck}" ]; then
-        iptables -t mangle -D POSTROUTING -o rmnet+ -j TTL --ttl-set ${ttlcheck} &>/dev/null || true
-        ip6tables -t mangle -D POSTROUTING -o rmnet+ -j HL --hl-set ${ttlcheck} &>/dev/null || true
+    if [ ! -z "${ttlcheck}" ]; then
+        /opt/bin/sudo /usr/sbin/iptables -w 5 -t mangle -D POSTROUTING -o rmnet+ -j TTL --ttl-set ${ttlcheck} &>/dev/null || true
+        /opt/bin/sudo /usr/sbin/ip6tables -w 5 -t mangle -D POSTROUTING -o rmnet+ -j HL --hl-set ${ttlcheck} &>/dev/null || true
     fi
 
     # Echo TTL to file
     echo $setTTL > /usrdata/simplefirewall/ttlvalue
 
     # Set Start Service
-    /usrdata/simplefirewall/ttl-override start
+    /opt/bin/sudo /usrdata/simplefirewall/ttl-override start
 fi
 
 
 
 # Check iptables for ttlvalue
-ttlvalue=$(iptables -t mangle -vnL | grep TTL | awk '{print $13}')
+ttlvalue=$(/opt/bin/sudo /usr/sbin/iptables -w 5 -t mangle -vnL | grep TTL | awk '{print $13}')
 ttlenabled=true;
 
 # Set Variables
@@ -58,4 +58,5 @@ cat <<EOT
 {
     "isEnabled": $ttlenabled,
     "ttl": $ttlvalue
-}
\ No newline at end of file
+}
+EOT
diff --git a/simpleadmin/www/cgi-bin/set_ttl.old b/simpleadmin/www/cgi-bin/set_ttl.old
new file mode 100644
index 0000000..db0f24c
--- /dev/null
+++ b/simpleadmin/www/cgi-bin/set_ttl.old
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+# Get query
+QUERY_STRING=$(echo "${QUERY_STRING}" | sed 's/;//g')
+
+if [ "${QUERY_STRING}" ]; then
+
+	export IFS="&"
+	for cmd in ${QUERY_STRING}; do
+	
+		if [ "$(echo $cmd | grep '=')" ]; then
+			key=$(echo $cmd | awk -F '=' '{print $1}')
+			value=$(echo $cmd | awk -F '=' '{print $2}')
+			eval $key=$value
+		fi
+		
+	done
+
+fi
+
+setTTL=$(printf '%b\n' "${ttlvalue//%/\\x}")
+
+if [ -n "${setTTL}" ]; then
+    # Stop Service To Remove Rules
+    /usrdata/simplefirewall/ttl-override stop
+
+    # Check iptables is still set
+    ttlcheck=$(iptables -t mangle -vnL | grep TTL | awk '{print $13}')
+
+    # If TTL is still set manually remove values
+    if [ !-z "${ttlcheck}" ]; then
+        iptables -t mangle -D POSTROUTING -o rmnet+ -j TTL --ttl-set ${ttlcheck} &>/dev/null || true
+        ip6tables -t mangle -D POSTROUTING -o rmnet+ -j HL --hl-set ${ttlcheck} &>/dev/null || true
+    fi
+
+    # Echo TTL to file
+    echo $setTTL > /usrdata/simplefirewall/ttlvalue
+
+    # Set Start Service
+    /usrdata/simplefirewall/ttl-override start
+fi
+
+
+
+# Check iptables for ttlvalue
+ttlvalue=$(iptables -t mangle -vnL | grep TTL | awk '{print $13}')
+ttlenabled=true;
+
+# Set Variables
+if [ -z "${ttlvalue}" ]; then
+    ttlvalue=0
+    ttlenabled=false
+fi
+
+echo "Content-type: text/json" 
+echo ""
+cat <<EOT
+{
+    "isEnabled": $ttlenabled,
+    "ttl": $ttlvalue
+}
\ No newline at end of file