From 95f4c632f7b0e0b2125766bf02036c89a6b50e7a Mon Sep 17 00:00:00 2001
From: Adam Warner <me@adamwarner.co.uk>
Date: Sat, 13 Jun 2020 20:30:03 +0100
Subject: [PATCH] expand valid_ip to allow for custom ports

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
---
 automated install/basic-install.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index e396e617..4352c578 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -1017,21 +1017,29 @@ valid_ip() {
     local ip=${1}
     local stat=1
 
-    # If the IP matches the format xxx.xxx.xxx.xxx,
-    if [[ "${ip}" =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+    # If the IP matches the format xxx.xxx.xxx.xxx (optional port of range #0-65536), also ensure string ends with 0-9
+    if [[ "${ip}" =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}#{0,1}[0-9]{0,5}$ && "${ip}" =~ ^.*[0-9]$ ]]; then
         # Save the old Internal Field Separator in a variable
         OIFS=$IFS
         # and set the new one to a dot (period)
-        IFS='.'
+        IFS='.#'
         # Put the IP into an array
         read -r -a ip <<< "${ip}"
         # Restore the IFS to what it was
         IFS=${OIFS}
+
         ## Evaluate each octet by checking if it's less than or equal to 255 (the max for each octet)
-        [[ "${ip[0]}" -le 255 && "${ip[1]}" -le 255 \
-        && "${ip[2]}" -le 255 && "${ip[3]}" -le 255 ]]
+        [[ "${ip[0]}" -le 255 && "${ip[1]}" -le 255 && "${ip[2]}" -le 255 && "${ip[3]}" -le 255 ]]
         # Save the exit code
         stat=$?
+
+        # If there is a 5th part to the array, then it is a port number - check it is between 1 and 65536
+        if [[ "${ip[4]}" ]]; then
+            [[ "${ip[4]}" -ge 1 && "${ip[4]}" -le 65536 ]]
+            # Save the exit code
+            stat=$?
+        fi
+
     fi
     # Return the exit code
     return "${stat}"