update

proxmenu-scripts.sh

@@ -8,6 +8,7 @@ source /opt/idssys/ta-proxmenu/inc/git-update.inc
 source /opt/idssys/ta-proxmenu/inc/ha-status.inc
 source /opt/idssys/ta-proxmenu/inc/post-install.inc
 source /opt/idssys/ta-proxmenu/inc/rmm.inc
+source /opt/idssys/ta-proxmenu/inc/secure-input.inc
 source /opt/idssys/ta-proxmenu/inc/deploy-iso-nfs-lxc.sh
 source /opt/idssys/ta-proxmenu/inc/deploy-pulse-lxc.sh
 source /opt/idssys/ta-proxmenu/inc/virtio-helpers.inc
@@ -172,8 +173,7 @@ TAPM_AUTHORIZE() {
 	fi
 	echo
 	echo -en "${idsCL[LightYellow]}Paste the TAPM deployment code: ${idsCL[Default]}"
-	read -r -s deploycode
-	echo
+	TAPM_READ_MASKED deploycode
 	deploycode="${deploycode^^}"
 	if [[ ! "$deploycode" =~ ^TAPM-[0-9A-HJKMNP-TV-Z]{5}-[0-9A-HJKMNP-TV-Z]{5}$ ]]; then
 		unset deploycode
@@ -311,8 +311,7 @@ INSTALL_SCREENCONNECT() {
 	fi
 	TAPM_CLEAR_AUTHORIZATION
 	echo -en "\n${idsCL[LightYellow]}Paste the URL provided from the Build Installer: ${idsCL[Default]}"
-	read -r -s SCURL
-	echo
+	TAPM_READ_MASKED SCURL
 	[[ -n "$SCURL" ]] || { echo "No URL supplied."; FINISH_FAILED_ACTION; return; }
 	if ! TAPM_CREATE_TEMP_DIR screenconnect; then
 		unset SCURL
@@ -368,8 +367,7 @@ INSTALL_RMM() {
 	TAPM_CLEAR_AUTHORIZATION
     
 	echo -en "\n${idsCL[LightYellow]}Paste the Linux Server URL provided from the Download Agent screen: ${idsCL[Default]}"
-	read -r -s RMMURL
-	echo
+	TAPM_READ_MASKED RMMURL
 	[[ -n "$RMMURL" ]] || { echo "No URL supplied."; FINISH_FAILED_ACTION; return; }
 	if ! TOKEN="$(TAPM_RMM_TOKEN_FROM_URL "$RMMURL")"; then
 		echo "Unable to extract the RMM token from the URL."
@@ -439,6 +437,7 @@ INSTALL_S1() {
 		FINISH_FAILED_ACTION
 		return
 	fi
+	echo
 
 	if ! TAPM_CREATE_TEMP_DIR sentinelone; then
 		TAPM_CLEAR_AUTHORIZATION
@@ -477,8 +476,7 @@ INSTALL_S1() {
 	TAPM_CLEAR_AUTHORIZATION
 
 	echo -en "${idsCL[LightYellow]}Paste the customers SentinelOne Site Token: ${idsCL[Default]}"
-	read -r -s s1token
-	echo
+	TAPM_READ_MASKED s1token
 	[[ -n "$s1token" ]] || {
 		TAPM_CLEAN_TEMP_DIR "$temp_dir"
 		echo "No SentinelOne site token supplied."