Merge "Strip whitespace from admin passwords"

This commit is contained in:
Zuul 2021-05-20 11:52:43 +00:00 committed by Gerrit Code Review
commit 45c1d2034f
2 changed files with 8 additions and 2 deletions

View File

@ -1467,8 +1467,10 @@ def store_data(backing_file, data):
def get_admin_passwd(user=None):
passwd = config("admin-password")
if passwd and passwd.lower() != "none":
return passwd
if passwd:
passwd = passwd.strip()
if passwd.lower() != "none":
return passwd
if user is None:
user = config('admin-user')

View File

@ -1138,6 +1138,10 @@ class TestKeystoneUtils(CharmTestCase):
def test_get_admin_passwd_pwd_set(self):
self.test_config.set('admin-password', 'supersecret')
self.assertEqual(utils.get_admin_passwd(), 'supersecret')
self.test_config.set('admin-password', 'supersecret ')
self.assertEqual(utils.get_admin_passwd(), 'supersecret')
self.test_config.set('admin-password', 'supersecret\n')
self.assertEqual(utils.get_admin_passwd(), 'supersecret')
@patch.object(utils, 'is_leader')
@patch.object(utils, 'leader_get')