Fix hestiacp#2044 Add checks if ip exists (hestiacp#2049)

* Improve checks if ip exists

* Include tests mail / helo

Author: jaapmarcus

bin/v-change-sys-ip-helo

@@ -26,6 +26,10 @@ if [ -z "$MAIL_SYSTEM" ]; then
     check_result "$E_NOTEXIST" "Mail system not installed"
 fi
 
+if [ ! -e "$HESTIA/data/ips/$ip" ]; then 
+    exit;
+fi
+
 #----------------------------------------------------------#
 #                    Verifications                         #
 #----------------------------------------------------------#

bin/v-delete-sys-ip

@@ -126,6 +126,13 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
     fi
 fi
 
+if [ ! -z "$MAIL_SYSTEM" ]; then
+    if [ -z "$NAT" ]; then 
+        delete_ip_helo_value $ip
+    else
+        delete_ip_helo_value $NAT
+    fi
+fi
 
 #----------------------------------------------------------#
 #                       Hestia                             #

func/ip.sh

@@ -50,7 +50,7 @@ update_ip_helo_value() {
     natip="$1"
 
     # In case the IP is an NAT use the real ip address 
-    if [ ! -f $HESTIA/data/ips/$ip ]; then
+    if [ ! -e "$HESTIA/data/ips/$ip" ]; then
         ip=$(get_real_ip $ip);
     fi 
 
@@ -74,6 +74,11 @@ update_ip_helo_value() {
     fi
 }
 
+delete_ip_helo_value (){
+    ip=$1
+    sed -i "/^$ip:/d" /etc/${MAIL_SYSTEM}/mailhelo.conf   
+}
+
 # Update ip address value
 update_ip_value() {
     key="$1"
@@ -195,7 +200,7 @@ get_real_ip() {
     if [ -e "$HESTIA/data/ips/$1" ]; then
         echo $1
     else
-        nat=$(grep -H "^NAT='$1'" $HESTIA/data/ips/*)
+        nat=$(grep -H "^NAT='$1'" $HESTIA/data/ips/* | head -n1 )
         if [ ! -z "$nat" ]; then
             echo "$nat" |cut -f 1 -d : |cut -f 7 -d /
         fi

test/test.bats

@@ -482,6 +482,14 @@ function check_ip_not_banned(){
     fi
 }
 
+@test "Ip: Change Helo" {
+    local ip="198.18.0.121"
+    run v-change-sys-ip-helo 198.18.0.121 dev.hestiacp.com
+    assert_success
+    refute_output
+    assert_file_contains /etc/exim4/mailhelo.conf "198.18.0.121:dev.hestiacp.com"
+}
+
 @test "Ip: Delete ips" {
     local ip="198.18.0.12"
     run v-delete-sys-ip $ip