From 75df243fcd4e920843ec17035370ce7477cadf78 Mon Sep 17 00:00:00 2001
From: Christoph von Gabler-Sahm <sahm@mac.com>
Date: Fri, 6 May 2022 10:17:37 +0200
Subject: [PATCH 1/5] Added option --max-password-attempts which can be set to
 literal "infinity" to prevent canceling. Also fixes accidental canceling by
 supplying an empty password, removes superfluous dialogs when password is not
 correct as well as shows the proper "password is not correct" message after
 the checking cycle.

---
 erase-install.sh | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/erase-install.sh b/erase-install.sh
index 3dce067..9690e87 100755
--- a/erase-install.sh
+++ b/erase-install.sh
@@ -212,7 +212,7 @@ dialog_user_invalid_fr="Ce compte ne peut pas être utilisé pour effectuer la r
 
 # Dialogue localizations - invalid password
 dialog_invalid_password_en="ERROR: The password entered is NOT the login password for"
-dialog_invalid_password_de="ERROR: Das eingegebene Kennwort ist NICHT das Anmeldekennwort für"
+dialog_invalid_password_de="ERROR: Das eingegebene Passwort ist NICHT das Anmeldepasswort für"
 dialog_invalid_password_nl="FOUT: Het ingevoerde wachtwoord is NIET het inlogwachtwoord voor"
 dialog_invalid_password_fr="ERREUR : Le mot de passe entré n'est PAS le mot de passe de connexion pour"
 
@@ -265,9 +265,15 @@ dialog_not_volume_owner=dialog_not_volume_owner_${user_language}
 
 ask_for_password() {
     # required for Silicon Macs
-    /bin/launchctl asuser "$current_uid" /usr/bin/osascript <<END
+    if [[ $max_password_attempts == "infinite" ]]; then
+        /bin/launchctl asuser "$current_uid" /usr/bin/osascript <<END
+        set nameentry to text returned of (display dialog "${!dialog_get_password} ($account_shortname)" default answer "" with hidden answer buttons {"${!dialog_enter_button}"} default button 1 with icon 2)
+END
+    else
+        /bin/launchctl asuser "$current_uid" /usr/bin/osascript <<END
         set nameentry to text returned of (display dialog "${!dialog_get_password} ($account_shortname)" default answer "" with hidden answer buttons {"${!dialog_enter_button}", "${!dialog_cancel_button}"} default button 1 with icon 2)
 END
+    fi
 }
 
 ask_for_shortname() {
@@ -466,8 +472,7 @@ check_password() {
     else
         echo "   [check_password] ERROR: The password entered is NOT the login password for $user."
         password_check="fail"
-        # open_osascript_dialog syntax: title, message, button1, icon
-        open_osascript_dialog "${!dialog_user_invalid}: $user" "" "OK" 2
+        /usr/bin/afplay "/System/Library/Sounds/Basso.aiff"
     fi
 }
 
@@ -1038,16 +1043,18 @@ get_user_details() {
     password_check="fail"
     while [[ "$password_check" != "pass" ]] ; do
         account_password=$(ask_for_password)
-        if [[ ! "$account_password" ]]; then
+        ask_for_password_rc=$?
+        # prevent accidental cancelling by simply pressing return (entering an empty password)
+        if [[ "$ask_for_password_rc" -ne 0 ]]; then
             echo "   [get_user_details] User cancelled."
             exit 1
         fi
         check_password "$account_shortname" "$account_password"
 
         password_attempts=$((password_attempts+1))
-        if [[ $password_attempts -ge 5 ]]; then
+        if [[ ( $max_password_attempts != "infinite" ) && ( $password_attempts -ge $max_password_attempts ) ]]; then
             # open_osascript_dialog syntax: title, message, button1, icon
-            open_osascript_dialog "${!dialog_user_invalid}: $user" "" "OK" 2 
+            open_osascript_dialog "${!dialog_invalid_password}: $user" "" "OK" 2 
             exit 1
         fi
     done
@@ -1467,6 +1474,10 @@ show_help() {
       this script cannot be run at the login window or from remote terminal.
     --current-user      Authenticate startosinstall using the current user
     --user XYZ          Supply a user with which to authenticate startosinstall
+    --max-password-attempts NN | infinity
+                        Overrides the default of 5 attempts to ask for the user's password. Using
+                        "infinity" will disable the Cancel button and asking until the password is
+                        successfully verified.
 
     Experimental features for macOS 10.15+:
     --list-full-installers
@@ -1585,6 +1596,9 @@ reinstall="no"
 # Override this default value with the --min-drive-space option.
 min_drive_space=45
 
+# default max_password_attempts to 5
+max_password_attempts=5
+
 while test $# -gt 0 ; do
     case "$1" in
         -l|--list) list="yes"
@@ -1635,6 +1649,11 @@ while test $# -gt 0 ; do
             shift
             account_shortname="$1"
             ;;
+        --max-password-attempts)
+            shift
+            max_password_attempts="$1"
+            echo "set max_password_attempts to $max_password_attempts"
+            ;;
         --rebootdelay)
             shift
             rebootdelay="$1"

From 42ea54c5293e262c6108299ee88f94015171fb47 Mon Sep 17 00:00:00 2001
From: Christoph von Gabler-Sahm <sahm@mac.com>
Date: Tue, 10 May 2022 10:51:37 +0200
Subject: [PATCH 2/5] explicitly check for all valid parameters of
 max_password_attempts, otherwise do not change default of 5. Also add logging
 of the password attempts and changed counting to start with 1 instead of 0 so
 that the log file lists the correct attempt numbers.

---
 erase-install.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/erase-install.sh b/erase-install.sh
index 9690e87..5a8c2d6 100755
--- a/erase-install.sh
+++ b/erase-install.sh
@@ -1039,9 +1039,10 @@ get_user_details() {
     fi
 
     # get password and check that the password is correct
-    password_attempts=0
+    password_attempts=1
     password_check="fail"
     while [[ "$password_check" != "pass" ]] ; do
+        echo "   [get_user_details] ask for password (attempt $password_attempts/$max_password_attempts)"
         account_password=$(ask_for_password)
         ask_for_password_rc=$?
         # prevent accidental cancelling by simply pressing return (entering an empty password)
@@ -1051,12 +1052,12 @@ get_user_details() {
         fi
         check_password "$account_shortname" "$account_password"
 
-        password_attempts=$((password_attempts+1))
         if [[ ( $max_password_attempts != "infinite" ) && ( $password_attempts -ge $max_password_attempts ) ]]; then
             # open_osascript_dialog syntax: title, message, button1, icon
             open_osascript_dialog "${!dialog_invalid_password}: $user" "" "OK" 2 
             exit 1
         fi
+        password_attempts=$((password_attempts+1))
     done
 
     # if we are performing eraseinstall the user needs to be an admin so let's promote the user
@@ -1651,8 +1652,9 @@ while test $# -gt 0 ; do
             ;;
         --max-password-attempts)
             shift
-            max_password_attempts="$1"
-            echo "set max_password_attempts to $max_password_attempts"
+            if [[ ( $1 == "infinity" ) || ( $1 -gt 0 ) ]]; then
+                max_password_attempts="$1"
+            fi
             ;;
         --rebootdelay)
             shift

From 86b88233eecd594f4b491e90a50c3dd7ad1129e7 Mon Sep 17 00:00:00 2001
From: Christoph von Gabler-Sahm <sahm@mac.com>
Date: Tue, 10 May 2022 18:13:22 +0200
Subject: [PATCH 3/5] Oh no, there was an inconsistent use of the parameter
 value: "infinity" vs. "infinite". I settled for "infinite" now.

---
 erase-install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/erase-install.sh b/erase-install.sh
index 5a8c2d6..1b87e81 100755
--- a/erase-install.sh
+++ b/erase-install.sh
@@ -1475,9 +1475,9 @@ show_help() {
       this script cannot be run at the login window or from remote terminal.
     --current-user      Authenticate startosinstall using the current user
     --user XYZ          Supply a user with which to authenticate startosinstall
-    --max-password-attempts NN | infinity
+    --max-password-attempts NN | infinite
                         Overrides the default of 5 attempts to ask for the user's password. Using
-                        "infinity" will disable the Cancel button and asking until the password is
+                        "infinite" will disable the Cancel button and asking until the password is
                         successfully verified.
 
     Experimental features for macOS 10.15+:
@@ -1652,7 +1652,7 @@ while test $# -gt 0 ; do
             ;;
         --max-password-attempts)
             shift
-            if [[ ( $1 == "infinity" ) || ( $1 -gt 0 ) ]]; then
+            if [[ ( $1 == "infinite" ) || ( $1 -gt 0 ) ]]; then
                 max_password_attempts="$1"
             fi
             ;;

From fc8f7e4b8af9dfd91b2aafcce8dcc158a5e44dcb Mon Sep 17 00:00:00 2001
From: Christoph von Gabler-Sahm <sahm@mac.com>
Date: Wed, 11 May 2022 11:57:31 +0200
Subject: [PATCH 4/5] Shellcheck complained about the double quotes in the help
 section (SC2140)

---
 erase-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erase-install.sh b/erase-install.sh
index 1b87e81..2e1042c 100755
--- a/erase-install.sh
+++ b/erase-install.sh
@@ -1477,7 +1477,7 @@ show_help() {
     --user XYZ          Supply a user with which to authenticate startosinstall
     --max-password-attempts NN | infinite
                         Overrides the default of 5 attempts to ask for the user's password. Using
-                        "infinite" will disable the Cancel button and asking until the password is
+                        'infinite' will disable the Cancel button and asking until the password is
                         successfully verified.
 
     Experimental features for macOS 10.15+:

From ba51114b1b0236dfb9aa06f0fde5b046dda13b50 Mon Sep 17 00:00:00 2001
From: Christoph von Gabler-Sahm <sahm@mac.com>
Date: Wed, 11 May 2022 17:36:23 +0200
Subject: [PATCH 5/5] also i forgot the second parameter form
 ("max-password-attempts=value")

---
 erase-install.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/erase-install.sh b/erase-install.sh
index 2e1042c..e3c2495 100755
--- a/erase-install.sh
+++ b/erase-install.sh
@@ -1768,6 +1768,12 @@ while test $# -gt 0 ; do
         --user*)
             account_shortname=$(echo "$1" | sed -e 's|^[^=]*=||g')
             ;;
+        --max-password-attempts*)
+            new_max_password_attempts=$(echo "$1" | sed -e 's|^[^=]*=||g')
+            if [[ ( $new_max_password_attempts == "infinite" ) || ( $new_max_password_attempts -gt 0 ) ]]; then
+                max_password_attempts="$1"
+            fi
+            ;;
         --rebootdelay*)
             rebootdelay=$(echo "$1" | sed -e 's|^[^=]*=||g')
             if [[ $rebootdelay -gt 300 ]]; then