7871027c9d
* Share the implementation of hashing for both vars_prompt and password_hash. * vars_prompt with encrypt does not require passlib for the algorithms supported by crypt. * Additional checks ensure that there is always a result. This works around issues in the crypt.crypt python function that returns None for algorithms it does not know. Some modules (like user module) interprets None as no password at all, which is misleading. * The password_hash filter supports all parameters of passlib. This allows users to provide a rounds parameter, fixing #15326. * password_hash is not restricted to the subset provided by crypt.crypt, fixing one half of #17266. * Updated documentation fixes other half of #17266. * password_hash does not hard-code the salt-length, which fixes bcrypt in connection with passlib. bcrypt requires a salt with length 22, which fixes #25347 * Salts are only generated by ansible when using crypt.crypt. Otherwise passlib generates them. * Avoids deprecated functionality of passlib with newer library versions. * When no rounds are specified for sha256/sha256_crypt and sha512/sha512_crypt always uses the default values used by crypt, i.e. 5000 rounds. Before when installed passlibs' defaults were used. passlib changes its defaults with newer library versions, leading to non idempotent behavior. NOTE: This will lead to the recalculation of existing hashes generated with passlib and without a rounds parameter. Yet henceforth the hashes will remain the same. No matter the installed passlib version. Making these hashes idempotent. Fixes #15326 Fixes #17266 Fixes #25347 except bcrypt still uses 2a, instead of the suggested 2b. * random_salt is solely handled by encrypt.py. There is no _random_salt function there anymore. Also the test moved to test_encrypt.py. * Uses pytest.skip when passlib is not available, instead of a silent return. * More checks are executed when passlib is not available. * Moves tests that require passlib into their own test-function. * Uses the six library to reraise the exception. * Fixes integration test. When no rounds are provided the defaults of crypt are used. In that case the rounds are not part of the resulting MCF output.
115 lines
3.1 KiB
Python
115 lines
3.1 KiB
Python
#!/usr/bin/env python
|
|
|
|
import os
|
|
import pexpect
|
|
import sys
|
|
|
|
from ansible.module_utils.six import PY2
|
|
|
|
if PY2:
|
|
log_buffer = sys.stdout
|
|
else:
|
|
log_buffer = sys.stdout.buffer
|
|
|
|
env_vars = {
|
|
'ANSIBLE_ROLES_PATH': './roles',
|
|
'ANSIBLE_NOCOLOR': 'True',
|
|
'ANSIBLE_RETRY_FILES_ENABLED': 'False',
|
|
}
|
|
|
|
|
|
def run_test(playbook, test_spec, args=None, timeout=10, env=None):
|
|
|
|
if not env:
|
|
env = os.environ.copy()
|
|
env.update(env_vars)
|
|
|
|
if not args:
|
|
args = sys.argv[1:]
|
|
|
|
vars_prompt_test = pexpect.spawn(
|
|
'ansible-playbook',
|
|
args=[playbook] + args,
|
|
timeout=timeout,
|
|
env=env,
|
|
)
|
|
|
|
vars_prompt_test.logfile = log_buffer
|
|
for item in test_spec[0]:
|
|
vars_prompt_test.expect(item[0])
|
|
if item[1]:
|
|
vars_prompt_test.send(item[1])
|
|
vars_prompt_test.expect(test_spec[1])
|
|
vars_prompt_test.expect(pexpect.EOF)
|
|
vars_prompt_test.close()
|
|
|
|
|
|
# These are the tests to run. Each test is a playbook and a test_spec.
|
|
#
|
|
# The test_spec is a list with two elements.
|
|
#
|
|
# The first element is a list of two element tuples. The first is the regexp to look
|
|
# for in the output, the second is the line to send.
|
|
#
|
|
# The last element is the last string of text to look for in the output.
|
|
#
|
|
tests = [
|
|
# Basic vars_prompt
|
|
{'playbook': 'vars_prompt-1.yml',
|
|
'test_spec': [
|
|
[('input:', 'some input\r')],
|
|
'"input": "some input"']},
|
|
|
|
# Custom prompt
|
|
{'playbook': 'vars_prompt-2.yml',
|
|
'test_spec': [
|
|
[('Enter some input:', 'some more input\r')],
|
|
'"input": "some more input"']},
|
|
|
|
# Test confirm, both correct and incorrect
|
|
{'playbook': 'vars_prompt-3.yml',
|
|
'test_spec': [
|
|
[('input:', 'confirm me\r'),
|
|
('confirm input:', 'confirm me\r')],
|
|
'"input": "confirm me"']},
|
|
|
|
{'playbook': 'vars_prompt-3.yml',
|
|
'test_spec': [
|
|
[('input:', 'confirm me\r'),
|
|
('confirm input:', 'incorrect\r'),
|
|
(r'\*\*\*\*\* VALUES ENTERED DO NOT MATCH \*\*\*\*', ''),
|
|
('input:', 'confirm me\r'),
|
|
('confirm input:', 'confirm me\r')],
|
|
'"input": "confirm me"']},
|
|
|
|
# Test private
|
|
{'playbook': 'vars_prompt-4.yml',
|
|
'test_spec': [
|
|
[('not_secret', 'this is displayed\r'),
|
|
('this is displayed', '')],
|
|
'"not_secret": "this is displayed"']},
|
|
|
|
# Test hashing
|
|
{'playbook': 'vars_prompt-5.yml',
|
|
'test_spec': [
|
|
[('password', 'Scenic-Improving-Payphone\r'),
|
|
('confirm password', 'Scenic-Improving-Payphone\r')],
|
|
r'"password": "\$6\$']},
|
|
|
|
# Test variables in prompt field
|
|
# https://github.com/ansible/ansible/issues/32723
|
|
{'playbook': 'vars_prompt-6.yml',
|
|
'test_spec': [
|
|
[('prompt from variable:', 'input\r')],
|
|
'']},
|
|
|
|
# Test play vars coming from vars_prompt
|
|
# https://github.com/ansible/ansible/issues/37984
|
|
{'playbook': 'vars_prompt-7.yml',
|
|
'test_spec': [
|
|
[('prompting for host:', 'testhost\r')],
|
|
r'testhost.*ok=1']},
|
|
]
|
|
|
|
for t in tests:
|
|
run_test(playbook=t['playbook'], test_spec=t['test_spec'])
|