Interactive reg script adjustments to double check service name vali… (#118)

* Interactive reg script adjustments to double check serevice name validation

* Optimizing run time of interactive test.

* Added a variable to control interactive test.

* Added an environment vriable to control full (long) interactive test, which adds a number of minutes to test

* Yet another tweak on interactive CI test

* Added test characters to service names to confirm validation.

Author: Digital-Larry

connectd/usr/bin/connectd_library

@@ -9,9 +9,9 @@
 #  Copyright (C) 2019 remot3.it, Inc. All rights reserved.
 
 ##### Settings #####
-LIBVERSION=lib_v2.1.21
+LIBVERSION=lib_v2.1.22
 AUTHOR="Gary Worsham"
-LIBMODIFIED="June 11, 2019"
+LIBMODIFIED="June 17, 2020"
 GREPFLAGS=
 apikey="remote.it.developertoolsHW9iHnd"
 
@@ -1111,7 +1111,7 @@ getNewPassword() {
            stty echo
         fi
 
-        if [ $(validateInput "$password" "\$ \@ \! \- \_ \. [a-zA-Z0-9]") != 0 ]; then
+        if [ $(validateInput "$password" "\$ \@ \! \_ \. [a-zA-Z0-9]-") != 0 ]; then
 	    printf "\nSorry, password contains one or more invalid characters.\n"
 	    password=""
 	    passwordOK=-1

scripts/build.sh

@@ -4,8 +4,8 @@
 # sorts out Lintian errors/warnings into individual
 # text files
 pkg=connectd
-ver=2.1.13
-MODIFIED="June 10, 2020"
+ver=2.1.14
+MODIFIED="June 17, 2020"
 SCRIPT_DIR="$(cd $(dirname $0) && pwd)"
 TEST_DIR="$SCRIPT_DIR"/../test
 pkgFolder="$pkg"
@@ -17,6 +17,7 @@ user=$(whoami)
 echo $user
 # debugging flag, set to 0 to skip tests
 runtests=1
+interactive=1
 
 #---------------------------------------------------------------------------------
 # add_creds takes the environment variables and puts them into the file
@@ -278,11 +279,13 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
+if [ $interactive -eq 1 ]; then
 "$TEST_DIR"/Interactive/full-interactive-test.sh
 if [ $? -ne 0 ]; then
     echo "Interactive Registration failure!"
     exit 1
 fi
+fi
 
 sudo "$TEST_DIR"/dpkg/dpkg-purge.sh
 if [ $? -ne 0 ]; then

test/Interactive/configure-01.key

@@ -1,16 +1,8 @@
 1
-SERVICENAME-device
+SERVICENAME-_ device
 1
 1
 y
-SERVICENAME-ssh
-1
-2
-y
-SERVICENAME-web
-1
-3
-y
-SERVICENAME-web-secure
+SERVICENAME-_ ssh
 5
 y

test/Interactive/configure-02.key

@@ -1,5 +1,13 @@
 1
 1
+2
+y
+SERVICENAME-web
+1
+3
+y
+SERVICENAME-SecureWeb
+1
 4
 n
 5900

test/Interactive/full-interactive-test.sh

@@ -78,14 +78,19 @@ sed "s/SERVICENAME/$TESTNAME/g" "$SCRIPT_DIR"/configure-01.key > "$SCRIPT_DIR"/c
 sed "s/SERVICENAME/$TESTNAME/g" "$SCRIPT_DIR"/configure-02.key > "$SCRIPT_DIR"/configure-02-test.key
 
 #-------------------------------------------------------------------
-# run installer for first time, add device name and 3 services
-# expected result is that 4 connectd services and 1 schannel service will be running
-check_service_counts 4 1 configure-01-test.key
+# run installer for first time, add device name and 1 service
+# expected result is that 2 connectd services and 1 schannel service will be running
+check_service_counts 2 1 configure-01-test.key
 
 #-------------------------------------------------------------------
 # run installer for second time, add 6 more services
 # expected result is that 9 connectd services and 1 schannel service will be running
-check_service_counts 10 1 configure-02-test.key
+if [ "$CI_FULL_INTERACTIVE_TEST" = "1" ]; then
+    COUNT=10
+    check_service_counts $COUNT 1 configure-02-test.key
+else
+    COUNT=2
+fi
 
 # Now use systemd to turn off and then on the connectd and connectd_schannel
 # daemons and confirm operation.
@@ -99,10 +104,10 @@ check_service_counts 0 0
 
 sudo systemctl start connectd
 sleep 10
-check_service_counts 10 0
+check_service_counts $COUNT 0
 sudo systemctl start connectd_schannel
 sleep 5
-check_service_counts 10 1
+check_service_counts $COUNT 1
 #-------------------------------------------------------------------
 # run installer for third time, remove all services
 # expected result is that 0 connectd services and 0 schannel service will be running

test/Interactive/interactive-test.sh

@@ -9,7 +9,7 @@ checkForRoot
 
 #-----------------------------------------------------------------------
 
-# it is necessasry to remove the bulk_identification_code.txt file for the following tests to work
+# it is necessary to remove the bulk_identification_code.txt file for the following tests to work
 # bulk_identification_code.txt is only used by bulk and auto registration
 if [ -e /etc/connectd/bulk_identification_code.txt ]; then
     echo "Deleting /etc/connectd/bulk_identification_code.txt"