From f2f12ac0d14d8ed6dd63bcaa563c997070568ad4 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Tue, 21 Apr 2020 13:37:36 +0200 Subject: [PATCH 1/2] discover_my_public_ip.sh updated with new URLs --- .../docker/openvidu-coturn/discover_my_public_ip.sh | 5 +++-- .../docker/openvidu-server-pro/discover_my_public_ip.sh | 5 +++-- .../docker/openvidu-server/discover_my_public_ip.sh | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/openvidu-server/docker/openvidu-coturn/discover_my_public_ip.sh b/openvidu-server/docker/openvidu-coturn/discover_my_public_ip.sh index 4dafd642..8c0908b1 100755 --- a/openvidu-server/docker/openvidu-coturn/discover_my_public_ip.sh +++ b/openvidu-server/docker/openvidu-coturn/discover_my_public_ip.sh @@ -20,12 +20,13 @@ function valid_ip() # Services to get public ip SERVICES=( + "curl --silent -sw :%{http_code} ipv4.icanhazip.com" "curl --silent -sw :%{http_code} ifconfig.me" + "curl --silent -sw :%{http_code} -4 ifconfig.co" "curl --silent -sw :%{http_code} ipecho.net/plain" "curl --silent -sw :%{http_code} ipinfo.io/ip" "curl --silent -sw :%{http_code} checkip.amazonaws.com" - "curl --silent -sw :%{http_code} ident.me" - "curl --silent -sw :%{http_code} icanhazip.com" + "curl --silent -sw :%{http_code} v4.ident.me" ) # Get public ip diff --git a/openvidu-server/docker/openvidu-server-pro/discover_my_public_ip.sh b/openvidu-server/docker/openvidu-server-pro/discover_my_public_ip.sh index 4dafd642..8c0908b1 100755 --- a/openvidu-server/docker/openvidu-server-pro/discover_my_public_ip.sh +++ b/openvidu-server/docker/openvidu-server-pro/discover_my_public_ip.sh @@ -20,12 +20,13 @@ function valid_ip() # Services to get public ip SERVICES=( + "curl --silent -sw :%{http_code} ipv4.icanhazip.com" "curl --silent -sw :%{http_code} ifconfig.me" + "curl --silent -sw :%{http_code} -4 ifconfig.co" "curl --silent -sw :%{http_code} ipecho.net/plain" "curl --silent -sw :%{http_code} ipinfo.io/ip" "curl --silent -sw :%{http_code} checkip.amazonaws.com" - "curl --silent -sw :%{http_code} ident.me" - "curl --silent -sw :%{http_code} icanhazip.com" + "curl --silent -sw :%{http_code} v4.ident.me" ) # Get public ip diff --git a/openvidu-server/docker/openvidu-server/discover_my_public_ip.sh b/openvidu-server/docker/openvidu-server/discover_my_public_ip.sh index 4dafd642..8c0908b1 100755 --- a/openvidu-server/docker/openvidu-server/discover_my_public_ip.sh +++ b/openvidu-server/docker/openvidu-server/discover_my_public_ip.sh @@ -20,12 +20,13 @@ function valid_ip() # Services to get public ip SERVICES=( + "curl --silent -sw :%{http_code} ipv4.icanhazip.com" "curl --silent -sw :%{http_code} ifconfig.me" + "curl --silent -sw :%{http_code} -4 ifconfig.co" "curl --silent -sw :%{http_code} ipecho.net/plain" "curl --silent -sw :%{http_code} ipinfo.io/ip" "curl --silent -sw :%{http_code} checkip.amazonaws.com" - "curl --silent -sw :%{http_code} ident.me" - "curl --silent -sw :%{http_code} icanhazip.com" + "curl --silent -sw :%{http_code} v4.ident.me" ) # Get public ip From c2198b5d01c03b5cde1fc3c2f7547df1e4329b9f Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Tue, 21 Apr 2020 13:42:06 +0200 Subject: [PATCH 2/2] discover_my_public_ip.sh ShellCheck fixes --- .../docker/openvidu-coturn/discover_my_public_ip.sh | 10 +++++----- .../openvidu-server-pro/discover_my_public_ip.sh | 10 +++++----- .../docker/openvidu-server/discover_my_public_ip.sh | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/openvidu-server/docker/openvidu-coturn/discover_my_public_ip.sh b/openvidu-server/docker/openvidu-coturn/discover_my_public_ip.sh index 8c0908b1..03302c04 100755 --- a/openvidu-server/docker/openvidu-coturn/discover_my_public_ip.sh +++ b/openvidu-server/docker/openvidu-coturn/discover_my_public_ip.sh @@ -9,7 +9,7 @@ function valid_ip() if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then OIFS=$IFS IFS='.' - ip=($ip) + ip=("$ip") IFS=$OIFS [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \ && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]] @@ -32,16 +32,16 @@ SERVICES=( # Get public ip for service in "${SERVICES[@]}"; do RUN_COMMAND=$($service | tr -d '[:space:]') - IP=$(echo $RUN_COMMAND | cut -d':' -f1) - HTTP_CODE=$(echo $RUN_COMMAND | cut -d':' -f2) + IP=$(echo "$RUN_COMMAND" | cut -d':' -f1) + HTTP_CODE=$(echo "$RUN_COMMAND" | cut -d':' -f2) if [ "$HTTP_CODE" == "200" ]; then if valid_ip "$IP"; then - printf "$IP" + printf "%s" "$IP" exit 0 fi fi done printf "error" -exit 0 +exit 0 \ No newline at end of file diff --git a/openvidu-server/docker/openvidu-server-pro/discover_my_public_ip.sh b/openvidu-server/docker/openvidu-server-pro/discover_my_public_ip.sh index 8c0908b1..03302c04 100755 --- a/openvidu-server/docker/openvidu-server-pro/discover_my_public_ip.sh +++ b/openvidu-server/docker/openvidu-server-pro/discover_my_public_ip.sh @@ -9,7 +9,7 @@ function valid_ip() if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then OIFS=$IFS IFS='.' - ip=($ip) + ip=("$ip") IFS=$OIFS [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \ && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]] @@ -32,16 +32,16 @@ SERVICES=( # Get public ip for service in "${SERVICES[@]}"; do RUN_COMMAND=$($service | tr -d '[:space:]') - IP=$(echo $RUN_COMMAND | cut -d':' -f1) - HTTP_CODE=$(echo $RUN_COMMAND | cut -d':' -f2) + IP=$(echo "$RUN_COMMAND" | cut -d':' -f1) + HTTP_CODE=$(echo "$RUN_COMMAND" | cut -d':' -f2) if [ "$HTTP_CODE" == "200" ]; then if valid_ip "$IP"; then - printf "$IP" + printf "%s" "$IP" exit 0 fi fi done printf "error" -exit 0 +exit 0 \ No newline at end of file diff --git a/openvidu-server/docker/openvidu-server/discover_my_public_ip.sh b/openvidu-server/docker/openvidu-server/discover_my_public_ip.sh index 8c0908b1..03302c04 100755 --- a/openvidu-server/docker/openvidu-server/discover_my_public_ip.sh +++ b/openvidu-server/docker/openvidu-server/discover_my_public_ip.sh @@ -9,7 +9,7 @@ function valid_ip() if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then OIFS=$IFS IFS='.' - ip=($ip) + ip=("$ip") IFS=$OIFS [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \ && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]] @@ -32,16 +32,16 @@ SERVICES=( # Get public ip for service in "${SERVICES[@]}"; do RUN_COMMAND=$($service | tr -d '[:space:]') - IP=$(echo $RUN_COMMAND | cut -d':' -f1) - HTTP_CODE=$(echo $RUN_COMMAND | cut -d':' -f2) + IP=$(echo "$RUN_COMMAND" | cut -d':' -f1) + HTTP_CODE=$(echo "$RUN_COMMAND" | cut -d':' -f2) if [ "$HTTP_CODE" == "200" ]; then if valid_ip "$IP"; then - printf "$IP" + printf "%s" "$IP" exit 0 fi fi done printf "error" -exit 0 +exit 0 \ No newline at end of file