From 6a6866afa343e3b53ad77a36552e19404ac7afab Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Thu, 4 Jul 2019 00:29:01 +0000 Subject: [PATCH] Bug 23250: Just use an @ in the password Rather than try to use -y and symbols, since older versions of pwgen don't have the -y, Purposefully just shorten the generated password to 15 characters and put @ on the end. This avoids nasty shell globbing, fixes the MySQL requiring a symbol by default in the newer versions. While @ at the end is less secure, the password portion providing security is still 15 characters long. Before patch, password should have potentially multiple ugly symbols in it. After patch, when creating an instance, the password will have an @ at the end of it. Signed-off-by: Martin Renvoize --- debian/scripts/koha-create | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create index 35572f223c..6551fea3ef 100755 --- a/debian/scripts/koha-create +++ b/debian/scripts/koha-create @@ -579,10 +579,8 @@ if [ "$op" = create ] || [ "$op" = request ] || [ "$op" = use ] then if [ "$mysqlpwd" = "" ] then - # over-size, so when problematic chars are removed, - # still likely 16 characters left. - mysqlpwd="$(pwgen -s -y 32 1)" - mysqlpwd="$(echo $mysqlpwd | tr -d :\'\\\<\>\/ | cut -c1-16)" + mysqlpwd="$(pwgen -s 15 1)" + mysqlpwd="$mysqlpwd@" fi else mysqlpwd="$(getinstancemysqlpassword $name)" -- 2.20.1