b4b1bf9932
Do the right thing on Linux when password lock and a password hash are provided by writing
out the password hash prepended by the appropriate lock string rather than using -U and -L.
This is the correct way to set and lock the account in one command.
On BSD, run separate commands as appropriate since locking and setting the password cannot
be done in a single action.
FreeBSD requires running several commands to get the account in the desired state. As a result,
the rc, output, and error from all commands need to be combined and evaluated so an accurate
and complete summary can be given at the end of module execution.
* Improve integration tests to cover this scenario.
* Break up user integration tests into smaller files
* Properly lock account when creating a new account and password is supplied
* Simplify rc collection in FreeBSD class
Since the _handle_lock() method was added, the rc would be set to None, which could make
task change reporting incorrect. My first attempt to solve this used a set and was a bit too
complicated. Simplify it my comparing the rc from _handle_lock() and the current value of rc.
* Improve the Linux password hash and locking behavior
If password lock and hash are provided, set the hash and lock the account by using a password
hash since -L cannot be used with -p.
* Ensure -U and -L are not combined with -p since they are mutually exclusive to usermod.
* Clarify password_lock behavior..
(cherry picked from commit 264e08f21a)
Co-authored-by: Sam Doran <sdoran@redhat.com>
29 lines
682 B
YAML
29 lines
682 B
YAML
# Test creating ssh key with passphrase
|
|
- name: Remove ansibulluser
|
|
user:
|
|
name: ansibulluser
|
|
state: absent
|
|
|
|
- name: Create user with ssh key
|
|
user:
|
|
name: ansibulluser
|
|
state: present
|
|
generate_ssh_key: yes
|
|
force: yes
|
|
ssh_key_file: "{{ output_dir }}/test_id_rsa"
|
|
ssh_key_passphrase: secret_passphrase
|
|
|
|
- name: Unlock ssh key
|
|
command: "ssh-keygen -y -f {{ output_dir }}/test_id_rsa -P secret_passphrase"
|
|
register: result
|
|
|
|
- name: Check that ssh key was unlocked successfully
|
|
assert:
|
|
that:
|
|
- result.rc == 0
|
|
|
|
- name: Clean ssh key
|
|
file:
|
|
path: "{{ output_dir }}/test_id_rsa"
|
|
state: absent
|
|
when: ansible_os_family == 'FreeBSD'
|