diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a82a630a..0c392f29b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Fix a bug: wrong focus behavior on text editor - Fix a bug: trainings monitoring is not available - Fix a bug: invalid password length verification in profile edtion form +- Fix a bug: invalid password verification in setup script ## v5.4.15 2022 August 1 diff --git a/app/frontend/templates/shared/_member_form.html b/app/frontend/templates/shared/_member_form.html deleted file mode 100644 index 0b0690626..000000000 --- a/app/frontend/templates/shared/_member_form.html +++ /dev/null @@ -1,566 +0,0 @@ -{{alert.msg}} - - - - - - -
-
-
-
-
- -
-
- -
-
- - - - {{ 'app.shared.user.add_an_avatar' }} - {{ 'app.shared.buttons.change' }} - - - - -
-
-
- -
-
- -
- - - - - {{ 'app.shared.user.gender_is_required' }} -
- - -
-
- - - -
- {{ 'app.shared.user.pseudonym_is_required' }} -
- - - -
-
- - -
- {{ 'app.shared.user.surname_is_required' }} -
- -
-
- - -
- {{ 'app.shared.user.first_name_is_required' }} -
- -
-
- - -
- {{ 'app.shared.user.email_address_is_required' }} -
- -
- -
- - -
-
- - -
- {{ 'app.shared.user.password_is_required' }} - {{ 'app.shared.user.password_is_too_short' }} -
- -
-
- - -
- {{ 'app.shared.user.confirmation_of_password_is_required' }} - {{ 'app.shared.user.confirmation_of_password_is_too_short' }} - {{ 'app.shared.user.confirmation_mismatch_with_password' }} -
- -
-
- - - -
- {{ 'app.shared.user.organization_name_is_required' }} -
- -
-
- - - -
- {{ 'app.shared.user.organization_address_is_required' }} -
- -
-
- - - -
- {{ 'app.shared.user.date_of_birth_is_required' }} -
- -
-
- - - -
-
- -
-
- - -
- {{ 'app.shared.user.phone_number_is_required' }} -
- -
-
- - -
-
- -
-
- - -
-
- -
- - -
- -
- - -
- - -
- - - -
- - -
- - - -
- -
-
-
- - -
-
- -
-
- - -
-
- -
-
- - -
-
- -
-
- - -
-
- -
-
- - -
-
- -
-
- - -
-
- -
-
- - -
-
- -
-
- - -
-
- -
-
- d - -
-
- - -
-
- - -
-
- -
-
- d - -
-
- -
-
- - -
-
- -
-
- - -
-
- -
-
- - -
-
- - -
- -
- -
diff --git a/setup/setup.sh b/setup/setup.sh index 2bd954455..3d7ae6f80 100755 --- a/setup/setup.sh +++ b/setup/setup.sh @@ -412,8 +412,12 @@ read_password() local password confirmation >&2 echo "Please input a password for this administrator's account" read -rsp " > " password &2 printf "\nError: password is too short (minimal length: 8 characters)\n" + if [ ${#password} -lt 12 ]; then + >&2 printf "\nError: password is too short (minimal length: 12 characters)\n" + password=$(read_password 'no-confirm') + fi + if [[ ! $password =~ [0-9] || ! $password =~ [a-z] || ! $password =~ [A-Z] || ! $password =~ [[:punct:]] ]]; then + >&2 printf "\nError: password is too weak (should contain uppercases, lowercases, digits and special characters)\n" password=$(read_password 'no-confirm') fi if [ "$1" != 'no-confirm' ]; then