From b7bba6a689d135a9de972393fee47a520e6c5406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Tue, 12 Oct 2021 18:15:56 +0200
Subject: [PATCH] Validate when adding not when removing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 advanced/Scripts/webpage.sh | 44 ++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh
index 52c388f8..b651bed5 100755
--- a/advanced/Scripts/webpage.sh
+++ b/advanced/Scripts/webpage.sh
@@ -709,7 +709,13 @@ AddCustomDNSAddress() {
 
     ip="${args[2]}"
     host="${args[3]}"
-	echo "${ip} ${host}" >> "${dnscustomfile}"
+
+    if valid_ip "${ip}" || valid_ip6 "${ip}" ; then
+	     echo "${ip} ${host}" >> "${dnscustomfile}"
+     else
+         echo -e "  ${CROSS} Invalid IP has been passed"
+         exit 1
+     fi
 
     # Restart dnsmasq to load new custom DNS entries
     RestartDNS
@@ -721,12 +727,7 @@ RemoveCustomDNSAddress() {
     ip="${args[2]}"
     host="${args[3]}"
 
-    if valid_ip "${ip}" || valid_ip6 "${ip}" ; then
-        sed -i "/^${ip} ${host}$/d" "${dnscustomfile}"
-    else
-        echo -e "  ${CROSS} Invalid IP has been passed"
-        exit 1
-    fi
+    sed -i "/^${ip} ${host}$/d" "${dnscustomfile}"
 
     # Restart dnsmasq to update removed custom DNS entries
     RestartDNS
@@ -738,8 +739,19 @@ AddCustomCNAMERecord() {
     domain="${args[2]}"
     target="${args[3]}"
 
-    echo "cname=${domain},${target}" >> "${dnscustomcnamefile}"
-
+    validDomain="$(checkDomain "${domain}")"
+    if [[ -n "${validDomain}" ]]; then
+        validTarget="$(checkDomain "${target}")"
+        if [[ -n "${validTarget}" ]]; then
+          echo "cname=${validDomain},${validTarget}" >> "${dnscustomcnamefile}"
+        else
+          echo "  ${CROSS} Invalid Target Passed!"
+          exit 1
+        fi
+    else
+        echo "  ${CROSS} Invalid Domain passed!"
+        exit 1
+    fi
     # Restart dnsmasq to load new custom CNAME records
     RestartDNS
 }
@@ -750,19 +762,7 @@ RemoveCustomCNAMERecord() {
     domain="${args[2]}"
     target="${args[3]}"
 
-    validDomain="$(checkDomain "${domain}")"
-    if [[ -n "${validDomain}" ]]; then
-        validTarget="$(checkDomain "${target}")"
-        if [[ -n "${validDomain}" ]]; then
-            sed -i "/cname=${validDomain},${validTarget}$/d" "${dnscustomcnamefile}"
-        else
-            echo "  ${CROSS} Invalid Target Passed!"
-            exit 1
-        fi
-    else
-        echo "  ${CROSS} Invalid Domain passed!"
-        exit 1
-    fi
+    sed -i "/cname=${domain},${target}$/d" "${dnscustomcnamefile}"
 
     # Restart dnsmasq to update removed custom CNAME records
     RestartDNS