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>
140 lines
4.3 KiB
YAML
140 lines
4.3 KiB
YAML
- name: Test password lock
|
|
when: ansible_facts.system in ['FreeBSD', 'OpenBSD', 'Linux']
|
|
block:
|
|
- name: Remove ansibulluser
|
|
user:
|
|
name: ansibulluser
|
|
state: absent
|
|
remove: yes
|
|
|
|
- name: Create ansibulluser with password
|
|
user:
|
|
name: ansibulluser
|
|
password: "$6$rounds=656000$TT4O7jz2M57npccl$33LF6FcUMSW11qrESXL1HX0BS.bsiT6aenFLLiVpsQh6hDtI9pJh5iY7x8J7ePkN4fP8hmElidHXaeD51pbGS."
|
|
|
|
- name: Lock account without password parameter
|
|
user:
|
|
name: ansibulluser
|
|
password_lock: yes
|
|
register: password_lock_1
|
|
|
|
- name: Lock account without password parameter again
|
|
user:
|
|
name: ansibulluser
|
|
password_lock: yes
|
|
register: password_lock_2
|
|
|
|
- name: Unlock account without password parameter
|
|
user:
|
|
name: ansibulluser
|
|
password_lock: no
|
|
register: password_lock_3
|
|
|
|
- name: Unlock account without password parameter again
|
|
user:
|
|
name: ansibulluser
|
|
password_lock: no
|
|
register: password_lock_4
|
|
|
|
- name: Lock account with password parameter
|
|
user:
|
|
name: ansibulluser
|
|
password_lock: yes
|
|
password: "$6$rounds=656000$TT4O7jz2M57npccl$33LF6FcUMSW11qrESXL1HX0BS.bsiT6aenFLLiVpsQh6hDtI9pJh5iY7x8J7ePkN4fP8hmElidHXaeD51pbGS."
|
|
register: password_lock_5
|
|
|
|
- name: Lock account with password parameter again
|
|
user:
|
|
name: ansibulluser
|
|
password_lock: yes
|
|
password: "$6$rounds=656000$TT4O7jz2M57npccl$33LF6FcUMSW11qrESXL1HX0BS.bsiT6aenFLLiVpsQh6hDtI9pJh5iY7x8J7ePkN4fP8hmElidHXaeD51pbGS."
|
|
register: password_lock_6
|
|
|
|
- name: Unlock account with password parameter
|
|
user:
|
|
name: ansibulluser
|
|
password_lock: no
|
|
password: "$6$rounds=656000$TT4O7jz2M57npccl$33LF6FcUMSW11qrESXL1HX0BS.bsiT6aenFLLiVpsQh6hDtI9pJh5iY7x8J7ePkN4fP8hmElidHXaeD51pbGS."
|
|
register: password_lock_7
|
|
|
|
- name: Unlock account with password parameter again
|
|
user:
|
|
name: ansibulluser
|
|
password_lock: no
|
|
password: "$6$rounds=656000$TT4O7jz2M57npccl$33LF6FcUMSW11qrESXL1HX0BS.bsiT6aenFLLiVpsQh6hDtI9pJh5iY7x8J7ePkN4fP8hmElidHXaeD51pbGS."
|
|
register: password_lock_8
|
|
|
|
- name: Ensure task reported changes appropriately
|
|
assert:
|
|
msg: The password_lock tasks did not make changes appropriately
|
|
that:
|
|
- password_lock_1 is changed
|
|
- password_lock_2 is not changed
|
|
- password_lock_3 is changed
|
|
- password_lock_4 is not changed
|
|
- password_lock_5 is changed
|
|
- password_lock_6 is not changed
|
|
- password_lock_7 is changed
|
|
- password_lock_8 is not changed
|
|
|
|
- name: Lock account
|
|
user:
|
|
name: ansibulluser
|
|
password_lock: yes
|
|
|
|
- name: Verify account lock for BSD
|
|
when: ansible_facts.system in ['FreeBSD', 'OpenBSD']
|
|
block:
|
|
- name: BSD | Get account status
|
|
shell: "{{ status_command[ansible_facts['system']] }}"
|
|
register: account_status_locked
|
|
|
|
- name: Unlock account
|
|
user:
|
|
name: ansibulluser
|
|
password_lock: no
|
|
|
|
- name: BSD | Get account status
|
|
shell: "{{ status_command[ansible_facts['system']] }}"
|
|
register: account_status_unlocked
|
|
|
|
- name: FreeBSD | Ensure account is locked
|
|
assert:
|
|
that:
|
|
- "'LOCKED' in account_status_locked.stdout"
|
|
- "'LOCKED' not in account_status_unlocked.stdout"
|
|
when: ansible_facts['system'] == 'FreeBSD'
|
|
|
|
- name: Verify account lock for Linux
|
|
when: ansible_facts.system == 'Linux'
|
|
block:
|
|
- name: LINUX | Get account status
|
|
getent:
|
|
database: shadow
|
|
key: ansibulluser
|
|
|
|
- name: LINUX | Ensure account is locked
|
|
assert:
|
|
that:
|
|
- getent_shadow['ansibulluser'][0].startswith('!')
|
|
|
|
- name: Unlock account
|
|
user:
|
|
name: ansibulluser
|
|
password_lock: no
|
|
|
|
- name: LINUX | Get account status
|
|
getent:
|
|
database: shadow
|
|
key: ansibulluser
|
|
|
|
- name: LINUX | Ensure account is unlocked
|
|
assert:
|
|
that:
|
|
- not getent_shadow['ansibulluser'][0].startswith('!')
|
|
|
|
always:
|
|
- name: Unlock account
|
|
user:
|
|
name: ansibulluser
|
|
password_lock: no
|