From 4fb792401597419e6dd644088e72a9a79833fc97 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 16 Apr 2020 20:11:17 -0400 Subject: [PATCH] Fix invalid salts base64 standard alphabet doesn't quite map to salt alphabet. Use . and / instead. --- confluent_server/confluent/config/configmanager.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/confluent_server/confluent/config/configmanager.py b/confluent_server/confluent/config/configmanager.py index 9f6ee4eb..bc667a47 100644 --- a/confluent_server/confluent/config/configmanager.py +++ b/confluent_server/confluent/config/configmanager.py @@ -1,4 +1,4 @@ -7# vim: tabstop=4 shiftwidth=4 softtabstop=4 +# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2014 IBM Corporation # Copyright 2015-2019 Lenovo @@ -477,7 +477,8 @@ def _get_valid_attrname(attrname): def hashcrypt_value(value): - salt = confluent.util.stringify(base64.b64encode(os.urandom(12))) + salt = confluent.util.stringify(base64.b64encode(os.urandom(12), + altchars=b'./')) salt = '$6${0}'.format(salt) return crypt.crypt(value, salt)