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

Fixed function password

Browse Source
This commit is contained in:
b.waal
2020-03-19 11:05:39 +01:00
parent 3edd258335
commit fc9f9e8ef6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
installer.sh
View File

@@ -67,7 +67,7 @@ fi
} }
function PasswordQuest { function PasswordQuest {
passdiaone=$(whiptail --nocancel --passwordbox "Please enter your password (should contain at least 2 digits and 6 characters)" 11 82 --title "Config" 3>&1 1>&2 2>&3) passdiaone=$(whiptail --nocancel --passwordbox "Please enter your password (Requires 8 chars, uper & lower case, special and numerical)" 11 91 --title "Config" 3>&1 1>&2 2>&3)
if [ -z $passdiaone ]; then PasswordQuest; fi 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
@@ -79,9 +79,10 @@ 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 PasswordCheck; else
if [ $passdiaone != $passdiatwo ]; then whiptail --ok-button Done --msgbox " Password does not match!" 10 30 && PasswordQuest;else password="$passdiaone"; unset passdiaone passdiatwo; fi if [ $passdiaone != $passdiatwo ]; then whiptail --ok-button Done --msgbox " Password does not match!" 10 30 && PasswordQuest;else password="$passdiaone"; fi
fi fi
password="$passdiatwo" password="$passdiatwo"
unset passdiaone passdiatwo
} }
function LegacyPasswordQuest { function LegacyPasswordQuest {
@@ -100,9 +101,10 @@ function LegacyPasswordCheck {
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 LegacyPasswordCheck; else
if [ $passdiaone != $passdiatwo ]; then echo "Password does not match!" && LegacyPasswordQuest; password="$passdiaone"; unset passdiaone passdiatwo; fi if [ $passdiaone != $passdiatwo ]; then echo "Password does not match!" && LegacyPasswordQuest; password="$passdiaone"; fi
fi fi
password="$passdiatwo" password="$passdiatwo"
unset passdiaone passdiatwo
} }