openstack/os-brick
Code Issues Proposed changes

Merge "Skip cryptsetup password quality checking" into stable/stein

Browse Source
This commit is contained in:
Zuul 2020-02-21 22:35:31 +00:00 committed by Gerrit Code Review
commit fd6425b2ee
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
os_brick/encryptors/luks.py
View File

@ -119,6 +119,7 @@ class LuksEncryptor(cryptsetup.CryptsetupEncryptor):
# Enter new passphrase for key slot: # Enter new passphrase for key slot:
# Verify passphrase: # Verify passphrase:
self._execute('cryptsetup', 'luksAddKey', self.dev_path, self._execute('cryptsetup', 'luksAddKey', self.dev_path,
'--force-password',
process_input=''.join([mangled_passphrase, '\n', process_input=''.join([mangled_passphrase, '\n',
passphrase, '\n', passphrase]), passphrase, '\n', passphrase]),
run_as_root=True, check_exit_code=True, run_as_root=True, check_exit_code=True,

1
os_brick/tests/encryptors/test_luks.py
View File

@ -227,6 +227,7 @@ class LuksEncryptorTestCase(test_cryptsetup.CryptsetupEncryptorTestCase):
root_helper=self.root_helper, run_as_root=True, root_helper=self.root_helper, run_as_root=True,
check_exit_code=[0, 4], attempts=3), check_exit_code=[0, 4], attempts=3),
mock.call('cryptsetup', 'luksAddKey', self.dev_path, mock.call('cryptsetup', 'luksAddKey', self.dev_path,
'--force-password',
process_input=''.join([fake_key_mangled, process_input=''.join([fake_key_mangled,
'\n', fake_key, '\n', fake_key,
'\n', fake_key]), '\n', fake_key]),