From e9424113357ae8f4e21447132884b21971f9aafd Mon Sep 17 00:00:00 2001
From: gyurix <gyorgy.berenyi@format.hu>
Date: Thu, 24 Nov 2022 12:51:45 +0000
Subject: [PATCH] Added validate process for getting IP address of application

---
 Dockerfile            |  2 +-
 firewall/firewall-add | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 081e91d..1ebb10d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM base-firewall-1.8.8
+FROM base-firewall-1.8.7
 MAINTAINER gyurix
 COPY firewall /firewall
 CMD firewall/iptables-wrapper-installer.sh && /firewall/firewall-add
diff --git a/firewall/firewall-add b/firewall/firewall-add
index 62988a0..927a404 100755
--- a/firewall/firewall-add
+++ b/firewall/firewall-add
@@ -88,6 +88,16 @@ if [[ -z "$SOURCE_IP" ]]; then
 			if [[ "$i" != *"."* ]]; then
 				name_resolver $i;
 				debug "source ip is $APP_IP";
+				if [[ -z "$APP_IP" ]]; then
+					debug "No any IP address found for SOURCE: $SOURCE, try again to resolv";
+					name_resolver $i;
+					debug "source ip is $APP_IP";
+					
+					if [[ -z "$APP_IP" ]]; then
+						debug "No any IP address found for SOURCE: $SOURCE, giving up";
+					fi
+				fi
+
 				for IP in $(echo $APP_IP); do
 					IDX=$(expr 1 + $IDX)
 					eval SOURCE_IP_$IDX=$IP;
@@ -125,6 +135,17 @@ if [[ -z "$TARGET_IP" ]]; then
 			if [[ "$i" != *"."* ]]; then
 				name_resolver $i;
 				debug "target ip is $APP_IP";
+				
+				if [[ -z "$APP_IP" ]]; then
+					debug "No any IP address found for TARGET: $TARGET, try again to resolv";
+					name_resolver $i;
+					debug "source ip is $APP_IP";
+					
+					if [[ -z "$APP_IP" ]]; then
+						debug "No any IP address found for TARGET: $TARGET, giving up";
+					fi
+				fi
+				
 				for IP in $(echo $APP_IP); do
 					IDX=$(expr 1 + $IDX)
 					eval TARGET_IP_$IDX=$IP;