X-Git-Url: https://zdv2.bktei.com/gitweb/BK-2020-03.git/blobdiff_plain/51895d99f6920080502a39d9e284eb8ad0c75db2..4143a6ead723ffe633c8d4d893fd8de5edff7c3b:/unitproc/bktemp-validateInput?ds=sidebyside

diff --git a/unitproc/bktemp-validateInput b/unitproc/bktemp-validateInput
index 2f39d8b..e1678f1 100644
--- a/unitproc/bktemp-validateInput
+++ b/unitproc/bktemp-validateInput
@@ -7,19 +7,21 @@ try() { "$@" || die "cannot $*"; } #o
 validateInput() {
     # Desc: Validates Input
     # Usage: validateInput [str input] [str input type]
-    # Version: 0.2.0
+    # Version: 0.3.1
     # Input: arg1: string to validate
     #        arg2: string specifying input type (ex:"ssh_pubkey")
     # Output: return code 0: if input string matched specified string type
-    # Depends: bash 5, yell
+    # Depends: bash 5, yell()
+
+    local fn argInput argType
 
     # Save function name
-    local FN="${FUNCNAME[0]}";
+    fn="${FUNCNAME[0]}";
 
     # Process arguments
     argInput="$1";
     argType="$2";
-    if [[ $# -gt 2 ]]; then yell "ERROR:$0:$FN:Too many arguments."; exit 1; fi;
+    if [[ $# -gt 2 ]]; then yell "ERROR:$0:$fn:Too many arguments."; exit 1; fi;
 
     # Check for blank
     if [[ -z "$argInput" ]]; then return 1; fi
@@ -29,29 +31,70 @@ validateInput() {
     ### Check for alnum/dash base64 (ex: "ssh-rsa AAAAB3NzaC1yc2EAAA")
     if [[ "$argType" = "ssh_pubkey" ]]; then
 	if [[ "$argInput" =~ ^[[:alnum:]-]*[\ ]*[[:alnum:]+/=]*$ ]]; then
-	return 0; fi; fi;
+	    return 0; fi; fi;
 
     ## age_pubkey
     ### Check for age1[:bech32:]
-    if [[ "$argType" = "bech32" ]]; then
+    if [[ "$argType" = "age_pubkey" ]]; then
 	if [[ "$argInput" =~ ^age1[qpzry9x8gf2tvdw0s3jn54khce6mua7l]*$ ]]; then
 	    return 0; fi; fi
 
+    ## integer
+    if [[ "$argType" = "integer" ]]; then
+	if [[ "$argInput" =~ ^[[:digit:]]*$ ]]; then
+	    return 0; fi; fi;
+
+    ## time element (year, month, week, day, hour, minute, second)
+    if [[ "$argType" = "time_element" ]]; then
+	if [[ "$argInput" = "year" ]] || \
+	       [[ "$argInput" = "month" ]] || \
+	       [[ "$argInput" = "week" ]] || \
+	       [[ "$argInput" = "day" ]] || \
+	       [[ "$argInput" = "hour" ]] || \
+	       [[ "$argInput" = "minute" ]] || \
+	       [[ "$argInput" = "second" ]]; then
+	    return 0; fi; fi;
+    
     # Return error if no condition matched.
     return 1;
 } # Validates strings
 
 #==BEGIN sample code==
-testKey1="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCq8G0XWi8A+MXNu7MEaxDsZJUwtgPC4shGAAarXC4PQTRxLfUHtyWkNbzGh31U/bKI3Snp1O78yOVEZSjdmWkDvkwtWKJQcoZBStgqw9oIPE0oG8uh49XoX77nVabi0JCf8zO63Ai4/9EdwyqE9xsJ+soOYt2V5+UCj0zsv1xpt2YhfYyXrzBv9x6k9lCxy0NW3Ik1mSW+OzSOT3tgDf36ujV/CI2i8ERM9civWy8FtFOReZMV2kkbj7fXI4E1wKM1RFIn7er1MseCSvbvh3o2uCO46/euqHAstYs5cL+4yB2qM/xKfHT5aocDjq7GBLKtree9xdNF0EE9CNr/+J5R";
-testKey2="blah-blah onetwothreeREEE";
-testKey3="";
-testKey4="age1c3s6huz6en6jh40cem0erc0m2un2ry85my0t0ujj4a5cu8gzkysq9l39e4";
-keyTypeA="ssh_pubkey";
-keyTypeB="bech32";
-if validateInput "$testKey1" "$keyTypeA"; then echo "$testKey1 looks like a valid $keyTypeA."; else echo "$testKey1 doesn't look like a valid $keyTypeA."; fi
-if validateInput "$testKey2" "$keyTypeA"; then echo "$testKey2 looks like a valid $keyTypeA."; else echo "$testKey2 doesn't look like a valid $keyTypeA."; fi
-if validateInput "$testKey3" "$keyTypeA"; then echo "$testKey3 looks like a valid $keyTypeA."; else echo "$testKey3 doesn't look like a valid $keyTypeA."; fi
-if validateInput "$testKey4" "$keyTypeB"; then echo "$testKey4 looks like a valid $keyTypeB."; else echo "$testKey4 doesn't look like a valid $keyTypeB."; fi
+testKey="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCq8G0XWi8A+MXNu7MEaxDsZJUwtgPC4shGAAarXC4PQTRxLfUHtyWkNbzGh31U/bKI3Snp1O78yOVEZSjdmWkDvkwtWKJQcoZBStgqw9oIPE0oG8uh49XoX77nVabi0JCf8zO63Ai4/9EdwyqE9xsJ+soOYt2V5+UCj0zsv1xpt2YhfYyXrzBv9x6k9lCxy0NW3Ik1mSW+OzSOT3tgDf36ujV/CI2i8ERM9civWy8FtFOReZMV2kkbj7fXI4E1wKM1RFIn7er1MseCSvbvh3o2uCO46/euqHAstYs5cL+4yB2qM/xKfHT5aocDjq7GBLKtree9xdNF0EE9CNr/+J5R";
+keyType="ssh_pubkey";
+if validateInput "$testKey" "$keyType"; then echo "Looks like a valid $keyType:\"$testKey\""; else echo "Doesn't look like a valid $keyType:\"$testKey\""; fi
+echo "";
+
+testKey="blah-blah onetwothreeREEE";
+keyType="ssh_pubkey";
+if validateInput "$testKey" "$keyType"; then echo "Looks like a valid $keyType:\"$testKey\""; else echo "Doesn't look like a valid $keyType:\"$testKey\""; fi
+echo "";
+
+testKey="";
+keyType="ssh_pubkey";
+if validateInput "$testKey" "$keyType"; then echo "Looks like a valid $keyType:\"$testKey\""; else echo "Doesn't look like a valid $keyType:\"$testKey\""; fi
+echo "";
+
+testKey="age1c3s6huz6en6jh40cem0erc0m2un2ry85my0t0ujj4a5cu8gzkysq9l39e4";
+keyType="age_pubkey";
+if validateInput "$testKey" "$keyType"; then echo "Looks like a valid $keyType:\"$testKey\""; else echo "Doesn't look like a valid $keyType:\"$testKey\""; fi
+echo "";
+
+testKey="123"
+keyType="integer";
+if validateInput "$testKey" "$keyType"; then echo "Looks like a valid $keyType:\"$testKey\""; else echo "Doesn't look like a valid $keyType:\"$testKey\""; fi
+echo "";
+
+testKey="123abc"
+keyType="integer";
+if validateInput "$testKey" "$keyType"; then echo "Looks like a valid $keyType:\"$testKey\""; else echo "Doesn't look like a valid $keyType:\"$testKey\""; fi
+echo "";
+
+testKey="year"
+keyType="time_element";
+if validateInput "$testKey" "$keyType"; then echo "Looks like a valid $keyType:\"$testKey\""; else echo "Doesn't look like a valid $keyType:\"$testKey\""; fi
+echo "";
+
 #==END sample code==
 
 # Author: Steven Baltakatei Sandoval (bktei.com)