Merge pull request #4384 from pi-hole/tweak/local_dns_cname

Tweak local DNS record and CNAME

advanced/Scripts/webpage.sh

@@ -709,10 +709,25 @@ AddCustomDNSAddress() {
 
     ip="${args[2]}"
     host="${args[3]}"
-	echo "${ip} ${host}" >> "${dnscustomfile}"
+    reload="${args[4]}"
 
-    # Restart dnsmasq to load new custom DNS entries
+    validHost="$(checkDomain "${host}")"
-    RestartDNS
+    if [[ -n "${validHost}" ]]; then
+        if valid_ip "${ip}" || valid_ip6 "${ip}" ; then
+            echo "${ip} ${validHost}" >> "${dnscustomfile}"
+        else
+            echo -e "  ${CROSS} Invalid IP has been passed"
+            exit 1
+        fi
+    else
+        echo "  ${CROSS} Invalid Domain passed!"
+        exit 1
+    fi
+
+    # Restart dnsmasq to load new custom DNS entries only if $reload not false
+    if [[ ! $reload == "false" ]]; then
+      RestartDNS
+    fi
 }
 
 RemoveCustomDNSAddress() {
@@ -720,16 +735,25 @@ RemoveCustomDNSAddress() {
 
     ip="${args[2]}"
     host="${args[3]}"
+    reload="${args[4]}"
 
-    if valid_ip "${ip}" || valid_ip6 "${ip}" ; then
+    validHost="$(checkDomain "${host}")"
-        sed -i "/^${ip} ${host}$/d" "${dnscustomfile}"
+    if [[ -n "${validHost}" ]]; then
-    else
+        if valid_ip "${ip}" || valid_ip6 "${ip}" ; then
-        echo -e "  ${CROSS} Invalid IP has been passed"
+            sed -i "/^${ip} ${validHost}$/d" "${dnscustomfile}"
-        exit 1
+        else
+            echo -e "  ${CROSS} Invalid IP has been passed"
+            exit 1
+        fi
+        else
+            echo "  ${CROSS} Invalid Domain passed!"
+            exit 1
     fi
 
-    # Restart dnsmasq to update removed custom DNS entries
+    # Restart dnsmasq to load new custom DNS entries only if reload is not false
-    RestartDNS
+    if [[ ! $reload == "false" ]]; then
+      RestartDNS
+    fi
 }
 
 AddCustomCNAMERecord() {
@@ -737,11 +761,25 @@ AddCustomCNAMERecord() {
 
     domain="${args[2]}"
     target="${args[3]}"
+    reload="${args[4]}"
 
-    echo "cname=${domain},${target}" >> "${dnscustomcnamefile}"
+    validDomain="$(checkDomain "${domain}")"
-
+    if [[ -n "${validDomain}" ]]; then
-    # Restart dnsmasq to load new custom CNAME records
+        validTarget="$(checkDomain "${target}")"
-    RestartDNS
+        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 only if reload is not false
+    if [[ ! $reload == "false" ]]; then
+      RestartDNS
+    fi
 }
 
 RemoveCustomCNAMERecord() {
@@ -749,23 +787,26 @@ RemoveCustomCNAMERecord() {
 
     domain="${args[2]}"
     target="${args[3]}"
+    reload="${args[4]}"
 
     validDomain="$(checkDomain "${domain}")"
     if [[ -n "${validDomain}" ]]; then
         validTarget="$(checkDomain "${target}")"
-        if [[ -n "${validDomain}" ]]; then
+        if [[ -n "${validTarget}" ]]; then
             sed -i "/cname=${validDomain},${validTarget}$/d" "${dnscustomcnamefile}"
         else
-            echo "  ${CROSS} Invalid Target Passed!"
+          echo "  ${CROSS} Invalid Target Passed!"
-            exit 1
+          exit 1
         fi
     else
         echo "  ${CROSS} Invalid Domain passed!"
         exit 1
     fi
 
-    # Restart dnsmasq to update removed custom CNAME records
+    # Restart dnsmasq to update removed custom CNAME records only if $reload not false
-    RestartDNS
+    if [[ ! $reload == "false" ]]; then
+      RestartDNS
+    fi
 }
 
 main() {