From fdc63b5816a3c7957ba27a1b4cfb53ec40b0fca8 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Fri, 18 Feb 2022 09:41:09 -0500 Subject: [PATCH 1/2] Clarify so-user update usage/help --- salt/common/tools/sbin/so-user | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/so-user b/salt/common/tools/sbin/so-user index 5901cbd1b..1f86cda02 100755 --- a/salt/common/tools/sbin/so-user +++ b/salt/common/tools/sbin/so-user @@ -29,7 +29,7 @@ if [[ $# -lt 1 || $# -gt 3 ]]; then echo " add: Adds a new user to the identity system; requires 'email' parameter, while 'role' parameter is optional and defaults to $DEFAULT_ROLE" echo " addrole: Grants a role to an existing user; requires 'email' and 'role' parameters" echo " delrole: Removes a role from an existing user; requires 'email' and 'role' parameters" - echo " update: Updates a user's password; requires 'email' parameter" + echo " update: Updates a user's password and disables MFA; requires 'email' parameter" echo " enable: Enables a user; requires 'email' parameter" echo " disable: Disables a user; requires 'email' parameter" echo " validate: Validates that the given email address and password are acceptable; requires 'email' parameter" From 93e9548eaffe4ea662a3dffcccc7935ca73a36ec Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Fri, 18 Feb 2022 15:14:48 -0500 Subject: [PATCH 2/2] Require a minimum of 8 characters for passwords, to match Kratos min requirements --- salt/common/tools/sbin/so-user | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/so-user b/salt/common/tools/sbin/so-user index 1f86cda02..93e184fd9 100755 --- a/salt/common/tools/sbin/so-user +++ b/salt/common/tools/sbin/so-user @@ -98,7 +98,7 @@ function validatePassword() { password=$1 len=$(expr length "$password") - if [[ $len -lt 6 ]]; then + if [[ $len -lt 8 ]]; then fail "Password does not meet the minimum requirements" fi if [[ $len -gt 72 ]]; then