fill_team: avoid \ char in password + fix substitution of UTF-8 chars
This commit is contained in:
parent
13548d913f
commit
5ffbeabf5b
@ -63,11 +63,11 @@ new_team() {
|
|||||||
COLOR=$((($R*256 + $G) * 256 + $B))
|
COLOR=$((($R*256 + $G) * 256 + $B))
|
||||||
|
|
||||||
[ "${GEN_PASSWD}" -eq 1 ] && {
|
[ "${GEN_PASSWD}" -eq 1 ] && {
|
||||||
PASSWD=$(pwgen -B -y 12)
|
PASSWD=$(pwgen -r '\\' -B -y 12)
|
||||||
cat >> teams.pass <<EOF
|
cat >> teams.pass <<EOF
|
||||||
${N}:${PASSWD}
|
${N}:${PASSWD}
|
||||||
EOF
|
EOF
|
||||||
NP=$(echo $N | cut -d : -f 1 | tr '[:upper:]âéêè' '[:lower:]aeee')
|
NP=$(echo $N | cut -d : -f 1 | sed 's/[[:upper:]]/\l&/g;s/[âáàä]/a/g;s/[êéèë]/e/g')
|
||||||
SALT="$(openssl rand -base64 3)"
|
SALT="$(openssl rand -base64 3)"
|
||||||
HASHED="{SSHA}$(echo -n $PASS$SALT | openssl dgst -binary -sha1 | sed 's#$#'"$SALT"'#' | base64)"
|
HASHED="{SSHA}$(echo -n $PASS$SALT | openssl dgst -binary -sha1 | sed 's#$#'"$SALT"'#' | base64)"
|
||||||
cat >> htpasswd <<EOF
|
cat >> htpasswd <<EOF
|
||||||
|
Loading…
Reference in New Issue
Block a user