Work_Archive/VPS-scripts_Web-V2
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 11 Wiki Activity

Fixed Password Prompts

Browse Source
This commit is contained in:
Bram Prieshof
2020-03-25 14:03:05 +01:00
parent e484b4bd88
commit deda672572
1 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
installer.sh
View File

@@ -116,27 +116,40 @@ if [ -z $passdiaone ]; then PasswordQuest; fi
if [[ ${#passdiaone} -ge 8 && "$passdiaone" == *[[:lower:]]* && "$passdiaone" == *[[:upper:]]* && "$passdiaone" == *[0-9]* && "$passdiaone" == *['!'@#%^\&*()_+]* ]]; then if [[ ${#passdiaone} -ge 8 && "$passdiaone" == *[[:lower:]]* && "$passdiaone" == *[[:upper:]]* && "$passdiaone" == *[0-9]* && "$passdiaone" == *['!'@#%^\&*()_+]* ]]; then
PasswordCheck PasswordCheck
else else
whiptail --ok-button Done --msgbox " Password is invalid!" 10 30 && PasswordQuest whiptail --ok-button Done --msgbox " Password is invalid!" 10 30
unset passdiaone
PasswordQuest
fi fi
} }
function PasswordCheck { function PasswordCheck {
#Checking password #Checking password
passdiatwo=$(whiptail --nocancel --passwordbox " Please re-enter your password" 11 82 --title "Config" 3>&1 1>&2 2>&3) passdiatwo=$(whiptail --nocancel --passwordbox " Please re-enter your password" 11 82 --title "Config" 3>&1 1>&2 2>&3)
if [ -z $passdiatwo ]; then PasswordCheck; else if [ -z $passdiatwo ]; then
if [ $passdiaone != $passdiatwo ]; then whiptail --ok-button Done --msgbox " Password does not match!" 10 30 && PasswordQuest;else password="$passdiaone"; fi PasswordCheck
fi else
password="$passdiatwo" if [ $passdiaone != $passdiatwo ]; then
whiptail --ok-button Done --msgbox " Password does not match!" 10 30
PasswordQuest
else
password="$passdiaone"
unset passdiaone passdiatwo unset passdiaone passdiatwo
fi
fi
} }
function LegacyPasswordQuest { function LegacyPasswordQuest {
echo "Enter password (Requires: 8 chars, 1 capital and 1 num)" echo "Enter password (Requires: 8 chars, 1 capital and 1 num)"
read -s passdiaone read -s passdiaone
if [ -z $passdiaone ]; then PasswordQuest; fi if [ -z $passdiaone ]; then LegacyPasswordQuest; fi
if [[ ${#passdiaone} -ge 8 && "$passdiaone" == *[[:lower:]]* && "$passdiaone" == *[[:upper:]]* && "$passdiaone" == *[0-9]* && "$passdiaone" == *['!'@#%^\&*()_+]* ]]; then if [[ ${#passdiaone} -ge 8 && "$passdiaone" == *[[:lower:]]* && "$passdiaone" == *[[:upper:]]* && "$passdiaone" == *[0-9]* && "$passdiaone" == *['!'@#%^\&*()_+]* ]]; then
LegacyPasswordCheck LegacyPasswordCheck
else else
echo " Password is invalid!" 10 30 && LegacyPasswordQuest echo "Password is invalid!"
unset passdiaone
LegacyPasswordQuest
fi fi
} }
@@ -144,11 +157,17 @@ function LegacyPasswordCheck {
#Checking password #Checking password
echo "Please re-enter your password" echo "Please re-enter your password"
read -s passdiatwo read -s passdiatwo
if [ -z $passdiatwo ]; then LegacyPasswordCheck; else if [ -z $passdiatwo ]; then
if [ $passdiaone != $passdiatwo ]; then echo "Password does not match!" && LegacyPasswordQuest; password="$passdiaone"; fi LegacyPasswordCheck
fi else
password="$passdiatwo" if [ $passdiaone != $passdiatwo ]; then
echo "Password does not match!"
LegacyPasswordQuest
else
password="$passdiaone"
unset passdiaone passdiatwo unset passdiaone passdiatwo
fi
fi
} }