From c9b7b13969c34025e429f08ff27ce4739c90ffd1 Mon Sep 17 00:00:00 2001 From: gyurix Date: Wed, 25 Jan 2023 09:21:06 +0000 Subject: [PATCH] Validating the existing source and target ip and correcting target ip number --- entrypoint.sh | 52 +++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 22a5c92..a9efa14 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -132,25 +132,28 @@ if [ ! -z "$SOURCE" ]; then for i in $(echo $SOURCE) ; do 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, 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 + debug "No any IP address found for SOURCE: $SOURCE, giving up"; + exit; fi + fi SOURCE_IP=$APP_IP; done - +else + debug "SOURCE is empty"; + exit; fi -IDX=0 -for i in $(echo $TARGET) ; do - - name_resolver $i; - debug "target ip is $APP_IP"; +if [ ! -z "$TARGET" ]; then + IDX=0 + for i in $(echo $TARGET) ; do + 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; @@ -158,15 +161,20 @@ for i in $(echo $TARGET) ; do if [[ -z "$APP_IP" ]]; then debug "No any IP address found for TARGET: $TARGET, giving up"; + exit; fi fi - for IP in $(echo $APP_IP); do - IDX=$(expr 1 + $IDX) - eval TARGET_IP_$IDX=$IP; - done; - -done - + TARGET_IP=$APP_IP; + #for IP in $(echo $APP_IP); do + # IDX=$(expr 1 + $IDX) + # eval TARGET_IP_$IDX=$IP; + #done; + + done +else + debug "TARGET is empty"; + exit; +fi; # CHECKING WHETHER IS IT NEEDED TO USE PUBLIC PROXY SERVICE if [ "$PUBLIC_PROXY_PATH" != "" ]; then @@ -204,7 +212,7 @@ if [ "$SMARTHOST_PROXY_PATH" != "" ]; then SMARTHOST_IP=$(jq -r .LOCAL_IP $SMARTHOST_PROXY_PATH/$DOMAIN 2>/dev/null) SMARTHOST_PORT=$(jq -r .HTTP_PORT $SMARTHOST_PROXY_PATH/$DOMAIN 2>/dev/null) - if [[ -f "$SMARTHOST_PROXY_PATH/$DOMAIN" && "$SMARTHOST_DOMAIN" == "$DOMAIN" && "$SMARTHOST_IP" == "$TARGET_IP_1" && "$SMARTHOST_PORT" == "$PORT" ]]; then + if [[ -f "$SMARTHOST_PROXY_PATH/$DOMAIN" && "$SMARTHOST_DOMAIN" == "$DOMAIN" && "$SMARTHOST_IP" == "$TARGET_IP" && "$SMARTHOST_PORT" == "$PORT" ]]; then echo "Nothing to do." else @@ -215,7 +223,7 @@ if [ "$SMARTHOST_PROXY_PATH" != "" ]; then "DOMAIN": "'$DOMAIN'", "ALIASES_HTTP": [ ], "ALIASES_HTTPS": [ ], - "LOCAL_IP": "'$TARGET_IP_1'", + "LOCAL_IP": "'$TARGET_IP'", "HTTP_PORT": "", "HTTPS_PORT": "'$PORT'", "ERROR_PAGE": "",